Commit 11f68c01 authored by Calvin Sun's avatar Calvin Sun

bug#56318: adjust the result files.

parent 8cf10ed1
...@@ -918,9 +918,9 @@ ERROR HY000: Too big row ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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;
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 ...@@ -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 ...@@ -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;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment