From: Marc Alff
Date: August 23 2010 10:38pm
Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3231 to 3232)
List-Archive: http://lists.mysql.com/commits/116554
Message-Id: <20100823223849.8BB9545E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1807659750788369254=="

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

 3232 Marc Alff	2010-08-23 [merge]
      Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

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

    added:
      mysql-test/suite/parts/r/part_ctype_utf32.result
      mysql-test/suite/parts/t/part_ctype_utf32.test
    modified:
      client/mysql.cc
      mysql-test/CMakeLists.txt
      mysql-test/r/mysql.result
      mysql-test/r/partition_innodb.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/t/disabled.def
      mysql-test/t/mysql.test
      mysql-test/t/partition_innodb.test
      scripts/CMakeLists.txt
      scripts/mysqlaccess.conf*
      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
      storage/perfschema/pfs.cc
=== 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


--===============1807659750788369254==
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-next-mr-bugfixing/
# testament_sha1: 0ecd9b64592906a2f9944c346ce667d90483314d
# timestamp: 2010-08-23 16:38:49 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing/
# base_revision_id: alik@ibmvm-20100823174334-dyurhp1rjmnmphkj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVnHLmUAArHfgFAQWGf/93Yn
/nC////wUAXM8VtlUlkJUDIUhKQmUbQUbGpPImm1HqAAAHpNGhpoHNMTJk0YTBMTTAJgEMEYEYBJ
JqYICGp6U09R6jRo0BoANPUBkPUHNMTJk0YTBMTTAJgEMEYEYBJJMgNNEMmmjQmQJijaT1DT1AAN
EpFNYXtnUzTWaSmqErfmV1S0MGSGSikCVyxKJpHmRo8LN1hO/DRWBXq7XxtYZhcnAWmvrkVmxLV0
EZs7ZFYTaMCx4aO/AtNXAlDdkrOEILU0GX34jx7PxOLcvF6rsG6tnb1sm4WSmV89Mw9xcw6XLnq4
5HDL0TqnJX8y/hru1s/eSP6BFxyOtcfLkZjwnWouCksOiDauRvgNurn3AGAByW02ysg52dY1/bQk
dRoBeTL+BkgkOJEJT56ncUxipF7B9kpEiw2AyQUjRooqiAxXFIoGXYQEj6sQt0GHEXkNpDAtr+Sn
2IZatwkN+eGIkqoSApLkZzxzZvraKwxVFDyuxiW4ylakWQEjWxB1crELO+xBakG4gHNQ0cpjblFB
IqGMyqwuiY00FqDiGFxYLaKwTqSKmLRo3RIi2sha7SxWql3+IM0FB0IdRrXo363tluMmjqpNmZqV
9GqMjOJvFhtUTR8K4/vGc7oDsOoTx5N383llC++K1G6PrfdVkYzYIKDIa3aE3TCqoRQgmpcTIJ2j
lNrzLVdIhk2aCe3EzJBfIyhHAm2IzEN8nlc4ZEiRCkRX2TreD8o2PCgKi8svRWt+wdWUFxGI0B4O
eFqwekFhbg0anzEHD+boyKLishNgUrkUfC806CdpBYVKFsUDSrcNJjAJlQmc/ELUXFzQKsJ7jMgt
RUaZIWQ6zhIZDFBpKcVFIx8FidDXVnipm7z244neLIA/Y/ItJWJmBjYd2Vuwdr+Pj7HvwkaauI+T
UO1m0sWYXjhevAUPPw/DZLzobxbjRL9DC84Rgirv7wcW1YdABJ0orq65xok6Rqf2AOYva3WxSXMj
8fE8gDUBYOWE7jbUndr0E/yvLGwx9c9nqUGAvcN54qcd8Q8hF5iwBF0tRH51OuNR78DVBhgDQAvN
Kic/AiGNOWzmX9hm32yvKbQqQxS8MZXlziVzHuandicWcrCngk8jh1XRdHJoczbcYOHCgGdnrHiy
xGVzc+WVtYormg0zpiF7cgjKd9Jk1RTVRqfmnkjvKKVlTfSIWlY5UpaxZZfqGBAtj3IGS3H/Cci5
zb4F/pn4xPvcdtoxaSYkl3WEQecTs3eawixtuszXKtaPfGAb3umAc4ameApQBBK9kC5SazcEsnrW
ahiYzacz2gTDKh0A8jSxa4WcPReCoFYnr3Yu+sdgr1sSmkMszcgxHT/QTaj0LAYmpO9cBYomYYPT
MXmJ5C+AQPpxMCBUskvPzS8SIPI9klSF60wGILoKvEVq49yWgEkpDgJk5UqsAYx6HuVCQ9sBw7tO
aDupIlhD47hMhTIGM/3PsGcDDnaGaK57ayckGRpOey+DqiopWis6kAjd3g5RPNmgWKozYtB4BmGc
FO8l1MLRlEo+BYWMmdy02LpCuV3NruLUuu8gJ2QwtM/9msegZV8wD4MqlJkvYyHk+1DHkAWikj0c
LA1ixRcd/grS/QZkQW2k8JlHg7RBQWuURE9artpHBYJGsuRNQgnED9g4CJ3laokm8W9VFF/ylPIo
J3jnDDB56cHqGwcRLyV9LYMNbWlB1ZOwzeHrJ+AH8rYLNhrxUQ12GuLaoLpN5EdzURTrZGJY55WV
Gh3OF1nI9CeQPXIO8ONorRMhtpU5FaMztQa9/RfPqG4u6jRJcVtIZTheKjglMK0OiuDbFtgQFMDC
gUUpKRBB/xdyRThQkFnHLmU=


--===============1807659750788369254==--