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

Fixed internal test check warnings in 5.1-bugteam.

Browse Source
This commit is contained in:
Georgi Kodinov
2009-02-01 11:18:09 +02:00
parent c0ae6f6d86
commit 299339d41a
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/mtr_check.sql
View File

@@ -12,7 +12,7 @@ BEGIN
-- Dump all global variables except those -- Dump all global variables except those
-- that are supposed to change -- that are supposed to change
SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE variable_name != 'timestamp'; WHERE variable_name != 'timestamp' ORDER BY VARIABLE_NAME;
-- Dump all databases, there should be none -- Dump all databases, there should be none
-- except those that was created during bootstrap -- except those that was created during bootstrap

2
mysql-test/r/init_file.result
View File

@@ -4,7 +4,6 @@ SELECT * INTO @Y FROM init_file.startup limit 1,1;
SELECT YEAR(@X)-YEAR(@Y); SELECT YEAR(@X)-YEAR(@Y);
YEAR(@X)-YEAR(@Y) YEAR(@X)-YEAR(@Y)
0 0
DROP DATABASE init_file;
ok ok
end of 4.1 tests end of 4.1 tests
select * from t1; select * from t1;
@@ -20,4 +19,3 @@ y
3 3
11 11
13 13
drop table t1, t2;

2
mysql-test/suite/rpl/t/rpl_trigger.test
View File

@@ -265,6 +265,8 @@ while ($rnd)
connection master; connection master;
eval drop table t1$rnd; eval drop table t1$rnd;
sync_slave_with_master;
connection master;
dec $rnd; dec $rnd;
} }

6
mysql-test/t/init_file.test
View File

@@ -13,7 +13,8 @@ INSERT INTO init_file.startup VALUES ( NOW() );
SELECT * INTO @X FROM init_file.startup limit 0,1; SELECT * INTO @X FROM init_file.startup limit 0,1;
SELECT * INTO @Y FROM init_file.startup limit 1,1; SELECT * INTO @Y FROM init_file.startup limit 1,1;
SELECT YEAR(@X)-YEAR(@Y); SELECT YEAR(@X)-YEAR(@Y);
DROP DATABASE init_file; # Enable this DROP DATABASE only after resolving bug #42507
# DROP DATABASE init_file;
--echo ok --echo ok
--echo end of 4.1 tests --echo end of 4.1 tests
@@ -26,4 +27,5 @@ select * from t1;
# Expected: # Expected:
# 30, 3, 11, 13 # 30, 3, 11, 13
select * from t2; select * from t2;
drop table t1, t2; # Enable this DROP TABLE only after resolving bug #42507
#drop table t1, t2;