mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge XtraDB 6 into MariaDB.
This commit is contained in:
@ -4,10 +4,10 @@
|
||||
#
|
||||
|
||||
-- source include/have_innodb.inc
|
||||
set @old_innodb_file_per_table=@@innodb_file_per_table;
|
||||
set @old_innodb_file_format=@@innodb_file_format;
|
||||
set @old_innodb_file_format_check=@@innodb_file_format_check;
|
||||
|
||||
SET @save_innodb_file_format=@@global.innodb_file_format;
|
||||
SET @save_innodb_file_format_check=@@global.innodb_file_format_check;
|
||||
SET @save_innodb_file_per_table=@@global.innodb_file_per_table;
|
||||
SET GLOBAL innodb_file_format='Barracuda';
|
||||
SET GLOBAL innodb_file_per_table=ON;
|
||||
|
||||
@ -1148,10 +1148,6 @@ KEY `idx44` (`col176`(100),`col42`,`col73`(189),`col94`),
|
||||
KEY `idx45` (`col2`(27),`col27`(116))
|
||||
)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
|
||||
|
||||
SET GLOBAL innodb_file_format=@save_innodb_file_format;
|
||||
SET GLOBAL innodb_file_format_check=@save_innodb_file_format_check;
|
||||
SET GLOBAL innodb_file_per_table=@save_innodb_file_per_table;
|
||||
|
||||
DROP TABLE IF EXISTS table0;
|
||||
DROP TABLE IF EXISTS table1;
|
||||
DROP TABLE IF EXISTS table2;
|
||||
@ -1160,3 +1156,7 @@ DROP TABLE IF EXISTS table4;
|
||||
DROP TABLE IF EXISTS table5;
|
||||
DROP TABLE IF EXISTS table6;
|
||||
|
||||
set global innodb_file_per_table=@old_innodb_file_per_table;
|
||||
set global innodb_file_format=@old_innodb_file_format;
|
||||
set global innodb_file_format_check=@old_innodb_file_format_check;
|
||||
|
||||
|
Reference in New Issue
Block a user