database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

bug#56318: Replication aborts with ER_TOO_BIG_ROWSIZE if innodb

Browse Source 
parameters don't match

Revert the changes of the default values of innodb_file_per_table
and innobase_file_format in 5.5, until WL#5135 is implemented.
This commit is contained in:
Calvin Sun
2010-10-05 13:38:30 -05:00
parent bfcc8ae8d9
commit 7381a8a38f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/suite/sys_vars/r/innodb_file_format_basic.result
View File

@ -1,28 +1,28 @@
SET @start_global_value = @@global.innodb_file_format; SET @start_global_value = @@global.innodb_file_format;
SELECT @start_global_value; SELECT @start_global_value;
@start_global_value @start_global_value
Barracuda Antelope
Valid values are 'Antelope' and 'Barracuda' Valid values are 'Antelope' and 'Barracuda'
select @@global.innodb_file_format in ('Antelope', 'Barracuda'); select @@global.innodb_file_format in ('Antelope', 'Barracuda');
@@global.innodb_file_format in ('Antelope', 'Barracuda') @@global.innodb_file_format in ('Antelope', 'Barracuda')
1 1
select @@global.innodb_file_format; select @@global.innodb_file_format;
@@global.innodb_file_format @@global.innodb_file_format
Barracuda Antelope
select @@session.innodb_file_format; select @@session.innodb_file_format;
ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable
show global variables like 'innodb_file_format'; show global variables like 'innodb_file_format';
Variable_name Value Variable_name Value
innodb_file_format Barracuda innodb_file_format Antelope
show session variables like 'innodb_file_format'; show session variables like 'innodb_file_format';
Variable_name Value Variable_name Value
innodb_file_format Barracuda innodb_file_format Antelope
select * from information_schema.global_variables where variable_name='innodb_file_format'; select * from information_schema.global_variables where variable_name='innodb_file_format';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
INNODB_FILE_FORMAT Barracuda INNODB_FILE_FORMAT Antelope
select * from information_schema.session_variables where variable_name='innodb_file_format'; select * from information_schema.session_variables where variable_name='innodb_file_format';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
INNODB_FILE_FORMAT Barracuda INNODB_FILE_FORMAT Antelope
set global innodb_file_format='Antelope'; set global innodb_file_format='Antelope';
select @@global.innodb_file_format; select @@global.innodb_file_format;
@@global.innodb_file_format @@global.innodb_file_format
@ -56,4 +56,4 @@ ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'Salmon'
SET @@global.innodb_file_format = @start_global_value; SET @@global.innodb_file_format = @start_global_value;
SELECT @@global.innodb_file_format; SELECT @@global.innodb_file_format;
@@global.innodb_file_format @@global.innodb_file_format
Barracuda Antelope

4
storage/innobase/handler/ha_innodb.cc
View File

@ -10835,13 +10835,13 @@ static MYSQL_SYSVAR_ULONG(fast_shutdown, innobase_fast_shutdown,
static MYSQL_SYSVAR_BOOL(file_per_table, srv_file_per_table, static MYSQL_SYSVAR_BOOL(file_per_table, srv_file_per_table,
PLUGIN_VAR_NOCMDARG, PLUGIN_VAR_NOCMDARG,
"Stores each InnoDB table to an .ibd file in the database dir.", "Stores each InnoDB table to an .ibd file in the database dir.",
NULL, NULL, TRUE); NULL, NULL, FALSE);
static MYSQL_SYSVAR_STR(file_format, innobase_file_format_name, static MYSQL_SYSVAR_STR(file_format, innobase_file_format_name,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"File format to use for new tables in .ibd files.", "File format to use for new tables in .ibd files.",
innodb_file_format_name_validate, innodb_file_format_name_validate,
innodb_file_format_name_update, "Barracuda"); innodb_file_format_name_update, "Antelope");
/* "innobase_file_format_check" decides whether we would continue /* "innobase_file_format_check" decides whether we would continue
booting the server if the file format stamped on the system booting the server if the file format stamped on the system