From: Marc Alff
Date: August 23 2010 10:29pm
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3227) Bug#55817
List-Archive: http://lists.mysql.com/commits/116551
X-Bug: 55817
Message-Id: <20100823222940.9DF8E45E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2888050823017670525=="

--===============2888050823017670525==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-55817/ based on revid:alik@ibmvm-20100823170222-qfahagegk2vo17ad

 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
=== 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


--===============2888050823017670525==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   55817/
# testament_sha1: d01dc6978497f44e5dc70497dfa0265a5555b41e
# timestamp: 2010-08-23 16:29:40 -0600
# base_revision_id: alik@ibmvm-20100823170222-qfahagegk2vo17ad
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRzh0pAAAbvfgFAQWGf/93Yn
/nC///9wUARWyV7sMxu7RSNDRE0mGmminmmknqe0oAAAAaGnqNAlIgNTNMp6U9J4o00aNNA0aGmj
RoAAkkAmQjTKmYkZ6jSEGmAaNDUYjIcwCYCZGAEYmJhMJghpiaYCSSAanqTMmjSnmVPJinqeo9I9
QB6RtIenqJSRtu2SVKi22kK1/DI4LCSFznohU9k5bJEuOJmDCkQTbvdNmZHh80ZcfvKhHDykJM9t
1HTZnu77Y95q7fsUO9zk00GXxsSrP50KO7YmUswb1wmTrmoSKY5EiJAYYRRyYtwde7nCDBNxDdNd
NZ3igZggzEbsq8LVywBWFg+Y3KcAMgPGszTCsee43dc0GrQDYPX2GQYvBOlQ3qLEy58B+3rkSIJD
5M9UUGusgqN0xBejQv4s6+EfEqqibsEdZOngyyqfCsrRvEnll3/ukPDbBVK+/pcK0GSAgCyZz1ZQ
FuvgK5BxJjyV9MMxSKNvNbWJRLCqhOshOE1CcPZ7x69TCxQvFnFGdpsKM+JzZTM0xYOMQpHRG+jJ
vvDMxSxeJ/5eSlFDa2djZoDhJCArBctdk+gUhPo4eKVz7tHzKqLG0UbG3aoFalg3ctmMBkYGBNLX
oTroGEsFRczRK5Dy5QQTyY3632pfoTf5CuJW/M08xK4cpkykBNGlwxYlSXKmNzOC7KBjNpSMXjRZ
NNokQlNvOadW27fmPbt9mXJZgeB3kMLwYvOVkl5L16dP8PfOUeOw/h4kvUxOHE7yUd1mKnnkeRfD
ei7VmRz74jmbSIG9PnIVS8wKOKb5YIwwJlSTSBjTTS9U9SkNmbOA9CgWdEq7GIvLGJL1vKK9Fugj
IJaZksXqzolVagFUuNU1DRxrudIpQF4Dr2Ep4FIVz2Qxv1GTuqe1J0UtGuFFLVGsevILJ8bJ4jfl
1rVauUXc0SXZNA7u79jznpmOKbIeMvdaoPx6l0rwiW0TXP9Kjw8khhO4a8jfrQLBuSO2g4XD+JBM
Qd6qXcE/e41QGhhbCGvAotF2+wr23ayWYD9q4iIjTSgpK76TVliadPCBlmM/naRyAk+HnOiqyjXh
+y7SYWUF3MY8R1ImgxoLBZB3r802Puemin2mlVoiYY92cXAIyTHJIeduSShZg4cA3wjIatNbOXap
soW7gtB4PcEScplQAxk1n4oSI2qcO2ahbpyBgk7q0wohNZ0OQzuPUqywqSxObhLzNQpMufTRQcpD
NVnMYsSpDuYKWUjnOZnbJ5bZ7cNBOL+vHKJkyx6vSxV7hk+4DexQuxg5ZSMlsQ3tAwh2Li5VlQsq
MW2Bi0MyjMs3K3CPEU73KyUqqt7KwLLFD5CighuHIt2XE+1qrD7XxvlKDnMMfvx4QUdrszYYbKMb
sKhF1STcvQT6n9rYGbNeFENbDKLbXHEg7+DaRHrdGMHQK3HR2OFrGuEbBEWmcCcjIHZoQUhC7IE1
8C8IOyyBrZYIraSVeE1qtHtk5RRWUYqLhf+LuSKcKEgOcOlIAA==


--===============2888050823017670525==--