[Pkg-mysql-commits] r1232 - in branches/etch-5.0/debian: . patches
Norbert Tretkowski
nobse at alioth.debian.org
Thu May 15 17:58:10 UTC 2008
tags 475159 pending
thanks
Author: nobse
Date: 2008-05-15 17:58:10 +0000 (Thu, 15 May 2008)
New Revision: 1232
Added:
branches/etch-5.0/debian/patches/51_innodb_parserbug.dpatch
Modified:
branches/etch-5.0/debian/changelog
branches/etch-5.0/debian/patches/00list
branches/etch-5.0/debian/patches/95_SECURITY_CVE-2007-3781.dpatch
Log:
Fix InnoDB parser that sometimes did not account for null bytes, causing spurious failure of some queries.
Modified: branches/etch-5.0/debian/changelog
===================================================================
--- branches/etch-5.0/debian/changelog 2008-05-15 17:46:08 UTC (rev 1231)
+++ branches/etch-5.0/debian/changelog 2008-05-15 17:58:10 UTC (rev 1232)
@@ -2,8 +2,10 @@
* Fix crash in EXPLAIN caused by certain queries that used uncorrelated
scalar subqueries. (closes: #464218)
+ * Fix InnoDB parser that sometimes did not account for null bytes, causing
+ spurious failure of some queries. (closes: #475159)
- -- Norbert Tretkowski <nobse at debian.org> Thu, 15 May 2008 19:41:40 +0200
+ -- Norbert Tretkowski <nobse at debian.org> Thu, 15 May 2008 19:56:28 +0200
mysql-dfsg-5.0 (5.0.32-7etch5) stable-security; urgency=high
Modified: branches/etch-5.0/debian/patches/00list
===================================================================
--- branches/etch-5.0/debian/patches/00list 2008-05-15 17:46:08 UTC (rev 1231)
+++ branches/etch-5.0/debian/patches/00list 2008-05-15 17:58:10 UTC (rev 1232)
@@ -29,3 +29,4 @@
95_SECURITY_CVE-2007-6304.dpatch
96_SECURITY_CVE-2008-0226+0227.dpatch
50_explain_crash.dpatch
+51_innodb_parserbug.dpatch
Added: branches/etch-5.0/debian/patches/51_innodb_parserbug.dpatch
===================================================================
--- branches/etch-5.0/debian/patches/51_innodb_parserbug.dpatch (rev 0)
+++ branches/etch-5.0/debian/patches/51_innodb_parserbug.dpatch 2008-05-15 17:58:10 UTC (rev 1232)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 51_innodb_parserbug.dpatch by Tim Small <tim at buttersideup.com>
+
+ at DPATCH@
+--- a/innobase/dict/dict0dict.c 2006-12-20 11:14:48.000000000 +0000
++++ b/innobase/dict/dict0dict.c 2008-01-11 14:43:37.000000000 +0000
+@@ -28,7 +28,7 @@
+ #include "rem0cmp.h"
+
+ /* Implement isspace() in a locale-independent way. (Bug #24299) */
+-#define ib_isspace(c) strchr(" \v\f\t\r\n", c)
++#define ib_isspace(c) ((char) (c) && strchr(" \v\f\t\r\n", c))
+
+ dict_sys_t* dict_sys = NULL; /* the dictionary system */
+
Modified: branches/etch-5.0/debian/patches/95_SECURITY_CVE-2007-3781.dpatch
===================================================================
--- branches/etch-5.0/debian/patches/95_SECURITY_CVE-2007-3781.dpatch 2008-05-15 17:46:08 UTC (rev 1231)
+++ branches/etch-5.0/debian/patches/95_SECURITY_CVE-2007-3781.dpatch 2008-05-15 17:58:10 UTC (rev 1232)
@@ -170,27 +170,6 @@
error= FALSE;
err:
-diff -Nur mysql-dfsg-5.0-5.0.32.orig/sql/sql_parse.cc.rej mysql-dfsg-5.0-5.0.32/sql/sql_parse.cc.rej
---- mysql-dfsg-5.0-5.0.32.orig/sql/sql_parse.cc.rej 1970-01-01 01:00:00.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.32/sql/sql_parse.cc.rej 2007-12-22 20:15:32.790866404 +0100
-@@ -0,0 +1,17 @@
-+***************
-+*** 3061,3067 ****
-+ else
-+ {
-+ /* regular create */
-+- if (lex->name)
-+ res= mysql_create_like_table(thd, create_table, &create_info,
-+ (Table_ident *)lex->name);
-+ else
-+--- 3062,3068 ----
-+ else
-+ {
-+ /* regular create */
-++ if (lex->create_info.options & HA_LEX_CREATE_TABLE_LIKE)
-+ res= mysql_create_like_table(thd, create_table, &create_info,
-+ (Table_ident *)lex->name);
-+ else
diff -Nur mysql-dfsg-5.0-5.0.32.orig/sql/sql_yacc.yy mysql-dfsg-5.0-5.0.32/sql/sql_yacc.yy
--- mysql-dfsg-5.0-5.0.32.orig/sql/sql_yacc.yy 2006-12-20 12:14:38.000000000 +0100
+++ mysql-dfsg-5.0-5.0.32/sql/sql_yacc.yy 2007-12-22 20:15:32.790866404 +0100
More information about the Pkg-mysql-commits
mailing list