mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369

Browse source 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_binlog_basic2.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
This commit is contained in:
unknown 2007-06-07 19:48:34 +02:00
commit bc35e6a779
26 changed files with 53 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/extra/binlog_tests/binlog.test
View file

@ -4,6 +4,7 @@
-- source include/not_embedded.inc
-- source include/have_innodb.inc
-- source include/have_log_bin.inc
-- source include/have_debug.inc
--disable_warnings

1
mysql-test/extra/binlog_tests/blackhole.test
View file

@ -4,6 +4,7 @@
#
-- source include/not_embedded.inc
-- source include/have_blackhole.inc
-- source include/have_log_bin.inc
# The server need to be started in $MYSQLTEST_VARDIR since it
# uses ../std_data_ln/

1
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test
View file

@ -1,5 +1,6 @@
-- source include/not_embedded.inc
-- source include/have_cp932.inc
-- source include/have_log_bin.inc
--character_set cp932
--disable_warnings

1
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
View file

@ -1,5 +1,6 @@
--source include/not_embedded.inc
--source include/have_ucs2.inc
--source include/have_log_bin.inc
#
# Check correct binlogging of UCS2 user variables (BUG#3875)

4
mysql-test/extra/binlog_tests/drop_temp_table.test
View file

@ -1,5 +1,5 @@
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
--source include/have_log_bin.inc
--disable_warnings
drop database if exists `drop-temp+table-test`;

1
mysql-test/extra/binlog_tests/insert_select-binlog.test
View file

@ -1,5 +1,6 @@
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
-- source include/have_log_bin.inc
--disable_warnings
drop table if exists t1,t2;

4
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
View file

@ -5,9 +5,7 @@
# did some tests manually on a slave; tables are replicated fine and
# Exec_Master_Log_Pos advances as expected.
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
-- source include/have_log_bin.inc
-- source include/have_innodb.inc
-- source include/have_debug.inc

2
mysql-test/include/have_binlog_format_mixed.inc
View file

@ -1,3 +1,5 @@
--source include/have_log_bin.inc
-- require r/have_binlog_format_mixed.require
disable_query_log;
show variables like "binlog_format";

2
mysql-test/include/have_binlog_format_mixed_or_row.inc
View file

@ -1,3 +1,5 @@
--source include/have_log_bin.inc
--require r/have_binlog_format_row.require
--disable_query_log
--replace_result MIXED ROW

2
mysql-test/include/have_binlog_format_row.inc
View file

@ -1,3 +1,5 @@
--source include/have_log_bin.inc
-- require r/have_binlog_format_row.require
disable_query_log;
show variables like "binlog_format";

2
mysql-test/include/have_binlog_format_statement.inc
View file

@ -1,3 +1,5 @@
--source include/have_log_bin.inc
-- require r/have_binlog_format_statement.require
disable_query_log;
show variables like "binlog_format";

3
mysql-test/include/master-slave.inc
View file

@ -1,3 +1,6 @@
# Replication tests need binlog
source include/have_binlog.inc;
connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);

17
mysql-test/lib/mtr_cases.pl
View file

@ -596,6 +596,22 @@ sub collect_one_test_case($$$$$$$) {
}
}
if ( $tinfo->{'need_binlog'} )
{
if (grep(/^--skip-log-bin/, @::opt_extra_mysqld_opt) )
{
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Test need binlog";
return;
}
}
else
{
# Test does not need binlog, add --skip-binlog to
# the options used when starting it
push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
}
}
}
@ -606,6 +622,7 @@ our @tags=
(
["include/have_innodb.inc", "innodb_test", 1],
["include/have_binlog_format_row.inc", "binlog_format", "row"],
["include/have_binlog.inc", "need_binlog", 1],
["include/have_binlog_format_statement.inc", "binlog_format", "statement"],
["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"],
["include/big_test.inc", "big_test", 1],

12
mysql-test/r/date_formats.result
View file

@ -1,17 +1,13 @@
drop table if exists t1;
SHOW GLOBAL VARIABLES LIKE "%_format%";
SHOW GLOBAL VARIABLES LIKE "%e_format";
Variable_name Value
binlog_format <format>
date_format %d.%m.%Y
datetime_format %Y-%m-%d %H:%i:%s
default_week_format 0
time_format %H.%i.%s
SHOW SESSION VARIABLES LIKE "%_format%";
SHOW SESSION VARIABLES LIKE "%e_format";
Variable_name Value
binlog_format <format>
date_format %d.%m.%Y
datetime_format %Y-%m-%d %H:%i:%s
default_week_format 0
time_format %H.%i.%s
SET time_format='%H%i%s';
SET time_format='%H:%i:%s.%f';
@ -30,12 +26,10 @@ set datetime_format= '%H:%i:%s %Y-%m-%d';
set datetime_format= '%H:%i:%s.%f %m-%d-%Y';
set datetime_format= '%h:%i:%s %p %Y-%m-%d';
set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
SHOW SESSION VARIABLES LIKE "%format";
SHOW SESSION VARIABLES LIKE "%e_format";
Variable_name Value
binlog_format <format>
date_format %m-%d-%Y
datetime_format %h:%i:%s.%f %p %Y-%m-%d
default_week_format 0
time_format %h:%i:%s%p
SET time_format='%h:%i:%s';
ERROR 42000: Variable 'time_format' can't be set to the value of '%h:%i:%s'

6
mysql-test/t/date_formats.test
View file

@ -7,9 +7,9 @@ drop table if exists t1;
--enable_warnings
--replace_result ROW <format> STATEMENT <format> MIXED <format>
SHOW GLOBAL VARIABLES LIKE "%_format%";
SHOW GLOBAL VARIABLES LIKE "%e_format";
--replace_result ROW <format> STATEMENT <format> MIXED <format>
SHOW SESSION VARIABLES LIKE "%_format%";
SHOW SESSION VARIABLES LIKE "%e_format";
#
# Test setting a lot of different formats to see which formats are accepted and
@ -37,7 +37,7 @@ set datetime_format= '%h:%i:%s %p %Y-%m-%d';
set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
--replace_result ROW <format> STATEMENT <format> MIXED <format>
SHOW SESSION VARIABLES LIKE "%format";
SHOW SESSION VARIABLES LIKE "%e_format";
--error 1231
SET time_format='%h:%i:%s';

2
mysql-test/t/flush_block_commit_notembedded.test
View file

@ -4,7 +4,7 @@
# This is intended to mimick how mysqldump and innobackup work.
# And it requires InnoDB
-- source include/not_embedded.inc
-- source include/have_log_bin.inc
-- source include/have_innodb.inc
connect (con1,localhost,root,,);

1
mysql-test/t/innodb.test
View file

@ -13,6 +13,7 @@
-- source include/not_embedded.inc
-- source include/have_innodb.inc
-- source include/have_log_bin.inc
#
# Small basic test with ignore

1
mysql-test/t/mysqlbinlog-cp932.test
View file

@ -3,6 +3,7 @@
-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/have_cp932.inc
-- source include/have_log_bin.inc
# Bug#16217 (mysql client did not know how not switch its internal charset)
flush logs;

3
mysql-test/t/mysqlbinlog.test
View file

@ -2,8 +2,7 @@
# TODO: Need to look at making a row based version once the new row based client is completed. [jbm]
-- source include/have_binlog_format_mixed_or_statement.inc
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
-- source include/have_log_bin.inc
# we need this for getting fixed timestamps inside of this test
set timestamp=1000000000;

2
mysql-test/t/mysqlbinlog2.test
View file

@ -4,8 +4,6 @@
# TODO: Need to look at making row based version once new binlog client is complete.
-- source include/have_binlog_format_mixed_or_statement.inc
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1;

1
mysql-test/t/mysqldump.test
View file

@ -1,5 +1,6 @@
# Embedded server doesn't support external clients
--source include/not_embedded.inc
--source include/have_log_bin.inc
--disable_warnings
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;

1
mysql-test/t/ps.test
View file

@ -1,4 +1,5 @@
-- source include/not_embedded.inc
-- source include/have_log_bin.inc
#
# SQL Syntax for Prepared Statements test
#

1
mysql-test/t/rpl_000015.test
View file

@ -1,3 +1,4 @@
-- source include/have_log_bin.inc
#####################
# Change Author: JBM
# Change Date: 2006-01-17

2
mysql-test/t/rpl_rotate_logs.test
View file

@ -1,6 +1,8 @@
# This test uses chmod, can't be run with root permissions
-- source include/not_as_root.inc
-- source include/have_log_bin.inc
#
# Test is run with max_binlog_size=2048 to force automatic rotation of the
# binary log

2
mysql-test/t/rpl_sf.test
View file

@ -1,3 +1,5 @@
-- source include/have_log_bin.inc
# Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
# save status

2
mysql-test/t/user_var-binlog.test
View file

@ -1,8 +1,6 @@
# Requires statement logging
-- source include/have_binlog_format_mixed_or_statement.inc
# TODO: Create row based version once $MYSQL_BINLOG has new RB version
# Embedded server does not support binlogging
--source include/not_embedded.inc
# Check that user variables are binlogged correctly (BUG#3875)
create table t1 (a varchar(50));