← Back to branch summary

~percona-dev/percona-server/5.1.57-partially-ported

« back to all changes in this revision

Viewing changes to bug580324.patch

  • Committer: Oleg Tsarev
  • Date: 2011-05-10 00:07:01 UTC
  • Revision ID: oleg.tsarev@percona.com-20110510000701-l08jx5er0g8ogi6w
Patches ported to 5.1.57
ATTENTION, ATTENTION, ATTENTION
!!!
Some parts of innodb_split_buf_pool_mutex.patch was removed (for apply another patches)
You should revert changes in this commit from patch and do their right

!!! 
innodb_lru_dump_restore.patch has some changes, what should be reviewed

!!!
mysql-test.diff - I removed part for "mysql-test/include/mtr_warnings.sql", should be restored and fixed

All other looks fine.

UNFORTUNATELY, MYSQL DOESN'T BUILD (Compilation error in InnoDB).

ATTENTION, ATTENTION, ATTENTION

Show diffs side-by-side

added added

removed removed

Lines of Context:
bug580324.patch
26
26
diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
27
27
--- a/sql/sql_parse.cc  2010-05-27 19:54:18.000000000 +0400
28
28
+++ b/sql/sql_parse.cc  2010-05-27 20:03:20.000000000 +0400
29
 
@@ -1327,10 +1327,12 @@
 
29
@@ -1341,10 +1341,12 @@
30
30
     break;
31
31
 #else
32
32
   {
41
41
 
42
42
     /* used as fields initializator */
43
43
     lex_start(thd);
44
 
@@ -1342,26 +1344,22 @@
 
44
@@ -1356,26 +1358,22 @@
45
45
     /*
46
46
       We have name + wildcard in packet, separated by endzero
47
47
     */
79
79
 
80
80
     if (is_schema_db(table_list.db, table_list.db_length))
81
81
     {
82
 
@@ -1370,9 +1368,6 @@
 
82
@@ -1384,9 +1382,6 @@
83
83
         table_list.schema_table= schema_table;
84
84
     }
85
85