From: Andrei Elkin Date: June 16 2011 8:30am Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3297 to 3298) WL#5569 List-Archive: http://lists.mysql.com/commits/139290 Message-Id: <201106160830.p5G8UExY016712@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0871763428==" --===============0871763428== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3298 Andrei Elkin 2011-06-16 wl#5569 MTS adding new tests to sys_vars.\ added: mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result mysql-test/suite/sys_vars/r/slave_pending_jobs_size_max_basic.result mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test mysql-test/suite/sys_vars/t/slave_pending_jobs_size_max_basic.test 3297 Luis Soares 2011-06-16 WL#5569 Adding a global suppression for the warning that may appear when stopping the slave sql thread in the middle of a group. This should affect MTS mode only. modified: mysql-test/include/mtr_warnings.sql === added file 'mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result' --- a/mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result 2011-06-16 08:29:53 +0000 @@ -0,0 +1,29 @@ +set @save.slave_parallel_workers= @@global.slave_parallel_workers; +select @@session.slave_parallel_workers; +ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable +show global variables like 'slave_parallel_workers'; +Variable_name Value +slave_parallel_workers 0 +show session variables like 'slave_parallel_workers'; +Variable_name Value +slave_parallel_workers 0 +select * from information_schema.global_variables where variable_name='$var'; +VARIABLE_NAME VARIABLE_VALUE +select * from information_schema.session_variables where variable_name='$var'; +VARIABLE_NAME VARIABLE_VALUE +set @@global.slave_parallel_workers= 0; +select @@global.slave_parallel_workers; +@@global.slave_parallel_workers +0 +set @@global.slave_parallel_workers= 1.1; +ERROR 42000: Incorrect argument type to variable 'slave_parallel_workers' +set @@global.slave_parallel_workers= "foo"; +ERROR 42000: Incorrect argument type to variable 'slave_parallel_workers' +set @@global.slave_parallel_workers= 0; +set @@global.slave_parallel_workers= cast(-1 as unsigned int); +Warnings: +Warning 1292 Truncated incorrect slave_parallel_workers value: '18446744073709551615' +select @@global.slave_parallel_workers; +@@global.slave_parallel_workers +4294967295 +set @@global.slave_parallel_workers= @save.slave_parallel_workers; === added file 'mysql-test/suite/sys_vars/r/slave_pending_jobs_size_max_basic.result' --- a/mysql-test/suite/sys_vars/r/slave_pending_jobs_size_max_basic.result 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/sys_vars/r/slave_pending_jobs_size_max_basic.result 2011-06-16 08:29:53 +0000 @@ -0,0 +1,33 @@ +set @save.slave_pending_jobs_size_max= @@global.slave_pending_jobs_size_max; +select @@session.slave_pending_jobs_size_max; +ERROR HY000: Variable 'slave_pending_jobs_size_max' is a GLOBAL variable +show global variables like 'slave_pending_jobs_size_max'; +Variable_name Value +slave_pending_jobs_size_max 16777216 +show session variables like 'slave_pending_jobs_size_max'; +Variable_name Value +slave_pending_jobs_size_max 16777216 +select * from information_schema.global_variables where variable_name='$var'; +VARIABLE_NAME VARIABLE_VALUE +select * from information_schema.session_variables where variable_name='$var'; +VARIABLE_NAME VARIABLE_VALUE +set @@global.slave_pending_jobs_size_max= 0; +Warnings: +Warning 1292 Truncated incorrect slave_pending_jobs_size_max value: '0' +select @@global.slave_pending_jobs_size_max; +@@global.slave_pending_jobs_size_max +1024 +set @@global.slave_pending_jobs_size_max= 1.1; +ERROR 42000: Incorrect argument type to variable 'slave_pending_jobs_size_max' +set @@global.slave_pending_jobs_size_max= "foo"; +ERROR 42000: Incorrect argument type to variable 'slave_pending_jobs_size_max' +set @@global.slave_pending_jobs_size_max= 0; +Warnings: +Warning 1292 Truncated incorrect slave_pending_jobs_size_max value: '0' +set @@global.slave_pending_jobs_size_max= cast(-1 as unsigned int); +Warnings: +Warning 1292 Truncated incorrect slave_pending_jobs_size_max value: '18446744073709551615' +select @@global.slave_pending_jobs_size_max; +@@global.slave_pending_jobs_size_max +18446744073709550592 +set @@global.slave_pending_jobs_size_max= @save.slave_pending_jobs_size_max; === added file 'mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test' --- a/mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test 2011-06-16 08:29:53 +0000 @@ -0,0 +1,41 @@ +--source include/not_embedded.inc + +let $var= slave_parallel_workers; +eval set @save.$var= @@global.$var; + +# +# exists as global only +# +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +eval select @@session.$var; + +eval show global variables like '$var'; +eval show session variables like '$var'; +select * from information_schema.global_variables where variable_name='$var'; +select * from information_schema.session_variables where variable_name='$var'; + +# +# show that it's writable +# +let $value= 0; +eval set @@global.$var= $value; +eval select @@global.$var; + +# +# incorrect types +# +--error ER_WRONG_TYPE_FOR_VAR +eval set @@global.$var= 1.1; +--error ER_WRONG_TYPE_FOR_VAR +eval set @@global.$var= "foo"; + +# +# min/max values +# +eval set @@global.$var= 0; +eval set @@global.$var= cast(-1 as unsigned int); +eval select @@global.$var; + +# cleanup + +eval set @@global.$var= @save.$var; === added file 'mysql-test/suite/sys_vars/t/slave_pending_jobs_size_max_basic.test' --- a/mysql-test/suite/sys_vars/t/slave_pending_jobs_size_max_basic.test 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/sys_vars/t/slave_pending_jobs_size_max_basic.test 2011-06-16 08:29:53 +0000 @@ -0,0 +1,41 @@ +--source include/not_embedded.inc + +let $var= slave_pending_jobs_size_max; +eval set @save.$var= @@global.$var; + +# +# exists as global only +# +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +eval select @@session.$var; + +eval show global variables like '$var'; +eval show session variables like '$var'; +select * from information_schema.global_variables where variable_name='$var'; +select * from information_schema.session_variables where variable_name='$var'; + +# +# show that it's writable +# +let $value= 0; +eval set @@global.$var= $value; +eval select @@global.$var; + +# +# incorrect types +# +--error ER_WRONG_TYPE_FOR_VAR +eval set @@global.$var= 1.1; +--error ER_WRONG_TYPE_FOR_VAR +eval set @@global.$var= "foo"; + +# +# min/max values +# +eval set @@global.$var= 0; +eval set @@global.$var= cast(-1 as unsigned int); +eval select @@global.$var; + +# cleanup + +eval set @@global.$var= @save.$var; --===============0871763428== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/andrei.elkin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@stripped # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 8e358bfdc75cb0bf6d562dcd350fbdce72d18f11 # timestamp: 2011-06-16 11:30:14 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: luis.soares@stripped\ # f1764iuxnwgdwrs5 # # Begin bundle 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 --===============0871763428==--