mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 06:22:28 +01:00
Merge mysql-5.5-innodb -> mysql-5.5-bugteam
This commit is contained in:
commit
d4b2f93aac
7 changed files with 22 additions and 22 deletions
|
@ -918,9 +918,9 @@ ERROR HY000: Too big row
|
||||||
alter table t1 row_format=compact;
|
alter table t1 row_format=compact;
|
||||||
create index t1u on t1 (u(1));
|
create index t1u on t1 (u(1));
|
||||||
drop table t1;
|
drop table t1;
|
||||||
set global innodb_file_per_table=1;
|
set global innodb_file_per_table=0;
|
||||||
set global innodb_file_format=Barracuda;
|
set global innodb_file_format=Antelope;
|
||||||
set global innodb_file_format_max=Barracuda;
|
set global innodb_file_format_max=Antelope;
|
||||||
SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
|
SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
|
||||||
SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
|
SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
|
||||||
CREATE TABLE t1(
|
CREATE TABLE t1(
|
||||||
|
|
|
@ -394,8 +394,8 @@ table_schema table_name row_format
|
||||||
test t8 Compact
|
test t8 Compact
|
||||||
test t9 Redundant
|
test t9 Redundant
|
||||||
drop table t8, t9;
|
drop table t8, t9;
|
||||||
set global innodb_file_per_table=1;
|
set global innodb_file_per_table=0;
|
||||||
set global innodb_file_format=Barracuda;
|
set global innodb_file_format=Antelope;
|
||||||
set global innodb_file_per_table=on;
|
set global innodb_file_per_table=on;
|
||||||
set global innodb_file_format=`Barracuda`;
|
set global innodb_file_format=`Barracuda`;
|
||||||
set global innodb_file_format_max=`Antelope`;
|
set global innodb_file_format_max=`Antelope`;
|
||||||
|
|
|
@ -125,6 +125,6 @@ Warning 1264 Out of range value for column 'col78' at row 1
|
||||||
Warning 1265 Data truncated for column 'col79' at row 1
|
Warning 1265 Data truncated for column 'col79' at row 1
|
||||||
Warning 1264 Out of range value for column 'col84' at row 1
|
Warning 1264 Out of range value for column 'col84' at row 1
|
||||||
DROP TABLE bug52745;
|
DROP TABLE bug52745;
|
||||||
SET GLOBAL innodb_file_format=Barracuda;
|
SET GLOBAL innodb_file_format=Antelope;
|
||||||
SET GLOBAL innodb_file_format_max=Antelope;
|
SET GLOBAL innodb_file_format_max=Antelope;
|
||||||
SET GLOBAL innodb_file_per_table=1;
|
SET GLOBAL innodb_file_per_table=0;
|
||||||
|
|
|
@ -11,6 +11,6 @@ Error 139 Too big row
|
||||||
Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
|
Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
|
||||||
Error 1030 Got error 139 from storage engine
|
Error 1030 Got error 139 from storage engine
|
||||||
DROP TABLE bug53591;
|
DROP TABLE bug53591;
|
||||||
SET GLOBAL innodb_file_format=Barracuda;
|
SET GLOBAL innodb_file_format=Antelope;
|
||||||
SET GLOBAL innodb_file_format_max=Antelope;
|
SET GLOBAL innodb_file_format_max=Antelope;
|
||||||
SET GLOBAL innodb_file_per_table=1;
|
SET GLOBAL innodb_file_per_table=0;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
select @@innodb_file_format;
|
select @@innodb_file_format;
|
||||||
@@innodb_file_format
|
@@innodb_file_format
|
||||||
Barracuda
|
Antelope
|
||||||
select @@innodb_file_format_check;
|
select @@innodb_file_format_check;
|
||||||
@@innodb_file_format_check
|
@@innodb_file_format_check
|
||||||
1
|
1
|
||||||
|
@ -17,14 +17,14 @@ Barracuda
|
||||||
set global innodb_file_format=default;
|
set global innodb_file_format=default;
|
||||||
select @@innodb_file_format;
|
select @@innodb_file_format;
|
||||||
@@innodb_file_format
|
@@innodb_file_format
|
||||||
Barracuda
|
Antelope
|
||||||
set global innodb_file_format=on;
|
set global innodb_file_format=on;
|
||||||
ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'ON'
|
ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'ON'
|
||||||
set global innodb_file_format=off;
|
set global innodb_file_format=off;
|
||||||
ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'off'
|
ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'off'
|
||||||
select @@innodb_file_format;
|
select @@innodb_file_format;
|
||||||
@@innodb_file_format
|
@@innodb_file_format
|
||||||
Barracuda
|
Antelope
|
||||||
set global innodb_file_format_max=antelope;
|
set global innodb_file_format_max=antelope;
|
||||||
set global innodb_file_format_max=barracuda;
|
set global innodb_file_format_max=barracuda;
|
||||||
set global innodb_file_format_max=cheetah;
|
set global innodb_file_format_max=cheetah;
|
||||||
|
@ -46,5 +46,5 @@ Antelope
|
||||||
set global innodb_file_format_max=antelope;
|
set global innodb_file_format_max=antelope;
|
||||||
set global innodb_file_format_check=off;
|
set global innodb_file_format_check=off;
|
||||||
ERROR HY000: Variable 'innodb_file_format_check' is a read only variable
|
ERROR HY000: Variable 'innodb_file_format_check' is a read only variable
|
||||||
SET GLOBAL innodb_file_format=Barracuda;
|
SET GLOBAL innodb_file_format=Antelope;
|
||||||
SET GLOBAL innodb_file_format_max=Antelope;
|
SET GLOBAL innodb_file_format_max=Antelope;
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -10841,13 +10841,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
|
||||||
|
|
Loading…
Reference in a new issue