diff options
author | Michael Widenius <monty@askmonty.org> | 2012-06-05 14:09:18 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-06-05 14:09:18 +0300 |
commit | 56ea8e9c0539a4dc95659ab4ba4b94956c7119e7 (patch) | |
tree | f1064496ed78c4ee1c4270ede3dcba94cf1a02ec /mysql-test/suite/innodb/r/innodb-create-options.result | |
parent | b889f6999367c9415f5806d2ea6ec104387ba1ff (diff) | |
download | mariadb-git-56ea8e9c0539a4dc95659ab4ba4b94956c7119e7.tar.gz |
Fixed build failures found by buildbot
- Added suppression of warnings
- Fixed some test cases
BUILD/FINISH.sh:
Added AM_EXTRA_MAKEFLAGS
BUILD/SETUP.sh:
Added option --extra-makeflags
client/mysqldump.c:
Added suppression
mysql-test/r/mysql.result:
Updated results
mysql-test/r/mysql_upgrade.result:
Updated results
mysql-test/r/partition_innodb_plugin.result:
Updated results
mysql-test/r/partition_open_files_limit.result:
Updated results
mysql-test/r/symlink.result:
Updated results
mysql-test/suite/innodb/r/innodb-create-options.result:
Updated results
mysql-test/suite/innodb/t/innodb-create-options.test:
Don't print error message (as it's varies on different system)
mysql-test/t/mysql.test:
Don't print error message (as it's varies on different system)
mysql-test/t/mysql_upgrade.test:
Fixed checking of error number
mysql-test/t/partition_innodb_plugin.test:
Don't print error message (as it's varies on different system)
plugin/semisync/semisync_master.cc:
Added suppression
sql/ha_partition.cc:
Added suppression
sql/item_subselect.cc:
Added suppression
sql/multi_range_read.cc:
Added suppression
sql/sql_parse.cc:
Added suppression
sql/sql_select.cc:
Added suppression
storage/innobase/handler/ha_innodb.cc:
Removed not used variable
storage/maria/ma_delete.c:
Added suppression
storage/maria/ma_key_recover.c:
Added suppression
storage/maria/ma_write.c:
Added suppression
strings/ctype-ucs2.c:
Added suppression
support-files/compiler_warnings.supp:
Added suppressions
unittest/mysys/my_vsnprintf-t.c:
Fixed test case with %M to also work on Solaris
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb-create-options.result')
-rw-r--r-- | mysql-test/suite/innodb/r/innodb-create-options.result | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-create-options.result b/mysql-test/suite/innodb/r/innodb-create-options.result index 7417bb2478b..94c84fcf60f 100644 --- a/mysql-test/suite/innodb/r/innodb-create-options.result +++ b/mysql-test/suite/innodb/r/innodb-create-options.result @@ -46,11 +46,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Compact ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: invalid ROW_FORMAT specifier. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Compact @@ -104,29 +104,29 @@ t1 Compressed key_block_size=16 DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( i INT ); ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: invalid ROW_FORMAT specifier. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16; SHOW WARNINGS; Level Code Message @@ -146,11 +146,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Compact row_format=COMPACT ALTER TABLE t1 KEY_BLOCK_SIZE=2; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=REDUNDANT; SHOW WARNINGS; Level Code Message @@ -158,11 +158,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Redundant row_format=REDUNDANT ALTER TABLE t1 KEY_BLOCK_SIZE=4; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=DYNAMIC; SHOW WARNINGS; Level Code Message @@ -170,11 +170,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Dynamic row_format=DYNAMIC ALTER TABLE t1 KEY_BLOCK_SIZE=8; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=COMPRESSED; SHOW WARNINGS; Level Code Message @@ -212,23 +212,23 @@ t1 CREATE TABLE `t1` ( `f1` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2 ALTER TABLE t1 ROW_FORMAT=COMPACT; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=REDUNDANT; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=DYNAMIC; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=COMPRESSED; SHOW WARNINGS; Level Code Message @@ -298,34 +298,34 @@ CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT; SHOW WARNINGS; Level Code Message ALTER TABLE t1 KEY_BLOCK_SIZE=8; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=COMPRESSED; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=DYNAMIC; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) SET GLOBAL innodb_file_format=Barracuda; DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4; SET GLOBAL innodb_file_format=Antelope; ALTER TABLE t1 ADD COLUMN f1 INT; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0; SHOW WARNINGS; Level Code Message @@ -352,11 +352,11 @@ Level Code Message Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table. Error 1005 Can't create table 'test.t1' (errno: 1478) CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC; -ERROR HY000: Can't create table 'test.t1' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table 'test.t1' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table. -Error 1005 Can't create table 'test.t1' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table 'test.t1' (errno: 1478) CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT; SHOW WARNINGS; Level Code Message @@ -375,23 +375,23 @@ CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT; SHOW WARNINGS; Level Code Message ALTER TABLE t1 KEY_BLOCK_SIZE=1; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=COMPRESSED; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=DYNAMIC; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=COMPACT; SHOW WARNINGS; Level Code Message @@ -415,12 +415,12 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4; SET GLOBAL innodb_file_per_table=OFF; ALTER TABLE t1 ADD COLUMN f1 INT; -ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +ERROR HY000: Can't create table '#sql-temporary' (errno: 1478) SHOW WARNINGS; Level Code Message Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table. -Error 1005 Can't create table '#sql-temporary' (errno: 1478 - Unknown error 1478) +Error 1005 Can't create table '#sql-temporary' (errno: 1478) ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0; SHOW WARNINGS; Level Code Message |