From: Dmitry Shulga Date: April 12 2011 12:48pm Subject: bzr push into mysql-trunk branch (Dmitry.Shulga:3354 to 3355) Bug#56976 List-Archive: http://lists.mysql.com/commits/135268 X-Bug: 56976 Message-Id: <201104121248.p3CCmtrj006268@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8161142446567491270==" --===============8161142446567491270== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3355 Dmitry Shulga 2011-04-12 Follow-up for patch removing '--max-long-data-size' variable use (which itself was a follow-up to fix for bug#56976). Removed tests that used this variable. removed: mysql-test/suite/sys_vars/r/max_long_data_size_basic.result mysql-test/suite/sys_vars/t/max_long_data_size_basic.test modified: mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/variables.result mysql-test/t/variables.test 3354 Jon Olav Hauglid 2011-04-12 Small clean-up patch. Removed three function declarations from sql_base.h for functions that no longer have any definition. modified: sql/sql_base.h === modified file 'mysql-test/r/mysqld--help-notwin.result' --- a/mysql-test/r/mysqld--help-notwin.result 2011-04-06 11:13:33 +0000 +++ b/mysql-test/r/mysqld--help-notwin.result 2011-04-12 12:48:26 +0000 @@ -320,10 +320,6 @@ The following options may be given as th max_join_size records return an error --max-length-for-sort-data=# Max number of bytes in sorted records - --max-long-data-size=# - The maximum BLOB length to send to server from - mysql_send_long_data API. Deprecated option; use - max_allowed_packet instead. --max-prepared-stmt-count=# Maximum number of prepared statements in the server --max-relay-log-size=# @@ -866,7 +862,6 @@ max-error-count 64 max-heap-table-size 16777216 max-join-size 18446744073709551615 max-length-for-sort-data 1024 -max-long-data-size 1048576 max-prepared-stmt-count 16382 max-relay-log-size 0 max-seeks-for-key 18446744073709551615 === modified file 'mysql-test/r/mysqld--help-win.result' --- a/mysql-test/r/mysqld--help-win.result 2011-04-06 11:13:33 +0000 +++ b/mysql-test/r/mysqld--help-win.result 2011-04-12 12:48:26 +0000 @@ -319,10 +319,6 @@ The following options may be given as th max_join_size records return an error --max-length-for-sort-data=# Max number of bytes in sorted records - --max-long-data-size=# - The maximum BLOB length to send to server from - mysql_send_long_data API. Deprecated option; use - max_allowed_packet instead. --max-prepared-stmt-count=# Maximum number of prepared statements in the server --max-relay-log-size=# @@ -869,7 +865,6 @@ max-error-count 64 max-heap-table-size 16777216 max-join-size 18446744073709551615 max-length-for-sort-data 1024 -max-long-data-size 1048576 max-prepared-stmt-count 16382 max-relay-log-size 0 max-seeks-for-key 18446744073709551615 === modified file 'mysql-test/r/variables.result' --- a/mysql-test/r/variables.result 2011-03-28 11:10:42 +0000 +++ b/mysql-test/r/variables.result 2011-04-12 12:48:26 +0000 @@ -1532,9 +1532,6 @@ ERROR HY000: Cannot drop default keycach SET @@global.key_cache_block_size=0; Warnings: Warning 1292 Truncated incorrect key_cache_block_size value: '0' -select @@max_long_data_size; -@@max_long_data_size -1048576 # # Bug#11766424 59527: DECIMAL_BIN_SIZE: ASSERTION `SCALE >= 0 && PRECISION > 0 && SCALE <= PRE # === removed file 'mysql-test/suite/sys_vars/r/max_long_data_size_basic.result' --- a/mysql-test/suite/sys_vars/r/max_long_data_size_basic.result 2011-03-15 12:57:36 +0000 +++ b/mysql-test/suite/sys_vars/r/max_long_data_size_basic.result 1970-01-01 00:00:00 +0000 @@ -1,14 +0,0 @@ -select @@global.max_long_data_size=20; -@@global.max_long_data_size=20 -0 -select @@session.max_long_data_size; -ERROR HY000: Variable 'max_long_data_size' is a GLOBAL variable -SELECT @@global.max_long_data_size = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='max_long_data_size'; -@@global.max_long_data_size = VARIABLE_VALUE -1 -set global max_long_data_size=1; -ERROR HY000: Variable 'max_long_data_size' is a read only variable -set session max_long_data_size=1; -ERROR HY000: Variable 'max_long_data_size' is a read only variable === removed file 'mysql-test/suite/sys_vars/t/max_long_data_size_basic.test' --- a/mysql-test/suite/sys_vars/t/max_long_data_size_basic.test 2011-03-15 12:57:36 +0000 +++ b/mysql-test/suite/sys_vars/t/max_long_data_size_basic.test 1970-01-01 00:00:00 +0000 @@ -1,17 +0,0 @@ -select @@global.max_long_data_size=20; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.max_long_data_size; - -# Show that value of the variable matches the value in the GLOBAL I_S table -SELECT @@global.max_long_data_size = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='max_long_data_size'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global max_long_data_size=1; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session max_long_data_size=1; - === modified file 'mysql-test/t/variables.test' --- a/mysql-test/t/variables.test 2011-03-28 11:10:42 +0000 +++ b/mysql-test/t/variables.test 2011-04-12 12:48:26 +0000 @@ -1268,11 +1268,6 @@ SET @@global.max_join_size=0; SET @@global.key_buffer_size=0; SET @@global.key_cache_block_size=0; -# -# Bug#56976: added new start-up parameter -# -select @@max_long_data_size; - --echo # --echo # Bug#11766424 59527: DECIMAL_BIN_SIZE: ASSERTION `SCALE >= 0 && PRECISION > 0 && SCALE <= PRE --echo # --===============8161142446567491270== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/dmitry.shulga@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@stripped\ # yvcnuhl4hf4aec4o # target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/ # testament_sha1: 5af0950e68858b9a795dfa46cdda293c928d74ae # timestamp: 2011-04-12 19:48:52 +0700 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/ # base_revision_id: jon.hauglid@stripped\ # 8xpm0j95y0b9eo05 # # Begin bundle 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 SKQXoXFrjgXi8mF2snKl/xdyRThQkJ3MXBQ= --===============8161142446567491270==--