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

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn

Browse Source 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
This commit is contained in:
unknown
2007-05-30 17:11:08 +02:00
parent 8fb480ef50 3d81d23567
commit 918340d04b
6 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/federated.inc
View File

@@ -1,3 +1,4 @@
--source include/have_log_bin.inc
--source include/not_embedded.inc --source include/not_embedded.inc
--source ./include/have_federated_db.inc --source ./include/have_federated_db.inc

3
mysql-test/mysql-test-run.pl
View File

@@ -3770,8 +3770,7 @@ sub mysqld_arguments ($$$$) {
"%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path); "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
# Check if "extra_opt" contains --skip-log-bin # Check if "extra_opt" contains --skip-log-bin
my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt); my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
if ( $mysqld->{'type'} eq 'master' ) if ( $mysqld->{'type'} eq 'master' )
{ {
if (! ($opt_skip_master_binlog || $skip_binlog) ) if (! ($opt_skip_master_binlog || $skip_binlog) )

9
mysql-test/r/date_formats.result
View File

@@ -1,14 +1,12 @@
drop table if exists t1; drop table if exists t1;
SHOW GLOBAL VARIABLES LIKE "%_format%"; SHOW GLOBAL VARIABLES WHERE Variable_name LIKE "%_format%" AND Variable_name != "binlog_format";
Variable_name Value Variable_name Value
binlog_format <format>
date_format %d.%m.%Y date_format %d.%m.%Y
datetime_format %Y-%m-%d %H:%i:%s datetime_format %Y-%m-%d %H:%i:%s
default_week_format 0 default_week_format 0
time_format %H.%i.%s time_format %H.%i.%s
SHOW SESSION VARIABLES LIKE "%_format%"; SHOW SESSION VARIABLES WHERE Variable_name LIKE "%_format%" AND Variable_name != "binlog_format";
Variable_name Value Variable_name Value
binlog_format <format>
date_format %d.%m.%Y date_format %d.%m.%Y
datetime_format %Y-%m-%d %H:%i:%s datetime_format %Y-%m-%d %H:%i:%s
default_week_format 0 default_week_format 0
@@ -30,9 +28,8 @@ 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.%f %m-%d-%Y';
set datetime_format= '%h:%i:%s %p %Y-%m-%d'; set datetime_format= '%h:%i:%s %p %Y-%m-%d';
set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d'; set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
SHOW SESSION VARIABLES LIKE "%format"; SHOW SESSION VARIABLES WHERE Variable_name LIKE "%format" AND Variable_name != "binlog_format";
Variable_name Value Variable_name Value
binlog_format <format>
date_format %m-%d-%Y date_format %m-%d-%Y
datetime_format %h:%i:%s.%f %p %Y-%m-%d datetime_format %h:%i:%s.%f %p %Y-%m-%d
default_week_format 0 default_week_format 0

2
mysql-test/r/have_log_bin.require
View File

@@ -1,2 +1,2 @@
Variable_name Value Variable_name Value
have_log_bin ON log_bin ON

9
mysql-test/t/date_formats.test
View File

@@ -6,10 +6,8 @@
drop table if exists t1; drop table if exists t1;
--enable_warnings --enable_warnings
--replace_result ROW <format> STATEMENT <format> MIXED <format> SHOW GLOBAL VARIABLES WHERE Variable_name LIKE "%_format%" AND Variable_name != "binlog_format";
SHOW GLOBAL VARIABLES LIKE "%_format%"; SHOW SESSION VARIABLES WHERE Variable_name LIKE "%_format%" AND Variable_name != "binlog_format";
--replace_result ROW <format> STATEMENT <format> MIXED <format>
SHOW SESSION VARIABLES LIKE "%_format%";
# #
# Test setting a lot of different formats to see which formats are accepted and # Test setting a lot of different formats to see which formats are accepted and
@@ -36,8 +34,7 @@ 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 %p %Y-%m-%d';
set datetime_format= '%h:%i:%s.%f %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 WHERE Variable_name LIKE "%format" AND Variable_name != "binlog_format";
SHOW SESSION VARIABLES LIKE "%format";
--error 1231 --error 1231
SET time_format='%h:%i:%s'; SET time_format='%h:%i:%s';

3
mysql-test/t/mysqldump.test
View File

@@ -1,6 +1,9 @@
# Embedded server doesn't support external clients # Embedded server doesn't support external clients
--source include/not_embedded.inc --source include/not_embedded.inc
# Binlog is required
--source include/have_log_bin.inc
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3; DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
drop database if exists mysqldump_test_db; drop database if exists mysqldump_test_db;