mirror of
https://github.com/MariaDB/server.git
synced 2026-04-20 07:15:33 +02:00
mysql-5.5.18 merge
This commit is contained in:
commit
0e007344ea
1160 changed files with 12806 additions and 6189 deletions
|
|
@ -17,7 +17,6 @@
|
|||
# Save innodb variables
|
||||
let $innodb_file_format_orig=`select @@innodb_file_format`;
|
||||
let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
|
||||
let $innodb_file_format_max_orig=`select @@innodb_file_format_max`;
|
||||
let $innodb_large_prefix_orig=`select @@innodb_large_prefix`;
|
||||
|
||||
# Set Innodb file format as feature works for Barracuda file format
|
||||
|
|
@ -1334,5 +1333,4 @@ DROP TABLE worklog5743;
|
|||
|
||||
eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
|
||||
eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
|
||||
eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig;
|
||||
eval SET GLOBAL innodb_large_prefix=$innodb_large_prefix_orig;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue