1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#28369 rpl test cases fail with binlog disabled

Browse Source 
- Additional tests in 5.1 that need binlog
 - Mark more test to need binlog
This commit is contained in:
msvensson@pilot.(none) 2007-06-07 19:20:49 +02:00
parent ad2419050e
commit a48e321e37
9 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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";

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';

1
mysql-test/t/ndb_binlog_basic2.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/have_log_bin.inc
--error ER_NDB_CANT_SWITCH_BINLOG_FORMAT
set session binlog_format=row;

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
#

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