database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
This commit is contained in:
unknown
2006-02-14 14:36:00 +01:00
parent f05d7cf70b 9236e3c24b
commit aa0e786000
14 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/binlog_stm_binlog.test
View File

@@ -5,7 +5,7 @@ create table t1 (a int, b int) engine=innodb;
begin;
insert into t1 values (1,2);
commit;
--replace_regex /\/\* xid=.* \*\//\/* XID *\//
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /Server ver: .*, Binlog ver: .*/Server ver: #, Binlog ver: #/
show binlog events;
drop table t1;

1
mysql-test/t/disabled.def
View File

@@ -32,3 +32,4 @@ rpl_sp : Bug#16456
rpl_until : Unstable test case, bug#15886
sp-goto : GOTO is currently is disabled - will be fixed in the future
subselect : Bug#15706 (ps mode) [PATCH PENDING]
rpl_ndb_log : result not deterministic

14
mysql-test/t/variables.test
View File

@@ -456,4 +456,18 @@ set global character_set_system = latin1;
--error 1238
set @@global.version_compile_os='234';
#
# Check character_set_filesystem variable
#
set character_set_filesystem=latin1;
select @@character_set_filesystem;
set @@global.character_set_filesystem=latin2;
set character_set_filesystem=latin1;
select @@character_set_filesystem;
set @@global.character_set_filesystem=latin2;
set character_set_filesystem=default;
select @@character_set_filesystem;
set @@global.character_set_filesystem=default;
select @@global.character_set_filesystem;
# End of 5.0 tests