From: Marc Alff
Date: August 11 2010 10:36am
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3197) Bug#55817
List-Archive: http://lists.mysql.com/commits/115479
X-Bug: 55817
Message-Id: <201008111037.o7B7IU7d018464@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6428171053977574265=="

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

#At file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-55817/ based on revid:jonathan.perkin@stripped

 3197 Marc Alff	2010-08-11
      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-11 10:36:05 +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


--===============6428171053977574265==
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:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   55817/
# testament_sha1: fef954e25aabcf47231fc9c8df2b0ecc44a72a7d
# timestamp: 2010-08-11 04:36:25 -0600
# base_revision_id: jonathan.perkin@stripped\
#   0g0ee595dxxqbkcz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS6W2iAAAbZfgEAQWGf/93Yn
/nC////wUARWmN7me7w6b073t63CSRAjNBGKaemqeAppgjEY1PUADIJRNTQyjyNU9Mmoyh+qDaho
AGQaNPUbUDIJqZT0Ak9I1GQbJABkGaRkAAxVNHiTTQnqYAAmmAAAAmmJoJSJppppqnlHqfqT1Mj1
BtTTQ9QAAGQ9Eajulz/Z81btonNna1HBVTKYJrnbYbXtWOjFyV0+MFVSO7tInt/ETEq7w8IyWBIR
FXhq5OAyXS8vwVTgioe7kz+P5seuXJoJxF269It3RkxdXaxU4mo6XDffuybHqHKJd4C70UnRc0JH
EQn4TSGugm7ZKPRlBcbcQL0Q6EisxndljvyFkiDUzwiHr8jINjwTt7LaVuFzkxKLLIPiHockRRPU
avUbs23qVFKCA2uYF2aVlFoLMXiiE+L0FbLNhC/PT3yBMnaZ7bKp3u0Ddb4uGFBaQtFLq6fmLAeT
/DWL2YsFAO112PGVcQ4rmpykdg56TDR0I0wJgjLswYPeWPrZUJU8ylpSRLVMElJjYQvFSTGpqW/3
IqFIXd+Y+Ika2nU7fOHL3z5zNNhal6eRML9tC6oRsayiV2tVY7QjzJHYTmMasHE/NSyViVjhRiHy
U+vlOq3dEBhjTE5zuumECECJi5Q83K01DnGgpQa9gM77ZIlg2hrTAVsOO8W8YlEPe07XGEkhSwQx
wpCKamCQAxqwidXmv0pweV3Vi+GFE9hyED8pFGs7rZdY3DRo/R73E+nhPs0jcCpYsc8aLwmK3mo1
HpR0I0ar0fT6vORuOEQcOru744uPblOafikUlLgdyA8JbGrUlbIq6OkChE447JMqfdOnbs/dDrPi
+r4HmnF57l0u+XMLrSz2sA1xXCGTVDWWHnopjZkjFIsuykh5FXJMqcjZ9ew8fGFVClTOVFIxxKob
RxLrml4qIwr4LetymS6SEdFgBTtlo2xj4eIMHxlIVWlAGu8h5h9ntwD8ljg6ptuq0u6s0jN+nFhj
ntzFpeeqcoOauOm3fOHk41UDUQaAa50/TozNiDwNBgbnkEECv/QMWVBXruiKLxUkVb6TFyEzJc5j
2mPszplGhIJ6KKbxdYiq1GMwF35iLP1QRWs0KIOUU4YocEVQqIze8791HwTAM2YLoMIWzpuxVvI7
bTEFvUGQIBBYSItONHogoxUHnOBASVcVi+K5xAoZeiFf0dYpeSKTtocNgU2ODG9JicxRqMhkESxF
SClyMUhC7daAYIXVVRRrbmU3VJT4cD3kiMXkUZlj3F9BF+qSLqDjCgO5zTyMl1Ib1SIBSu1ytMwr
kV7qCvBmURd2KbfRhJLR0m0mKmtyGpJzwIZyA2sKRXdMR0IBQ3dVZWxDq5RTq37qkfe7AuJXWqaS
iD3RSvp2lmjdKyMFXWEECV3g35wmSjlHoBk3gGYgMeKUnVxbUc2+RYHct3lisiWM4TpkNfK5TI56
ufYvLZft2n8E6im0juqUekPAMAOIGfHUVQvGIuIhloFrYQkm/4u5IpwoSBdLbRAA


--===============6428171053977574265==--