few fixes for test failures on windows

(and collateral changes)

mysql-test/t/innodb_mysql_lock.test:
  change the variable from the test, not from the .opt file.
  one mysqld restart less.
mysql-test/t/lowercase_table4.test:
  fix dos line endings
sql/handler.cc:
  don't access the uninitialized variable
This commit is contained in:
Sergei Golubchik 2012-10-30 11:41:41 +01:00
parent 33fb79773d
commit 86c642056a
16 changed files with 48 additions and 16 deletions

0
mysql-test/include/world.inc Executable file → Normal file
View File

0
mysql-test/include/world_schema.inc Executable file → Normal file
View File

View File

@ -1,3 +1,6 @@
set @old_innodb_lock_wait_timeout=@@global.innodb_lock_wait_timeout;
set global innodb_lock_wait_timeout=300;
set session innodb_lock_wait_timeout=300;
#
# Bug #22876 Four-way deadlock
#
@ -172,3 +175,4 @@ id value
1 12345
COMMIT;
DROP TABLE t1;
set global innodb_lock_wait_timeout=@old_innodb_lock_wait_timeout;

22
mysql-test/r/lowercase_table4.result Executable file → Normal file
View File

@ -30,6 +30,17 @@ Create Table CREATE TABLE `Table2` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1
SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
CONSTRAINT_CATALOG def
CONSTRAINT_SCHEMA mysql
CONSTRAINT_NAME innodb_index_stats_ibfk_1
UNIQUE_CONSTRAINT_CATALOG def
UNIQUE_CONSTRAINT_SCHEMA mysql
UNIQUE_CONSTRAINT_NAME PRIMARY
MATCH_OPTION NONE
UPDATE_RULE RESTRICT
DELETE_RULE RESTRICT
TABLE_NAME innodb_index_stats
REFERENCED_TABLE_NAME innodb_table_stats
CONSTRAINT_CATALOG def
CONSTRAINT_SCHEMA test
CONSTRAINT_NAME fk1
UNIQUE_CONSTRAINT_CATALOG def
@ -89,6 +100,17 @@ Create Table CREATE TABLE `Customer` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1
SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
CONSTRAINT_CATALOG def
CONSTRAINT_SCHEMA mysql
CONSTRAINT_NAME innodb_index_stats_ibfk_1
UNIQUE_CONSTRAINT_CATALOG def
UNIQUE_CONSTRAINT_SCHEMA mysql
UNIQUE_CONSTRAINT_NAME PRIMARY
MATCH_OPTION NONE
UPDATE_RULE RESTRICT
DELETE_RULE RESTRICT
TABLE_NAME innodb_index_stats
REFERENCED_TABLE_NAME innodb_table_stats
CONSTRAINT_CATALOG def
CONSTRAINT_SCHEMA test
CONSTRAINT_NAME product_order_ibfk_1
UNIQUE_CONSTRAINT_CATALOG def

View File

