database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

few fixes for test failures on windows

Browse Source 
(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
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/t/innodb_mysql_lock.test
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;