#At lp:maria 2733 knielsen@knielsen-hq.org 2009-09-15 MySQL 5.1.38 after-merge fixes. Fix some mistakes in the original merge found during review. removed: mysql-test/include/wait_for_status_var.inc.moved modified: mysql-test/include/concurrent.inc mysql-test/include/mix1.inc mysql-test/r/innodb_mysql.result per-file messages: mysql-test/include/concurrent.inc Add missing lines mistakenly omitted in merge. mysql-test/include/mix1.inc Revert wrong change done during merge. mysql-test/include/wait_for_status_var.inc.moved Remove file which was accidentally not removed during conflict resolution in merge. mysql-test/r/innodb_mysql.result Revert result file change following fixing root problem in merge. === modified file 'mysql-test/include/concurrent.inc' --- a/mysql-test/include/concurrent.inc 2009-09-07 20:50:10 +0000 +++ b/mysql-test/include/concurrent.inc 2009-09-15 06:08:54 +0000 @@ -666,7 +666,9 @@ disconnect thread1; --echo ** connection thread2 connection thread2; disconnect thread2; +--source include/wait_until_disconnected.inc --echo ** connection default connection default; drop table t1; drop user mysqltest@localhost; + === modified file 'mysql-test/include/mix1.inc' --- a/mysql-test/include/mix1.inc 2009-09-07 20:50:10 +0000 +++ b/mysql-test/include/mix1.inc 2009-09-15 06:08:54 +0000 @@ -1509,6 +1509,7 @@ DROP TABLE t1; --echo # SQL_SELECT::test_quick_select --echo # (reproduced only with InnoDB tables) --echo # + eval CREATE TABLE t1 (c1 INT, c2 INT, c3 INT, KEY (c3), KEY (c2, c3)) ENGINE=$engine_type; @@ -1538,7 +1539,7 @@ DROP TABLE t1; eval CREATE TABLE t1 (c1 DECIMAL(12,2), c2 DECIMAL(12,2), c3 DECIMAL(12,2), KEY (c3), KEY (c2, c3)) - ENGINE=innodb; + ENGINE=$engine_type; INSERT INTO t1 VALUES (1,1,1), (1,1,1), (1,1,2), (1,1,1), (1,1,2); SELECT 1 FROM (SELECT COUNT(DISTINCT c1) === removed file 'mysql-test/include/wait_for_status_var.inc.moved' --- a/mysql-test/include/wait_for_status_var.inc.moved 2009-09-07 20:50:10 +0000 +++ b/mysql-test/include/wait_for_status_var.inc.moved 1970-01-01 00:00:00 +0000 @@ -1,68 +0,0 @@ -# ==== Purpose ==== -# -# Waits until a variable from SHOW STATUS has returned a specified -# value, or until a timeout is reached. -# -# ==== Usage ==== -# -# let $status_var= Threads_connected; -# let $status_var_value= 1; -# --source include/wait_for_status_var.inc -# -# Parameters: -# -# $status_var, $status_var_value -# This macro will wait until the variable of SHOW STATUS -# named $status_var gets the value $status_var_value. See -# the example above. -# -# $status_type= GLOBAL|SESSION -# To specify the type (attribute) of status variable and -# run either SHOW GLOBAL STATUS or SHOW SESSION STATUS. -# -# $status_var_comparsion -# By default, this file waits until $status_var becomes equal to -# $status_var_value. If you want to wait until $status_var -# becomes *unequal* to $status_var_value, set this parameter to the -# string '!=', like this: -# let $status_var_comparsion= !=; -# -# $status_timeout -# The default timeout is 1 minute. You can change the timeout by -# setting $status_timeout. The unit is tenths of seconds. -# - -if (`SELECT STRCMP('$status_type', '') * STRCMP(UPPER('$status_type'), 'SESSION') * STRCMP(UPPER('$status_type'), 'GLOBAL')`) -{ - --echo **** ERROR: Unknown type of variable status_type: allowed values are: SESSION or GLOBAL **** - exit; -} - -let $_status_timeout_counter= $status_timeout; -if (!$_status_timeout_counter) -{ - let $_status_timeout_counter= 600; -} - -let $_status_var_comparsion= $status_var_comparsion; -if (`SELECT '$_status_var_comparsion' = ''`) -{ - let $_status_var_comparsion= =; -} - -let $_show_status_value= query_get_value("SHOW $status_type STATUS LIKE '$status_var'", Value, 1); -while (`SELECT NOT('$_show_status_value' $_status_var_comparsion '$status_var_value')`) -{ - if (!$_status_timeout_counter) - { - --echo **** ERROR: failed while waiting for $status_type $status_var $_status_var_comparison $status_var_value **** - --echo Note: the following output may have changed since the failure was detected - --echo **** Showing STATUS, PROCESSLIST **** - eval SHOW $status_type STATUS LIKE '$status_var'; - SHOW PROCESSLIST; - exit; - } - dec $_status_timeout_counter; - sleep 0.1; - let $_show_status_value= query_get_value("SHOW $status_type STATUS LIKE '$status_var'", Value, 1); -} === modified file 'mysql-test/r/innodb_mysql.result' --- a/mysql-test/r/innodb_mysql.result 2009-09-09 21:06:57 +0000 +++ b/mysql-test/r/innodb_mysql.result 2009-09-15 06:08:54 +0000 @@ -1746,7 +1746,7 @@ id select_type table type possible_keys DROP TABLE t1; CREATE TABLE t1 (c1 DECIMAL(12,2), c2 DECIMAL(12,2), c3 DECIMAL(12,2), KEY (c3), KEY (c2, c3)) -ENGINE=innodb; +ENGINE=InnoDB; INSERT INTO t1 VALUES (1,1,1), (1,1,1), (1,1,2), (1,1,1), (1,1,2); SELECT 1 FROM (SELECT COUNT(DISTINCT c1) FROM t1 WHERE c2 IN (1, 1) AND c3 = 2 GROUP BY c2) x;