@ -1,6 +1,6 @@
--- r/mysqld--help.result 2012-01-13 16:50:49.000000000 +0100
+++ r/mysqld--help-win.result 2012-01-19 14:12:00.000000000 +0100
@@ -240,7 +240,6 @@
--- r/mysqld--help.result 2012-10-25 14:02:57.000000000 +0200
+++ mysqld--help,win.result~ 2012-10-30 11:37:08.000000000 +0100
@@ -244,7 +244,6 @@
The number of segments in a key cache
-L, --language=name Client error messages in given language. May be given as
a full path. Deprecated. Use --lc-messages-dir instead.
@ -8,7 +8,7 @@
--lc-messages=name Set the language used for the error messages.
-L, --lc-messages-dir=name
Directory where error messages are
@@ -436,6 +435,7 @@
@@ -437,6 +436,7 @@
NULLS_UNEQUAL (default behavior for 4.1 and later),
NULLS_EQUAL (emulate 4.0 behavior), and NULLS_IGNORED
--myisam-use-mmap Use memory mapping for reading and writing MyISAM tables
@ -16,7 +16,7 @@
--net-buffer-length=#
Buffer length for TCP/IP and socket communication
--net-read-timeout=#
@@ -695,6 +695,9 @@
@@ -774,6 +774,9 @@
files within specified directory
--server-id=# Uniquely identifies the server instance in the community
of replication partners
@ -26,7 +26,7 @@
--show-slave-auth-info
Show user and password in SHOW SLAVE HOSTS on this
master.
@@ -759,6 +762,10 @@
@@ -841,6 +844,10 @@
Log slow queries to given log file. Defaults logging to
'hostname'-slow.log. Must be enabled to activate other
slow log options
@ -37,7 +37,7 @@
--socket=name Socket file to use for connection
--sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of
@@ -767,6 +774,7 @@
@@ -849,6 +856,7 @@
for the complete list of valid sql modes
--stack-trace Print a symbolic stack trace on failure
(Defaults to on; use --skip-stack-trace to disable.)
@ -45,7 +45,7 @@
--stored-program-cache=#
The soft upper limit for number of cached stored routines
for one connection.
@@ -807,8 +815,8 @@
@@ -889,8 +897,8 @@
size, MySQL will automatically convert it to an on-disk
MyISAM or Aria table
-t, --tmpdir=name Path for temporary files. Several paths may be specified,
@ -56,15 +56,15 @@
--transaction-alloc-block-size=#
Allocation block size for transactions to be stored in
binary log
@@ -908,7 +916,6 @@
@@ -993,7 +1001,6 @@
key-cache-block-size 1024
key-cache-division-limit 100
key-cache-segments 0
language MYSQL_SHAREDIR/
-large-pages FALSE
lc-messages en_US
lc-messages-dir MYSQL_SHAREDIR/
lc-time-names en_US
@@ -971,6 +978,7 @@
@@ -1056,6 +1063,7 @@
myisam-sort-buffer-size 8388608
myisam-stats-method nulls_unequal
myisam-use-mmap FALSE
@ -72,7 +72,7 @@
net-buffer-length 16384
net-read-timeout 30
net-retry-count 10
@@ -1035,6 +1043,8 @@
@@ -1148,6 +1156,8 @@
secure-auth FALSE
secure-file-priv (No default value)
server-id 0
@ -81,7 +81,7 @@
show-slave-auth-info FALSE
skip-grant-tables TRUE
skip-name-resolve FALSE
@@ -1050,6 +1060,7 @@
@@ -1164,6 +1174,7 @@
slave-type-conversions
slow-launch-time 2
slow-query-log FALSE

0
mysql-test/suite/innodb/r/innodb_bug60196.result Executable file → Normal file
View File

0
mysql-test/suite/innodb/t/innodb_bug57904.test Executable file → Normal file
View File

0
mysql-test/suite/innodb/t/innodb_bug60196-master.opt Executable file → Normal file
View File

0
mysql-test/suite/innodb/t/innodb_bug60196.test Executable file → Normal file
View File

View File

@ -1 +0,0 @@
--loose-innodb_lock_wait_timeout=300

View File

@ -3,6 +3,10 @@
# Save the initial number of concurrent sessions.
--source include/count_sessions.inc
set @old_innodb_lock_wait_timeout=@@global.innodb_lock_wait_timeout;
set global innodb_lock_wait_timeout=300;
set session innodb_lock_wait_timeout=300;
--echo #
--echo # Bug #22876 Four-way deadlock
--echo #
@ -318,3 +322,6 @@ disconnect con1;
# Check that all connections opened by test cases in this file are really
# gone so execution of other tests won't be affected by their presence.
--source include/wait_until_count_sessions.inc
set global innodb_lock_wait_timeout=@old_innodb_lock_wait_timeout;

0
mysql-test/t/lowercase_table4-master.opt Executable file → Normal file
View File

2
mysql-test/t/lowercase_table4.test Executable file → Normal file
View File

@ -17,7 +17,7 @@ USE XY;
--disable_query_log
--disable_result_log
let $tcs = `SELECT @@table_open_cache + 1`;
let $tcs = `SELECT @@table_open_cache + 1`;
let $i = $tcs;

0
mysql-test/t/range_vs_index_merge.test Executable file → Normal file
View File

0
mysql-test/t/range_vs_index_merge_innodb.test Executable file → Normal file
View File

View File

@ -2868,7 +2868,7 @@ int handler::update_auto_increment()
DBUG_RETURN(HA_ERR_AUTOINC_ERANGE);
DBUG_PRINT("info",("auto_increment: %llu nb_reserved_values: %llu",
nr, nb_reserved_values));
nr, append ? nb_reserved_values : 0));
/* Store field without warning (Warning will be printed by insert) */
save_count_cuted_fields= thd->count_cuted_fields;