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

Percona-Server-5.6.14-rel62.0 merge

Browse Source 
support ha_innodb.so as a dynamic plugin.
* remove obsolete *,innodb_plugin.rdiff files
* s/--plugin-load=/--plugin-load-add=/
* MYSQL_PLUGIN_IMPORT glob_hostname[]
* use my_error instead of push_warning_printf(ER_DEFAULT)
* don't use tdc_size and tc_size in a module

update test cases (XtraDB is 5.6.14, InnoDB is 5.6.10)
* copy new tests over
* disable some tests for (old) InnoDB
* delete XtraDB tests that no longer apply

small compatibility changes:
* s/HTON_EXTENDED_KEYS/HTON_SUPPORTS_EXTENDED_KEYS/
* revert unnecessary InnoDB changes to make it a bit closer to the upstream

fix XtraDB to compile on Windows (both as a static and a dynamic plugin)

disable XtraDB on Windows (deadlocks) and where no atomic ops are available (e.g. CentOS 5)


storage/innobase/handler/ha_innodb.cc:
  revert few unnecessary changes to make it a bit closer to the original InnoDB
storage/innobase/include/univ.i:
  correct the version to match what it was merged from
This commit is contained in:
Sergei Golubchik
2013-12-22 17:06:50 +01:00
parent e27c34f9e4 52c26f7a1f
commit ffa8c4cfcc
506 changed files with 138702 additions and 54084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mysql-test/suite/sys_vars/r/innodb_log_archive_basic.result Normal file
View File

@@ -0,0 +1,38 @@
SELECT @@GLOBAL.innodb_log_archive;
@@GLOBAL.innodb_log_archive
0
0 Expected
SET @save_innodb_log_archive = @@GLOBAL.innodb_log_archive;
SET @@GLOBAL.innodb_log_archive=1;
SELECT @@GLOBAL.innodb_log_archive;
@@GLOBAL.innodb_log_archive
1
1 Expected
SELECT VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='innodb_log_archive';
VARIABLE_VALUE
ON
ON Expected
SET @@GLOBAL.innodb_log_archive = @save_innodb_log_archive;
SELECT @@innodb_log_archive;
@@innodb_log_archive
0
0 Expected
SELECT @@innodb_log_archive;
@@innodb_log_archive
0
0 Expected
SELECT @@local.innodb_log_archive;
ERROR HY000: Variable 'innodb_log_archive' is a GLOBAL variable
Expected error 'Variable is a GLOBAL variable'
SELECT @@SESSION.innodb_log_archive;
ERROR HY000: Variable 'innodb_log_archive' is a GLOBAL variable
Expected error 'Variable is a GLOBAL variable'
SELECT @@GLOBAL.innodb_log_archive;
@@GLOBAL.innodb_log_archive
0
0 Expected
SELECT innodb_log_archive = @@SESSION.innodb_log_archive;
ERROR 42S22: Unknown column 'innodb_log_archive' in 'field list'
Expected error Unknown column 'innodb_log_archive' in 'field list'