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 next-mr -> next-4284.

Browse Source 
mysql-test/t/disabled.def:
  Restore disabled ssl tests: SSL certificates were updated.
  Disable sp_sync.test, the test case can't work in next-4284.
mysql-test/t/partition_innodb.test:
  Disable parsing of the test case for Bug#47343, 
  the test can not work in next-4284.
mysql-test/t/ps_ddl.test:
  Update results (CREATE TABLE IF NOT EXISTS takes
  into account existence of the temporary table).
This commit is contained in:
Konstantin Osipov
2010-02-06 13:28:06 +03:00
parent ba678eef7d b38ef2b5f7
commit a72f90bc43
233 changed files with 6237 additions and 7842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
mysql-test/suite/sys_vars/r/binlog_direct_non_transactional_updates_basic.result Normal file
View File

@@ -0,0 +1,76 @@
SELECT @@GLOBAL.binlog_direct_non_transactional_updates;
@@GLOBAL.binlog_direct_non_transactional_updates
1
'#---------------------BS_STVARS_002_01----------------------#'
SET @start_value= @@global.binlog_direct_non_transactional_updates;
SELECT COUNT(@@GLOBAL.binlog_direct_non_transactional_updates);
COUNT(@@GLOBAL.binlog_direct_non_transactional_updates)
1
1 Expected
SELECT COUNT(@@SESSION.binlog_direct_non_transactional_updates);
COUNT(@@SESSION.binlog_direct_non_transactional_updates)
1
1 Expected
'#---------------------BS_STVARS_002_02----------------------#'
SET @@GLOBAL.binlog_direct_non_transactional_updates=TRUE;
SELECT @@GLOBAL.binlog_direct_non_transactional_updates;
@@GLOBAL.binlog_direct_non_transactional_updates
1
SET @@SESSION.binlog_direct_non_transactional_updates=TRUE;
SELECT @@SESSION.binlog_direct_non_transactional_updates;
@@SESSION.binlog_direct_non_transactional_updates
1
'#---------------------BS_STVARS_002_03----------------------#'
SELECT
IF(@@GLOBAL.binlog_direct_non_transactional_updates, "ON", "OFF") = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='binlog_direct_non_transactional_updates';
IF(@@GLOBAL.binlog_direct_non_transactional_updates, "ON", "OFF") = VARIABLE_VALUE
1
1 Expected
SELECT COUNT(@@GLOBAL.binlog_direct_non_transactional_updates);
COUNT(@@GLOBAL.binlog_direct_non_transactional_updates)
1
1 Expected
SELECT COUNT(VARIABLE_VALUE)
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='binlog_direct_non_transactional_updates';
COUNT(VARIABLE_VALUE)
1
1 Expected
'#---------------------BS_STVARS_002_04----------------------#'
SELECT
IF(@@SESSION.binlog_direct_non_transactional_updates, "ON", "OFF") = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='binlog_direct_non_transactional_updates';
IF(@@SESSION.binlog_direct_non_transactional_updates, "ON", "OFF") = VARIABLE_VALUE
1
1 Expected
SELECT COUNT(@@SESSION.binlog_direct_non_transactional_updates);
COUNT(@@SESSION.binlog_direct_non_transactional_updates)
1
1 Expected
SELECT COUNT(VARIABLE_VALUE)
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='binlog_direct_non_transactional_updates';
COUNT(VARIABLE_VALUE)
1
1 Expected
'#---------------------BS_STVARS_002_05----------------------#'
SELECT COUNT(@@binlog_direct_non_transactional_updates);
COUNT(@@binlog_direct_non_transactional_updates)
1
1 Expected
SELECT COUNT(@@local.binlog_direct_non_transactional_updates);
COUNT(@@local.binlog_direct_non_transactional_updates)
1
1 Expected
SELECT COUNT(@@SESSION.binlog_direct_non_transactional_updates);
COUNT(@@SESSION.binlog_direct_non_transactional_updates)
1
1 Expected
SELECT COUNT(@@GLOBAL.binlog_direct_non_transactional_updates);
COUNT(@@GLOBAL.binlog_direct_non_transactional_updates)
1
1 Expected
SET @@global.binlog_direct_non_transactional_updates= @start_value;

6
mysql-test/suite/sys_vars/r/sql_log_update_basic.result
View File

@@ -22,13 +22,13 @@ VARIABLE_NAME VARIABLE_VALUE
SQL_LOG_UPDATE ON
set global sql_log_update=1;
Warnings:
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
select @@global.sql_log_update;
@@global.sql_log_update
1
set session sql_log_update=ON;
Warnings:
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
select @@session.sql_log_update;
@@session.sql_log_update
1
@@ -40,7 +40,7 @@ set global sql_log_update="foo";
ERROR 42000: Variable 'sql_log_update' can't be set to the value of 'foo'
SET @@global.sql_log_update = @start_global_value;
Warnings:
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored
Note 1315 The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
SELECT @@global.sql_log_update;
@@global.sql_log_update
1