database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

branches/zip:

Browse Source 
Adjust the paths in innodb_lock_wait_timeout.diff with a recent rename of
the test/result files in the MySQL tree.
This commit is contained in:
vasil
2009-01-28 06:21:44 +00:00
parent a2c56cdf04
commit 42df53d783
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/patches/innodb_lock_wait_timeout.diff
View File

@@ -1,5 +1,5 @@
--- mysql-test/t/innodb_lock_wait_timeout_basic.test.orig 2008-08-04 09:28:16.000000000 +0300 --- mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test.orig 2008-08-04 09:28:16.000000000 +0300
+++ mysql-test/t/innodb_lock_wait_timeout_basic.test 2008-10-07 11:14:15.000000000 +0300 +++ mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test 2008-10-07 11:14:15.000000000 +0300
@@ -37,10 +37,6 @@ @@ -37,10 +37,6 @@
# Check if Value can set # # Check if Value can set #
#################################################################### ####################################################################
@@ -25,8 +25,8 @@
SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout); SELECT COUNT(@@GLOBAL.innodb_lock_wait_timeout);
--echo 1 Expected --echo 1 Expected
--- mysql-test/r/innodb_lock_wait_timeout_basic.result.orig 2008-08-04 09:27:50.000000000 +0300 --- mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result.orig 2008-08-04 09:27:50.000000000 +0300
+++ mysql-test/r/innodb_lock_wait_timeout_basic.result 2008-10-07 11:15:14.000000000 +0300 +++ mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result 2008-10-07 11:15:14.000000000 +0300
@@ -4,9 +4,6 @@ @@ -4,9 +4,6 @@
1 1
1 Expected 1 Expected