bzr push into mysql-trunk-bugfixing branch (marc.alff:3226 to 3227) Bug#55817

[Marc Alff]

 3227 Marc Alff	2010-08-23
      Bug#55817 Server in bootstrap mode cannot execute long queries, installation breaks
            
      Increased the maximun query length in bootstrap mode,
      to accomodate the documentation generated content in file fill_help_tables.sql

    modified:
      sql/sql_bootstrap.h
 3226 Alexander Nozdrin	2010-08-23 [merge]
      Auto-merge from mysql-5.5-bugfixing.

    added:
      mysql-test/suite/parts/r/part_ctype_utf32.result
      mysql-test/suite/parts/t/part_ctype_utf32.test
    modified:
      mysql-test/r/partition_innodb.result
      mysql-test/t/partition_innodb.test
      sql/field.cc
      sql/sql_audit.cc
      sql/sql_audit.h
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_table.cc
      sql/sql_table.h
=== modified file 'sql/sql_bootstrap.h'
--- a/sql/sql_bootstrap.h	2010-06-30 14:05:18 +0000
+++ b/sql/sql_bootstrap.h	2010-08-23 22:29:36 +0000
@@ -20,15 +20,15 @@
 /**
   The maximum size of a bootstrap query.
   Increase this size if parsing a longer query during bootstrap is necessary.
-  The longest query in use currently is:
-    INSERT INTO time_zone_transition ..., 8059 characters
+  The longest query in use depends on the documentation content,
+  see the file fill_help_tables.sql
 */
-#define MAX_BOOTSTRAP_QUERY_SIZE 10000
+#define MAX_BOOTSTRAP_QUERY_SIZE 20000
 /**
   The maximum size of a bootstrap query, expressed in a single line.
-  Do not increase this size, use the multiline syntax with 'GO' instead.
+  Do not increase this size, use the multiline syntax instead.
 */
-#define MAX_BOOTSTRAP_LINE_SIZE 10000
+#define MAX_BOOTSTRAP_LINE_SIZE 20000
 
 #define READ_BOOTSTRAP_EOF 1
 #define READ_BOOTSTRAP_ERROR 2


Attachment: [text/bzr-bundle] bzr/[e-mail]