From 7f444caa0ad6b2eddc730de3cd9c94bfb9037b51 Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Sun, 3 Feb 2013 02:53:57 +0400 Subject: [PATCH] MDEV-4028 - Converted rdiff files to uniform MDEV-11 - Modifed tests and result files to use explicit column lists in INSERT and SELECT statements --- mysql-test/suite/storage_engine/1st.result | 2 +- mysql-test/suite/storage_engine/1st.test | 6 +- .../suite/storage_engine/alter_table.result | 2 +- .../suite/storage_engine/alter_table.test | 2 +- .../storage_engine/alter_tablespace.result | 6 +- .../storage_engine/alter_tablespace.test | 6 +- .../storage_engine/autoinc_secondary.result | 6 +- .../storage_engine/autoinc_secondary.test | 6 +- .../suite/storage_engine/autoinc_vars.result | 8 +- .../suite/storage_engine/autoinc_vars.test | 8 +- .../suite/storage_engine/autoincrement.result | 16 +- .../suite/storage_engine/autoincrement.test | 16 +- .../storage_engine/col_opt_default.result | 4 +- .../suite/storage_engine/col_opt_default.test | 4 +- .../storage_engine/col_opt_not_null.result | 178 +- .../storage_engine/col_opt_not_null.test | 2 +- .../suite/storage_engine/col_opt_null.result | 176 +- .../storage_engine/col_opt_unsigned.result | 78 +- .../storage_engine/col_opt_unsigned.test | 6 +- .../storage_engine/col_opt_zerofill.result | 78 +- .../storage_engine/col_opt_zerofill.test | 6 +- mysql-test/suite/storage_engine/delete.result | 18 +- mysql-test/suite/storage_engine/delete.test | 18 +- .../suite/storage_engine/delete_ignore.result | 10 +- .../suite/storage_engine/delete_ignore.test | 10 +- .../storage_engine/delete_low_prio.result | 6 +- .../suite/storage_engine/delete_low_prio.test | 6 +- .../suite/storage_engine/delete_quick.result | 10 +- .../suite/storage_engine/delete_quick.test | 10 +- .../storage_engine/delete_with_keys.result | 6 +- .../storage_engine/delete_with_keys.test | 6 +- .../suite/storage_engine/foreign_keys.result | 8 +- .../suite/storage_engine/foreign_keys.test | 9 +- mysql-test/suite/storage_engine/insert.result | 22 +- mysql-test/suite/storage_engine/insert.test | 22 +- .../storage_engine/insert_delayed.result | 6 +- .../suite/storage_engine/insert_delayed.test | 6 +- .../storage_engine/insert_high_prio.result | 4 +- .../storage_engine/insert_high_prio.test | 4 +- .../storage_engine/insert_low_prio.result | 2 +- .../suite/storage_engine/insert_low_prio.test | 2 +- .../storage_engine/insert_with_keys.result | 14 +- .../storage_engine/insert_with_keys.test | 14 +- .../suite/storage_engine/loaddata.result | 72 +- mysql-test/suite/storage_engine/loaddata.test | 48 +- mysql-test/suite/storage_engine/lock.result | 6 +- mysql-test/suite/storage_engine/lock.test | 6 +- .../storage_engine/parts/repair_table.result | 16 +- .../storage_engine/parts/repair_table.test | 4 +- .../parts/truncate_table.result | 10 +- .../storage_engine/parts/truncate_table.test | 10 +- .../suite/storage_engine/repair_table.inc | 4 +- .../suite/storage_engine/repair_table.result | 6 +- .../suite/storage_engine/replace.result | 8 +- mysql-test/suite/storage_engine/replace.test | 8 +- mysql-test/suite/storage_engine/select.result | 24 +- mysql-test/suite/storage_engine/select.test | 24 +- .../storage_engine/select_high_prio.result | 2 +- .../storage_engine/select_high_prio.test | 4 +- .../storage_engine/truncate_table.result | 4 +- .../suite/storage_engine/truncate_table.test | 4 +- .../trx/cons_snapshot_repeatable_read.result | 2 +- .../trx/cons_snapshot_serializable.result | 2 +- .../trx/consistent_snapshot.inc | 2 +- .../suite/storage_engine/trx/delete.result | 6 +- .../suite/storage_engine/trx/delete.test | 6 +- .../suite/storage_engine/trx/insert.result | 6 +- .../suite/storage_engine/trx/insert.test | 6 +- .../trx/level_read_committed.result | 22 +- .../trx/level_read_uncommitted.result | 22 +- .../trx/level_repeatable_read.result | 20 +- .../trx/level_serializable.result | 20 +- .../trx/select_for_update.result | 10 +- .../storage_engine/trx/select_for_update.test | 10 +- .../trx/select_lock_in_share_mode.result | 10 +- .../trx/select_lock_in_share_mode.test | 10 +- .../trx/transaction_isolation.inc | 20 +- .../suite/storage_engine/trx/update.result | 4 +- .../suite/storage_engine/trx/update.test | 4 +- mysql-test/suite/storage_engine/trx/xa.result | 22 +- mysql-test/suite/storage_engine/trx/xa.test | 22 +- .../storage_engine/trx/xa_recovery.result | 2 +- .../suite/storage_engine/trx/xa_recovery.test | 2 +- .../suite/storage_engine/type_binary.inc | 8 +- .../suite/storage_engine/type_binary.result | 8 +- .../storage_engine/type_binary_indexes.result | 2 +- .../storage_engine/type_binary_indexes.test | 2 +- mysql-test/suite/storage_engine/type_bit.inc | 14 +- .../suite/storage_engine/type_bit.result | 14 +- mysql-test/suite/storage_engine/type_blob.inc | 4 +- .../suite/storage_engine/type_blob.result | 4 +- mysql-test/suite/storage_engine/type_bool.inc | 28 +- .../suite/storage_engine/type_bool.result | 28 +- mysql-test/suite/storage_engine/type_char.inc | 12 +- .../suite/storage_engine/type_char.result | 12 +- .../storage_engine/type_char_indexes.result | 8 +- .../storage_engine/type_char_indexes.test | 8 +- .../suite/storage_engine/type_date_time.inc | 8 +- .../storage_engine/type_date_time.result | 8 +- mysql-test/suite/storage_engine/type_enum.inc | 14 +- .../suite/storage_engine/type_enum.result | 14 +- .../suite/storage_engine/type_fixed.inc | 28 +- .../suite/storage_engine/type_fixed.result | 28 +- .../suite/storage_engine/type_float.inc | 22 +- .../suite/storage_engine/type_float.result | 22 +- mysql-test/suite/storage_engine/type_int.inc | 22 +- .../suite/storage_engine/type_int.result | 22 +- mysql-test/suite/storage_engine/type_set.inc | 10 +- .../suite/storage_engine/type_set.result | 10 +- .../suite/storage_engine/type_spatial.inc | 62 +- .../suite/storage_engine/type_spatial.result | 62 +- .../type_spatial_indexes.result | 124 +- mysql-test/suite/storage_engine/type_text.inc | 4 +- .../suite/storage_engine/type_text.result | 4 +- .../suite/storage_engine/type_varchar.inc | 2 +- .../suite/storage_engine/type_varchar.result | 2 +- mysql-test/suite/storage_engine/update.result | 6 +- mysql-test/suite/storage_engine/update.test | 6 +- .../suite/storage_engine/update_ignore.result | 6 +- .../suite/storage_engine/update_ignore.test | 6 +- .../storage_engine/update_low_prio.result | 6 +- .../suite/storage_engine/update_low_prio.test | 6 +- .../suite/storage_engine/update_multi.result | 8 +- .../suite/storage_engine/update_multi.test | 8 +- .../storage_engine/update_with_keys.result | 8 +- .../storage_engine/update_with_keys.test | 8 +- mysql-test/suite/storage_engine/vcol.result | 8 +- mysql-test/suite/storage_engine/vcol.test | 8 +- .../storage_engine/autoinc_secondary.rdiff | 2 +- .../storage_engine/insert_delayed.rdiff | 6 +- .../storage_engine/parts/repair_table.rdiff | 16 +- .../storage_engine/repair_table.rdiff | 6 +- .../storage_engine/type_char_indexes.rdiff | 8 +- .../storage_engine/type_spatial_indexes.rdiff | 66 +- .../mysql-test/storage_engine/vcol.rdiff | 8 +- .../storage_engine/alter_tablespace.rdiff | 6 +- .../storage_engine/foreign_keys.rdiff | 8 +- .../trx/cons_snapshot_repeatable_read.rdiff | 29 +- .../trx/cons_snapshot_serializable.rdiff | 29 +- .../storage_engine/trx/delete.rdiff | 2 +- .../storage_engine/trx/insert.rdiff | 4 +- .../trx/level_read_committed.rdiff | 138 +- .../trx/level_read_uncommitted.rdiff | 19 +- .../trx/level_repeatable_read.rdiff | 149 +- .../trx/level_serializable.rdiff | 172 +- .../trx/select_for_update.rdiff | 4 +- .../trx/select_lock_in_share_mode.rdiff | 2 +- .../storage_engine/trx/update.rdiff | 2 +- .../mysql-test/storage_engine/trx/xa.rdiff | 8 +- .../storage_engine/trx/xa_recovery.rdiff | 2 +- .../storage_engine/alter_table.rdiff | 219 +- .../storage_engine/alter_tablespace.rdiff | 59 +- .../storage_engine/analyze_table.rdiff | 56 +- .../storage_engine/autoincrement.rdiff | 98 +- .../storage_engine/cache_index.rdiff | 117 +- .../storage_engine/char_indexes.rdiff | 0 .../storage_engine/checksum_table_live.rdiff | 19 +- .../storage_engine/create_table.rdiff | 94 +- .../storage_engine/foreign_keys.rdiff | 285 +- .../storage_engine/fulltext_search.rdiff | 292 +- .../mysql-test/storage_engine/handler.rdiff | 167 +- .../mysql-test/storage_engine/index.rdiff | 17 +- .../storage_engine/index_enable_disable.rdiff | 50 +- .../storage_engine/index_type_btree.rdiff | 17 +- .../storage_engine/index_type_hash.rdiff | 103 +- .../storage_engine/insert_delayed.rdiff | 40 +- .../mysql-test/storage_engine/lock.rdiff | 142 +- .../storage_engine/optimize_table.rdiff | 59 +- .../storage_engine/parts/alter_table.rdiff | 131 +- .../storage_engine/parts/analyze_table.rdiff | 170 +- .../storage_engine/parts/check_table.rdiff | 348 +- .../storage_engine/parts/checksum_table.rdiff | 170 +- .../storage_engine/parts/create_table.rdiff | 315 +- .../storage_engine/parts/optimize_table.rdiff | 186 +- .../storage_engine/parts/repair_table.rdiff | 598 ++-- .../storage_engine/parts/truncate_table.rdiff | 201 +- .../storage_engine/repair_table.rdiff | 234 +- .../storage_engine/show_engine.rdiff | 12 +- .../storage_engine/tbl_opt_ai.rdiff | 24 +- .../tbl_opt_avg_row_length.rdiff | 25 +- .../storage_engine/tbl_opt_checksum.rdiff | 25 +- .../storage_engine/tbl_opt_connection.rdiff | 27 +- .../tbl_opt_data_index_dir.rdiff | 26 +- .../tbl_opt_delay_key_write.rdiff | 25 +- .../tbl_opt_insert_method.rdiff | 25 +- .../tbl_opt_key_block_size.rdiff | 25 +- .../storage_engine/tbl_opt_max_rows.rdiff | 25 +- .../storage_engine/tbl_opt_min_rows.rdiff | 25 +- .../storage_engine/tbl_opt_pack_keys.rdiff | 25 +- .../storage_engine/tbl_opt_password.rdiff | 25 +- .../storage_engine/tbl_opt_row_format.rdiff | 25 +- .../storage_engine/tbl_opt_union.rdiff | 24 +- .../storage_engine/tbl_standard_opts.rdiff | 27 +- .../storage_engine/tbl_temporary.rdiff | 14 +- .../storage_engine/truncate_table.rdiff | 83 +- .../trx/cons_snapshot_repeatable_read.rdiff | 29 +- .../trx/cons_snapshot_serializable.rdiff | 29 +- .../storage_engine/trx/delete.rdiff | 84 +- .../storage_engine/trx/insert.rdiff | 97 +- .../trx/level_read_committed.rdiff | 138 +- .../trx/level_read_uncommitted.rdiff | 19 +- .../trx/level_repeatable_read.rdiff | 149 +- .../trx/level_serializable.rdiff | 172 +- .../trx/select_for_update.rdiff | 90 +- .../trx/select_lock_in_share_mode.rdiff | 63 +- .../storage_engine/trx/update.rdiff | 99 +- .../mysql-test/storage_engine/trx/xa.rdiff | 123 +- .../storage_engine/trx/xa_recovery.rdiff | 55 +- .../storage_engine/type_char_indexes.rdiff | 28 +- .../storage_engine/type_float_indexes.rdiff | 15 +- .../storage_engine/type_spatial.rdiff | 1418 +++++---- .../storage_engine/type_spatial_indexes.rdiff | 2834 +++++++++-------- .../mysql-test/storage_engine/vcol.rdiff | 161 +- 213 files changed, 7031 insertions(+), 5955 deletions(-) delete mode 100644 storage/myisammrg/mysql-test/storage_engine/char_indexes.rdiff diff --git a/mysql-test/suite/storage_engine/1st.result b/mysql-test/suite/storage_engine/1st.result index 6b686c2b2b4..192a8f8f39b 100644 --- a/mysql-test/suite/storage_engine/1st.result +++ b/mysql-test/suite/storage_engine/1st.result @@ -4,7 +4,7 @@ SHOW CREATE TABLE t1; SHOW COLUMNS IN t1; INSERT INTO t1 VALUES (1,'a'); INSERT INTO t1 (a,b) VALUES (2,'b'); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 2 b diff --git a/mysql-test/suite/storage_engine/1st.test b/mysql-test/suite/storage_engine/1st.test index af7a4503948..c9ebd8b75e4 100644 --- a/mysql-test/suite/storage_engine/1st.test +++ b/mysql-test/suite/storage_engine/1st.test @@ -14,7 +14,7 @@ # - CREATE TABLE .. (column1 , column2 ) ENGINE=; # - INSERT INTO TABLE .. VALUES (val1,val2); # - DROP TABLE .. -# - SELECT * FROM .. +# - SELECT a,b FROM .. # - SHOW CREATE TABLE .. # - SHOW COLUMNS IN ... # @@ -62,10 +62,10 @@ if (!$mysql_errname) --source unexpected_result.inc } - SELECT * FROM t1; + SELECT a,b FROM t1; if ($mysql_errname) { - --let $functionality = SELECT * FROM .. + --let $functionality = SELECT a,b FROM .. --source unexpected_result.inc } diff --git a/mysql-test/suite/storage_engine/alter_table.result b/mysql-test/suite/storage_engine/alter_table.result index 6d868a27a36..09696e0e6b6 100644 --- a/mysql-test/suite/storage_engine/alter_table.result +++ b/mysql-test/suite/storage_engine/alter_table.result @@ -105,7 +105,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL ) ENGINE= DEFAULT CHARSET=latin1 -SELECT * FROM t1; +SELECT a,b FROM t1; a b 2 2 4 3 diff --git a/mysql-test/suite/storage_engine/alter_table.test b/mysql-test/suite/storage_engine/alter_table.test index 023d8927e16..f99792f5766 100644 --- a/mysql-test/suite/storage_engine/alter_table.test +++ b/mysql-test/suite/storage_engine/alter_table.test @@ -111,7 +111,7 @@ SHOW CREATE TABLE t1; --source alter_table.inc --source mask_engine.inc SHOW CREATE TABLE t1; -SELECT * FROM t1; +SELECT a,b FROM t1; DROP TABLE t1; # Character set, collate diff --git a/mysql-test/suite/storage_engine/alter_tablespace.result b/mysql-test/suite/storage_engine/alter_tablespace.result index 5d8709b2357..71ef910b222 100644 --- a/mysql-test/suite/storage_engine/alter_tablespace.result +++ b/mysql-test/suite/storage_engine/alter_tablespace.result @@ -4,15 +4,15 @@ ALTER TABLE t1 DISCARD TABLESPACE; DROP TABLE t1; CREATE TABLE t1 (a ) ENGINE= ; INSERT INTO t1 (a) VALUES (1),(2); -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 ALTER TABLE t1 DISCARD TABLESPACE; -SELECT * FROM t1; +SELECT a FROM t1; ERROR HY000: Got error -1 from storage engine ALTER TABLE t1 IMPORT TABLESPACE; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 diff --git a/mysql-test/suite/storage_engine/alter_tablespace.test b/mysql-test/suite/storage_engine/alter_tablespace.test index 6c429bb98ea..508639c7dc5 100644 --- a/mysql-test/suite/storage_engine/alter_tablespace.test +++ b/mysql-test/suite/storage_engine/alter_tablespace.test @@ -30,7 +30,7 @@ if (!$mysql_errname) --source create_table.inc INSERT INTO t1 (a) VALUES (1),(2); --sorted_result - SELECT * FROM t1; + SELECT a FROM t1; # http://dev.mysql.com/doc/mysql-enterprise-backup/3.5/en/partial.restoring.single.html # To get a "clean" backup we need to either use innobackup, or to monitor show engine innodb status, @@ -64,7 +64,7 @@ EOF --source alter_table.inc --let $error_codes = ER_GET_ERRNO - SELECT * FROM t1; + SELECT a FROM t1; --source check_errors.inc if ($mysql_errname != ER_GET_ERRNO) { @@ -76,7 +76,7 @@ EOF --let $alter_definition = IMPORT TABLESPACE --source alter_table.inc --sorted_result - SELECT * FROM t1; + SELECT a FROM t1; # Adding a warning suppression based on what InnoDB currently does # when it attempts to access a table without an *.ibd file diff --git a/mysql-test/suite/storage_engine/autoinc_secondary.result b/mysql-test/suite/storage_engine/autoinc_secondary.result index ad2b43bc6fe..28b0a406fff 100644 --- a/mysql-test/suite/storage_engine/autoinc_secondary.result +++ b/mysql-test/suite/storage_engine/autoinc_secondary.result @@ -4,7 +4,7 @@ INSERT INTO t1 (b) VALUES ('a'),('b'),('b'),('c'),('a'); SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 1 -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 2 b @@ -17,7 +17,7 @@ INSERT INTO t1 (a) VALUES ('a'),('b'),('b'),('c'),('a'); SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 1 -SELECT * FROM t1; +SELECT a,b FROM t1; a b a 1 a 2 @@ -30,7 +30,7 @@ INSERT INTO t1 (a) VALUES ('a'),('b'),('b'),('c'),('a'); SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 1 -SELECT * FROM t1; +SELECT a,b FROM t1; a b a 1 a 5 diff --git a/mysql-test/suite/storage_engine/autoinc_secondary.test b/mysql-test/suite/storage_engine/autoinc_secondary.test index 8b95f1d859e..25fc0f7cfa1 100644 --- a/mysql-test/suite/storage_engine/autoinc_secondary.test +++ b/mysql-test/suite/storage_engine/autoinc_secondary.test @@ -25,7 +25,7 @@ if (!$mysql_errname) INSERT INTO t1 (b) VALUES ('a'),('b'),('b'),('c'),('a'); SELECT LAST_INSERT_ID(); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -45,7 +45,7 @@ if (!$mysql_errname) INSERT INTO t1 (a) VALUES ('a'),('b'),('b'),('c'),('a'); SELECT LAST_INSERT_ID(); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -65,7 +65,7 @@ if (!$mysql_errname) INSERT INTO t1 (a) VALUES ('a'),('b'),('b'),('c'),('a'); SELECT LAST_INSERT_ID(); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/autoinc_vars.result b/mysql-test/suite/storage_engine/autoinc_vars.result index a9fd8c8d06c..aca21dfd1c4 100644 --- a/mysql-test/suite/storage_engine/autoinc_vars.result +++ b/mysql-test/suite/storage_engine/autoinc_vars.result @@ -5,7 +5,7 @@ INSERT INTO t1 (a,b) VALUES (NULL,'a'),(NULL,'b'),(NULL,'c'); SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 1 -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 2 b @@ -15,7 +15,7 @@ INSERT INTO t1 (a,b) VALUES (NULL,'d'),(NULL,'e'),(NULL,'f'); SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 200 -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 2 b @@ -28,7 +28,7 @@ INSERT INTO t1 (a,b) VALUES (NULL,'g'),(NULL,'h'),(NULL,'i'); SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 850 -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 2 b @@ -48,6 +48,6 @@ ERROR 22003: Out of range value for column 'a' at row 1 SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 850 -SELECT * FROM t1; +SELECT a FROM t1; a DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/autoinc_vars.test b/mysql-test/suite/storage_engine/autoinc_vars.test index ceafcd7138f..b154fd794d0 100644 --- a/mysql-test/suite/storage_engine/autoinc_vars.test +++ b/mysql-test/suite/storage_engine/autoinc_vars.test @@ -25,7 +25,7 @@ if (!$mysql_errname) INSERT INTO t1 (a,b) VALUES (NULL,'a'),(NULL,'b'),(NULL,'c'); SELECT LAST_INSERT_ID(); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; # auto_increment_increment @@ -34,13 +34,13 @@ if (!$mysql_errname) INSERT INTO t1 (a,b) VALUES (NULL,'d'),(NULL,'e'),(NULL,'f'); SELECT LAST_INSERT_ID(); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; SET auto_increment_increment = 50; INSERT INTO t1 (a,b) VALUES (NULL,'g'),(NULL,'h'),(NULL,'i'); SELECT LAST_INSERT_ID(); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -60,7 +60,7 @@ if (!$mysql_errname) INSERT INTO t1 (a) VALUES (NULL); SELECT LAST_INSERT_ID(); --sorted_result - SELECT * FROM t1; + SELECT a FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/autoincrement.result b/mysql-test/suite/storage_engine/autoincrement.result index bc51a2a82af..44cb8650441 100644 --- a/mysql-test/suite/storage_engine/autoincrement.result +++ b/mysql-test/suite/storage_engine/autoincrement.result @@ -8,7 +8,7 @@ t1 CREATE TABLE `t1` ( KEY `a` (`a`) ) ENGINE= DEFAULT CHARSET=latin1 INSERT INTO t1 (b) VALUES ('a'),('b'); -SELECT * FROM t1 ORDER BY a; +SELECT a,b FROM t1 ORDER BY a; a b 1 a 2 b @@ -16,7 +16,7 @@ SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 1 INSERT INTO t1 (a,b) VALUES (NULL,'c'),(0,'d'); -SELECT * FROM t1 ORDER BY a; +SELECT a,b FROM t1 ORDER BY a; a b 1 a 2 b @@ -27,7 +27,7 @@ LAST_INSERT_ID() 3 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'; INSERT INTO t1 (a,b) VALUES (NULL,'e'); -SELECT * FROM t1 ORDER BY a; +SELECT a,b FROM t1 ORDER BY a; a b 1 a 2 b @@ -38,7 +38,7 @@ SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 5 INSERT INTO t1 (a,b) VALUES (0,'f'); -SELECT * FROM t1 ORDER BY a; +SELECT a,b FROM t1 ORDER BY a; a b 0 f 1 a @@ -61,7 +61,7 @@ SHOW TABLE STATUS FROM test LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment t1 # # # # # # # # # 8 # # # # # # # INSERT INTO t1 (a,b) VALUES (NULL,'i'),(9,'j'); -SELECT * FROM t1 ORDER BY a; +SELECT a,b FROM t1 ORDER BY a; a b 0 f 1 a @@ -84,7 +84,7 @@ SHOW TABLE STATUS FROM test LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment t1 # # # # # # # # # 21 # # # # # # # INSERT INTO t1 (a,b) VALUES (NULL,'l'); -SELECT * FROM t1 ORDER BY a; +SELECT a,b FROM t1 ORDER BY a; a b 0 f 1 a @@ -105,7 +105,7 @@ SHOW TABLE STATUS FROM test LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment t1 # # # # # # # # # 22 # # # # # # # INSERT INTO t1 (a,b) VALUES (-5,'m'); -SELECT * FROM t1 ORDER BY a; +SELECT a,b FROM t1 ORDER BY a; a b -5 m 0 f @@ -123,7 +123,7 @@ a b DROP TABLE t1; CREATE TABLE t1 (a AUTO_INCREMENT, b , (a)) ENGINE= AUTO_INCREMENT = 100; INSERT INTO t1 (a,b) VALUES (NULL,'a'),(NULL,'b'); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 100 a 101 b diff --git a/mysql-test/suite/storage_engine/autoincrement.test b/mysql-test/suite/storage_engine/autoincrement.test index fb07ea55c57..ddb0ab1b464 100644 --- a/mysql-test/suite/storage_engine/autoincrement.test +++ b/mysql-test/suite/storage_engine/autoincrement.test @@ -26,22 +26,22 @@ if (!$mysql_errname) # Automatic values INSERT INTO t1 (b) VALUES ('a'),('b'); - SELECT * FROM t1 ORDER BY a; + SELECT a,b FROM t1 ORDER BY a; SELECT LAST_INSERT_ID(); INSERT INTO t1 (a,b) VALUES (NULL,'c'),(0,'d'); - SELECT * FROM t1 ORDER BY a; + SELECT a,b FROM t1 ORDER BY a; SELECT LAST_INSERT_ID(); let $sql_mode = `SELECT @@sql_mode`; SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'; INSERT INTO t1 (a,b) VALUES (NULL,'e'); - SELECT * FROM t1 ORDER BY a; + SELECT a,b FROM t1 ORDER BY a; SELECT LAST_INSERT_ID(); INSERT INTO t1 (a,b) VALUES (0,'f'); - SELECT * FROM t1 ORDER BY a; + SELECT a,b FROM t1 ORDER BY a; SELECT LAST_INSERT_ID(); --replace_result $sql_mode @@ -63,7 +63,7 @@ if (!$mysql_errname) INSERT INTO t1 (a,b) VALUES (NULL,'i'),(9,'j'); - SELECT * FROM t1 ORDER BY a; + SELECT a,b FROM t1 ORDER BY a; SELECT LAST_INSERT_ID(); --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # @@ -77,7 +77,7 @@ if (!$mysql_errname) SHOW TABLE STATUS FROM test LIKE 't1'; INSERT INTO t1 (a,b) VALUES (NULL,'l'); - SELECT * FROM t1 ORDER BY a; + SELECT a,b FROM t1 ORDER BY a; SELECT LAST_INSERT_ID(); --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # @@ -87,7 +87,7 @@ if (!$mysql_errname) # but won't check what happens to the sequence after that, since the behavior is undefined INSERT INTO t1 (a,b) VALUES (-5,'m'); - SELECT * FROM t1 ORDER BY a; + SELECT a,b FROM t1 ORDER BY a; DROP TABLE t1; } @@ -106,7 +106,7 @@ if (!$mysql_errname) { INSERT INTO t1 (a,b) VALUES (NULL,'a'),(NULL,'b'); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; SELECT LAST_INSERT_ID(); DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/col_opt_default.result b/mysql-test/suite/storage_engine/col_opt_default.result index 2d0a8508b99..d1f3e9d98c6 100644 --- a/mysql-test/suite/storage_engine/col_opt_default.result +++ b/mysql-test/suite/storage_engine/col_opt_default.result @@ -4,7 +4,7 @@ SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) # 0 INSERT INTO t1 (a) VALUES (1); -SELECT * FROM t1; +SELECT a FROM t1; a 1 ALTER TABLE t1 ADD COLUMN b DEFAULT ''; @@ -13,7 +13,7 @@ Field Type Null Key Default Extra a int(11) # 0 b char(8) # INSERT INTO t1 (b) VALUES ('a'); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 a 1 diff --git a/mysql-test/suite/storage_engine/col_opt_default.test b/mysql-test/suite/storage_engine/col_opt_default.test index f59daef37fc..3b28def76db 100644 --- a/mysql-test/suite/storage_engine/col_opt_default.test +++ b/mysql-test/suite/storage_engine/col_opt_default.test @@ -25,7 +25,7 @@ if (!$mysql_errname) INSERT INTO t1 (a) VALUES (1); --sorted_result - SELECT * FROM t1; + SELECT a FROM t1; --let $alter_definition = ADD COLUMN b $char_col DEFAULT '' --source alter_table.inc @@ -41,7 +41,7 @@ if (!$mysql_errname) INSERT INTO t1 (b) VALUES ('a'); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; } DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/col_opt_not_null.result b/mysql-test/suite/storage_engine/col_opt_not_null.result index 49b834efc26..18508e98e8c 100644 --- a/mysql-test/suite/storage_engine/col_opt_not_null.result +++ b/mysql-test/suite/storage_engine/col_opt_not_null.result @@ -15,20 +15,20 @@ b0 binary(0) # # # # b1 binary(1) # # # # b20 binary(20) # # # # b255 binary(255) # # # # -INSERT INTO t1 VALUES ('','','','',''); -INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); +INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('','','','',''); +INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); SELECT HEX(b), HEX(b0), HEX(b1), HEX(b20), HEX(b255) FROM t1; HEX(b) HEX(b0) HEX(b1) HEX(b20) HEX(b255) 00 00 0000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 61 62 616263646566676869206B6C6D6E6F7071727374 4372656174696E6720616E2061727469636C6520666F7220746865204B6E6F776C65646765626173652069732073696D696C617220746F2061736B696E67207175657374696F6E732E2046697273742C206E6176696761746520746F207468652063617465676F727920776865726520796F75206665656C207468652061727469636C652073686F756C642062652E204F6E63652074686572652C20646F75626C6520636865636B207468617420616E2061727469636C6520646F65736E277420616C726561647920657869737420776869636820776F756C6420776F726B2E00000000000000000000000000000000000000000000000000000000000000 -INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); +INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); Warnings: Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'b0' at row 1 Warning 1265 Data truncated for column 'b1' at row 1 Warning 1265 Data truncated for column 'b20' at row 1 Warning 1265 Data truncated for column 'b255' at row 1 -INSERT INTO t1 SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1; +INSERT INTO t1 (b,b0,b1,b20,b255) SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1; Warnings: Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'b0' at row 1 @@ -237,29 +237,29 @@ a bit(1) # # # b bit(20) # # # c bit(64) # # # d bit(1) # # # -INSERT INTO t1 VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1); +INSERT INTO t1 (a,b,c,d) VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1); SELECT BIN(a), HEX(b), c+0 FROM t1 WHERE d>0; BIN(a) HEX(b) c+0 0 FFFFF 18446744073709551615 -INSERT INTO t1 VALUES (1,0,-1,0); +INSERT INTO t1 (a,b,c,d) VALUES (1,0,-1,0); SELECT a+0, b+0, c+0 FROM t1 WHERE d<100; a+0 b+0 c+0 0 1048575 18446744073709551615 1 0 18446744073709551615 -INSERT INTO t1 VALUES (b'1', 'f', 0xFF, 0x0); +INSERT INTO t1 (a,b,c,d) VALUES (b'1', 'f', 0xFF, 0x0); SELECT a+0, b+0, c+0 FROM t1 WHERE d IN (0, 2); a+0 b+0 c+0 1 0 18446744073709551615 1 102 255 -INSERT INTO t1 VALUES (0x10,0,0,1); +INSERT INTO t1 (a,b,c,d) VALUES (0x10,0,0,1); Warnings: Warning 1264 Out of range value for column 'a' at row 1 -SELECT * FROM t1; +SELECT a,b,c,d FROM t1; a b c d -INSERT INTO t1 VALUES (0x01,0,0x10000000000000000,0); +INSERT INTO t1 (a,b,c,d) VALUES (0x01,0,0x10000000000000000,0); Warnings: Warning 1264 Out of range value for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c,d FROM t1; a b c d DROP TABLE t1; CREATE TABLE t1 (a BIT(65) NOT NULL) ENGINE= ; @@ -319,7 +319,7 @@ b17m longblob # # # t tinyblob # # # m mediumblob # # # l longblob # # # -INSERT INTO t1 VALUES +INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES ('','','','','','','','','',''), ('a','b','c','d','e','f','g','h','i','j'), ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'), @@ -330,7 +330,7 @@ LENGTH(b) LENGTH(b0) LENGTH(b1) LENGTH(b300) LENGTH(bm) LENGTH(b70k) LENGTH(b17m 1 1 1 1 1 1 1 1 1 1 5 5 5 5 5 5 5 5 5 6 65535 65535 255 65535 65535 1048576 2097152 255 1048576 2097152 -INSERT INTO t1 VALUES +INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) ); Warnings: Warning 1265 Data truncated for column 'b' at row 1 @@ -392,23 +392,23 @@ SHOW COLUMNS IN t1; Field Type Null Key Default Extra b1 tinyint(1) # # # b2 tinyint(1) # # # -INSERT INTO t1 VALUES (1,TRUE); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (1,TRUE); +SELECT b1,b2 FROM t1; b1 b2 1 1 -INSERT INTO t1 VALUES (FALSE,0); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (FALSE,0); +SELECT b1,b2 FROM t1; b1 b2 0 0 1 1 -INSERT INTO t1 VALUES (2,3); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (2,3); +SELECT b1,b2 FROM t1; b1 b2 0 0 1 1 2 3 -INSERT INTO t1 VALUES (-1,-2); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (-1,-2); +SELECT b1,b2 FROM t1; b1 b2 -1 -2 0 0 @@ -420,28 +420,28 @@ false false true true true true true true -SELECT * FROM t1 WHERE b1 = TRUE; +SELECT b1,b2 FROM t1 WHERE b1 = TRUE; b1 b2 1 1 -SELECT * FROM t1 WHERE b2 = FALSE; +SELECT b1,b2 FROM t1 WHERE b2 = FALSE; b1 b2 0 0 -INSERT INTO t1 VALUES ('a','b'); +INSERT INTO t1 (b1,b2) VALUES ('a','b'); Warnings: Warning 1366 Incorrect integer value: 'a' for column 'b1' at row 1 Warning 1366 Incorrect integer value: 'b' for column 'b2' at row 1 -SELECT * FROM t1; +SELECT b1,b2 FROM t1; b1 b2 -1 -2 0 0 0 0 1 1 2 3 -INSERT INTO t1 VALUES (128,-129); +INSERT INTO t1 (b1,b2) VALUES (128,-129); Warnings: Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b2' at row 1 -SELECT * FROM t1; +SELECT b1,b2 FROM t1; b1 b2 -1 -2 0 0 @@ -499,20 +499,20 @@ c0 char(0) # # # c1 char(1) # # # c20 char(20) # # # c255 char(255) # # # -INSERT INTO t1 VALUES ('','','','',''); -INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); -SELECT * FROM t1; +INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('','','','',''); +INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); +SELECT c,c0,c1,c20,c255 FROM t1; c c0 c1 c20 c255 a b abcdefghi klmnopqrst Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn't already exist which would work. -INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); +INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); Warnings: Warning 1265 Data truncated for column 'c' at row 1 Warning 1265 Data truncated for column 'c0' at row 1 Warning 1265 Data truncated for column 'c1' at row 1 Warning 1265 Data truncated for column 'c20' at row 1 Warning 1265 Data truncated for column 'c255' at row 1 -INSERT INTO t1 SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1; +INSERT INTO t1 (c,c0,c1,c20,c255) SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1; Warnings: Warning 1265 Data truncated for column 'c' at row 2 Warning 1265 Data truncated for column 'c0' at row 2 @@ -523,7 +523,7 @@ Warning 1265 Data truncated for column 'c0' at row 3 Warning 1265 Data truncated for column 'c1' at row 3 Warning 1265 Data truncated for column 'c20' at row 3 Warning 1265 Data truncated for column 'c255' at row 3 -SELECT * FROM t1; +SELECT c,c0,c1,c20,c255 FROM t1; c c0 c1 c20 c255 @@ -625,7 +625,7 @@ INSERT INTO t1 (v0,v1,v64,v65000) VALUES ('','y','Once there, double check that * MySQL 5.0 Certification Study Guide, By Paul DuBois, Stefan Hinz, Carsten Pedersen o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. '); -SELECT * FROM t1; +SELECT v0,v1,v64,v65000 FROM t1; v0 v1 v64 v65000 @@ -751,18 +751,18 @@ y year(4) # # # y4 year(4) # # # y2 year(2) # # # SET @tm = '2012-04-09 05:27:00'; -INSERT INTO t1 VALUES +INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES ('1000-01-01', '1000-01-01 00:00:00', FROM_UNIXTIME(1), '-838:59:59', '1901', '1901', '00'), ('9999-12-31', '9999-12-31 23:59:59', FROM_UNIXTIME(2147483647), '838:59:59', '2155', '2155', '99'), ('0000-00-00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '00:00:00', '0', '0', '0'), (DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm),YEAR(@tm),YEAR(@tm)); -SELECT * FROM t1; +SELECT d,dt,ts,t,y,y4,y2 FROM t1; d dt ts t y y4 y2 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00 1000-01-01 1000-01-01 00:00:00 1970-01-01 03:00:01 -838:59:59 1901 1901 00 2012-04-09 2012-04-09 05:27:00 2012-04-09 05:27:00 05:27:00 2012 2012 12 9999-12-31 9999-12-31 23:59:59 2038-01-19 07:14:07 838:59:59 2155 2155 99 -INSERT INTO t1 VALUES +INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' ); Warnings: Warning 1265 Data truncated for column 'd' at row 1 @@ -772,7 +772,7 @@ Warning 1264 Out of range value for column 't' at row 1 Warning 1264 Out of range value for column 'y' at row 1 Warning 1264 Out of range value for column 'y4' at row 1 Warning 1264 Out of range value for column 'y2' at row 1 -SELECT * FROM t1; +SELECT d,dt,ts,t,y,y4,y2 FROM t1; d dt ts t y y4 y2 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 -838:59:59 0000 0000 00 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00 @@ -853,7 +853,7 @@ SHOW COLUMNS IN t1; Field Type Null Key Default Extra c timestamp NO CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP INSERT INTO t1 (c) VALUES (NULL); -SELECT * FROM t1; +SELECT c FROM t1; c DROP TABLE t1; @@ -959,17 +959,17 @@ Field Type Null Key Default Extra a enum('') # # # b enum('test1','test2','test3','test4','test5') # # # c enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75') # # # -INSERT INTO t1 VALUES ('','test2','4'),('',5,2); -SELECT * FROM t1; +INSERT INTO t1 (a,b,c) VALUES ('','test2','4'),('',5,2); +SELECT a,b,c FROM t1; a b c test2 4 test5 2 -INSERT INTO t1 VALUES (0,'test6',-1); +INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1); Warnings: Warning 1265 Data truncated for column 'a' at row 1 Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c FROM t1; a b c test2 4 @@ -984,14 +984,14 @@ a enum('') # # # b enum('test1','test2','test3','test4','test5') # # # c enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75') # # # e enum('a','A') # # # -INSERT INTO t1 VALUES ('','test3','75','A'); -SELECT * FROM t1; +INSERT INTO t1 (a,b,c,e) VALUES ('','test3','75','A'); +SELECT a,b,c,e FROM t1; a b c e a test2 4 a test3 75 a test5 2 a -SELECT * FROM t1 WHERE b='test2' OR a != ''; +SELECT a,b,c,e FROM t1 WHERE b='test2' OR a != ''; a b c e test2 4 a DROP TABLE t1; @@ -1050,30 +1050,30 @@ n0_0 decimal(10,0) # # # n1 decimal(1,0) # # # n20_4 decimal(20,4) # # # n65_4 decimal(65,4) # # # -INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); -SELECT * FROM t1; +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); -INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); -SELECT * FROM t1; +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -1084,7 +1084,7 @@ Warning 1264 Out of range value for column 'n' at row 1 Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 @@ -1092,7 +1092,7 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -1104,7 +1104,7 @@ Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 Warning 1264 Out of range value for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 @@ -1113,7 +1113,7 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); Warnings: Note 1265 Data truncated for column 'd' at row 1 Note 1265 Data truncated for column 'd0' at row 1 @@ -1125,7 +1125,7 @@ Note 1265 Data truncated for column 'n0_0' at row 1 Note 1265 Data truncated for column 'n1' at row 1 Note 1265 Data truncated for column 'n20_4' at row 1 Note 1265 Data truncated for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 @@ -1229,8 +1229,8 @@ d1_0 double(1,0) # # # d10_10 double(10,10) # # # d53 double(53,0) # # # d53_10 double(53,10) # # # -INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); -SELECT * FROM t1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 11111111.111 d10_10 0.0123456789 @@ -1241,8 +1241,8 @@ f0 12345.1 f20_3 56789.988 f23_0 123457000 r1_1 0.9 -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES ( +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 99999999999999999999999999999999999999, 99999999999999999999999999999999999999.9999999999999999, 0.9, @@ -1257,7 +1257,7 @@ INSERT INTO t1 VALUES ( Warnings: Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 0 d 11111111.111 @@ -1288,8 +1288,8 @@ f23_0 1e38 r1_1 0.0 r1_1 0.9 r1_1 0.9 -INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); -SELECT * FROM t1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d -1e60 d 0 @@ -1341,7 +1341,7 @@ MAX(f0) 9.999999680285692e37 MAX(f20_3) 99999998430674940.000 MAX(f23_0) 9.999999680285692e37 MAX(r1_1) 0.9 -INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; Warnings: Warning 1264 Out of range value for column 'f' at row 1 Warning 1264 Out of range value for column 'f0' at row 1 @@ -1349,7 +1349,7 @@ Warning 1264 Out of range value for column 'r1_1' at row 1 Warning 1264 Out of range value for column 'f23_0' at row 1 Warning 1264 Out of range value for column 'f20_3' at row 1 Warning 1264 Out of range value for column 'd1_0' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d -1e60 d 0 @@ -1400,7 +1400,7 @@ r1_1 0.0 r1_1 0.9 r1_1 0.9 r1_1 0.9 -INSERT INTO t1 VALUES ( +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 999999999999999999999999999999999999999, 999999999999999999999999999999999999999.9999999999999999, 1.9, @@ -1423,7 +1423,7 @@ Warning 1264 Out of range value for column 'd1_0' at row 1 Warning 1264 Out of range value for column 'd10_10' at row 1 Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d -1e60 d 0 @@ -1594,16 +1594,16 @@ b bigint(20) # # # b0 bigint(20) # # # b1 bigint(1) # # # b20 bigint(20) # # # -INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); -SELECT * FROM t1; +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 -INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); -INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -1625,14 +1625,14 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -SELECT * FROM t1; +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 -2147483648 -2147483648 -2147483648 -2147483648 -128 -128 -128 -128 -32768 -32768 -32768 -32768 -8388608 -8388608 -8388608 -8388608 -9223372036854775808 -9223372036854775808 -9223372036854775808 -9223372036854775808 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 -INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -1654,7 +1654,7 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -1676,7 +1676,7 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -1742,7 +1742,7 @@ Warning 1264 Out of range value for column 'm' at row 4 Warning 1264 Out of range value for column 'm0' at row 4 Warning 1264 Out of range value for column 'm1' at row 4 Warning 1264 Out of range value for column 'm20' at row 4 -SELECT * FROM t1; +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 -2147483648 -2147483648 -2147483648 -2147483648 -128 -128 -128 -128 -32768 -32768 -32768 -32768 -8388608 -8388608 -8388608 -8388608 -9223372036854775808 -9223372036854775808 -9223372036854775808 -9223372036854775808 -2147483648 -2147483648 -2147483648 -2147483648 -128 -128 -128 -128 -32768 -32768 -32768 -32768 -8388608 -8388608 -8388608 -8388608 -9223372036854775808 -9223372036854775808 -9223372036854775808 -9223372036854775808 @@ -1912,22 +1912,22 @@ Field Type Null Key Default Extra a set('') # # # b set('test1','test2','test3','test4','test5') # # # c set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50''51','52','53','54','55','56','57','58','59','60','61','62','63','64') # # # -INSERT INTO t1 VALUES +INSERT INTO t1 (a,b,c) VALUES ('','test2,test3','01,34,44,,23'), ('',5,2), (',','test4,test2',''); Warnings: Warning 1265 Data truncated for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c FROM t1; a b c test1,test3 02 test2,test3 01,23,34,44 test2,test4 -INSERT INTO t1 VALUES (0,'test6',-1); +INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1); Warnings: Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c FROM t1; a b c 01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50'51,52,53,54,55,56,57,58,59,60,61,62,63,64 test1,test3 02 @@ -1945,7 +1945,7 @@ c set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15' e set('a','A') # # # ALTER TABLE t1 ADD COLUMN f SET('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',' ','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i') NOT NULL; ERROR HY000: Too many strings for column f and SET -SELECT * FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != ''; +SELECT a,b,c,e FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != ''; a b c e test2,test3 01,23,34,44 test2,test4 @@ -2005,7 +2005,7 @@ t17m longtext # # # tt tinytext # # # m mediumtext # # # l longtext # # # -INSERT INTO t1 VALUES +INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES ('','','','','','','','','',''), ('a','b','c','d','e','f','g','h','i','j'), ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'), @@ -2016,7 +2016,7 @@ LENGTH(t) LENGTH(t0) LENGTH(t1) LENGTH(t300) LENGTH(tm) LENGTH(t70k) LENGTH(t17m 1 1 1 1 1 1 1 1 1 1 5 5 5 5 5 5 5 5 5 6 65535 65535 255 65535 65535 1048576 1048576 255 1048576 1048576 -INSERT INTO t1 VALUES +INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) ); Warnings: Warning 1265 Data truncated for column 't' at row 1 diff --git a/mysql-test/suite/storage_engine/col_opt_not_null.test b/mysql-test/suite/storage_engine/col_opt_not_null.test index 2cd0e909536..1ec00621518 100644 --- a/mysql-test/suite/storage_engine/col_opt_not_null.test +++ b/mysql-test/suite/storage_engine/col_opt_not_null.test @@ -144,7 +144,7 @@ if (!$mysql_errname) } --replace_regex /[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} [[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}// - SELECT * FROM t1; + SELECT c FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/col_opt_null.result b/mysql-test/suite/storage_engine/col_opt_null.result index ebcb91d0c5f..45982faed61 100644 --- a/mysql-test/suite/storage_engine/col_opt_null.result +++ b/mysql-test/suite/storage_engine/col_opt_null.result @@ -15,20 +15,20 @@ b0 binary(0) # # # # b1 binary(1) # # # # b20 binary(20) # # # # b255 binary(255) # # # # -INSERT INTO t1 VALUES ('','','','',''); -INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); +INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('','','','',''); +INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); SELECT HEX(b), HEX(b0), HEX(b1), HEX(b20), HEX(b255) FROM t1; HEX(b) HEX(b0) HEX(b1) HEX(b20) HEX(b255) 00 00 0000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 61 62 616263646566676869206B6C6D6E6F7071727374 4372656174696E6720616E2061727469636C6520666F7220746865204B6E6F776C65646765626173652069732073696D696C617220746F2061736B696E67207175657374696F6E732E2046697273742C206E6176696761746520746F207468652063617465676F727920776865726520796F75206665656C207468652061727469636C652073686F756C642062652E204F6E63652074686572652C20646F75626C6520636865636B207468617420616E2061727469636C6520646F65736E277420616C726561647920657869737420776869636820776F756C6420776F726B2E00000000000000000000000000000000000000000000000000000000000000 -INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); +INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); Warnings: Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'b0' at row 1 Warning 1265 Data truncated for column 'b1' at row 1 Warning 1265 Data truncated for column 'b20' at row 1 Warning 1265 Data truncated for column 'b255' at row 1 -INSERT INTO t1 SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1; +INSERT INTO t1 (b,b0,b1,b20,b255) SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1; Warnings: Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'b0' at row 1 @@ -229,29 +229,29 @@ a bit(1) # # # b bit(20) # # # c bit(64) # # # d bit(1) # # # -INSERT INTO t1 VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1); +INSERT INTO t1 (a,b,c,d) VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1); SELECT BIN(a), HEX(b), c+0 FROM t1 WHERE d>0; BIN(a) HEX(b) c+0 0 FFFFF 18446744073709551615 -INSERT INTO t1 VALUES (1,0,-1,0); +INSERT INTO t1 (a,b,c,d) VALUES (1,0,-1,0); SELECT a+0, b+0, c+0 FROM t1 WHERE d<100; a+0 b+0 c+0 0 1048575 18446744073709551615 1 0 18446744073709551615 -INSERT INTO t1 VALUES (b'1', 'f', 0xFF, 0x0); +INSERT INTO t1 (a,b,c,d) VALUES (b'1', 'f', 0xFF, 0x0); SELECT a+0, b+0, c+0 FROM t1 WHERE d IN (0, 2); a+0 b+0 c+0 1 0 18446744073709551615 1 102 255 -INSERT INTO t1 VALUES (0x10,0,0,1); +INSERT INTO t1 (a,b,c,d) VALUES (0x10,0,0,1); Warnings: Warning 1264 Out of range value for column 'a' at row 1 -SELECT * FROM t1; +SELECT a,b,c,d FROM t1; a b c d -INSERT INTO t1 VALUES (0x01,0,0x10000000000000000,0); +INSERT INTO t1 (a,b,c,d) VALUES (0x01,0,0x10000000000000000,0); Warnings: Warning 1264 Out of range value for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c,d FROM t1; a b c d DROP TABLE t1; CREATE TABLE t1 (a BIT(65) NULL) ENGINE= ; @@ -307,7 +307,7 @@ b17m longblob # # # t tinyblob # # # m mediumblob # # # l longblob # # # -INSERT INTO t1 VALUES +INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES ('','','','','','','','','',''), ('a','b','c','d','e','f','g','h','i','j'), ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'), @@ -318,7 +318,7 @@ LENGTH(b) LENGTH(b0) LENGTH(b1) LENGTH(b300) LENGTH(bm) LENGTH(b70k) LENGTH(b17m 1 1 1 1 1 1 1 1 1 1 5 5 5 5 5 5 5 5 5 6 65535 65535 255 65535 65535 1048576 2097152 255 1048576 2097152 -INSERT INTO t1 VALUES +INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) ); Warnings: Warning 1265 Data truncated for column 'b' at row 1 @@ -388,23 +388,23 @@ SHOW COLUMNS IN t1; Field Type Null Key Default Extra b1 tinyint(1) # # # b2 tinyint(1) # # # -INSERT INTO t1 VALUES (1,TRUE); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (1,TRUE); +SELECT b1,b2 FROM t1; b1 b2 1 1 -INSERT INTO t1 VALUES (FALSE,0); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (FALSE,0); +SELECT b1,b2 FROM t1; b1 b2 0 0 1 1 -INSERT INTO t1 VALUES (2,3); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (2,3); +SELECT b1,b2 FROM t1; b1 b2 0 0 1 1 2 3 -INSERT INTO t1 VALUES (-1,-2); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (-1,-2); +SELECT b1,b2 FROM t1; b1 b2 -1 -2 0 0 @@ -416,28 +416,28 @@ false false true true true true true true -SELECT * FROM t1 WHERE b1 = TRUE; +SELECT b1,b2 FROM t1 WHERE b1 = TRUE; b1 b2 1 1 -SELECT * FROM t1 WHERE b2 = FALSE; +SELECT b1,b2 FROM t1 WHERE b2 = FALSE; b1 b2 0 0 -INSERT INTO t1 VALUES ('a','b'); +INSERT INTO t1 (b1,b2) VALUES ('a','b'); Warnings: Warning 1366 Incorrect integer value: 'a' for column 'b1' at row 1 Warning 1366 Incorrect integer value: 'b' for column 'b2' at row 1 -SELECT * FROM t1; +SELECT b1,b2 FROM t1; b1 b2 -1 -2 0 0 0 0 1 1 2 3 -INSERT INTO t1 VALUES (128,-129); +INSERT INTO t1 (b1,b2) VALUES (128,-129); Warnings: Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b2' at row 1 -SELECT * FROM t1; +SELECT b1,b2 FROM t1; b1 b2 -1 -2 0 0 @@ -491,20 +491,20 @@ c0 char(0) # # # c1 char(1) # # # c20 char(20) # # # c255 char(255) # # # -INSERT INTO t1 VALUES ('','','','',''); -INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); -SELECT * FROM t1; +INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('','','','',''); +INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); +SELECT c,c0,c1,c20,c255 FROM t1; c c0 c1 c20 c255 a b abcdefghi klmnopqrst Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn't already exist which would work. -INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); +INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); Warnings: Warning 1265 Data truncated for column 'c' at row 1 Warning 1265 Data truncated for column 'c0' at row 1 Warning 1265 Data truncated for column 'c1' at row 1 Warning 1265 Data truncated for column 'c20' at row 1 Warning 1265 Data truncated for column 'c255' at row 1 -INSERT INTO t1 SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1; +INSERT INTO t1 (c,c0,c1,c20,c255) SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1; Warnings: Warning 1265 Data truncated for column 'c' at row 2 Warning 1265 Data truncated for column 'c0' at row 2 @@ -515,7 +515,7 @@ Warning 1265 Data truncated for column 'c0' at row 3 Warning 1265 Data truncated for column 'c1' at row 3 Warning 1265 Data truncated for column 'c20' at row 3 Warning 1265 Data truncated for column 'c255' at row 3 -SELECT * FROM t1; +SELECT c,c0,c1,c20,c255 FROM t1; c c0 c1 c20 c255 @@ -613,7 +613,7 @@ INSERT INTO t1 (v0,v1,v64,v65000) VALUES ('','y','Once there, double check that * MySQL 5.0 Certification Study Guide, By Paul DuBois, Stefan Hinz, Carsten Pedersen o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. '); -SELECT * FROM t1; +SELECT v0,v1,v64,v65000 FROM t1; v0 v1 v64 v65000 @@ -735,18 +735,18 @@ y year(4) # # # y4 year(4) # # # y2 year(2) # # # SET @tm = '2012-04-09 05:27:00'; -INSERT INTO t1 VALUES +INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES ('1000-01-01', '1000-01-01 00:00:00', FROM_UNIXTIME(1), '-838:59:59', '1901', '1901', '00'), ('9999-12-31', '9999-12-31 23:59:59', FROM_UNIXTIME(2147483647), '838:59:59', '2155', '2155', '99'), ('0000-00-00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '00:00:00', '0', '0', '0'), (DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm),YEAR(@tm),YEAR(@tm)); -SELECT * FROM t1; +SELECT d,dt,ts,t,y,y4,y2 FROM t1; d dt ts t y y4 y2 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00 1000-01-01 1000-01-01 00:00:00 1970-01-01 03:00:01 -838:59:59 1901 1901 00 2012-04-09 2012-04-09 05:27:00 2012-04-09 05:27:00 05:27:00 2012 2012 12 9999-12-31 9999-12-31 23:59:59 2038-01-19 07:14:07 838:59:59 2155 2155 99 -INSERT INTO t1 VALUES +INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' ); Warnings: Warning 1265 Data truncated for column 'd' at row 1 @@ -756,7 +756,7 @@ Warning 1264 Out of range value for column 't' at row 1 Warning 1264 Out of range value for column 'y' at row 1 Warning 1264 Out of range value for column 'y4' at row 1 Warning 1264 Out of range value for column 'y2' at row 1 -SELECT * FROM t1; +SELECT d,dt,ts,t,y,y4,y2 FROM t1; d dt ts t y y4 y2 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 -838:59:59 0000 0000 00 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00 @@ -927,17 +927,17 @@ Field Type Null Key Default Extra a enum('') # # # b enum('test1','test2','test3','test4','test5') # # # c enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75') # # # -INSERT INTO t1 VALUES ('','test2','4'),('',5,2); -SELECT * FROM t1; +INSERT INTO t1 (a,b,c) VALUES ('','test2','4'),('',5,2); +SELECT a,b,c FROM t1; a b c test2 4 test5 2 -INSERT INTO t1 VALUES (0,'test6',-1); +INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1); Warnings: Warning 1265 Data truncated for column 'a' at row 1 Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c FROM t1; a b c test2 4 @@ -952,14 +952,14 @@ a enum('') # # # b enum('test1','test2','test3','test4','test5') # # # c enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75') # # # e enum('a','A') # # # -INSERT INTO t1 VALUES ('','test3','75','A'); -SELECT * FROM t1; +INSERT INTO t1 (a,b,c,e) VALUES ('','test3','75','A'); +SELECT a,b,c,e FROM t1; a b c e NULL test2 4 NULL test3 75 a test5 2 NULL -SELECT * FROM t1 WHERE b='test2' OR a != ''; +SELECT a,b,c,e FROM t1 WHERE b='test2' OR a != ''; a b c e test2 4 NULL DROP TABLE t1; @@ -1014,30 +1014,30 @@ n0_0 decimal(10,0) # # # n1 decimal(1,0) # # # n20_4 decimal(20,4) # # # n65_4 decimal(65,4) # # # -INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); -SELECT * FROM t1; +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); -INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); -SELECT * FROM t1; +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -1048,7 +1048,7 @@ Warning 1264 Out of range value for column 'n' at row 1 Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 @@ -1056,7 +1056,7 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -1068,7 +1068,7 @@ Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 Warning 1264 Out of range value for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 @@ -1077,7 +1077,7 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); Warnings: Note 1265 Data truncated for column 'd' at row 1 Note 1265 Data truncated for column 'd0' at row 1 @@ -1089,7 +1089,7 @@ Note 1265 Data truncated for column 'n0_0' at row 1 Note 1265 Data truncated for column 'n1' at row 1 Note 1265 Data truncated for column 'n20_4' at row 1 Note 1265 Data truncated for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 @@ -1183,8 +1183,8 @@ d1_0 double(1,0) # # # d10_10 double(10,10) # # # d53 double(53,0) # # # d53_10 double(53,10) # # # -INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); -SELECT * FROM t1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 11111111.111 d10_10 0.0123456789 @@ -1195,8 +1195,8 @@ f0 12345.1 f20_3 56789.988 f23_0 123457000 r1_1 0.9 -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES ( +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 99999999999999999999999999999999999999, 99999999999999999999999999999999999999.9999999999999999, 0.9, @@ -1211,7 +1211,7 @@ INSERT INTO t1 VALUES ( Warnings: Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 0 d 11111111.111 @@ -1242,8 +1242,8 @@ f23_0 1e38 r1_1 0.0 r1_1 0.9 r1_1 0.9 -INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); -SELECT * FROM t1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d -1e60 d 0 @@ -1295,7 +1295,7 @@ MAX(f0) 9.999999680285692e37 MAX(f20_3) 99999998430674940.000 MAX(f23_0) 9.999999680285692e37 MAX(r1_1) 0.9 -INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; Warnings: Warning 1264 Out of range value for column 'f' at row 1 Warning 1264 Out of range value for column 'f0' at row 1 @@ -1303,7 +1303,7 @@ Warning 1264 Out of range value for column 'r1_1' at row 1 Warning 1264 Out of range value for column 'f23_0' at row 1 Warning 1264 Out of range value for column 'f20_3' at row 1 Warning 1264 Out of range value for column 'd1_0' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d -1e60 d 0 @@ -1354,7 +1354,7 @@ r1_1 0.0 r1_1 0.9 r1_1 0.9 r1_1 0.9 -INSERT INTO t1 VALUES ( +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 999999999999999999999999999999999999999, 999999999999999999999999999999999999999.9999999999999999, 1.9, @@ -1377,7 +1377,7 @@ Warning 1264 Out of range value for column 'd1_0' at row 1 Warning 1264 Out of range value for column 'd10_10' at row 1 Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d -1e60 d 0 @@ -1540,16 +1540,16 @@ b bigint(20) # # # b0 bigint(20) # # # b1 bigint(1) # # # b20 bigint(20) # # # -INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); -SELECT * FROM t1; +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 -INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); -INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -1571,14 +1571,14 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -SELECT * FROM t1; +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 -2147483648 -2147483648 -2147483648 -2147483648 -128 -128 -128 -128 -32768 -32768 -32768 -32768 -8388608 -8388608 -8388608 -8388608 -9223372036854775808 -9223372036854775808 -9223372036854775808 -9223372036854775808 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 -INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -1600,7 +1600,7 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -1622,7 +1622,7 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -1688,7 +1688,7 @@ Warning 1264 Out of range value for column 'm' at row 4 Warning 1264 Out of range value for column 'm0' at row 4 Warning 1264 Out of range value for column 'm1' at row 4 Warning 1264 Out of range value for column 'm20' at row 4 -SELECT * FROM t1; +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 -2147483648 -2147483648 -2147483648 -2147483648 -128 -128 -128 -128 -32768 -32768 -32768 -32768 -8388608 -8388608 -8388608 -8388608 -9223372036854775808 -9223372036854775808 -9223372036854775808 -9223372036854775808 -2147483648 -2147483648 -2147483648 -2147483648 -128 -128 -128 -128 -32768 -32768 -32768 -32768 -8388608 -8388608 -8388608 -8388608 -9223372036854775808 -9223372036854775808 -9223372036854775808 -9223372036854775808 @@ -1838,22 +1838,22 @@ Field Type Null Key Default Extra a set('') # # # b set('test1','test2','test3','test4','test5') # # # c set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50''51','52','53','54','55','56','57','58','59','60','61','62','63','64') # # # -INSERT INTO t1 VALUES +INSERT INTO t1 (a,b,c) VALUES ('','test2,test3','01,34,44,,23'), ('',5,2), (',','test4,test2',''); Warnings: Warning 1265 Data truncated for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c FROM t1; a b c test1,test3 02 test2,test3 01,23,34,44 test2,test4 -INSERT INTO t1 VALUES (0,'test6',-1); +INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1); Warnings: Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c FROM t1; a b c 01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50'51,52,53,54,55,56,57,58,59,60,61,62,63,64 test1,test3 02 @@ -1871,7 +1871,7 @@ c set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15' e set('a','A') # # # ALTER TABLE t1 ADD COLUMN f SET('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',' ','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i') NULL; ERROR HY000: Too many strings for column f and SET -SELECT * FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != ''; +SELECT a,b,c,e FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != ''; a b c e test2,test3 01,23,34,44 NULL test2,test4 NULL @@ -1927,7 +1927,7 @@ t17m longtext # # # tt tinytext # # # m mediumtext # # # l longtext # # # -INSERT INTO t1 VALUES +INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES ('','','','','','','','','',''), ('a','b','c','d','e','f','g','h','i','j'), ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'), @@ -1938,7 +1938,7 @@ LENGTH(t) LENGTH(t0) LENGTH(t1) LENGTH(t300) LENGTH(tm) LENGTH(t70k) LENGTH(t17m 1 1 1 1 1 1 1 1 1 1 5 5 5 5 5 5 5 5 5 6 65535 65535 255 65535 65535 1048576 1048576 255 1048576 1048576 -INSERT INTO t1 VALUES +INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) ); Warnings: Warning 1265 Data truncated for column 't' at row 1 diff --git a/mysql-test/suite/storage_engine/col_opt_unsigned.result b/mysql-test/suite/storage_engine/col_opt_unsigned.result index a68aa48ee79..7b5274525ce 100644 --- a/mysql-test/suite/storage_engine/col_opt_unsigned.result +++ b/mysql-test/suite/storage_engine/col_opt_unsigned.result @@ -25,15 +25,15 @@ n0_0 decimal(10,0) unsigned # # # n1 decimal(1,0) unsigned # # # n20_4 decimal(20,4) unsigned # # # n65_4 decimal(65,4) unsigned # # # -INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); -SELECT * FROM t1; +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -45,7 +45,7 @@ Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 Warning 1264 Out of range value for column 'n65_4' at row 1 -INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -57,20 +57,20 @@ Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 Warning 1264 Out of range value for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -81,7 +81,7 @@ Warning 1264 Out of range value for column 'n' at row 1 Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 @@ -89,7 +89,7 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -101,7 +101,7 @@ Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 Warning 1264 Out of range value for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 @@ -110,7 +110,7 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); Warnings: Note 1265 Data truncated for column 'd' at row 1 Note 1265 Data truncated for column 'd0' at row 1 @@ -122,7 +122,7 @@ Note 1265 Data truncated for column 'n0_0' at row 1 Note 1265 Data truncated for column 'n1' at row 1 Note 1265 Data truncated for column 'n20_4' at row 1 Note 1265 Data truncated for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 @@ -152,7 +152,7 @@ Warning 1264 Out of range value for column 'b' at row 1 INSERT INTO t1 (a,b) VALUES (-100,100); Warnings: Warning 1264 Out of range value for column 'a' at row 1 -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 100 1 0 @@ -184,8 +184,8 @@ d1_0 double(1,0) unsigned # # # d10_10 double(10,10) unsigned # # # d53 double(53,0) unsigned # # # d53_10 double(53,10) unsigned # # # -INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); -SELECT * FROM t1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 11111111.111 d10_10 0.0123456789 @@ -196,8 +196,8 @@ f0 12345.1 f20_3 56789.988 f23_0 123457000 r1_1 0.9 -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES ( +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 99999999999999999999999999999999999999, 99999999999999999999999999999999999999.9999999999999999, 0.9, @@ -212,7 +212,7 @@ INSERT INTO t1 VALUES ( Warnings: Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 0 d 11111111.111 @@ -243,7 +243,7 @@ f23_0 1e38 r1_1 0.0 r1_1 0.9 r1_1 0.9 -INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); Warnings: Warning 1264 Out of range value for column 'f' at row 1 Warning 1264 Out of range value for column 'f0' at row 1 @@ -255,7 +255,7 @@ Warning 1264 Out of range value for column 'd1_0' at row 1 Warning 1264 Out of range value for column 'd10_10' at row 1 Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 0 d 0 @@ -307,7 +307,7 @@ MAX(f0) 9.999999680285692e37 MAX(f20_3) 99999998430674940.000 MAX(f23_0) 9.999999680285692e37 MAX(r1_1) 0.9 -INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; Warnings: Warning 1264 Out of range value for column 'f' at row 1 Warning 1264 Out of range value for column 'f0' at row 1 @@ -315,7 +315,7 @@ Warning 1264 Out of range value for column 'r1_1' at row 1 Warning 1264 Out of range value for column 'f23_0' at row 1 Warning 1264 Out of range value for column 'f20_3' at row 1 Warning 1264 Out of range value for column 'd1_0' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 0 d 0 @@ -366,7 +366,7 @@ r1_1 0.0 r1_1 0.9 r1_1 0.9 r1_1 0.9 -INSERT INTO t1 VALUES ( +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 999999999999999999999999999999999999999, 999999999999999999999999999999999999999.9999999999999999, 1.9, @@ -389,7 +389,7 @@ Warning 1264 Out of range value for column 'd1_0' at row 1 Warning 1264 Out of range value for column 'd10_10' at row 1 Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 0 d 0 @@ -470,7 +470,7 @@ Warning 1264 Out of range value for column 'b' at row 1 INSERT INTO t1 (a,b) VALUES (-100,100); Warnings: Warning 1264 Out of range value for column 'a' at row 1 -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 100 1 0 @@ -522,15 +522,15 @@ b bigint(20) unsigned # # # b0 bigint(20) unsigned # # # b1 bigint(1) unsigned # # # b20 bigint(20) unsigned # # # -INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); -SELECT * FROM t1; +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 -INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -552,15 +552,15 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); -SELECT * FROM t1; +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 4294967295 4294967295 4294967295 4294967295 255 255 255 255 65535 65535 65535 65535 16777215 16777215 16777215 16777215 18446744073709551615 18446744073709551615 18446744073709551615 18446744073709551615 -INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -582,7 +582,7 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -604,7 +604,7 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -654,7 +654,7 @@ Warning 1264 Out of range value for column 'm' at row 3 Warning 1264 Out of range value for column 'm0' at row 3 Warning 1264 Out of range value for column 'm1' at row 3 Warning 1264 Out of range value for column 'm20' at row 3 -SELECT * FROM t1; +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -690,7 +690,7 @@ Warning 1264 Out of range value for column 's' at row 1 Warning 1264 Out of range value for column 'm' at row 1 Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'b' at row 1 -SELECT * FROM t1; +SELECT t,s,m,i,b FROM t1; t s m i b 0 0 0 0 0 255 65535 16777215 4294967295 18446744073709551615 diff --git a/mysql-test/suite/storage_engine/col_opt_unsigned.test b/mysql-test/suite/storage_engine/col_opt_unsigned.test index e9d4566de7f..62b7b29a507 100644 --- a/mysql-test/suite/storage_engine/col_opt_unsigned.test +++ b/mysql-test/suite/storage_engine/col_opt_unsigned.test @@ -29,7 +29,7 @@ if (!$mysql_errname) INSERT INTO t1 (a,b) VALUES (1.0,-1.0); INSERT INTO t1 (a,b) VALUES (-100,100); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -56,7 +56,7 @@ if (!$mysql_errname) INSERT INTO t1 (a,b) VALUES (1.0,-1.0); INSERT INTO t1 (a,b) VALUES (-100,100); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -86,7 +86,7 @@ if (!$mysql_errname) INSERT INTO t1 (t,s,m,i,b) VALUES (255,65535,16777215,4294967295,18446744073709551615); INSERT INTO t1 (t,s,m,i,b) VALUES (-1,-1,-1,-1,-1); --sorted_result - SELECT * FROM t1; + SELECT t,s,m,i,b FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/col_opt_zerofill.result b/mysql-test/suite/storage_engine/col_opt_zerofill.result index c2445c5bbc7..a35ce4bfe66 100644 --- a/mysql-test/suite/storage_engine/col_opt_zerofill.result +++ b/mysql-test/suite/storage_engine/col_opt_zerofill.result @@ -25,15 +25,15 @@ n0_0 decimal(10,0) unsigned zerofill # # # n1 decimal(1,0) unsigned zerofill # # # n20_4 decimal(20,4) unsigned zerofill # # # n65_4 decimal(65,4) unsigned zerofill # # # -INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); -SELECT * FROM t1; +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 0000000100 0000123456 0.3 00040000.25 00000000000000000000000000000000123456789123456789.1000100000 0000001024 0000007000 8 0000000000999999.9000 0000000000000000000000000000000000000000009223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -45,7 +45,7 @@ Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 Warning 1264 Out of range value for column 'n65_4' at row 1 -INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -57,20 +57,20 @@ Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 Warning 1264 Out of range value for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 0000000100 0000123456 0.3 00040000.25 00000000000000000000000000000000123456789123456789.1000100000 0000001024 0000007000 8 0000000000999999.9000 0000000000000000000000000000000000000000009223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -81,7 +81,7 @@ Warning 1264 Out of range value for column 'n' at row 1 Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 @@ -89,7 +89,7 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0000000100 0000123456 0.3 00040000.25 00000000000000000000000000000000123456789123456789.1000100000 0000001024 0000007000 8 0000000000999999.9000 0000000000000000000000000000000000000000009223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -101,7 +101,7 @@ Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 Warning 1264 Out of range value for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 @@ -110,7 +110,7 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); Warnings: Note 1265 Data truncated for column 'd' at row 1 Note 1265 Data truncated for column 'd0' at row 1 @@ -122,7 +122,7 @@ Note 1265 Data truncated for column 'n0_0' at row 1 Note 1265 Data truncated for column 'n1' at row 1 Note 1265 Data truncated for column 'n20_4' at row 1 Note 1265 Data truncated for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 0000000000 0000000000 0.0 00000000.00 00000000000000000000000000000000000000000000000000.0000000000 0000000000 0000000000 0 0000000000000000.0000 0000000000000000000000000000000000000000000000000000000000000.0000 @@ -149,7 +149,7 @@ b decimal(10,0) unsigned zerofill # # # # INSERT INTO t1 (a,b) VALUES (1.1,1234); Warnings: Note 1265 Data truncated for column 'a' at row 1 -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0000000001 0000001234 DROP TABLE t1; @@ -180,8 +180,8 @@ d1_0 double(1,0) unsigned zerofill # # # d10_10 double(10,10) unsigned zerofill # # # d53 double(53,0) unsigned zerofill # # # d53_10 double(53,10) unsigned zerofill # # # -INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); -SELECT * FROM t1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 0000012345.1 d 000000000011111111.111 d10_10 0.0123456789 @@ -192,8 +192,8 @@ f0 0000012345.1 f20_3 0000000000056789.988 f23_0 000123457000 r1_1 0.9 -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES ( +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 99999999999999999999999999999999999999, 99999999999999999999999999999999999999.9999999999999999, 0.9, @@ -208,7 +208,7 @@ INSERT INTO t1 VALUES ( Warnings: Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 0000012345.1 d 0000000000000000000000 d 0000000000000000001e81 @@ -239,7 +239,7 @@ f23_0 000123457000 r1_1 0.0 r1_1 0.9 r1_1 0.9 -INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); Warnings: Warning 1264 Out of range value for column 'f' at row 1 Warning 1264 Out of range value for column 'f0' at row 1 @@ -251,7 +251,7 @@ Warning 1264 Out of range value for column 'd1_0' at row 1 Warning 1264 Out of range value for column 'd10_10' at row 1 Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 0000012345.1 d 0000000000000000000000 d 0000000000000000000000 @@ -303,7 +303,7 @@ MAX(f0) 9.999999680285692e37 MAX(f20_3) 99999998430674940.000 MAX(f23_0) 9.999999680285692e37 MAX(r1_1) 0.9 -INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; Warnings: Warning 1264 Out of range value for column 'f' at row 1 Warning 1264 Out of range value for column 'f0' at row 1 @@ -311,7 +311,7 @@ Warning 1264 Out of range value for column 'r1_1' at row 1 Warning 1264 Out of range value for column 'f23_0' at row 1 Warning 1264 Out of range value for column 'f20_3' at row 1 Warning 1264 Out of range value for column 'd1_0' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 0000012345.1 d 0000000000000000000000 d 0000000000000000000000 @@ -362,7 +362,7 @@ r1_1 0.0 r1_1 0.9 r1_1 0.9 r1_1 0.9 -INSERT INTO t1 VALUES ( +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 999999999999999999999999999999999999999, 999999999999999999999999999999999999999.9999999999999999, 1.9, @@ -385,7 +385,7 @@ Warning 1264 Out of range value for column 'd1_0' at row 1 Warning 1264 Out of range value for column 'd10_10' at row 1 Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 0000012345.1 d 0000000000000000000000 d 0000000000000000000000 @@ -461,7 +461,7 @@ Field Type Null Key Default Extra a double unsigned zerofill # # # # b float unsigned zerofill # # # # INSERT INTO t1 (a,b) VALUES (1,1234.5); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0000000000000000000001 0000001234.5 DROP TABLE t1; @@ -512,15 +512,15 @@ b bigint(20) unsigned zerofill # # # b0 bigint(20) unsigned zerofill # # # b1 bigint(1) unsigned zerofill # # # b20 bigint(20) unsigned zerofill # # # -INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); -SELECT * FROM t1; +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 0000000000 0000000000 0 00000000000000000000 000 000 0 00000000000000000000 00000 00000 0 00000000000000000000 00000000 00000000 0 00000000000000000000 00000000000000000000 00000000000000000000 0 00000000000000000000 0000000001 0000000002 3 00000000000000000004 005 006 7 00000000000000000008 00009 00010 11 00000000000000000012 00000013 00000014 15 00000000000000000016 00000000000000000017 00000000000000000018 19 00000000000000000020 2147483647 2147483647 2147483647 00000000002147483647 127 127 127 00000000000000000127 32767 32767 32767 00000000000000032767 08388607 08388607 8388607 00000000000008388607 09223372036854775807 09223372036854775807 9223372036854775807 09223372036854775807 -INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -542,15 +542,15 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); -SELECT * FROM t1; +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 0000000000 0000000000 0 00000000000000000000 000 000 0 00000000000000000000 00000 00000 0 00000000000000000000 00000000 00000000 0 00000000000000000000 00000000000000000000 00000000000000000000 0 00000000000000000000 0000000000 0000000000 0 00000000000000000000 000 000 0 00000000000000000000 00000 00000 0 00000000000000000000 00000000 00000000 0 00000000000000000000 00000000000000000000 00000000000000000000 0 00000000000000000000 0000000001 0000000002 3 00000000000000000004 005 006 7 00000000000000000008 00009 00010 11 00000000000000000012 00000013 00000014 15 00000000000000000016 00000000000000000017 00000000000000000018 19 00000000000000000020 2147483647 2147483647 2147483647 00000000002147483647 127 127 127 00000000000000000127 32767 32767 32767 00000000000000032767 08388607 08388607 8388607 00000000000008388607 09223372036854775807 09223372036854775807 9223372036854775807 09223372036854775807 4294967295 4294967295 4294967295 00000000004294967295 255 255 255 00000000000000000255 65535 65535 65535 00000000000000065535 16777215 16777215 16777215 00000000000016777215 18446744073709551615 18446744073709551615 18446744073709551615 18446744073709551615 -INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -572,7 +572,7 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -594,7 +594,7 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -644,7 +644,7 @@ Warning 1264 Out of range value for column 'm' at row 3 Warning 1264 Out of range value for column 'm0' at row 3 Warning 1264 Out of range value for column 'm1' at row 3 Warning 1264 Out of range value for column 'm20' at row 3 -SELECT * FROM t1; +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 0000000000 0000000000 0 00000000000000000000 000 000 0 00000000000000000000 00000 00000 0 00000000000000000000 00000000 00000000 0 00000000000000000000 00000000000000000000 00000000000000000000 0 00000000000000000000 0000000000 0000000000 0 00000000000000000000 000 000 0 00000000000000000000 00000 00000 0 00000000000000000000 00000000 00000000 0 00000000000000000000 00000000000000000000 00000000000000000000 0 00000000000000000000 @@ -673,7 +673,7 @@ m mediumint(8) unsigned zerofill # # # # i int(10) unsigned zerofill # # # # b bigint(20) unsigned zerofill # # # # INSERT INTO t1 (t,s,m,i,b) VALUES (1,10,100,1000,0); -SELECT * FROM t1; +SELECT t,s,m,i,b FROM t1; t s m i b 001 00010 00000100 0000001000 00000000000000000000 DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/col_opt_zerofill.test b/mysql-test/suite/storage_engine/col_opt_zerofill.test index 83b7dcf28c1..0dc1c243673 100644 --- a/mysql-test/suite/storage_engine/col_opt_zerofill.test +++ b/mysql-test/suite/storage_engine/col_opt_zerofill.test @@ -27,7 +27,7 @@ if (!$mysql_errname) SHOW COLUMNS IN t1; INSERT INTO t1 (a,b) VALUES (1.1,1234); - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -52,7 +52,7 @@ if (!$mysql_errname) SHOW COLUMNS IN t1; INSERT INTO t1 (a,b) VALUES (1,1234.5); - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -80,7 +80,7 @@ if (!$mysql_errname) SHOW COLUMNS IN t1; INSERT INTO t1 (t,s,m,i,b) VALUES (1,10,100,1000,0); - SELECT * FROM t1; + SELECT t,s,m,i,b FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/delete.result b/mysql-test/suite/storage_engine/delete.result index 1d84516c86a..d7125a344b7 100644 --- a/mysql-test/suite/storage_engine/delete.result +++ b/mysql-test/suite/storage_engine/delete.result @@ -3,7 +3,7 @@ CREATE TABLE t1 (a , b ) ENGINE= , d ) ENGINE= ; INSERT INTO t2 (c,d) SELECT b, a FROM t1; -SELECT * FROM t2; +SELECT c,d FROM t2; c d b 2 b 2 @@ -48,7 +48,7 @@ e 5 foobar 10000 foobar 10000 DELETE t2.* FROM t1, t2 WHERE c < b AND a + d != 1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 10000 foobar 10000 foobar @@ -57,21 +57,21 @@ a b 4 d 5 e 5 e -SELECT * FROM t2; +SELECT c,d FROM t2; c d foobar 10000 foobar 10000 DELETE FROM t2, t1.* USING t2, t1 WHERE c = 'foobar' and b = c; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 2 b 2 b 4 d 5 e 5 e -SELECT * FROM t2; +SELECT c,d FROM t2; c d DELETE FROM t1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b DROP TABLE t1, t2; diff --git a/mysql-test/suite/storage_engine/delete.test b/mysql-test/suite/storage_engine/delete.test index 802093e2977..e210ec3d17c 100644 --- a/mysql-test/suite/storage_engine/delete.test +++ b/mysql-test/suite/storage_engine/delete.test @@ -25,16 +25,16 @@ if ($mysql_errname) --source unexpected_result.inc } --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; DELETE FROM t1 WHERE a < 0 OR b = 'a'; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; # ORDER BY and LIMIT DELETE FROM t1 WHERE a <= 4 ORDER BY b DESC LIMIT 1; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; # Multi-table DELETE @@ -43,23 +43,23 @@ SELECT * FROM t1; --source create_table.inc INSERT INTO t2 (c,d) SELECT b, a FROM t1; --sorted_result -SELECT * FROM t2; +SELECT c,d FROM t2; DELETE t2.* FROM t1, t2 WHERE c < b AND a + d != 1; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; --sorted_result -SELECT * FROM t2; +SELECT c,d FROM t2; DELETE FROM t2, t1.* USING t2, t1 WHERE c = 'foobar' and b = c; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; --sorted_result -SELECT * FROM t2; +SELECT c,d FROM t2; DELETE FROM t1; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; # Cleanup DROP TABLE t1, t2; diff --git a/mysql-test/suite/storage_engine/delete_ignore.result b/mysql-test/suite/storage_engine/delete_ignore.result index a15c338ea04..aedac761d99 100644 --- a/mysql-test/suite/storage_engine/delete_ignore.result +++ b/mysql-test/suite/storage_engine/delete_ignore.result @@ -4,7 +4,7 @@ INSERT INTO t1 (a,b) VALUES (10000,'foobar'),(1,'a'),(2,'b'),(3,'c'),(4,'d'),(5, INSERT INTO t1 (a,b) SELECT a, b FROM t1; CREATE TABLE t2 (c , d ) ENGINE= ; INSERT INTO t2 (c,d) SELECT b, a FROM t1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 1 a @@ -18,7 +18,7 @@ a b 4 d 5 e 5 e -SELECT * FROM t2; +SELECT c,d FROM t2; c d a 1 a 1 @@ -33,7 +33,7 @@ e 5 foobar 10000 foobar 10000 DELETE IGNORE FROM t1 WHERE b IS NOT NULL ORDER BY a LIMIT 1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 10000 foobar @@ -49,10 +49,10 @@ a b DELETE IGNORE t1.*, t2.* FROM t1, t2 WHERE c < b OR a != ( SELECT 1 UNION SELECT 2 ); Warnings: Warning 1242 Subquery returns more than 1 row -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a -SELECT * FROM t2; +SELECT c,d FROM t2; c d foobar 10000 foobar 10000 diff --git a/mysql-test/suite/storage_engine/delete_ignore.test b/mysql-test/suite/storage_engine/delete_ignore.test index fa98ec92029..c1b1926db45 100644 --- a/mysql-test/suite/storage_engine/delete_ignore.test +++ b/mysql-test/suite/storage_engine/delete_ignore.test @@ -18,9 +18,9 @@ INSERT INTO t1 (a,b) SELECT a, b FROM t1; --source create_table.inc INSERT INTO t2 (c,d) SELECT b, a FROM t1; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; --sorted_result -SELECT * FROM t2; +SELECT c,d FROM t2; DELETE IGNORE FROM t1 WHERE b IS NOT NULL ORDER BY a LIMIT 1; if ($mysql_errname) @@ -29,13 +29,13 @@ if ($mysql_errname) --source unexpected_result.inc } --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; DELETE IGNORE t1.*, t2.* FROM t1, t2 WHERE c < b OR a != ( SELECT 1 UNION SELECT 2 ); --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; --sorted_result -SELECT * FROM t2; +SELECT c,d FROM t2; # Cleanup DROP TABLE t1, t2; diff --git a/mysql-test/suite/storage_engine/delete_low_prio.result b/mysql-test/suite/storage_engine/delete_low_prio.result index be334612a2b..89d08db5450 100644 --- a/mysql-test/suite/storage_engine/delete_low_prio.result +++ b/mysql-test/suite/storage_engine/delete_low_prio.result @@ -17,7 +17,7 @@ SLEEP(1) 0 0 connection default; -SELECT * FROM t1; +SELECT a,b FROM t1; a b INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); connection con1; @@ -34,7 +34,7 @@ SLEEP(1) 0 0 connection default; -SELECT * FROM t1; +SELECT a,b FROM t1; a b INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); SET LOW_PRIORITY_UPDATES = 1; @@ -52,7 +52,7 @@ SLEEP(1) 0 0 connection default; -SELECT * FROM t1; +SELECT a,b FROM t1; a b disconnect con1; disconnect con2; diff --git a/mysql-test/suite/storage_engine/delete_low_prio.test b/mysql-test/suite/storage_engine/delete_low_prio.test index 34677df5373..f79a055dabe 100644 --- a/mysql-test/suite/storage_engine/delete_low_prio.test +++ b/mysql-test/suite/storage_engine/delete_low_prio.test @@ -73,7 +73,7 @@ if ($found) --connection default --reap --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); @@ -113,7 +113,7 @@ if ($found) --connection default --reap --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); SET LOW_PRIORITY_UPDATES = 1; @@ -148,7 +148,7 @@ if ($found) --connection default --reap --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; --disconnect con1 --disconnect con2 diff --git a/mysql-test/suite/storage_engine/delete_quick.result b/mysql-test/suite/storage_engine/delete_quick.result index 30d4841b51f..7166bcde96c 100644 --- a/mysql-test/suite/storage_engine/delete_quick.result +++ b/mysql-test/suite/storage_engine/delete_quick.result @@ -2,24 +2,24 @@ DROP TABLE IF EXISTS t1,t2; CREATE TABLE t1 (a , (a), b ) ENGINE= ; INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'); DELETE QUICK FROM t1 WHERE a = 1 OR b > 'foo'; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 2 b 3 c 4 d 5 e CREATE TABLE t2 (c , d ) ENGINE= ; -INSERT INTO t2 SELECT b, a FROM t1; -SELECT * FROM t2; +INSERT INTO t2 (c,d) SELECT b, a FROM t1; +SELECT c,d FROM t2; c d b 2 c 3 d 4 e 5 DELETE QUICK FROM t2, t1.* USING t2, t1 WHERE c IS NULL OR a = d; -SELECT * FROM t1; +SELECT a,b FROM t1; a b -SELECT * FROM t2; +SELECT c,d FROM t2; c d DROP TABLE t2; DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/delete_quick.test b/mysql-test/suite/storage_engine/delete_quick.test index 3b37096de4f..f96fedfd9c5 100644 --- a/mysql-test/suite/storage_engine/delete_quick.test +++ b/mysql-test/suite/storage_engine/delete_quick.test @@ -30,20 +30,20 @@ if (!$mysql_errname) if (!$mysql_errname) { --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; --let $create_definition = c $char_col, d $int_col --let $table_name = t2 --source create_table.inc - INSERT INTO t2 SELECT b, a FROM t1; + INSERT INTO t2 (c,d) SELECT b, a FROM t1; --sorted_result - SELECT * FROM t2; + SELECT c,d FROM t2; DELETE QUICK FROM t2, t1.* USING t2, t1 WHERE c IS NULL OR a = d; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; --sorted_result - SELECT * FROM t2; + SELECT c,d FROM t2; DROP TABLE t2; } DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/delete_with_keys.result b/mysql-test/suite/storage_engine/delete_with_keys.result index 6622cc1fb64..e968451b2e2 100644 --- a/mysql-test/suite/storage_engine/delete_with_keys.result +++ b/mysql-test/suite/storage_engine/delete_with_keys.result @@ -3,7 +3,7 @@ CREATE TABLE t1 (a , b , (b)) ENGINE= 'y'; DELETE FROM t1 WHERE a=2; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 3 c @@ -17,7 +17,7 @@ CREATE TABLE t1 (a PRIMARY KEY, b ) ENGINE= 'y'; DELETE FROM t1 WHERE a=2; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 3 c @@ -30,7 +30,7 @@ DROP TABLE t1; CREATE TABLE t1 (a , b , c , (a), (b)) ENGINE= ; INSERT INTO t1 (a,b,c) VALUES (1,2,3),(4,5,6),(7,8,9); DELETE FROM t1 WHERE a = 10 OR b = 20 ORDER BY c LIMIT 1; -SELECT * FROM t1; +SELECT a,b,c FROM t1; a b c 1 2 3 4 5 6 diff --git a/mysql-test/suite/storage_engine/delete_with_keys.test b/mysql-test/suite/storage_engine/delete_with_keys.test index 274801b6d0e..cda0da0653f 100644 --- a/mysql-test/suite/storage_engine/delete_with_keys.test +++ b/mysql-test/suite/storage_engine/delete_with_keys.test @@ -29,7 +29,7 @@ if (!$mysql_errname) DELETE FROM t1 WHERE a=2; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DELETE FROM t1; } DROP TABLE t1; @@ -49,7 +49,7 @@ if (!$mysql_errname) DELETE FROM t1 WHERE a=2; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DELETE FROM t1; DROP TABLE t1; } @@ -66,7 +66,7 @@ if (!$mysql_errname) INSERT INTO t1 (a,b,c) VALUES (1,2,3),(4,5,6),(7,8,9); DELETE FROM t1 WHERE a = 10 OR b = 20 ORDER BY c LIMIT 1; --sorted_result - SELECT * FROM t1; + SELECT a,b,c FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/foreign_keys.result b/mysql-test/suite/storage_engine/foreign_keys.result index 5374e78d9b1..6c4a3406811 100644 --- a/mysql-test/suite/storage_engine/foreign_keys.result +++ b/mysql-test/suite/storage_engine/foreign_keys.result @@ -26,11 +26,11 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail DELETE FROM t1 WHERE a=2; ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)) DELETE FROM t2 WHERE a=2; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 c 2 d -SELECT * FROM t2; +SELECT a,b FROM t2; a b 1 a DROP TABLE t1; @@ -54,7 +54,7 @@ ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (` INSERT INTO t1 (a,b) VALUES (3,'a'),(4,'a'); INSERT INTO t2 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(4,'e'),(3,'a'); UPDATE t1 SET a=a+1; -SELECT * FROM t2; +SELECT a,b FROM t2; a b 5 a 5 a @@ -63,7 +63,7 @@ a b 5 d 5 e DELETE FROM t1 WHERE b='a' LIMIT 2; -SELECT * FROM t2; +SELECT a,b FROM t2; a b TRUNCATE TABLE t1; ERROR 42000: Cannot truncate a table referenced in a foreign key constraint (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `test`.`t1` (`a`)) diff --git a/mysql-test/suite/storage_engine/foreign_keys.test b/mysql-test/suite/storage_engine/foreign_keys.test index 643ca8bf6b1..cbadc4c950d 100644 --- a/mysql-test/suite/storage_engine/foreign_keys.test +++ b/mysql-test/suite/storage_engine/foreign_keys.test @@ -73,8 +73,9 @@ if (!$mysql_errname) DELETE FROM t2 WHERE a=2; --sorted_result - SELECT * FROM t1; - SELECT * FROM t2; + SELECT a,b FROM t1; + --sorted_result + SELECT a,b FROM t2; --let $error_codes = ER_ROW_IS_REFERENCED DROP TABLE t1; @@ -119,7 +120,7 @@ if (!$mysql_errname) --source unexpected_result.inc } --sorted_result - SELECT * FROM t2; + SELECT a,b FROM t2; DELETE FROM t1 WHERE b='a' LIMIT 2; if ($mysql_errname) @@ -128,7 +129,7 @@ if (!$mysql_errname) --source unexpected_result.inc } --sorted_result - SELECT * FROM t2; + SELECT a,b FROM t2; --let $error_codes = ER_TRUNCATE_ILLEGAL_FK TRUNCATE TABLE t1; diff --git a/mysql-test/suite/storage_engine/insert.result b/mysql-test/suite/storage_engine/insert.result index a07a6e8d9a4..2dfe20cb822 100644 --- a/mysql-test/suite/storage_engine/insert.result +++ b/mysql-test/suite/storage_engine/insert.result @@ -1,7 +1,7 @@ DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 (a , b ) ENGINE= ; INSERT INTO t1 VALUES (100,'foobar'),(1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 100 foobar @@ -10,7 +10,7 @@ a b 4 d 5 e INSERT t1 VALUE (10,'foo'),(11,'abc'); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 10 foo @@ -21,7 +21,7 @@ a b 4 d 5 e INSERT INTO t1 (b,a) VALUES ('test',0); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 test 1 a @@ -33,7 +33,7 @@ a b 4 d 5 e INSERT INTO t1 VALUES (DEFAULT,DEFAULT); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 test 1 a @@ -46,7 +46,7 @@ a b 5 e NULL NULL INSERT t1 (a) VALUE (10),(20); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 test 1 a @@ -61,7 +61,7 @@ a b 5 e NULL NULL INSERT INTO t1 SET a = 11, b = 'f'; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 test 1 a @@ -77,7 +77,7 @@ a b 5 e NULL NULL INSERT t1 SET b = DEFAULT; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 test 1 a @@ -94,9 +94,9 @@ a b NULL NULL NULL NULL CREATE TABLE t2 (a , b ) ENGINE= ; -INSERT INTO t2 SELECT * FROM t1; +INSERT INTO t2 SELECT a,b FROM t1; INSERT INTO t1 (a) SELECT a FROM t2 WHERE b = 'foo'; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 test 1 a @@ -113,8 +113,8 @@ a b 5 e NULL NULL NULL NULL -INSERT t1 SELECT * FROM t1; -SELECT * FROM t1; +INSERT t1 (a,b) SELECT a,b FROM t1; +SELECT a,b FROM t1; a b 0 test 0 test diff --git a/mysql-test/suite/storage_engine/insert.test b/mysql-test/suite/storage_engine/insert.test index d9076219eb0..1f780eba71f 100644 --- a/mysql-test/suite/storage_engine/insert.test +++ b/mysql-test/suite/storage_engine/insert.test @@ -22,40 +22,40 @@ if ($mysql_errname) --source unexpected_result.inc } --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; INSERT t1 VALUE (10,'foo'),(11,'abc'); --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; INSERT INTO t1 (b,a) VALUES ('test',0); --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; INSERT INTO t1 VALUES (DEFAULT,DEFAULT); --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; INSERT t1 (a) VALUE (10),(20); --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; # INSERT [INTO] .. SET INSERT INTO t1 SET a = 11, b = 'f'; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; INSERT t1 SET b = DEFAULT; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; # INSERT .. SELECT --let $table_name = t2 --source create_table.inc -INSERT INTO t2 SELECT * FROM t1; +INSERT INTO t2 SELECT a,b FROM t1; if ($mysql_errname) { --let $functionality = INSERT .. SELECT @@ -65,11 +65,11 @@ if ($mysql_errname) INSERT INTO t1 (a) SELECT a FROM t2 WHERE b = 'foo'; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; -INSERT t1 SELECT * FROM t1; +INSERT t1 (a,b) SELECT a,b FROM t1; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; # Cleanup DROP TABLE t1, t2; diff --git a/mysql-test/suite/storage_engine/insert_delayed.result b/mysql-test/suite/storage_engine/insert_delayed.result index 98e149bdf96..528003d8923 100644 --- a/mysql-test/suite/storage_engine/insert_delayed.result +++ b/mysql-test/suite/storage_engine/insert_delayed.result @@ -6,17 +6,17 @@ connect con0,localhost,root,,; SET lock_wait_timeout = 1; INSERT DELAYED INTO t1 (a,b) VALUES (3,'c'); INSERT DELAYED INTO t1 SET a=4, b='d'; -INSERT DELAYED INTO t1 SELECT 5, 'e'; +INSERT DELAYED INTO t1 (a,b) SELECT 5, 'e'; ERROR HY000: Lock wait timeout exceeded; try restarting transaction disconnect con0; connection default; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 f 2 b UNLOCK TABLES; FLUSH TABLES; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 f 2 b diff --git a/mysql-test/suite/storage_engine/insert_delayed.test b/mysql-test/suite/storage_engine/insert_delayed.test index 7c3c4eec768..ca8bf7eddbb 100644 --- a/mysql-test/suite/storage_engine/insert_delayed.test +++ b/mysql-test/suite/storage_engine/insert_delayed.test @@ -41,16 +41,16 @@ if (!$mysql_errname) INSERT DELAYED INTO t1 SET a=4, b='d'; # DELAYED is ignored with INSERT .. SELECT --let $error_codes = ER_LOCK_WAIT_TIMEOUT - INSERT DELAYED INTO t1 SELECT 5, 'e'; + INSERT DELAYED INTO t1 (a,b) SELECT 5, 'e'; --source check_errors.inc --disconnect con0 --connection default - SELECT * FROM t1; + SELECT a,b FROM t1; } UNLOCK TABLES; FLUSH TABLES; -SELECT * FROM t1; +SELECT a,b FROM t1; # Cleanup DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/insert_high_prio.result b/mysql-test/suite/storage_engine/insert_high_prio.result index 66378564ff7..4f5a3a443cd 100644 --- a/mysql-test/suite/storage_engine/insert_high_prio.result +++ b/mysql-test/suite/storage_engine/insert_high_prio.result @@ -26,7 +26,7 @@ SLEEP(1) 0 0 connection con0; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 f 2 b @@ -50,7 +50,7 @@ SLEEP(1) 0 0 connection con0; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 f 2 b diff --git a/mysql-test/suite/storage_engine/insert_high_prio.test b/mysql-test/suite/storage_engine/insert_high_prio.test index 819e996d468..558e95a6cdf 100644 --- a/mysql-test/suite/storage_engine/insert_high_prio.test +++ b/mysql-test/suite/storage_engine/insert_high_prio.test @@ -80,7 +80,7 @@ if ($found) --connection con0 --reap --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; DROP TABLE t1; @@ -122,7 +122,7 @@ if ($found) --connection con0 --reap --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; --disconnect con1 --disconnect con2 diff --git a/mysql-test/suite/storage_engine/insert_low_prio.result b/mysql-test/suite/storage_engine/insert_low_prio.result index 561b6296380..1a74a82ea23 100644 --- a/mysql-test/suite/storage_engine/insert_low_prio.result +++ b/mysql-test/suite/storage_engine/insert_low_prio.result @@ -25,7 +25,7 @@ SLEEP(1) 0 0 connection con0; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 f 2 b diff --git a/mysql-test/suite/storage_engine/insert_low_prio.test b/mysql-test/suite/storage_engine/insert_low_prio.test index 30f47833162..ed30d106016 100644 --- a/mysql-test/suite/storage_engine/insert_low_prio.test +++ b/mysql-test/suite/storage_engine/insert_low_prio.test @@ -76,7 +76,7 @@ if ($found) --connection con0 --reap --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; --disconnect con0 --disconnect con1 diff --git a/mysql-test/suite/storage_engine/insert_with_keys.result b/mysql-test/suite/storage_engine/insert_with_keys.result index db7439c4dbf..39e42b306d2 100644 --- a/mysql-test/suite/storage_engine/insert_with_keys.result +++ b/mysql-test/suite/storage_engine/insert_with_keys.result @@ -5,7 +5,7 @@ INSERT INTO t1 (a,b) VALUES (100,'a'), (6,'f'); INSERT INTO t1 (a,b) VALUES (30,'m'),(29,'n'); INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z'); INSERT INTO t1 (a,b) VALUES (3,'a'),(0,''); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 1 a @@ -34,7 +34,7 @@ ERROR 23000: Duplicate entry '3' for key 'a' # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). # If you got a difference in error message, just add it to rdiff file INSERT INTO t1 (a,b) VALUES (0,''); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 1 a @@ -50,7 +50,7 @@ INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z'); Warnings: Warning 1062 Duplicate entry '1' for key 'a' INSERT INTO t1 (a,b) VALUES (3,'a'),(4,'d') ON DUPLICATE KEY UPDATE a = a+10; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 1 a @@ -73,7 +73,7 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z'); ERROR 23000: Duplicate entry '1-a' for key 'a' # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). # If you got a difference in error message, just add it to rdiff file -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 100 a @@ -90,7 +90,7 @@ INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z'); Warnings: Warning 1062 Duplicate entry '1-a' for key 'a' INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z') ON DUPLICATE KEY UPDATE a = a+VALUES(a); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 100 a 100 b @@ -122,7 +122,7 @@ ERROR 23000: Duplicate entry '3' for key 'PRIMARY' # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). # If you got a difference in error message, just add it to rdiff file INSERT INTO t1 (a,b) VALUES (0,''); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 1 a @@ -138,7 +138,7 @@ INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z'); Warnings: Warning 1062 Duplicate entry '1' for key 'PRIMARY' INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z') ON DUPLICATE KEY UPDATE b = CONCAT(b,b); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 1 aa diff --git a/mysql-test/suite/storage_engine/insert_with_keys.test b/mysql-test/suite/storage_engine/insert_with_keys.test index 1959b55c707..c44b6c712e0 100644 --- a/mysql-test/suite/storage_engine/insert_with_keys.test +++ b/mysql-test/suite/storage_engine/insert_with_keys.test @@ -24,7 +24,7 @@ if (!$mysql_errname) INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z'); INSERT INTO t1 (a,b) VALUES (3,'a'),(0,''); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -49,7 +49,7 @@ if (!$mysql_errname) --source check_errors.inc INSERT INTO t1 (a,b) VALUES (0,''); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z'); if ($mysql_errname) @@ -63,7 +63,7 @@ if (!$mysql_errname) } --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -86,12 +86,12 @@ if (!$mysql_errname) INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z'); --source check_errors.inc --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z'); INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z') ON DUPLICATE KEY UPDATE a = a+VALUES(a); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; --let $error_codes = ER_DUP_ENTRY,ER_DUP_KEY INSERT INTO t1 (a,b) VALUES (101,'x'),(101,'x'); @@ -120,7 +120,7 @@ if (!$mysql_errname) --source check_errors.inc INSERT INTO t1 (a,b) VALUES (0,''); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z'); if ($mysql_errname) @@ -134,7 +134,7 @@ if (!$mysql_errname) --source unexpected_result.inc } --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/loaddata.result b/mysql-test/suite/storage_engine/loaddata.result index 85608cdc32a..2b25435fa7a 100644 --- a/mysql-test/suite/storage_engine/loaddata.result +++ b/mysql-test/suite/storage_engine/loaddata.result @@ -1,8 +1,8 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 (a , b ) ENGINE= ; LOAD DATA INFILE '/se_loaddata.dat' INTO TABLE t1 -FIELDS TERMINATED BY ','; -SELECT * FROM t1; +FIELDS TERMINATED BY ',' (a,b); +SELECT a,b FROM t1; a b 1 foo 2 bar @@ -10,8 +10,8 @@ a b 4 abc LOAD DATA LOCAL INFILE '/se_loaddata.dat' INTO TABLE t1 CHARACTER SET utf8 COLUMNS TERMINATED BY ',' - ESCAPED BY '/'; -SELECT * FROM t1; + ESCAPED BY '/' (a,b); +SELECT a,b FROM t1; a b 1 foo 1 foo @@ -21,27 +21,6 @@ a b 3 4 abc 4 abc -LOAD DATA INFILE '/se_loaddata.dat' INTO TABLE t1 -FIELDS TERMINATED BY ';' - OPTIONALLY ENCLOSED BY '''' - LINES STARTING BY 'prefix:' -IGNORE 2 LINES -(a,b); -Warnings: -Warning 1262 Row 2 was truncated; it contained more data than there were input columns -SELECT * FROM t1; -a b -0 -1 foo -1 foo -100 foo -2 bar -2 bar -3 -3 -4 abc -4 abc -7 test LOAD DATA LOCAL INFILE '/se_loaddata.dat' INTO TABLE t1 FIELDS TERMINATED BY ';' (a) SET b='loaded'; @@ -49,7 +28,27 @@ Warnings: Warning 1262 Row 1 was truncated; it contained more data than there were input columns Warning 1262 Row 2 was truncated; it contained more data than there were input columns Warning 1262 Row 3 was truncated; it contained more data than there were input columns -SELECT * FROM t1; +SELECT a,b FROM t1; +a b +0 loaded +1 foo +1 foo +102 loaded +2 bar +2 bar +3 +3 +4 abc +4 abc +5 loaded +LOAD DATA INFILE '/se_loaddata.dat' INTO TABLE t1 +FIELDS TERMINATED BY ';' + OPTIONALLY ENCLOSED BY '''' + LINES STARTING BY 'prefix:' +IGNORE 2 LINES (a,b); +Warnings: +Warning 1262 Row 2 was truncated; it contained more data than there were input columns +SELECT a,b FROM t1; a b 0 0 loaded @@ -65,4 +64,25 @@ a b 4 abc 5 loaded 7 test +LOAD DATA INFILE '/se_loaddata.dat' INTO TABLE t1; +SELECT a,b FROM t1; +a b +0 +0 loaded +1 foo +1 foo +1 foo +100 foo +102 loaded +2 bar +2 bar +2 bar +3 +3 +3 +4 abc +4 abc +4 abc +5 loaded +7 test DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/loaddata.test b/mysql-test/suite/storage_engine/loaddata.test index c413184af00..5a708626c74 100644 --- a/mysql-test/suite/storage_engine/loaddata.test +++ b/mysql-test/suite/storage_engine/loaddata.test @@ -22,23 +22,40 @@ EOF --replace_result $datadir eval LOAD DATA INFILE '$datadir/se_loaddata.dat' INTO TABLE t1 - FIELDS TERMINATED BY ','; + FIELDS TERMINATED BY ',' (a,b); if ($mysql_errname) { --source unexpected_result.inc + --remove_file $datadir/se_loaddata.dat } if (!$mysql_errname) { --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; --replace_result $datadir eval LOAD DATA LOCAL INFILE '$datadir/se_loaddata.dat' INTO TABLE t1 CHARACTER SET utf8 COLUMNS TERMINATED BY ',' - ESCAPED BY '/'; + ESCAPED BY '/' (a,b); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; + + --remove_file $datadir/se_loaddata.dat + --write_file $datadir/se_loaddata.dat +5;YYY; +102;'zzz'; +0;'test'; +EOF + + --replace_result $datadir + eval + LOAD DATA LOCAL INFILE '$datadir/se_loaddata.dat' INTO TABLE t1 + FIELDS TERMINATED BY ';' + (a) SET b='loaded'; + + --sorted_result + SELECT a,b FROM t1; --remove_file $datadir/se_loaddata.dat --write_file $datadir/se_loaddata.dat @@ -57,31 +74,30 @@ EOF FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '''' LINES STARTING BY 'prefix:' - IGNORE 2 LINES - (a,b); + IGNORE 2 LINES (a,b); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; --remove_file $datadir/se_loaddata.dat --write_file $datadir/se_loaddata.dat -5;YYY; -102;'zzz'; -0;'test'; +1 foo +2 bar +3 +4 abc EOF --replace_result $datadir eval - LOAD DATA LOCAL INFILE '$datadir/se_loaddata.dat' INTO TABLE t1 - FIELDS TERMINATED BY ';' - (a) SET b='loaded'; - + LOAD DATA INFILE '$datadir/se_loaddata.dat' INTO TABLE t1; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; + + --remove_file $datadir/se_loaddata.dat + } # Cleanup ---remove_file $datadir/se_loaddata.dat DROP TABLE t1; --source cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/lock.result b/mysql-test/suite/storage_engine/lock.result index 73573381110..f20548da12b 100644 --- a/mysql-test/suite/storage_engine/lock.result +++ b/mysql-test/suite/storage_engine/lock.result @@ -12,7 +12,7 @@ id2 COUNT(DISTINCT id) 3 1 UPDATE t1 SET id=-1 WHERE id=1; connection con1; -SELECT * FROM t1; +SELECT id,id2 FROM t1; ERROR HY000: Lock wait timeout exceeded; try restarting transaction LOCK TABLE t1 READ; ERROR HY000: Lock wait timeout exceeded; try restarting transaction @@ -38,7 +38,7 @@ DROP TABLE IF EXISTS t2; UNLOCK TABLES; CREATE TABLE t2 (id , id2 ) ENGINE= ; LOCK TABLE t1 WRITE, t2 WRITE; -INSERT INTO t2 SELECT * FROM t1; +INSERT INTO t2 (id,id2) SELECT id,id2 FROM t1; UPDATE t1 SET id=1 WHERE id=-1; DROP TABLE t1,t2; CREATE TABLE t1 (i1 , nr ) ENGINE= ; @@ -105,7 +105,7 @@ LOCK TABLE t1 WRITE, t2 WRITE; CREATE TEMPORARY TABLE t1 (a , b ) ENGINE= ; FLUSH TABLE t1; DROP TEMPORARY TABLE t1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b UNLOCK TABLES; DROP TABLE t1, t2; diff --git a/mysql-test/suite/storage_engine/lock.test b/mysql-test/suite/storage_engine/lock.test index 16872bdaa7d..7335f8d1d39 100644 --- a/mysql-test/suite/storage_engine/lock.test +++ b/mysql-test/suite/storage_engine/lock.test @@ -43,7 +43,7 @@ connection con1; # With WRITE lock held by connection 'default', # nobody else can access the table --let $error_codes = ER_LOCK_WAIT_TIMEOUT -SELECT * FROM t1; +SELECT id,id2 FROM t1; --source check_errors.inc --let $error_codes = ER_LOCK_WAIT_TIMEOUT LOCK TABLE t1 READ; @@ -94,7 +94,7 @@ UNLOCK TABLES; --let $create_definition = id $int_col, id2 $int_col --source create_table.inc LOCK TABLE t1 WRITE, t2 WRITE; -INSERT INTO t2 SELECT * FROM t1; +INSERT INTO t2 (id,id2) SELECT id,id2 FROM t1; UPDATE t1 SET id=1 WHERE id=-1; if ($mysql_errname) { @@ -232,7 +232,7 @@ LOCK TABLE t1 WRITE, t2 WRITE; --source create_table.inc FLUSH TABLE t1; DROP TEMPORARY TABLE t1; -SELECT * FROM t1; +SELECT a,b FROM t1; UNLOCK TABLES; DROP TABLE t1, t2; diff --git a/mysql-test/suite/storage_engine/parts/repair_table.result b/mysql-test/suite/storage_engine/parts/repair_table.result index b156df6d7dc..8b08ee15fd0 100644 --- a/mysql-test/suite/storage_engine/parts/repair_table.result +++ b/mysql-test/suite/storage_engine/parts/repair_table.result @@ -10,7 +10,7 @@ INSERT INTO t2 (a,b) SELECT a, b FROM t1; ALTER TABLE t1 REPAIR PARTITION p0; Table Op Msg_type Msg_text test.t1 repair status OK -INSERT INTO t1 VALUES (3,'c'); +INSERT INTO t1 (a,b) VALUES (3,'c'); ALTER TABLE t1 REPAIR PARTITION NO_WRITE_TO_BINLOG p0, p1; Table Op Msg_type Msg_text test.t1 repair status OK @@ -22,7 +22,7 @@ INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h'); ALTER TABLE t1 REPAIR PARTITION LOCAL ALL EXTENDED; Table Op Msg_type Msg_text test.t1 repair status OK -INSERT INTO t1 VALUES (10,'j'); +INSERT INTO t1 (a,b) VALUES (10,'j'); ALTER TABLE t1 REPAIR PARTITION p1 QUICK USE_FRM; Table Op Msg_type Msg_text test.t1 repair status OK @@ -76,7 +76,7 @@ Table Op Msg_type Msg_text test.t1 check Error Failed to read from the .par file test.t1 check Error Incorrect information in file: './test/t1.frm' test.t1 check error Corrupt -SELECT * FROM t1; +SELECT a,b FROM t1; ERROR HY000: Failed to read from the .par file # Statement ended with one of expected results (0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY). # If you got a difference in error message, just add it to rdiff file @@ -118,7 +118,7 @@ Table Op Msg_type Msg_text test.t1 check error Size of datafile is: 26 Should be: 39 test.t1 check error Partition p0 returned error test.t1 check error Corrupt -SELECT * FROM t1; +SELECT a,b FROM t1; a b 8 h 10 j @@ -142,7 +142,7 @@ test.t1 check error Record-count is not ok; is 3 Should be: 2 test.t1 check warning Found 3 key parts. Should be: 2 test.t1 check error Partition p0 returned error test.t1 check error Corrupt -SELECT * FROM t1; +SELECT a,b FROM t1; a b 8 h 10 j @@ -166,7 +166,7 @@ Table Op Msg_type Msg_text test.t1 check error Size of datafile is: 39 Should be: 52 test.t1 check error Partition p1 returned error test.t1 check error Corrupt -SELECT * FROM t1; +SELECT a,b FROM t1; a b 8 h 10 j @@ -193,7 +193,7 @@ test.t1 check error Record-count is not ok; is 4 Should be: 3 test.t1 check warning Found 4 key parts. Should be: 3 test.t1 check error Partition p1 returned error test.t1 check error Corrupt -SELECT * FROM t1; +SELECT a,b FROM t1; a b 8 h 10 j @@ -218,7 +218,7 @@ Restoring /test/t1.par CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK -SELECT * FROM t1; +SELECT a,b FROM t1; a b 8 h 10 j diff --git a/mysql-test/suite/storage_engine/parts/repair_table.test b/mysql-test/suite/storage_engine/parts/repair_table.test index f77b2ef8de4..06be8de1f56 100644 --- a/mysql-test/suite/storage_engine/parts/repair_table.test +++ b/mysql-test/suite/storage_engine/parts/repair_table.test @@ -35,7 +35,7 @@ if (!$mysql_errname) let $alter_definition = REPAIR PARTITION p0; --source ../alter_table.inc - INSERT INTO t1 VALUES (3,'c'); + INSERT INTO t1 (a,b) VALUES (3,'c'); let $alter_definition = REPAIR PARTITION NO_WRITE_TO_BINLOG p0, p1; --source ../alter_table.inc @@ -57,7 +57,7 @@ if (!$mysql_errname) let $alter_definition = REPAIR PARTITION LOCAL ALL EXTENDED; --source ../alter_table.inc - INSERT INTO t1 VALUES (10,'j'); + INSERT INTO t1 (a,b) VALUES (10,'j'); let $alter_definition = REPAIR PARTITION p1 QUICK USE_FRM; --source ../alter_table.inc diff --git a/mysql-test/suite/storage_engine/parts/truncate_table.result b/mysql-test/suite/storage_engine/parts/truncate_table.result index e46f4c97de5..e3b18d57989 100644 --- a/mysql-test/suite/storage_engine/parts/truncate_table.result +++ b/mysql-test/suite/storage_engine/parts/truncate_table.result @@ -3,7 +3,7 @@ CREATE TABLE t1 (a , b ) ENGINE= KEY AUTO_INCREMENT, c ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; @@ -46,23 +46,23 @@ t1 CREATE TABLE `t1` ( ) ENGINE= AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (a) PARTITIONS 2 */ -SELECT * FROM t1; +SELECT a,c FROM t1; a c 1 d DROP TABLE t1; CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); ALTER TABLE t1 TRUNCATE PARTITION p0; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 101 g 3 c -EXPLAIN PARTITIONS SELECT * FROM t1; +EXPLAIN PARTITIONS SELECT a,b FROM t1; id select_type table partitions type possible_keys key key_len ref rows Extra 1 SIMPLE t1 p0,p1 # # # # # # INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c'); ALTER TABLE t1 TRUNCATE PARTITION ALL; -SELECT * FROM t1; +SELECT a,b FROM t1; a b DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/parts/truncate_table.test b/mysql-test/suite/storage_engine/parts/truncate_table.test index 20f316d5297..9d921f013f4 100644 --- a/mysql-test/suite/storage_engine/parts/truncate_table.test +++ b/mysql-test/suite/storage_engine/parts/truncate_table.test @@ -33,7 +33,7 @@ if (!$mysql_errname) INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c'); TRUNCATE TABLE t1; - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -64,7 +64,7 @@ if (!$mysql_errname) INSERT INTO t1 (c) VALUES ('d'); --source ../mask_engine.inc SHOW CREATE TABLE t1; - SELECT * FROM t1; + SELECT a,c FROM t1; DROP TABLE t1; } @@ -93,16 +93,16 @@ if (!$mysql_errname) } --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; --replace_column 5 # 6 # 7 # 8 # 9 # 10 # - EXPLAIN PARTITIONS SELECT * FROM t1; + EXPLAIN PARTITIONS SELECT a,b FROM t1; INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c'); let $alter_definition = TRUNCATE PARTITION ALL; --source ../alter_table.inc - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/repair_table.inc b/mysql-test/suite/storage_engine/repair_table.inc index 83d2f02e20a..be3e5ba35c2 100644 --- a/mysql-test/suite/storage_engine/repair_table.inc +++ b/mysql-test/suite/storage_engine/repair_table.inc @@ -64,7 +64,7 @@ INSERT INTO t1 (a,b) VALUES (14,'n'); --source check_errors.inc CHECK TABLE t1; --let $error_codes = 0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY -SELECT * FROM t1; +SELECT a,b FROM t1; --source check_errors.inc --enable_warnings REPAIR TABLE t1; @@ -143,7 +143,7 @@ if ($have_default_index) EOF CHECK TABLE t1; --let $error_codes = 0,ER_NOT_KEYFILE,144 - SELECT * FROM t1; + SELECT a,b FROM t1; --source check_errors.inc } } diff --git a/mysql-test/suite/storage_engine/repair_table.result b/mysql-test/suite/storage_engine/repair_table.result index f1af943fd7b..a20b9be3ba1 100644 --- a/mysql-test/suite/storage_engine/repair_table.result +++ b/mysql-test/suite/storage_engine/repair_table.result @@ -46,7 +46,7 @@ CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check Error Incorrect file format 't1' test.t1 check error Corrupt -SELECT * FROM t1; +SELECT a,b FROM t1; ERROR HY000: Incorrect file format 't1' # Statement ended with one of expected results (0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY). # If you got a difference in error message, just add it to rdiff file @@ -84,7 +84,7 @@ CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check error Size of datafile is: 39 Should be: 65 test.t1 check error Corrupt -SELECT * FROM t1; +SELECT a,b FROM t1; ERROR HY000: Incorrect key file for table 't1'; try to repair it # Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). # If you got a difference in error message, just add it to rdiff file @@ -99,7 +99,7 @@ Table Op Msg_type Msg_text test.t1 check warning Table is marked as crashed and last repair failed test.t1 check error Size of datafile is: 39 Should be: 65 test.t1 check error Corrupt -SELECT * FROM t1; +SELECT a,b FROM t1; ERROR HY000: Table './test/t1' is marked as crashed and last (automatic?) repair failed # Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). # If you got a difference in error message, just add it to rdiff file diff --git a/mysql-test/suite/storage_engine/replace.result b/mysql-test/suite/storage_engine/replace.result index c8fbca8f534..85988c740b2 100644 --- a/mysql-test/suite/storage_engine/replace.result +++ b/mysql-test/suite/storage_engine/replace.result @@ -1,7 +1,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 (a , b ) ENGINE= ; REPLACE INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 2 b @@ -9,7 +9,7 @@ a b 4 d 5 e REPLACE t1 (a,b) VALUE (10,'foo'),(10,'foo'); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 10 foo @@ -26,7 +26,7 @@ ERROR 23000: Duplicate entry '2' for key 'a' # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). # If you got a difference in error message, just add it to rdiff file REPLACE INTO t1 (a,b) VALUES (2,'d'); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 2 d @@ -39,7 +39,7 @@ ERROR 23000: Duplicate entry 'b' for key 'PRIMARY' # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). # If you got a difference in error message, just add it to rdiff file REPLACE INTO t1 (a,b) VALUES (4,'b'); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 3 c diff --git a/mysql-test/suite/storage_engine/replace.test b/mysql-test/suite/storage_engine/replace.test index 368ed62a300..0a00734abec 100644 --- a/mysql-test/suite/storage_engine/replace.test +++ b/mysql-test/suite/storage_engine/replace.test @@ -13,11 +13,11 @@ DROP TABLE IF EXISTS t1; REPLACE INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'); --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; REPLACE t1 (a,b) VALUE (10,'foo'),(10,'foo'); --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; DROP TABLE t1; @@ -37,7 +37,7 @@ if (!$mysql_errname) --source check_errors.inc REPLACE INTO t1 (a,b) VALUES (2,'d'); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } @@ -58,7 +58,7 @@ if (!$mysql_errname) --source check_errors.inc REPLACE INTO t1 (a,b) VALUES (4,'b'); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/select.result b/mysql-test/suite/storage_engine/select.result index d2331f4d869..015ed80b771 100644 --- a/mysql-test/suite/storage_engine/select.result +++ b/mysql-test/suite/storage_engine/select.result @@ -144,7 +144,7 @@ a b a b 200 bar 200 bar 200 bar 200 bar 200 bar 200 bar -SELECT alias1.* FROM ( SELECT * FROM t1 ) alias1, t2 WHERE t2.a IN (100,200); +SELECT alias1.* FROM ( SELECT a,b FROM t1 ) alias1, t2 WHERE t2.a IN (100,200); a b 1 z 1 z @@ -233,7 +233,7 @@ SUM(t2.a) SELECT MIN(t2.a) FROM t1 RIGHT OUTER JOIN t2 USING (b,a); MIN(t2.a) 1 -SELECT alias.b FROM t1 NATURAL JOIN ( SELECT * FROM t1 ) alias WHERE b > ''; +SELECT alias.b FROM t1 NATURAL JOIN ( SELECT a,b FROM t1 ) alias WHERE b > ''; b bar bar @@ -247,7 +247,7 @@ z z z z -SELECT t2.b FROM ( SELECT * FROM t1 ) alias NATURAL LEFT JOIN t2 WHERE b IS NOT NULL; +SELECT t2.b FROM ( SELECT a,b FROM t1 ) alias NATURAL LEFT JOIN t2 WHERE b IS NOT NULL; b bar bar @@ -306,15 +306,15 @@ z z z z -SELECT ( SELECT MIN(a) FROM ( SELECT * FROM t1 ) alias1 ) AS min_a FROM t2; +SELECT ( SELECT MIN(a) FROM ( SELECT a,b FROM t1 ) alias1 ) AS min_a FROM t2; min_a 1 1 1 -SELECT * FROM t2 WHERE a = ( SELECT MIN(a) FROM t1 ); +SELECT a,b FROM t2 WHERE a = ( SELECT MIN(a) FROM t1 ); a b 1 z -SELECT * FROM t2 WHERE b LIKE ( SELECT b FROM t1 ORDER BY b LIMIT 1 ); +SELECT a,b FROM t2 WHERE b LIKE ( SELECT b FROM t1 ORDER BY b LIMIT 1 ); a b 200 bar SELECT t2.* FROM t1 t1_outer, t2 WHERE ( t1_outer.a, t2.b ) IN ( SELECT a, b FROM t2 WHERE a = t1_outer.a ); @@ -325,19 +325,19 @@ a b 100 foobar 200 bar 200 bar -SELECT * FROM t2 WHERE b = ANY ( SELECT b FROM t1 WHERE a > 1 ); +SELECT a,b FROM t2 WHERE b = ANY ( SELECT b FROM t1 WHERE a > 1 ); a b 100 foobar 200 bar -SELECT * FROM t2 WHERE b > ALL ( SELECT b FROM t1 WHERE b < 'foo' ); +SELECT a,b FROM t2 WHERE b > ALL ( SELECT b FROM t1 WHERE b < 'foo' ); a b 1 z 100 foobar -SELECT * FROM t1 WHERE ROW(a, b) = ( SELECT a, b FROM t2 ORDER BY a, b LIMIT 1 ); +SELECT a,b FROM t1 WHERE ROW(a, b) = ( SELECT a, b FROM t2 ORDER BY a, b LIMIT 1 ); a b 1 z 1 z -SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2 WHERE t2.b > t1.b ); +SELECT a,b FROM t1 WHERE EXISTS ( SELECT a,b FROM t2 WHERE t2.b > t1.b ); a b 100 foobar 100 foobar @@ -371,12 +371,12 @@ a b 100 foobar 200 bar 200 bar -SELECT * FROM t1 UNION SELECT * FROM t2 UNION DISTINCT SELECT * FROM t1; +SELECT a,b FROM t1 UNION SELECT a,b FROM t2 UNION DISTINCT SELECT a,b FROM t1; a b 1 z 100 foobar 200 bar -SELECT * FROM t1 UNION SELECT * FROM t2 UNION ALL SELECT * FROM t1; +SELECT a,b FROM t1 UNION SELECT a,b FROM t2 UNION ALL SELECT a,b FROM t1; a b 1 z 1 z diff --git a/mysql-test/suite/storage_engine/select.test b/mysql-test/suite/storage_engine/select.test index 528fa64cfb2..34cfd99d344 100644 --- a/mysql-test/suite/storage_engine/select.test +++ b/mysql-test/suite/storage_engine/select.test @@ -108,7 +108,7 @@ SELECT t1_1.*, t2.* FROM t2, t1 AS t1_1, t1 AS t1_2 WHERE t1_1.a = t1_2.a AND t2.a = t1_1.a; --sorted_result -SELECT alias1.* FROM ( SELECT * FROM t1 ) alias1, t2 WHERE t2.a IN (100,200); +SELECT alias1.* FROM ( SELECT a,b FROM t1 ) alias1, t2 WHERE t2.a IN (100,200); --sorted_result SELECT t1.a FROM { OJ t1 LEFT OUTER JOIN t2 ON t1.a = t2.a+10 }; @@ -134,10 +134,10 @@ SELECT SUM(t2.a) FROM t1 RIGHT JOIN t2 ON t2.b = t1.b; SELECT MIN(t2.a) FROM t1 RIGHT OUTER JOIN t2 USING (b,a); --sorted_result -SELECT alias.b FROM t1 NATURAL JOIN ( SELECT * FROM t1 ) alias WHERE b > ''; +SELECT alias.b FROM t1 NATURAL JOIN ( SELECT a,b FROM t1 ) alias WHERE b > ''; --sorted_result -SELECT t2.b FROM ( SELECT * FROM t1 ) alias NATURAL LEFT JOIN t2 WHERE b IS NOT NULL; +SELECT t2.b FROM ( SELECT a,b FROM t1 ) alias NATURAL LEFT JOIN t2 WHERE b IS NOT NULL; --sorted_result SELECT t1.*, t2.* FROM t1 NATURAL LEFT OUTER JOIN t2; @@ -151,15 +151,15 @@ SELECT t1_2.b FROM t1 t1_1 NATURAL RIGHT OUTER JOIN t1 t1_2 INNER JOIN t2; # Subquery as scalar operand, subquery in the FROM clause --sorted_result -SELECT ( SELECT MIN(a) FROM ( SELECT * FROM t1 ) alias1 ) AS min_a FROM t2; +SELECT ( SELECT MIN(a) FROM ( SELECT a,b FROM t1 ) alias1 ) AS min_a FROM t2; # Comparison using subqueries --sorted_result -SELECT * FROM t2 WHERE a = ( SELECT MIN(a) FROM t1 ); +SELECT a,b FROM t2 WHERE a = ( SELECT MIN(a) FROM t1 ); --sorted_result -SELECT * FROM t2 WHERE b LIKE ( SELECT b FROM t1 ORDER BY b LIMIT 1 ); +SELECT a,b FROM t2 WHERE b LIKE ( SELECT b FROM t1 ORDER BY b LIMIT 1 ); # Subquery with IN, correlated subquery @@ -169,20 +169,20 @@ SELECT t2.* FROM t1 t1_outer, t2 WHERE ( t1_outer.a, t2.b ) IN ( SELECT a, b FRO # Subquery with ANY, ALL --sorted_result -SELECT * FROM t2 WHERE b = ANY ( SELECT b FROM t1 WHERE a > 1 ); +SELECT a,b FROM t2 WHERE b = ANY ( SELECT b FROM t1 WHERE a > 1 ); --sorted_result -SELECT * FROM t2 WHERE b > ALL ( SELECT b FROM t1 WHERE b < 'foo' ); +SELECT a,b FROM t2 WHERE b > ALL ( SELECT b FROM t1 WHERE b < 'foo' ); # Row subqueries --sorted_result -SELECT * FROM t1 WHERE ROW(a, b) = ( SELECT a, b FROM t2 ORDER BY a, b LIMIT 1 ); +SELECT a,b FROM t1 WHERE ROW(a, b) = ( SELECT a, b FROM t2 ORDER BY a, b LIMIT 1 ); # Subquery with EXISTS --sorted_result -SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2 WHERE t2.b > t1.b ); +SELECT a,b FROM t1 WHERE EXISTS ( SELECT a,b FROM t2 WHERE t2.b > t1.b ); # Subquery in ORDER BY @@ -197,10 +197,10 @@ SELECT a, b FROM t1 HAVING a IN ( SELECT a FROM t2 WHERE b = t1.b ); # Union --sorted_result -SELECT * FROM t1 UNION SELECT * FROM t2 UNION DISTINCT SELECT * FROM t1; +SELECT a,b FROM t1 UNION SELECT a,b FROM t2 UNION DISTINCT SELECT a,b FROM t1; --sorted_result -SELECT * FROM t1 UNION SELECT * FROM t2 UNION ALL SELECT * FROM t1; +SELECT a,b FROM t1 UNION SELECT a,b FROM t2 UNION ALL SELECT a,b FROM t1; # Cleanup diff --git a/mysql-test/suite/storage_engine/select_high_prio.result b/mysql-test/suite/storage_engine/select_high_prio.result index b3b70df3731..10226ae0f39 100644 --- a/mysql-test/suite/storage_engine/select_high_prio.result +++ b/mysql-test/suite/storage_engine/select_high_prio.result @@ -12,7 +12,7 @@ LOCK TABLE t1 READ; connection con0; UPDATE t1 SET b = CONCAT(b,b); connection con2; -SELECT * FROM t1; +SELECT a,b FROM t1; connection con1; UNLOCK TABLES; connection con0; diff --git a/mysql-test/suite/storage_engine/select_high_prio.test b/mysql-test/suite/storage_engine/select_high_prio.test index 385752e8d4e..49cd91ebbfd 100644 --- a/mysql-test/suite/storage_engine/select_high_prio.test +++ b/mysql-test/suite/storage_engine/select_high_prio.test @@ -49,12 +49,12 @@ let $condition = LIKE 'Waiting for table%'; let $wait_timeout = 2; --source include/wait_show_condition.inc --send -SELECT * FROM t1; +SELECT a,b FROM t1; --connection con1 let $show_statement = SHOW PROCESSLIST; let $field = Info; -let $condition = = 'SELECT * FROM t1'; +let $condition = = 'SELECT a,b FROM t1'; let $wait_timeout = 2; --source include/wait_show_condition.inc if (!$found) diff --git a/mysql-test/suite/storage_engine/truncate_table.result b/mysql-test/suite/storage_engine/truncate_table.result index 0a774c4b8dd..d8dc5046442 100644 --- a/mysql-test/suite/storage_engine/truncate_table.result +++ b/mysql-test/suite/storage_engine/truncate_table.result @@ -3,7 +3,7 @@ CREATE TABLE t1 (a , b ) ENGINE= KEY AUTO_INCREMENT, c ) ENGINE= ; @@ -22,7 +22,7 @@ INSERT INTO t1 (c) VALUES ('d'); SHOW TABLE STATUS LIKE 't1'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment t1 # # # # # # # # # 2 # # # # # # # -SELECT * FROM t1; +SELECT a,c FROM t1; a c 1 d DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/truncate_table.test b/mysql-test/suite/storage_engine/truncate_table.test index c84fba143b7..a9277b39619 100644 --- a/mysql-test/suite/storage_engine/truncate_table.test +++ b/mysql-test/suite/storage_engine/truncate_table.test @@ -19,7 +19,7 @@ if (!$mysql_errname) { INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c'); TRUNCATE TABLE t1; - SELECT * FROM t1; + SELECT a,b FROM t1; } DROP TABLE t1; @@ -51,7 +51,7 @@ if (!$mysql_errname) --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # SHOW TABLE STATUS LIKE 't1'; - SELECT * FROM t1; + SELECT a,c FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/trx/cons_snapshot_repeatable_read.result b/mysql-test/suite/storage_engine/trx/cons_snapshot_repeatable_read.result index a52f18fc623..3b0bdb3b560 100644 --- a/mysql-test/suite/storage_engine/trx/cons_snapshot_repeatable_read.result +++ b/mysql-test/suite/storage_engine/trx/cons_snapshot_repeatable_read.result @@ -9,7 +9,7 @@ connection con2; INSERT INTO t1 (a) VALUES (1); connection con1; # If consistent read works on this isolation level (REPEATABLE READ), the following SELECT should not return the value we inserted (1) -SELECT * FROM t1; +SELECT a FROM t1; a COMMIT; connection default; diff --git a/mysql-test/suite/storage_engine/trx/cons_snapshot_serializable.result b/mysql-test/suite/storage_engine/trx/cons_snapshot_serializable.result index 8d75ea075a2..691039e8d96 100644 --- a/mysql-test/suite/storage_engine/trx/cons_snapshot_serializable.result +++ b/mysql-test/suite/storage_engine/trx/cons_snapshot_serializable.result @@ -9,7 +9,7 @@ connection con2; INSERT INTO t1 (a) VALUES (1); connection con1; # If consistent read works on this isolation level (SERIALIZABLE), the following SELECT should not return the value we inserted (1) -SELECT * FROM t1; +SELECT a FROM t1; a COMMIT; connection default; diff --git a/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc b/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc index 8dc9d6c4bb1..7f0dfe04214 100644 --- a/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc +++ b/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc @@ -38,7 +38,7 @@ if ($mysql_errname) connection con1; --echo # If consistent read works on this isolation level ($trx_isolation), the following SELECT should not return the value we inserted (1) -SELECT * FROM t1; +SELECT a FROM t1; COMMIT; connection default; diff --git a/mysql-test/suite/storage_engine/trx/delete.result b/mysql-test/suite/storage_engine/trx/delete.result index 827877a7e30..14e5389dcfb 100644 --- a/mysql-test/suite/storage_engine/trx/delete.result +++ b/mysql-test/suite/storage_engine/trx/delete.result @@ -4,7 +4,7 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(6,'f'),(7,' INSERT INTO t1 (a,b) SELECT a, b FROM t1; BEGIN; DELETE FROM t1 WHERE b IN ('c'); -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 1 a @@ -24,7 +24,7 @@ a b 8 h DELETE FROM t1 WHERE a < 0 OR b = 'a'; COMMIT; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 10000 foobar 10000 foobar @@ -46,7 +46,7 @@ SAVEPOINT spt1; DELETE FROM t1; RELEASE SAVEPOINT spt1; ROLLBACK; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 10000 foobar 10000 foobar diff --git a/mysql-test/suite/storage_engine/trx/delete.test b/mysql-test/suite/storage_engine/trx/delete.test index 0898eebb49a..50da1f20153 100644 --- a/mysql-test/suite/storage_engine/trx/delete.test +++ b/mysql-test/suite/storage_engine/trx/delete.test @@ -22,11 +22,11 @@ if ($mysql_errname) --source ../unexpected_result.inc } --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; DELETE FROM t1 WHERE a < 0 OR b = 'a'; COMMIT; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; BEGIN; DELETE FROM t1 WHERE a <= 4 ORDER BY b DESC LIMIT 1; @@ -35,7 +35,7 @@ DELETE FROM t1; RELEASE SAVEPOINT spt1; ROLLBACK; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; BEGIN; DELETE FROM t1 WHERE a <= 4 ORDER BY b DESC LIMIT 1; diff --git a/mysql-test/suite/storage_engine/trx/insert.result b/mysql-test/suite/storage_engine/trx/insert.result index 986d63b2a07..1d8aca98687 100644 --- a/mysql-test/suite/storage_engine/trx/insert.result +++ b/mysql-test/suite/storage_engine/trx/insert.result @@ -4,7 +4,7 @@ BEGIN; INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(100,'foo'); INSERT t1 (a,b) VALUE (10,'foo'),(11,'abc'); COMMIT; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 10 foo @@ -21,7 +21,7 @@ INSERT INTO t1 (a,b) VALUES (DEFAULT,DEFAULT); RELEASE SAVEPOINT spt1; INSERT INTO t1 (a,b) VALUES (DEFAULT,DEFAULT); ROLLBACK; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 10 foo @@ -39,7 +39,7 @@ INSERT t1 SET b = DEFAULT; ROLLBACK TO SAVEPOINT spt1; INSERT INTO t1 (b,a) VALUES ('test1',10); COMMIT; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 10 NULL diff --git a/mysql-test/suite/storage_engine/trx/insert.test b/mysql-test/suite/storage_engine/trx/insert.test index c458f90b1bb..1a736584b03 100644 --- a/mysql-test/suite/storage_engine/trx/insert.test +++ b/mysql-test/suite/storage_engine/trx/insert.test @@ -15,7 +15,7 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(100,'foo'); INSERT t1 (a,b) VALUE (10,'foo'),(11,'abc'); COMMIT; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; BEGIN; INSERT INTO t1 (b,a) VALUES ('test',0); @@ -25,7 +25,7 @@ RELEASE SAVEPOINT spt1; INSERT INTO t1 (a,b) VALUES (DEFAULT,DEFAULT); ROLLBACK; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; BEGIN; INSERT t1 (a) VALUE (10),(20); @@ -36,7 +36,7 @@ ROLLBACK TO SAVEPOINT spt1; INSERT INTO t1 (b,a) VALUES ('test1',10); COMMIT; --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/trx/level_read_committed.result b/mysql-test/suite/storage_engine/trx/level_read_committed.result index 12c0c2f42a8..ce1b126dc1a 100644 --- a/mysql-test/suite/storage_engine/trx/level_read_committed.result +++ b/mysql-test/suite/storage_engine/trx/level_read_committed.result @@ -6,7 +6,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; connection con1; CREATE TABLE t1 (a ) ENGINE= ; START TRANSACTION; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; BEGIN; @@ -14,53 +14,53 @@ INSERT INTO t1 (a) VALUES(1); # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; INSERT INTO t1 (a) VALUES (2); # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a INSERT INTO t1 (a) SELECT a+100 FROM t1; # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 COMMIT; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 INSERT INTO t1 (a) SELECT a+200 FROM t1; # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 201 202 COMMIT; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 201 202 connection con2; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 @@ -81,7 +81,7 @@ connection con2; INSERT INTO t1 (a) VALUES (1); connection con1; # If consistent read works on this isolation level (READ COMMITTED), the following SELECT should not return the value we inserted (1) -SELECT * FROM t1; +SELECT a FROM t1; a 1 COMMIT; diff --git a/mysql-test/suite/storage_engine/trx/level_read_uncommitted.result b/mysql-test/suite/storage_engine/trx/level_read_uncommitted.result index 2bf93768b00..68fbe5632cb 100644 --- a/mysql-test/suite/storage_engine/trx/level_read_uncommitted.result +++ b/mysql-test/suite/storage_engine/trx/level_read_uncommitted.result @@ -6,7 +6,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; connection con1; CREATE TABLE t1 (a ) ENGINE= ; START TRANSACTION; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; BEGIN; @@ -14,7 +14,7 @@ INSERT INTO t1 (a) VALUES(1); # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 connection con2; @@ -22,35 +22,35 @@ INSERT INTO t1 (a) VALUES (2); # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 INSERT INTO t1 (a) SELECT a+100 FROM t1; # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. -SELECT * FROM t1; +SELECT a FROM t1; a 1 101 102 2 connection con2; -SELECT * FROM t1; +SELECT a FROM t1; a 1 101 102 2 COMMIT; -SELECT * FROM t1; +SELECT a FROM t1; a 1 101 102 2 connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 101 @@ -59,7 +59,7 @@ a INSERT INTO t1 (a) SELECT a+200 FROM t1; # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. -SELECT * FROM t1; +SELECT a FROM t1; a 1 101 @@ -70,7 +70,7 @@ a 301 302 COMMIT; -SELECT * FROM t1; +SELECT a FROM t1; a 1 101 @@ -81,7 +81,7 @@ a 301 302 connection con2; -SELECT * FROM t1; +SELECT a FROM t1; a 1 101 @@ -106,7 +106,7 @@ connection con2; INSERT INTO t1 (a) VALUES (1); connection con1; # If consistent read works on this isolation level (READ UNCOMMITTED), the following SELECT should not return the value we inserted (1) -SELECT * FROM t1; +SELECT a FROM t1; a 1 COMMIT; diff --git a/mysql-test/suite/storage_engine/trx/level_repeatable_read.result b/mysql-test/suite/storage_engine/trx/level_repeatable_read.result index 82324c16801..c828b18dba0 100644 --- a/mysql-test/suite/storage_engine/trx/level_repeatable_read.result +++ b/mysql-test/suite/storage_engine/trx/level_repeatable_read.result @@ -6,7 +6,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ; connection con1; CREATE TABLE t1 (a ) ENGINE= ; START TRANSACTION; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; BEGIN; @@ -14,50 +14,50 @@ INSERT INTO t1 (a) VALUES(1); # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; INSERT INTO t1 (a) VALUES (2); # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a INSERT INTO t1 (a) SELECT a+100 FROM t1; ERROR HY000: Lock wait timeout exceeded; try restarting transaction # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. # If it differs from the result file, it might indicate a problem. -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 COMMIT; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a INSERT INTO t1 (a) SELECT a+200 FROM t1; # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. -SELECT * FROM t1; +SELECT a FROM t1; a 201 202 COMMIT; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 201 202 connection con2; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 diff --git a/mysql-test/suite/storage_engine/trx/level_serializable.result b/mysql-test/suite/storage_engine/trx/level_serializable.result index 0f990dfbf77..3f57395fa37 100644 --- a/mysql-test/suite/storage_engine/trx/level_serializable.result +++ b/mysql-test/suite/storage_engine/trx/level_serializable.result @@ -6,7 +6,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE; connection con1; CREATE TABLE t1 (a ) ENGINE= ; START TRANSACTION; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; BEGIN; @@ -15,7 +15,7 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. # If it differs from the result file, it might indicate a problem. connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; INSERT INTO t1 (a) VALUES (2); @@ -23,32 +23,32 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. # If it differs from the result file, it might indicate a problem. connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a INSERT INTO t1 (a) SELECT a+100 FROM t1; # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; -SELECT * FROM t1; +SELECT a FROM t1; a COMMIT; -SELECT * FROM t1; +SELECT a FROM t1; a connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a INSERT INTO t1 (a) SELECT a+200 FROM t1; # WARNING: Statement ended with errno 0, errname ''. # If it differs from the result file, it might indicate a problem. -SELECT * FROM t1; +SELECT a FROM t1; a COMMIT; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; -SELECT * FROM t1; +SELECT a FROM t1; a connection default; disconnect con1; diff --git a/mysql-test/suite/storage_engine/trx/select_for_update.result b/mysql-test/suite/storage_engine/trx/select_for_update.result index 8b0de87de05..f5954489d91 100644 --- a/mysql-test/suite/storage_engine/trx/select_for_update.result +++ b/mysql-test/suite/storage_engine/trx/select_for_update.result @@ -3,23 +3,23 @@ CREATE TABLE t1 (a , b ) ENGINE= , b ) ENGINE= 100; COMMIT; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 10050 NULL 10050 NULL @@ -31,7 +31,7 @@ UPDATE t1 SET b = ''; ROLLBACK TO SAVEPOINT spt1; UPDATE t1 SET b = 'upd' WHERE a = 10050; COMMIT; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 10050 upd 10050 upd diff --git a/mysql-test/suite/storage_engine/trx/update.test b/mysql-test/suite/storage_engine/trx/update.test index df65e244528..245b7554477 100644 --- a/mysql-test/suite/storage_engine/trx/update.test +++ b/mysql-test/suite/storage_engine/trx/update.test @@ -26,7 +26,7 @@ if (!$mysql_errname) UPDATE t1 SET a=a-50, b=DEFAULT WHERE a>100; COMMIT; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; BEGIN; UPDATE t1 SET b = 'update' WHERE a <= 4 ORDER BY a DESC, b ASC LIMIT 3; @@ -41,7 +41,7 @@ if (!$mysql_errname) UPDATE t1 SET b = 'upd' WHERE a = 10050; COMMIT; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; } DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/trx/xa.result b/mysql-test/suite/storage_engine/trx/xa.result index 3e2cb43a11c..72017018e2a 100644 --- a/mysql-test/suite/storage_engine/trx/xa.result +++ b/mysql-test/suite/storage_engine/trx/xa.result @@ -7,18 +7,18 @@ connection con2; XA START 'xa1'; INSERT INTO t1 (a) VALUES (1); connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; INSERT INTO t1 (a) VALUES (2); XA END 'xa1'; connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; XA PREPARE 'xa1'; connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a connection con2; XA RECOVER; @@ -26,7 +26,7 @@ formatID gtrid_length bqual_length data 1 3 0 xa1 XA COMMIT 'xa1'; connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 @@ -34,7 +34,7 @@ connection con2; XA START 'xa2'; INSERT INTO t1 (a) VALUES (3); connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 @@ -42,14 +42,14 @@ connection con2; INSERT INTO t1 (a) VALUES (4); XA END 'xa2'; connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 connection con2; XA COMMIT 'xa2' ONE PHASE; connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 @@ -59,7 +59,7 @@ connection con2; XA START 'xa3'; INSERT INTO t1 (a) VALUES (5); connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 @@ -69,7 +69,7 @@ connection con2; INSERT INTO t1 (a) VALUES (6); XA END 'xa3'; connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 @@ -78,7 +78,7 @@ a connection con2; XA PREPARE 'xa3'; connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 @@ -87,7 +87,7 @@ a connection con2; XA ROLLBACK 'xa3'; connection con1; -SELECT * FROM t1; +SELECT a FROM t1; a 1 2 diff --git a/mysql-test/suite/storage_engine/trx/xa.test b/mysql-test/suite/storage_engine/trx/xa.test index c64ba7cd27b..17cae7eae76 100644 --- a/mysql-test/suite/storage_engine/trx/xa.test +++ b/mysql-test/suite/storage_engine/trx/xa.test @@ -30,7 +30,7 @@ INSERT INTO t1 (a) VALUES (1); --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; --connection con2 INSERT INTO t1 (a) VALUES (2); @@ -38,14 +38,14 @@ XA END 'xa1'; --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; --connection con2 XA PREPARE 'xa1'; --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; --connection con2 XA RECOVER; @@ -53,7 +53,7 @@ XA COMMIT 'xa1'; --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; # One-phase COMMIT @@ -63,7 +63,7 @@ INSERT INTO t1 (a) VALUES (3); --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; --connection con2 INSERT INTO t1 (a) VALUES (4); @@ -71,14 +71,14 @@ XA END 'xa2'; --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; --connection con2 XA COMMIT 'xa2' ONE PHASE; --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; # Rollback @@ -88,7 +88,7 @@ INSERT INTO t1 (a) VALUES (5); --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; --connection con2 INSERT INTO t1 (a) VALUES (6); @@ -96,21 +96,21 @@ XA END 'xa3'; --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; --connection con2 XA PREPARE 'xa3'; --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; --connection con2 XA ROLLBACK 'xa3'; --connection con1 --sorted_result -SELECT * FROM t1; +SELECT a FROM t1; DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/trx/xa_recovery.result b/mysql-test/suite/storage_engine/trx/xa_recovery.result index e14e9a0bf1a..a9208a6e9d3 100644 --- a/mysql-test/suite/storage_engine/trx/xa_recovery.result +++ b/mysql-test/suite/storage_engine/trx/xa_recovery.result @@ -22,7 +22,7 @@ formatID gtrid_length bqual_length data 1 3 0 xa2 XA ROLLBACK 'xa1'; XA COMMIT 'xa2'; -SELECT * FROM t1; +SELECT a FROM t1; a 3 4 diff --git a/mysql-test/suite/storage_engine/trx/xa_recovery.test b/mysql-test/suite/storage_engine/trx/xa_recovery.test index d7ac2e782d1..4dab66b77dd 100644 --- a/mysql-test/suite/storage_engine/trx/xa_recovery.test +++ b/mysql-test/suite/storage_engine/trx/xa_recovery.test @@ -64,7 +64,7 @@ EOF XA RECOVER; XA ROLLBACK 'xa1'; XA COMMIT 'xa2'; -SELECT * FROM t1; +SELECT a FROM t1; DROP TABLE t1; --source ../cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/type_binary.inc b/mysql-test/suite/storage_engine/type_binary.inc index 812a1cc9527..dbee1d57274 100644 --- a/mysql-test/suite/storage_engine/type_binary.inc +++ b/mysql-test/suite/storage_engine/type_binary.inc @@ -27,16 +27,16 @@ if (!$mysql_errname) # Valid values - INSERT INTO t1 VALUES ('','','','',''); - INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); + INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('','','','',''); + INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); --sorted_result SELECT HEX(b), HEX(b0), HEX(b1), HEX(b20), HEX(b255) FROM t1; # Invalid values - INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); - INSERT INTO t1 SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1; + INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); + INSERT INTO t1 (b,b0,b1,b20,b255) SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1; --sorted_result SELECT HEX(b), HEX(b0), HEX(b1), HEX(b20), HEX(b255) FROM t1; diff --git a/mysql-test/suite/storage_engine/type_binary.result b/mysql-test/suite/storage_engine/type_binary.result index 455dbb57a7e..8da8b04095b 100644 --- a/mysql-test/suite/storage_engine/type_binary.result +++ b/mysql-test/suite/storage_engine/type_binary.result @@ -12,20 +12,20 @@ b0 binary(0) # # # # b1 binary(1) # # # # b20 binary(20) # # # # b255 binary(255) # # # # -INSERT INTO t1 VALUES ('','','','',''); -INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); +INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('','','','',''); +INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); SELECT HEX(b), HEX(b0), HEX(b1), HEX(b20), HEX(b255) FROM t1; HEX(b) HEX(b0) HEX(b1) HEX(b20) HEX(b255) 00 00 0000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 61 62 616263646566676869206B6C6D6E6F7071727374 4372656174696E6720616E2061727469636C6520666F7220746865204B6E6F776C65646765626173652069732073696D696C617220746F2061736B696E67207175657374696F6E732E2046697273742C206E6176696761746520746F207468652063617465676F727920776865726520796F75206665656C207468652061727469636C652073686F756C642062652E204F6E63652074686572652C20646F75626C6520636865636B207468617420616E2061727469636C6520646F65736E277420616C726561647920657869737420776869636820776F756C6420776F726B2E00000000000000000000000000000000000000000000000000000000000000 -INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); +INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); Warnings: Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'b0' at row 1 Warning 1265 Data truncated for column 'b1' at row 1 Warning 1265 Data truncated for column 'b20' at row 1 Warning 1265 Data truncated for column 'b255' at row 1 -INSERT INTO t1 SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1; +INSERT INTO t1 (b,b0,b1,b20,b255) SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1; Warnings: Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'b0' at row 1 diff --git a/mysql-test/suite/storage_engine/type_binary_indexes.result b/mysql-test/suite/storage_engine/type_binary_indexes.result index 6f828aed100..96e0d6d601a 100644 --- a/mysql-test/suite/storage_engine/type_binary_indexes.result +++ b/mysql-test/suite/storage_engine/type_binary_indexes.result @@ -88,7 +88,7 @@ SHOW INDEX IN t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 1 v16 1 v16 # # 10 NULL # # INSERT INTO t1 (b,b20,v16,v128) VALUES ('a','char1','varchar1a','varchar1b'),('a','char2','varchar2a','varchar2b'),('b','char3','varchar1a','varchar1b'),('c','char4','varchar3a','varchar3b'),('d','char5','varchar4a','varchar3b'),('e','char6','varchar2a','varchar3b'); -INSERT INTO t1 SELECT * FROM t1; +INSERT INTO t1 (b,b20,v16,v128) SELECT b,b20,v16,v128 FROM t1; EXPLAIN SELECT HEX(SUBSTRING(v16,0,3)) FROM t1 WHERE v16 LIKE 'varchar%'; id select_type table type possible_keys key key_len ref rows Extra # # # # # NULL # # # # diff --git a/mysql-test/suite/storage_engine/type_binary_indexes.test b/mysql-test/suite/storage_engine/type_binary_indexes.test index 24b16aa5175..943593027f8 100644 --- a/mysql-test/suite/storage_engine/type_binary_indexes.test +++ b/mysql-test/suite/storage_engine/type_binary_indexes.test @@ -130,7 +130,7 @@ if (!$mysql_errname) SHOW INDEX IN t1; INSERT INTO t1 (b,b20,v16,v128) VALUES ('a','char1','varchar1a','varchar1b'),('a','char2','varchar2a','varchar2b'),('b','char3','varchar1a','varchar1b'),('c','char4','varchar3a','varchar3b'),('d','char5','varchar4a','varchar3b'),('e','char6','varchar2a','varchar3b'); - INSERT INTO t1 SELECT * FROM t1; + INSERT INTO t1 (b,b20,v16,v128) SELECT b,b20,v16,v128 FROM t1; --replace_column 1 # 2 # 3 # 4 # 5 # 7 # 8 # 9 # 10 # EXPLAIN SELECT HEX(SUBSTRING(v16,0,3)) FROM t1 WHERE v16 LIKE 'varchar%'; diff --git a/mysql-test/suite/storage_engine/type_bit.inc b/mysql-test/suite/storage_engine/type_bit.inc index 1a232305e1c..eb7920f8d83 100644 --- a/mysql-test/suite/storage_engine/type_bit.inc +++ b/mysql-test/suite/storage_engine/type_bit.inc @@ -43,28 +43,28 @@ if (!$mysql_errname) SHOW COLUMNS IN t1; } - INSERT INTO t1 VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1); + INSERT INTO t1 (a,b,c,d) VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1); --sorted_result SELECT BIN(a), HEX(b), c+0 FROM t1 WHERE d>0; - INSERT INTO t1 VALUES (1,0,-1,0); + INSERT INTO t1 (a,b,c,d) VALUES (1,0,-1,0); --sorted_result SELECT a+0, b+0, c+0 FROM t1 WHERE d<100; - INSERT INTO t1 VALUES (b'1', 'f', 0xFF, 0x0); + INSERT INTO t1 (a,b,c,d) VALUES (b'1', 'f', 0xFF, 0x0); --sorted_result SELECT a+0, b+0, c+0 FROM t1 WHERE d IN (0, 2); # Out of range values # (should produce warnings) - INSERT INTO t1 VALUES (0x10,0,0,1); + INSERT INTO t1 (a,b,c,d) VALUES (0x10,0,0,1); --sorted_result - SELECT * FROM t1; + SELECT a,b,c,d FROM t1; - INSERT INTO t1 VALUES (0x01,0,0x10000000000000000,0); + INSERT INTO t1 (a,b,c,d) VALUES (0x01,0,0x10000000000000000,0); --sorted_result - SELECT * FROM t1; + SELECT a,b,c,d FROM t1; DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/type_bit.result b/mysql-test/suite/storage_engine/type_bit.result index 69b9ac53d76..3c88b297d8a 100644 --- a/mysql-test/suite/storage_engine/type_bit.result +++ b/mysql-test/suite/storage_engine/type_bit.result @@ -18,29 +18,29 @@ a bit(1) # # # b bit(20) # # # c bit(64) # # # d bit(1) # # # -INSERT INTO t1 VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1); +INSERT INTO t1 (a,b,c,d) VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1); SELECT BIN(a), HEX(b), c+0 FROM t1 WHERE d>0; BIN(a) HEX(b) c+0 0 FFFFF 18446744073709551615 -INSERT INTO t1 VALUES (1,0,-1,0); +INSERT INTO t1 (a,b,c,d) VALUES (1,0,-1,0); SELECT a+0, b+0, c+0 FROM t1 WHERE d<100; a+0 b+0 c+0 0 1048575 18446744073709551615 1 0 18446744073709551615 -INSERT INTO t1 VALUES (b'1', 'f', 0xFF, 0x0); +INSERT INTO t1 (a,b,c,d) VALUES (b'1', 'f', 0xFF, 0x0); SELECT a+0, b+0, c+0 FROM t1 WHERE d IN (0, 2); a+0 b+0 c+0 1 0 18446744073709551615 1 102 255 -INSERT INTO t1 VALUES (0x10,0,0,1); +INSERT INTO t1 (a,b,c,d) VALUES (0x10,0,0,1); Warnings: Warning 1264 Out of range value for column 'a' at row 1 -SELECT * FROM t1; +SELECT a,b,c,d FROM t1; a b c d -INSERT INTO t1 VALUES (0x01,0,0x10000000000000000,0); +INSERT INTO t1 (a,b,c,d) VALUES (0x01,0,0x10000000000000000,0); Warnings: Warning 1264 Out of range value for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c,d FROM t1; a b c d DROP TABLE t1; CREATE TABLE t1 (a BIT(65) ) ENGINE= ; diff --git a/mysql-test/suite/storage_engine/type_blob.inc b/mysql-test/suite/storage_engine/type_blob.inc index 93a52fc9971..626c556102e 100644 --- a/mysql-test/suite/storage_engine/type_blob.inc +++ b/mysql-test/suite/storage_engine/type_blob.inc @@ -33,7 +33,7 @@ if (!$mysql_errname) # Valid values # (cannot get MAX for all columns due to max_allowed_packet limitations) - INSERT INTO t1 VALUES + INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES ('','','','','','','','','',''), ('a','b','c','d','e','f','g','h','i','j'), ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'), @@ -44,7 +44,7 @@ if (!$mysql_errname) # Invalid values (produce warnings, except for mediumblob and longblob columns for which the values are within limits) - INSERT INTO t1 VALUES + INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) ); --sorted_result diff --git a/mysql-test/suite/storage_engine/type_blob.result b/mysql-test/suite/storage_engine/type_blob.result index a93391f749a..9a9e14709e5 100644 --- a/mysql-test/suite/storage_engine/type_blob.result +++ b/mysql-test/suite/storage_engine/type_blob.result @@ -22,7 +22,7 @@ b17m longblob # # # t tinyblob # # # m mediumblob # # # l longblob # # # -INSERT INTO t1 VALUES +INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES ('','','','','','','','','',''), ('a','b','c','d','e','f','g','h','i','j'), ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'), @@ -33,7 +33,7 @@ LENGTH(b) LENGTH(b0) LENGTH(b1) LENGTH(b300) LENGTH(bm) LENGTH(b70k) LENGTH(b17m 1 1 1 1 1 1 1 1 1 1 5 5 5 5 5 5 5 5 5 6 65535 65535 255 65535 65535 1048576 2097152 255 1048576 2097152 -INSERT INTO t1 VALUES +INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) ); Warnings: Warning 1265 Data truncated for column 'b' at row 1 diff --git a/mysql-test/suite/storage_engine/type_bool.inc b/mysql-test/suite/storage_engine/type_bool.inc index ae7d0043c49..b14f658c973 100644 --- a/mysql-test/suite/storage_engine/type_bool.inc +++ b/mysql-test/suite/storage_engine/type_bool.inc @@ -25,40 +25,40 @@ if (!$mysql_errname) # Valid values - INSERT INTO t1 VALUES (1,TRUE); + INSERT INTO t1 (b1,b2) VALUES (1,TRUE); --sorted_result - SELECT * FROM t1; + SELECT b1,b2 FROM t1; - INSERT INTO t1 VALUES (FALSE,0); + INSERT INTO t1 (b1,b2) VALUES (FALSE,0); --sorted_result - SELECT * FROM t1; + SELECT b1,b2 FROM t1; - INSERT INTO t1 VALUES (2,3); + INSERT INTO t1 (b1,b2) VALUES (2,3); --sorted_result - SELECT * FROM t1; + SELECT b1,b2 FROM t1; - INSERT INTO t1 VALUES (-1,-2); + INSERT INTO t1 (b1,b2) VALUES (-1,-2); --sorted_result - SELECT * FROM t1; + SELECT b1,b2 FROM t1; --sorted_result SELECT IF(b1,'true','false') AS a, IF(b2,'true','false') AS b FROM t1; --sorted_result - SELECT * FROM t1 WHERE b1 = TRUE; + SELECT b1,b2 FROM t1 WHERE b1 = TRUE; --sorted_result - SELECT * FROM t1 WHERE b2 = FALSE; + SELECT b1,b2 FROM t1 WHERE b2 = FALSE; # Invalid values - INSERT INTO t1 VALUES ('a','b'); + INSERT INTO t1 (b1,b2) VALUES ('a','b'); --sorted_result - SELECT * FROM t1; + SELECT b1,b2 FROM t1; - INSERT INTO t1 VALUES (128,-129); + INSERT INTO t1 (b1,b2) VALUES (128,-129); --sorted_result - SELECT * FROM t1; + SELECT b1,b2 FROM t1; # This is why we don't have zerofill and unsigned tests # for boolean columns: diff --git a/mysql-test/suite/storage_engine/type_bool.result b/mysql-test/suite/storage_engine/type_bool.result index 89beaa11a16..87308ed63fc 100644 --- a/mysql-test/suite/storage_engine/type_bool.result +++ b/mysql-test/suite/storage_engine/type_bool.result @@ -6,23 +6,23 @@ SHOW COLUMNS IN t1; Field Type Null Key Default Extra b1 tinyint(1) # # # b2 tinyint(1) # # # -INSERT INTO t1 VALUES (1,TRUE); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (1,TRUE); +SELECT b1,b2 FROM t1; b1 b2 1 1 -INSERT INTO t1 VALUES (FALSE,0); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (FALSE,0); +SELECT b1,b2 FROM t1; b1 b2 0 0 1 1 -INSERT INTO t1 VALUES (2,3); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (2,3); +SELECT b1,b2 FROM t1; b1 b2 0 0 1 1 2 3 -INSERT INTO t1 VALUES (-1,-2); -SELECT * FROM t1; +INSERT INTO t1 (b1,b2) VALUES (-1,-2); +SELECT b1,b2 FROM t1; b1 b2 -1 -2 0 0 @@ -34,28 +34,28 @@ false false true true true true true true -SELECT * FROM t1 WHERE b1 = TRUE; +SELECT b1,b2 FROM t1 WHERE b1 = TRUE; b1 b2 1 1 -SELECT * FROM t1 WHERE b2 = FALSE; +SELECT b1,b2 FROM t1 WHERE b2 = FALSE; b1 b2 0 0 -INSERT INTO t1 VALUES ('a','b'); +INSERT INTO t1 (b1,b2) VALUES ('a','b'); Warnings: Warning 1366 Incorrect integer value: 'a' for column 'b1' at row 1 Warning 1366 Incorrect integer value: 'b' for column 'b2' at row 1 -SELECT * FROM t1; +SELECT b1,b2 FROM t1; b1 b2 -1 -2 0 0 0 0 1 1 2 3 -INSERT INTO t1 VALUES (128,-129); +INSERT INTO t1 (b1,b2) VALUES (128,-129); Warnings: Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b2' at row 1 -SELECT * FROM t1; +SELECT b1,b2 FROM t1; b1 b2 -1 -2 0 0 diff --git a/mysql-test/suite/storage_engine/type_char.inc b/mysql-test/suite/storage_engine/type_char.inc index 8484fc23b10..8e666299736 100644 --- a/mysql-test/suite/storage_engine/type_char.inc +++ b/mysql-test/suite/storage_engine/type_char.inc @@ -27,19 +27,19 @@ if (!$mysql_errname) # Valid values - INSERT INTO t1 VALUES ('','','','',''); - INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); + INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('','','','',''); + INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); --sorted_result - SELECT * FROM t1; + SELECT c,c0,c1,c20,c255 FROM t1; # Invalid values - INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); - INSERT INTO t1 SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1; + INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); + INSERT INTO t1 (c,c0,c1,c20,c255) SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1; --sorted_result - SELECT * FROM t1; + SELECT c,c0,c1,c20,c255 FROM t1; --sorted_result SELECT DISTINCT c20, REPEAT('a',LENGTH(c20)), COUNT(*) FROM t1 GROUP BY c1, c20; diff --git a/mysql-test/suite/storage_engine/type_char.result b/mysql-test/suite/storage_engine/type_char.result index 61d3cf2419d..ce6d6f11b19 100644 --- a/mysql-test/suite/storage_engine/type_char.result +++ b/mysql-test/suite/storage_engine/type_char.result @@ -12,20 +12,20 @@ c0 char(0) # # # c1 char(1) # # # c20 char(20) # # # c255 char(255) # # # -INSERT INTO t1 VALUES ('','','','',''); -INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); -SELECT * FROM t1; +INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('','','','',''); +INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.'); +SELECT c,c0,c1,c20,c255 FROM t1; c c0 c1 c20 c255 a b abcdefghi klmnopqrst Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn't already exist which would work. -INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); +INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256)); Warnings: Warning 1265 Data truncated for column 'c' at row 1 Warning 1265 Data truncated for column 'c0' at row 1 Warning 1265 Data truncated for column 'c1' at row 1 Warning 1265 Data truncated for column 'c20' at row 1 Warning 1265 Data truncated for column 'c255' at row 1 -INSERT INTO t1 SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1; +INSERT INTO t1 (c,c0,c1,c20,c255) SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1; Warnings: Warning 1265 Data truncated for column 'c' at row 2 Warning 1265 Data truncated for column 'c0' at row 2 @@ -36,7 +36,7 @@ Warning 1265 Data truncated for column 'c0' at row 3 Warning 1265 Data truncated for column 'c1' at row 3 Warning 1265 Data truncated for column 'c20' at row 3 Warning 1265 Data truncated for column 'c255' at row 3 -SELECT * FROM t1; +SELECT c,c0,c1,c20,c255 FROM t1; c c0 c1 c20 c255 diff --git a/mysql-test/suite/storage_engine/type_char_indexes.result b/mysql-test/suite/storage_engine/type_char_indexes.result index f02fcef3ef0..33594e2581f 100644 --- a/mysql-test/suite/storage_engine/type_char_indexes.result +++ b/mysql-test/suite/storage_engine/type_char_indexes.result @@ -96,10 +96,10 @@ varchar1b 2 varchar2b 1 varchar3b 1 SET SESSION optimizer_switch = 'engine_condition_pushdown=on'; -EXPLAIN SELECT * FROM t1 WHERE c > 'a'; +EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; id select_type table type possible_keys key key_len ref rows Extra # # # range c_v c_v # # # Using index condition -SELECT * FROM t1 WHERE c > 'a'; +SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; c c20 v16 v128 b char3 varchar1a varchar1b c char4 varchar3a varchar3b @@ -133,10 +133,10 @@ r1a r1a r2a r3a -EXPLAIN SELECT * FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; +EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; id select_type table type possible_keys key key_len ref rows Extra # # # range # v16 # # # # -SELECT * FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; +SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; c c20 v16 v128 a char1 varchar1a varchar1b b char3 varchar1a varchar1b diff --git a/mysql-test/suite/storage_engine/type_char_indexes.test b/mysql-test/suite/storage_engine/type_char_indexes.test index 582800eabba..6fff8a6f73e 100644 --- a/mysql-test/suite/storage_engine/type_char_indexes.test +++ b/mysql-test/suite/storage_engine/type_char_indexes.test @@ -135,9 +135,9 @@ if (!$mysql_errname) SET SESSION optimizer_switch = 'engine_condition_pushdown=on'; --replace_column 1 # 2 # 3 # 7 # 8 # 9 # - EXPLAIN SELECT * FROM t1 WHERE c > 'a'; + EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; --sorted_result - SELECT * FROM t1 WHERE c > 'a'; + SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; SET SESSION optimizer_switch = @@global.optimizer_switch; DROP TABLE t1; @@ -175,9 +175,9 @@ if (!$mysql_errname) SELECT SUBSTRING(v16,7,3) FROM t1 IGNORE INDEX (v16) WHERE v16 LIKE 'varchar%'; --replace_column 1 # 2 # 3 # 5 # 7 # 8 # 9 # 10 # - EXPLAIN SELECT * FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; + EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; --sorted_result - SELECT * FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; + SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/type_date_time.inc b/mysql-test/suite/storage_engine/type_date_time.inc index d0b953984be..29bfcf630f0 100644 --- a/mysql-test/suite/storage_engine/type_date_time.inc +++ b/mysql-test/suite/storage_engine/type_date_time.inc @@ -32,22 +32,22 @@ if (!$mysql_errname) # Valid values # '1970-01-01 00:00:01' - INSERT INTO t1 VALUES + INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES ('1000-01-01', '1000-01-01 00:00:00', FROM_UNIXTIME(1), '-838:59:59', '1901', '1901', '00'), ('9999-12-31', '9999-12-31 23:59:59', FROM_UNIXTIME(2147483647), '838:59:59', '2155', '2155', '99'), ('0000-00-00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '00:00:00', '0', '0', '0'), (DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm),YEAR(@tm),YEAR(@tm)); --sorted_result - SELECT * FROM t1; + SELECT d,dt,ts,t,y,y4,y2 FROM t1; # Invalid values - INSERT INTO t1 VALUES + INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' ); --sorted_result - SELECT * FROM t1; + SELECT d,dt,ts,t,y,y4,y2 FROM t1; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/type_date_time.result b/mysql-test/suite/storage_engine/type_date_time.result index 06b92d3149f..73c9a2ec7ed 100644 --- a/mysql-test/suite/storage_engine/type_date_time.result +++ b/mysql-test/suite/storage_engine/type_date_time.result @@ -19,18 +19,18 @@ y year(4) # # # y4 year(4) # # # y2 year(2) # # # SET @tm = '2012-04-09 05:27:00'; -INSERT INTO t1 VALUES +INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES ('1000-01-01', '1000-01-01 00:00:00', FROM_UNIXTIME(1), '-838:59:59', '1901', '1901', '00'), ('9999-12-31', '9999-12-31 23:59:59', FROM_UNIXTIME(2147483647), '838:59:59', '2155', '2155', '99'), ('0000-00-00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '00:00:00', '0', '0', '0'), (DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm),YEAR(@tm),YEAR(@tm)); -SELECT * FROM t1; +SELECT d,dt,ts,t,y,y4,y2 FROM t1; d dt ts t y y4 y2 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00 1000-01-01 1000-01-01 00:00:00 1970-01-01 03:00:01 -838:59:59 1901 1901 00 2012-04-09 2012-04-09 05:27:00 2012-04-09 05:27:00 05:27:00 2012 2012 12 9999-12-31 9999-12-31 23:59:59 2038-01-19 07:14:07 838:59:59 2155 2155 99 -INSERT INTO t1 VALUES +INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' ); Warnings: Warning 1265 Data truncated for column 'd' at row 1 @@ -40,7 +40,7 @@ Warning 1264 Out of range value for column 't' at row 1 Warning 1264 Out of range value for column 'y' at row 1 Warning 1264 Out of range value for column 'y4' at row 1 Warning 1264 Out of range value for column 'y2' at row 1 -SELECT * FROM t1; +SELECT d,dt,ts,t,y,y4,y2 FROM t1; d dt ts t y y4 y2 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 -838:59:59 0000 0000 00 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00 diff --git a/mysql-test/suite/storage_engine/type_enum.inc b/mysql-test/suite/storage_engine/type_enum.inc index 6b9b83fc52e..2e747e50ef4 100644 --- a/mysql-test/suite/storage_engine/type_enum.inc +++ b/mysql-test/suite/storage_engine/type_enum.inc @@ -28,16 +28,16 @@ if (!$mysql_errname) --replace_column 3 # 4 # 5 # SHOW COLUMNS IN t1; - INSERT INTO t1 VALUES ('','test2','4'),('',5,2); + INSERT INTO t1 (a,b,c) VALUES ('','test2','4'),('',5,2); --sorted_result - SELECT * FROM t1; + SELECT a,b,c FROM t1; # Out of range values # (should produce warnings) - INSERT INTO t1 VALUES (0,'test6',-1); + INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1); --sorted_result - SELECT * FROM t1; + SELECT a,b,c FROM t1; # Non-unique values in enum # (should produce a warning) @@ -53,14 +53,14 @@ if (!$mysql_errname) --replace_column 3 # 4 # 5 # SHOW COLUMNS IN t1; - INSERT INTO t1 VALUES ('','test3','75','A'); + INSERT INTO t1 (a,b,c,e) VALUES ('','test3','75','A'); --sorted_result - SELECT * FROM t1; + SELECT a,b,c,e FROM t1; # Simple comparison --sorted_result - SELECT * FROM t1 WHERE b='test2' OR a != ''; + SELECT a,b,c,e FROM t1 WHERE b='test2' OR a != ''; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/type_enum.result b/mysql-test/suite/storage_engine/type_enum.result index 920aa5c7807..c2efd87ffb7 100644 --- a/mysql-test/suite/storage_engine/type_enum.result +++ b/mysql-test/suite/storage_engine/type_enum.result @@ -8,17 +8,17 @@ Field Type Null Key Default Extra a enum('') # # # b enum('test1','test2','test3','test4','test5') # # # c enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75') # # # -INSERT INTO t1 VALUES ('','test2','4'),('',5,2); -SELECT * FROM t1; +INSERT INTO t1 (a,b,c) VALUES ('','test2','4'),('',5,2); +SELECT a,b,c FROM t1; a b c test2 4 test5 2 -INSERT INTO t1 VALUES (0,'test6',-1); +INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1); Warnings: Warning 1265 Data truncated for column 'a' at row 1 Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c FROM t1; a b c test2 4 @@ -33,14 +33,14 @@ a enum('') # # # b enum('test1','test2','test3','test4','test5') # # # c enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75') # # # e enum('a','A') # # # -INSERT INTO t1 VALUES ('','test3','75','A'); -SELECT * FROM t1; +INSERT INTO t1 (a,b,c,e) VALUES ('','test3','75','A'); +SELECT a,b,c,e FROM t1; a b c e NULL test2 4 NULL test3 75 a test5 2 NULL -SELECT * FROM t1 WHERE b='test2' OR a != ''; +SELECT a,b,c,e FROM t1 WHERE b='test2' OR a != ''; a b c e test2 4 NULL DROP TABLE t1; diff --git a/mysql-test/suite/storage_engine/type_fixed.inc b/mysql-test/suite/storage_engine/type_fixed.inc index 6765fb575bc..3b4ade9ff6d 100644 --- a/mysql-test/suite/storage_engine/type_fixed.inc +++ b/mysql-test/suite/storage_engine/type_fixed.inc @@ -32,40 +32,40 @@ if (!$mysql_errname) # Always valid values - INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); - INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); - INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); + INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); + INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0); + INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); --sorted_result - SELECT * FROM t1; + SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; # Values which can be valid or not, # depending on whether columns are SIGNED or UNSIGNED # (if not valid should produce warnings) - INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); - INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); + INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); + INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); --sorted_result - SELECT * FROM t1; + SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; --sorted_result - SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; + SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; # Invalid values - INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); + INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); --sorted_result - SELECT * FROM t1; + SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; - INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); + INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); --sorted_result - SELECT * FROM t1; + SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; - INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); + INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); --sorted_result - SELECT * FROM t1; + SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; --let $error_codes = ER_TOO_BIG_PRECISION --let $alter_definition = ADD COLUMN n66 NUMERIC(66) diff --git a/mysql-test/suite/storage_engine/type_fixed.result b/mysql-test/suite/storage_engine/type_fixed.result index 2c1566538db..5eea911a323 100644 --- a/mysql-test/suite/storage_engine/type_fixed.result +++ b/mysql-test/suite/storage_engine/type_fixed.result @@ -22,30 +22,30 @@ n0_0 decimal(10,0) # # # n1 decimal(1,0) # # # n20_4 decimal(20,4) # # # n65_4 decimal(65,4) # # # -INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); -SELECT * FROM t1; +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999); +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); -INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); -SELECT * FROM t1; +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999); +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 0 0 0.0 0.00 0.0000000000 0 0 0 0.0000 0.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 ); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -56,7 +56,7 @@ Warning 1264 Out of range value for column 'n' at row 1 Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 @@ -64,7 +64,7 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 100 123456 0.3 40000.25 123456789123456789.1000100000 1024 7000 8 999999.9000 9223372036854775807.0000 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999); Warnings: Warning 1264 Out of range value for column 'd' at row 1 Warning 1264 Out of range value for column 'd0' at row 1 @@ -76,7 +76,7 @@ Warning 1264 Out of range value for column 'n0_0' at row 1 Warning 1264 Out of range value for column 'n1' at row 1 Warning 1264 Out of range value for column 'n20_4' at row 1 Warning 1264 Out of range value for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 @@ -85,7 +85,7 @@ d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 9999999999 9999999999 0.9 99999999.99 99999999999999999999999999999999999999999999999999.9999999999 9999999999 9999999999 9 9999999999999999.9999 9999999999999999999999999999999999999999999999999999999999999.9999 -INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); +INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111); Warnings: Note 1265 Data truncated for column 'd' at row 1 Note 1265 Data truncated for column 'd0' at row 1 @@ -97,7 +97,7 @@ Note 1265 Data truncated for column 'n0_0' at row 1 Note 1265 Data truncated for column 'n1' at row 1 Note 1265 Data truncated for column 'n20_4' at row 1 Note 1265 Data truncated for column 'n65_4' at row 1 -SELECT * FROM t1; +SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1; d d0 d1_1 d10_2 d60_10 n n0_0 n1 n20_4 n65_4 -100 -123456 -0.3 -40000.25 -123456789123456789.1000100000 -1024 -7000 -8 -999999.9000 -9223372036854775807.0000 -9999999999 -9999999999 -0.9 -99999999.99 -99999999999999999999999999999999999999999999999999.9999999999 -9999999999 -9999999999 -9 -9999999999999999.9999 -9999999999999999999999999999999999999999999999999999999999999.9999 diff --git a/mysql-test/suite/storage_engine/type_float.inc b/mysql-test/suite/storage_engine/type_float.inc index 7e355f01e0d..1b8f0102755 100644 --- a/mysql-test/suite/storage_engine/type_float.inc +++ b/mysql-test/suite/storage_engine/type_float.inc @@ -32,13 +32,13 @@ if (!$mysql_errname) # Always valid values - INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); + INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); --sorted_result - --query_vertical SELECT * FROM t1 + --query_vertical SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1 - INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); - INSERT INTO t1 VALUES ( + INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0); + INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 99999999999999999999999999999999999999, 99999999999999999999999999999999999999.9999999999999999, 0.9, @@ -52,28 +52,28 @@ if (!$mysql_errname) ); --sorted_result - --query_vertical SELECT * FROM t1 + --query_vertical SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1 # Values which can be valid or not, # depending on whether columns are SIGNED or UNSIGNED # (if not valid should produce warnings) - INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); + INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); --sorted_result - --query_vertical SELECT * FROM t1 + --query_vertical SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1 --sorted_result --query_vertical SELECT MAX(f), MAX(f0), MAX(r1_1), MAX(f23_0), MAX(f20_3), MAX(d), MAX(d1_0), MAX(d10_10), MAX(d53), MAX(d53_10) FROM t1 # Invalid values - INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; + INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; --sorted_result - --query_vertical SELECT * FROM t1 + --query_vertical SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1 - INSERT INTO t1 VALUES ( + INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 999999999999999999999999999999999999999, 999999999999999999999999999999999999999.9999999999999999, 1.9, @@ -87,7 +87,7 @@ if (!$mysql_errname) ); --sorted_result - --query_vertical SELECT * FROM t1 + --query_vertical SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1 --let $error_codes = ER_TOO_BIG_DISPLAYWIDTH --let $alter_definition = ADD COLUMN d0_0 DOUBLE(0,0) diff --git a/mysql-test/suite/storage_engine/type_float.result b/mysql-test/suite/storage_engine/type_float.result index 1f863505430..5cd76673a3c 100644 --- a/mysql-test/suite/storage_engine/type_float.result +++ b/mysql-test/suite/storage_engine/type_float.result @@ -22,8 +22,8 @@ d1_0 double(1,0) # # # d10_10 double(10,10) # # # d53 double(53,0) # # # d53_10 double(53,10) # # # -INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); -SELECT * FROM t1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999); +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 11111111.111 d10_10 0.0123456789 @@ -34,8 +34,8 @@ f0 12345.1 f20_3 56789.988 f23_0 123457000 r1_1 0.9 -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES ( +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 99999999999999999999999999999999999999, 99999999999999999999999999999999999999.9999999999999999, 0.9, @@ -50,7 +50,7 @@ INSERT INTO t1 VALUES ( Warnings: Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d 0 d 11111111.111 @@ -81,8 +81,8 @@ f23_0 1e38 r1_1 0.0 r1_1 0.9 r1_1 0.9 -INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); -SELECT * FROM t1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999); +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d -1e60 d 0 @@ -134,7 +134,7 @@ MAX(f0) 9.999999680285692e37 MAX(f20_3) 99999998430674940.000 MAX(f23_0) 9.999999680285692e37 MAX(r1_1) 0.9 -INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1; Warnings: Warning 1264 Out of range value for column 'f' at row 1 Warning 1264 Out of range value for column 'f0' at row 1 @@ -142,7 +142,7 @@ Warning 1264 Out of range value for column 'r1_1' at row 1 Warning 1264 Out of range value for column 'f23_0' at row 1 Warning 1264 Out of range value for column 'f20_3' at row 1 Warning 1264 Out of range value for column 'd1_0' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d -1e60 d 0 @@ -193,7 +193,7 @@ r1_1 0.0 r1_1 0.9 r1_1 0.9 r1_1 0.9 -INSERT INTO t1 VALUES ( +INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES ( 999999999999999999999999999999999999999, 999999999999999999999999999999999999999.9999999999999999, 1.9, @@ -216,7 +216,7 @@ Warning 1264 Out of range value for column 'd1_0' at row 1 Warning 1264 Out of range value for column 'd10_10' at row 1 Warning 1264 Out of range value for column 'd53' at row 1 Warning 1264 Out of range value for column 'd53_10' at row 1 -SELECT * FROM t1; +SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1; f 12345.1 d -1e60 d 0 diff --git a/mysql-test/suite/storage_engine/type_int.inc b/mysql-test/suite/storage_engine/type_int.inc index 5aaea78fcd5..058b18a24d5 100644 --- a/mysql-test/suite/storage_engine/type_int.inc +++ b/mysql-test/suite/storage_engine/type_int.inc @@ -42,32 +42,32 @@ if (!$mysql_errname) # Always valid values - INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); - INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); - INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); + INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); + INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); + INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); --sorted_result - SELECT * FROM t1; + SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; # Values which can be valid or not, # depending on whether columns are SIGNED or UNSIGNED # (if not valid should produce warnings) - INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); - INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); + INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); + INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); --sorted_result - SELECT * FROM t1; + SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; # Invalid values - INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); + INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); - INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); + INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); - INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); + INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); --sorted_result - SELECT * FROM t1; + SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; --let $error_codes = ER_TOO_BIG_DISPLAYWIDTH --let $alter_definition = ADD COLUMN i257 INT(257) diff --git a/mysql-test/suite/storage_engine/type_int.result b/mysql-test/suite/storage_engine/type_int.result index 47f4ebad93a..8f462648a6a 100644 --- a/mysql-test/suite/storage_engine/type_int.result +++ b/mysql-test/suite/storage_engine/type_int.result @@ -42,16 +42,16 @@ b bigint(20) # # # b0 bigint(20) # # # b1 bigint(1) # # # b20 bigint(20) # # # -INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); -INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); -INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); -SELECT * FROM t1; +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807); +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 -INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); -INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -73,14 +73,14 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -SELECT * FROM t1; +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 -2147483648 -2147483648 -2147483648 -2147483648 -128 -128 -128 -128 -32768 -32768 -32768 -32768 -8388608 -8388608 -8388608 -8388608 -9223372036854775808 -9223372036854775808 -9223372036854775808 -9223372036854775808 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 2147483647 2147483647 2147483647 2147483647 127 127 127 127 32767 32767 32767 32767 8388607 8388607 8388607 8388607 9223372036854775807 9223372036854775807 9223372036854775807 9223372036854775807 -INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -102,7 +102,7 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -124,7 +124,7 @@ Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b0' at row 1 Warning 1264 Out of range value for column 'b1' at row 1 Warning 1264 Out of range value for column 'b20' at row 1 -INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); +INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615); Warnings: Warning 1264 Out of range value for column 'i' at row 1 Warning 1264 Out of range value for column 'i0' at row 1 @@ -190,7 +190,7 @@ Warning 1264 Out of range value for column 'm' at row 4 Warning 1264 Out of range value for column 'm0' at row 4 Warning 1264 Out of range value for column 'm1' at row 4 Warning 1264 Out of range value for column 'm20' at row 4 -SELECT * FROM t1; +SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1; i i0 i1 i20 t t0 t1 t20 s s0 s1 s20 m m0 m1 m20 b b0 b1 b20 -2147483648 -2147483648 -2147483648 -2147483648 -128 -128 -128 -128 -32768 -32768 -32768 -32768 -8388608 -8388608 -8388608 -8388608 -9223372036854775808 -9223372036854775808 -9223372036854775808 -9223372036854775808 -2147483648 -2147483648 -2147483648 -2147483648 -128 -128 -128 -128 -32768 -32768 -32768 -32768 -8388608 -8388608 -8388608 -8388608 -9223372036854775808 -9223372036854775808 -9223372036854775808 -9223372036854775808 diff --git a/mysql-test/suite/storage_engine/type_set.inc b/mysql-test/suite/storage_engine/type_set.inc index b4844b00ec7..bc927cf8014 100644 --- a/mysql-test/suite/storage_engine/type_set.inc +++ b/mysql-test/suite/storage_engine/type_set.inc @@ -25,19 +25,19 @@ if (!$mysql_errname) --replace_column 3 # 4 # 5 # SHOW COLUMNS IN t1; - INSERT INTO t1 VALUES + INSERT INTO t1 (a,b,c) VALUES ('','test2,test3','01,34,44,,23'), ('',5,2), (',','test4,test2',''); --sorted_result - SELECT * FROM t1; + SELECT a,b,c FROM t1; # Out of range values # (should produce warnings) - INSERT INTO t1 VALUES (0,'test6',-1); + INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1); --sorted_result - SELECT * FROM t1; + SELECT a,b,c FROM t1; # Non-unique values in set # (should produce a warning) @@ -62,7 +62,7 @@ if (!$mysql_errname) # Simple comparison --sorted_result - SELECT * FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != ''; + SELECT a,b,c,e FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != ''; DROP TABLE t1; } diff --git a/mysql-test/suite/storage_engine/type_set.result b/mysql-test/suite/storage_engine/type_set.result index 210b07748bc..2248ce9f7e0 100644 --- a/mysql-test/suite/storage_engine/type_set.result +++ b/mysql-test/suite/storage_engine/type_set.result @@ -8,22 +8,22 @@ Field Type Null Key Default Extra a set('') # # # b set('test1','test2','test3','test4','test5') # # # c set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50''51','52','53','54','55','56','57','58','59','60','61','62','63','64') # # # -INSERT INTO t1 VALUES +INSERT INTO t1 (a,b,c) VALUES ('','test2,test3','01,34,44,,23'), ('',5,2), (',','test4,test2',''); Warnings: Warning 1265 Data truncated for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c FROM t1; a b c test1,test3 02 test2,test3 01,23,34,44 test2,test4 -INSERT INTO t1 VALUES (0,'test6',-1); +INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1); Warnings: Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'c' at row 1 -SELECT * FROM t1; +SELECT a,b,c FROM t1; a b c 01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50'51,52,53,54,55,56,57,58,59,60,61,62,63,64 test1,test3 02 @@ -41,7 +41,7 @@ c set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15' e set('a','A') # # # ALTER TABLE t1 ADD COLUMN f SET('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',' ','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i') ; ERROR HY000: Too many strings for column f and SET -SELECT * FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != ''; +SELECT a,b,c,e FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != ''; a b c e test2,test3 01,23,34,44 NULL test2,test4 NULL diff --git a/mysql-test/suite/storage_engine/type_spatial.inc b/mysql-test/suite/storage_engine/type_spatial.inc index 5195f779bcc..212786d60bf 100644 --- a/mysql-test/suite/storage_engine/type_spatial.inc +++ b/mysql-test/suite/storage_engine/type_spatial.inc @@ -372,50 +372,50 @@ if (!$mysql_errname) SHOW FIELDS FROM gis_geometrycollection; SHOW FIELDS FROM gis_geometry; - INSERT INTO gis_point VALUES + INSERT INTO gis_point (fid,g) VALUES (101, PointFromText('POINT(10 10)')), (102, PointFromText('POINT(20 10)')), (103, PointFromText('POINT(20 20)')), (104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); - INSERT INTO gis_line VALUES + INSERT INTO gis_line (fid,g) VALUES (105, LineFromText('LINESTRING(0 0,0 10,10 0)')), (106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), (107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); - INSERT INTO gis_polygon VALUES + INSERT INTO gis_polygon (fid,g) VALUES (108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), (109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), (110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); - INSERT INTO gis_multi_point VALUES + INSERT INTO gis_multi_point (fid,g) VALUES (111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), (112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), (113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); - INSERT INTO gis_multi_line VALUES + INSERT INTO gis_multi_line (fid,g) VALUES (114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), (115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), (116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); - INSERT INTO gis_multi_polygon VALUES + INSERT INTO gis_multi_polygon (fid,g) VALUES (117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); - INSERT INTO gis_geometrycollection VALUES + INSERT INTO gis_geometrycollection (fid,g) VALUES (120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), (121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), (122, GeomFromText('GeometryCollection()')), (123, GeomFromText('GeometryCollection EMPTY')); - INSERT into gis_geometry SELECT * FROM gis_point; - INSERT into gis_geometry SELECT * FROM gis_line; - INSERT into gis_geometry SELECT * FROM gis_polygon; - INSERT into gis_geometry SELECT * FROM gis_multi_point; - INSERT into gis_geometry SELECT * FROM gis_multi_line; - INSERT into gis_geometry SELECT * FROM gis_multi_polygon; - INSERT into gis_geometry SELECT * FROM gis_geometrycollection; + INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_point; + INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_line; + INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_polygon; + INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_point; + INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_line; + INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_polygon; + INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_geometrycollection; SELECT fid, AsText(g) FROM gis_point; SELECT fid, AsText(g) FROM gis_line; @@ -475,7 +475,7 @@ if (!$mysql_errname) USE gis_ogs; --echo # Lakes - INSERT INTO lakes VALUES ( + INSERT INTO lakes (fid,name,shore) VALUES ( 101, 'BLUE LAKE', PolyFromText( 'POLYGON( @@ -486,37 +486,37 @@ if (!$mysql_errname) --echo # Road Segments - INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2, + INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(102, 'Route 5', NULL, 2, LineFromText( 'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); - INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4, + INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(103, 'Route 5', 'Main Street', 4, LineFromText( 'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); - INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2, + INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(104, 'Route 5', NULL, 2, LineFromText( 'LINESTRING( 70 38, 72 48 )' ,101)); - INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4, + INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(105, 'Main Street', NULL, 4, LineFromText( 'LINESTRING( 70 38, 84 42 )' ,101)); - INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, + INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(106, 'Dirt Road by Green Forest', NULL, 1, LineFromText( 'LINESTRING( 28 26, 28 0 )',101)); --echo # DividedRoutes - INSERT INTO divided_routes VALUES(119, 'Route 75', 4, + INSERT INTO divided_routes (fid,name,num_lanes,centerlines) VALUES(119, 'Route 75', 4, MLineFromText( 'MULTILINESTRING((10 48,10 21,10 0), (16 0,16 23,16 48))', 101)); --echo # Forests - INSERT INTO forests VALUES(109, 'Green Forest', + INSERT INTO forests (fid,name,boundary) VALUES(109, 'Green Forest', MPolyFromText( 'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', @@ -524,28 +524,28 @@ if (!$mysql_errname) --echo # Bridges - INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText( + INSERT INTO bridges (fid,name,position) VALUES(110, 'Cam Bridge', PointFromText( 'POINT( 44 31 )', 101)); --echo # Streams - INSERT INTO streams VALUES(111, 'Cam Stream', + INSERT INTO streams (fid,name,centerline) VALUES(111, 'Cam Stream', LineFromText( 'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); - INSERT INTO streams VALUES(112, NULL, + INSERT INTO streams (fid,name,centerline) VALUES(112, NULL, LineFromText( 'LINESTRING( 76 0, 78 4, 73 9 )', 101)); --echo # Buildings - INSERT INTO buildings VALUES(113, '123 Main Street', + INSERT INTO buildings (fid,name,position,footprint) VALUES(113, '123 Main Street', PointFromText( 'POINT( 52 30 )', 101), PolyFromText( 'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); - INSERT INTO buildings VALUES(114, '215 Main Street', + INSERT INTO buildings (fid,name,position,footprint) VALUES(114, '215 Main Street', PointFromText( 'POINT( 64 33 )', 101), PolyFromText( @@ -554,24 +554,24 @@ if (!$mysql_errname) --echo # Ponds - INSERT INTO ponds VALUES(120, NULL, 'Stock Pond', + INSERT INTO ponds (fid,name,type,shores) VALUES(120, NULL, 'Stock Pond', MPolyFromText( 'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); --echo # Named Places - INSERT INTO named_places VALUES(117, 'Ashton', + INSERT INTO named_places (fid,name,boundary) VALUES(117, 'Ashton', PolyFromText( 'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); - INSERT INTO named_places VALUES(118, 'Goose Island', + INSERT INTO named_places (fid,name,boundary) VALUES(118, 'Goose Island', PolyFromText( 'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); --echo # Map Neatlines - INSERT INTO map_neatlines VALUES(115, + INSERT INTO map_neatlines (fid,neatline) VALUES(115, PolyFromText( 'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); diff --git a/mysql-test/suite/storage_engine/type_spatial.result b/mysql-test/suite/storage_engine/type_spatial.result index c6b856ab8b0..94e3b22fd3c 100644 --- a/mysql-test/suite/storage_engine/type_spatial.result +++ b/mysql-test/suite/storage_engine/type_spatial.result @@ -77,43 +77,43 @@ SHOW FIELDS FROM gis_geometry; Field Type Null Key Default Extra fid int(11) YES NULL g geometry YES NULL -INSERT INTO gis_point VALUES +INSERT INTO gis_point (fid,g) VALUES (101, PointFromText('POINT(10 10)')), (102, PointFromText('POINT(20 10)')), (103, PointFromText('POINT(20 20)')), (104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); -INSERT INTO gis_line VALUES +INSERT INTO gis_line (fid,g) VALUES (105, LineFromText('LINESTRING(0 0,0 10,10 0)')), (106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), (107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); -INSERT INTO gis_polygon VALUES +INSERT INTO gis_polygon (fid,g) VALUES (108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), (109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), (110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); -INSERT INTO gis_multi_point VALUES +INSERT INTO gis_multi_point (fid,g) VALUES (111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), (112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), (113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); -INSERT INTO gis_multi_line VALUES +INSERT INTO gis_multi_line (fid,g) VALUES (114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), (115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), (116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); -INSERT INTO gis_multi_polygon VALUES +INSERT INTO gis_multi_polygon (fid,g) VALUES (117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); -INSERT INTO gis_geometrycollection VALUES +INSERT INTO gis_geometrycollection (fid,g) VALUES (120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), (121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), (122, GeomFromText('GeometryCollection()')), (123, GeomFromText('GeometryCollection EMPTY')); -INSERT into gis_geometry SELECT * FROM gis_point; -INSERT into gis_geometry SELECT * FROM gis_line; -INSERT into gis_geometry SELECT * FROM gis_polygon; -INSERT into gis_geometry SELECT * FROM gis_multi_point; -INSERT into gis_geometry SELECT * FROM gis_multi_line; -INSERT into gis_geometry SELECT * FROM gis_multi_polygon; -INSERT into gis_geometry SELECT * FROM gis_geometrycollection; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_point; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_line; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_polygon; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_point; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_line; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_polygon; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_geometrycollection; SELECT fid, AsText(g) FROM gis_point; fid AsText(g) 101 POINT(10 10) @@ -431,7 +431,7 @@ first second w c o e d t i r DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; USE gis_ogs; # Lakes -INSERT INTO lakes VALUES ( +INSERT INTO lakes (fid,name,shore) VALUES ( 101, 'BLUE LAKE', PolyFromText( 'POLYGON( @@ -440,68 +440,68 @@ PolyFromText( )', 101)); # Road Segments -INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(102, 'Route 5', NULL, 2, LineFromText( 'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); -INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(103, 'Route 5', 'Main Street', 4, LineFromText( 'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); -INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(104, 'Route 5', NULL, 2, LineFromText( 'LINESTRING( 70 38, 72 48 )' ,101)); -INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(105, 'Main Street', NULL, 4, LineFromText( 'LINESTRING( 70 38, 84 42 )' ,101)); -INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(106, 'Dirt Road by Green Forest', NULL, 1, LineFromText( 'LINESTRING( 28 26, 28 0 )',101)); # DividedRoutes -INSERT INTO divided_routes VALUES(119, 'Route 75', 4, +INSERT INTO divided_routes (fid,name,num_lanes,centerlines) VALUES(119, 'Route 75', 4, MLineFromText( 'MULTILINESTRING((10 48,10 21,10 0), (16 0,16 23,16 48))', 101)); # Forests -INSERT INTO forests VALUES(109, 'Green Forest', +INSERT INTO forests (fid,name,boundary) VALUES(109, 'Green Forest', MPolyFromText( 'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', 101)); # Bridges -INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText( +INSERT INTO bridges (fid,name,position) VALUES(110, 'Cam Bridge', PointFromText( 'POINT( 44 31 )', 101)); # Streams -INSERT INTO streams VALUES(111, 'Cam Stream', +INSERT INTO streams (fid,name,centerline) VALUES(111, 'Cam Stream', LineFromText( 'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); -INSERT INTO streams VALUES(112, NULL, +INSERT INTO streams (fid,name,centerline) VALUES(112, NULL, LineFromText( 'LINESTRING( 76 0, 78 4, 73 9 )', 101)); # Buildings -INSERT INTO buildings VALUES(113, '123 Main Street', +INSERT INTO buildings (fid,name,position,footprint) VALUES(113, '123 Main Street', PointFromText( 'POINT( 52 30 )', 101), PolyFromText( 'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); -INSERT INTO buildings VALUES(114, '215 Main Street', +INSERT INTO buildings (fid,name,position,footprint) VALUES(114, '215 Main Street', PointFromText( 'POINT( 64 33 )', 101), PolyFromText( 'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101)); # Ponds -INSERT INTO ponds VALUES(120, NULL, 'Stock Pond', +INSERT INTO ponds (fid,name,type,shores) VALUES(120, NULL, 'Stock Pond', MPolyFromText( 'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); # Named Places -INSERT INTO named_places VALUES(117, 'Ashton', +INSERT INTO named_places (fid,name,boundary) VALUES(117, 'Ashton', PolyFromText( 'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); -INSERT INTO named_places VALUES(118, 'Goose Island', +INSERT INTO named_places (fid,name,boundary) VALUES(118, 'Goose Island', PolyFromText( 'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); # Map Neatlines -INSERT INTO map_neatlines VALUES(115, +INSERT INTO map_neatlines (fid,neatline) VALUES(115, PolyFromText( 'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); SELECT Dimension(shore) diff --git a/mysql-test/suite/storage_engine/type_spatial_indexes.result b/mysql-test/suite/storage_engine/type_spatial_indexes.result index a3c2a4d4e75..cebcb80d14f 100644 --- a/mysql-test/suite/storage_engine/type_spatial_indexes.result +++ b/mysql-test/suite/storage_engine/type_spatial_indexes.result @@ -77,43 +77,43 @@ SHOW FIELDS FROM gis_geometry; Field Type Null Key Default Extra fid int(11) YES NULL g geometry YES NULL -INSERT INTO gis_point VALUES +INSERT INTO gis_point (fid,g) VALUES (101, PointFromText('POINT(10 10)')), (102, PointFromText('POINT(20 10)')), (103, PointFromText('POINT(20 20)')), (104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); -INSERT INTO gis_line VALUES +INSERT INTO gis_line (fid,g) VALUES (105, LineFromText('LINESTRING(0 0,0 10,10 0)')), (106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), (107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); -INSERT INTO gis_polygon VALUES +INSERT INTO gis_polygon (fid,g) VALUES (108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), (109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), (110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); -INSERT INTO gis_multi_point VALUES +INSERT INTO gis_multi_point (fid,g) VALUES (111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), (112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), (113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); -INSERT INTO gis_multi_line VALUES +INSERT INTO gis_multi_line (fid,g) VALUES (114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), (115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), (116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); -INSERT INTO gis_multi_polygon VALUES +INSERT INTO gis_multi_polygon (fid,g) VALUES (117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); -INSERT INTO gis_geometrycollection VALUES +INSERT INTO gis_geometrycollection (fid,g) VALUES (120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), (121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), (122, GeomFromText('GeometryCollection()')), (123, GeomFromText('GeometryCollection EMPTY')); -INSERT into gis_geometry SELECT * FROM gis_point; -INSERT into gis_geometry SELECT * FROM gis_line; -INSERT into gis_geometry SELECT * FROM gis_polygon; -INSERT into gis_geometry SELECT * FROM gis_multi_point; -INSERT into gis_geometry SELECT * FROM gis_multi_line; -INSERT into gis_geometry SELECT * FROM gis_multi_polygon; -INSERT into gis_geometry SELECT * FROM gis_geometrycollection; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_point; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_line; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_polygon; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_point; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_line; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_polygon; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_geometrycollection; SELECT fid, AsText(g) FROM gis_point; fid AsText(g) 101 POINT(10 10) @@ -431,7 +431,7 @@ first second w c o e d t i r DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; USE gis_ogs; # Lakes -INSERT INTO lakes VALUES ( +INSERT INTO lakes (fid,name,shore) VALUES ( 101, 'BLUE LAKE', PolyFromText( 'POLYGON( @@ -440,68 +440,68 @@ PolyFromText( )', 101)); # Road Segments -INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(102, 'Route 5', NULL, 2, LineFromText( 'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); -INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(103, 'Route 5', 'Main Street', 4, LineFromText( 'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); -INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(104, 'Route 5', NULL, 2, LineFromText( 'LINESTRING( 70 38, 72 48 )' ,101)); -INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(105, 'Main Street', NULL, 4, LineFromText( 'LINESTRING( 70 38, 84 42 )' ,101)); -INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(106, 'Dirt Road by Green Forest', NULL, 1, LineFromText( 'LINESTRING( 28 26, 28 0 )',101)); # DividedRoutes -INSERT INTO divided_routes VALUES(119, 'Route 75', 4, +INSERT INTO divided_routes (fid,name,num_lanes,centerlines) VALUES(119, 'Route 75', 4, MLineFromText( 'MULTILINESTRING((10 48,10 21,10 0), (16 0,16 23,16 48))', 101)); # Forests -INSERT INTO forests VALUES(109, 'Green Forest', +INSERT INTO forests (fid,name,boundary) VALUES(109, 'Green Forest', MPolyFromText( 'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', 101)); # Bridges -INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText( +INSERT INTO bridges (fid,name,position) VALUES(110, 'Cam Bridge', PointFromText( 'POINT( 44 31 )', 101)); # Streams -INSERT INTO streams VALUES(111, 'Cam Stream', +INSERT INTO streams (fid,name,centerline) VALUES(111, 'Cam Stream', LineFromText( 'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); -INSERT INTO streams VALUES(112, NULL, +INSERT INTO streams (fid,name,centerline) VALUES(112, NULL, LineFromText( 'LINESTRING( 76 0, 78 4, 73 9 )', 101)); # Buildings -INSERT INTO buildings VALUES(113, '123 Main Street', +INSERT INTO buildings (fid,name,position,footprint) VALUES(113, '123 Main Street', PointFromText( 'POINT( 52 30 )', 101), PolyFromText( 'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); -INSERT INTO buildings VALUES(114, '215 Main Street', +INSERT INTO buildings (fid,name,position,footprint) VALUES(114, '215 Main Street', PointFromText( 'POINT( 64 33 )', 101), PolyFromText( 'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101)); # Ponds -INSERT INTO ponds VALUES(120, NULL, 'Stock Pond', +INSERT INTO ponds (fid,name,type,shores) VALUES(120, NULL, 'Stock Pond', MPolyFromText( 'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); # Named Places -INSERT INTO named_places VALUES(117, 'Ashton', +INSERT INTO named_places (fid,name,boundary) VALUES(117, 'Ashton', PolyFromText( 'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); -INSERT INTO named_places VALUES(118, 'Goose Island', +INSERT INTO named_places (fid,name,boundary) VALUES(118, 'Goose Island', PolyFromText( 'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); # Map Neatlines -INSERT INTO map_neatlines VALUES(115, +INSERT INTO map_neatlines (fid,neatline) VALUES(115, PolyFromText( 'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); SELECT Dimension(shore) @@ -777,43 +777,43 @@ SHOW FIELDS FROM gis_geometry; Field Type Null Key Default Extra fid int(11) YES NULL g geometry NO NULL -INSERT INTO gis_point VALUES +INSERT INTO gis_point (fid,g) VALUES (101, PointFromText('POINT(10 10)')), (102, PointFromText('POINT(20 10)')), (103, PointFromText('POINT(20 20)')), (104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); -INSERT INTO gis_line VALUES +INSERT INTO gis_line (fid,g) VALUES (105, LineFromText('LINESTRING(0 0,0 10,10 0)')), (106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), (107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); -INSERT INTO gis_polygon VALUES +INSERT INTO gis_polygon (fid,g) VALUES (108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), (109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), (110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); -INSERT INTO gis_multi_point VALUES +INSERT INTO gis_multi_point (fid,g) VALUES (111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), (112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), (113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); -INSERT INTO gis_multi_line VALUES +INSERT INTO gis_multi_line (fid,g) VALUES (114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), (115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), (116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); -INSERT INTO gis_multi_polygon VALUES +INSERT INTO gis_multi_polygon (fid,g) VALUES (117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); -INSERT INTO gis_geometrycollection VALUES +INSERT INTO gis_geometrycollection (fid,g) VALUES (120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), (121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), (122, GeomFromText('GeometryCollection()')), (123, GeomFromText('GeometryCollection EMPTY')); -INSERT into gis_geometry SELECT * FROM gis_point; -INSERT into gis_geometry SELECT * FROM gis_line; -INSERT into gis_geometry SELECT * FROM gis_polygon; -INSERT into gis_geometry SELECT * FROM gis_multi_point; -INSERT into gis_geometry SELECT * FROM gis_multi_line; -INSERT into gis_geometry SELECT * FROM gis_multi_polygon; -INSERT into gis_geometry SELECT * FROM gis_geometrycollection; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_point; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_line; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_polygon; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_point; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_line; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_polygon; +INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_geometrycollection; SELECT fid, AsText(g) FROM gis_point; fid AsText(g) 101 POINT(10 10) @@ -1131,7 +1131,7 @@ first second w c o e d t i r DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; USE gis_ogs; # Lakes -INSERT INTO lakes VALUES ( +INSERT INTO lakes (fid,name,shore) VALUES ( 101, 'BLUE LAKE', PolyFromText( 'POLYGON( @@ -1140,68 +1140,68 @@ PolyFromText( )', 101)); # Road Segments -INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(102, 'Route 5', NULL, 2, LineFromText( 'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); -INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(103, 'Route 5', 'Main Street', 4, LineFromText( 'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); -INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(104, 'Route 5', NULL, 2, LineFromText( 'LINESTRING( 70 38, 72 48 )' ,101)); -INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(105, 'Main Street', NULL, 4, LineFromText( 'LINESTRING( 70 38, 84 42 )' ,101)); -INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, +INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(106, 'Dirt Road by Green Forest', NULL, 1, LineFromText( 'LINESTRING( 28 26, 28 0 )',101)); # DividedRoutes -INSERT INTO divided_routes VALUES(119, 'Route 75', 4, +INSERT INTO divided_routes (fid,name,num_lanes,centerlines) VALUES(119, 'Route 75', 4, MLineFromText( 'MULTILINESTRING((10 48,10 21,10 0), (16 0,16 23,16 48))', 101)); # Forests -INSERT INTO forests VALUES(109, 'Green Forest', +INSERT INTO forests (fid,name,boundary) VALUES(109, 'Green Forest', MPolyFromText( 'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', 101)); # Bridges -INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText( +INSERT INTO bridges (fid,name,position) VALUES(110, 'Cam Bridge', PointFromText( 'POINT( 44 31 )', 101)); # Streams -INSERT INTO streams VALUES(111, 'Cam Stream', +INSERT INTO streams (fid,name,centerline) VALUES(111, 'Cam Stream', LineFromText( 'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); -INSERT INTO streams VALUES(112, NULL, +INSERT INTO streams (fid,name,centerline) VALUES(112, NULL, LineFromText( 'LINESTRING( 76 0, 78 4, 73 9 )', 101)); # Buildings -INSERT INTO buildings VALUES(113, '123 Main Street', +INSERT INTO buildings (fid,name,position,footprint) VALUES(113, '123 Main Street', PointFromText( 'POINT( 52 30 )', 101), PolyFromText( 'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); -INSERT INTO buildings VALUES(114, '215 Main Street', +INSERT INTO buildings (fid,name,position,footprint) VALUES(114, '215 Main Street', PointFromText( 'POINT( 64 33 )', 101), PolyFromText( 'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101)); # Ponds -INSERT INTO ponds VALUES(120, NULL, 'Stock Pond', +INSERT INTO ponds (fid,name,type,shores) VALUES(120, NULL, 'Stock Pond', MPolyFromText( 'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); # Named Places -INSERT INTO named_places VALUES(117, 'Ashton', +INSERT INTO named_places (fid,name,boundary) VALUES(117, 'Ashton', PolyFromText( 'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); -INSERT INTO named_places VALUES(118, 'Goose Island', +INSERT INTO named_places (fid,name,boundary) VALUES(118, 'Goose Island', PolyFromText( 'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); # Map Neatlines -INSERT INTO map_neatlines VALUES(115, +INSERT INTO map_neatlines (fid,neatline) VALUES(115, PolyFromText( 'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); SELECT Dimension(shore) diff --git a/mysql-test/suite/storage_engine/type_text.inc b/mysql-test/suite/storage_engine/type_text.inc index 0f31e91c776..86521e5fb1e 100644 --- a/mysql-test/suite/storage_engine/type_text.inc +++ b/mysql-test/suite/storage_engine/type_text.inc @@ -33,7 +33,7 @@ if (!$mysql_errname) # Valid values # (cannot get MAX for all columns due to max_allowed_packet limitations) - INSERT INTO t1 VALUES + INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES ('','','','','','','','','',''), ('a','b','c','d','e','f','g','h','i','j'), ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'), @@ -44,7 +44,7 @@ if (!$mysql_errname) # Invalid values (produce warnings, except for mediumtext and longtext columns for which the values are within limits) - INSERT INTO t1 VALUES + INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) ); --sorted_result diff --git a/mysql-test/suite/storage_engine/type_text.result b/mysql-test/suite/storage_engine/type_text.result index b3ca7a8d9da..88204e2235e 100644 --- a/mysql-test/suite/storage_engine/type_text.result +++ b/mysql-test/suite/storage_engine/type_text.result @@ -22,7 +22,7 @@ t17m longtext # # # tt tinytext # # # m mediumtext # # # l longtext # # # -INSERT INTO t1 VALUES +INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES ('','','','','','','','','',''), ('a','b','c','d','e','f','g','h','i','j'), ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'), @@ -33,7 +33,7 @@ LENGTH(t) LENGTH(t0) LENGTH(t1) LENGTH(t300) LENGTH(tm) LENGTH(t70k) LENGTH(t17m 1 1 1 1 1 1 1 1 1 1 5 5 5 5 5 5 5 5 5 6 65535 65535 255 65535 65535 1048576 1048576 255 1048576 1048576 -INSERT INTO t1 VALUES +INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) ); Warnings: Warning 1265 Data truncated for column 't' at row 1 diff --git a/mysql-test/suite/storage_engine/type_varchar.inc b/mysql-test/suite/storage_engine/type_varchar.inc index 472f74e0dd1..e2da3deba39 100644 --- a/mysql-test/suite/storage_engine/type_varchar.inc +++ b/mysql-test/suite/storage_engine/type_varchar.inc @@ -72,7 +72,7 @@ if (!$mysql_errname) o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. '); --sorted_result - SELECT * FROM t1; + SELECT v0,v1,v64,v65000 FROM t1; # Invalid values diff --git a/mysql-test/suite/storage_engine/type_varchar.result b/mysql-test/suite/storage_engine/type_varchar.result index 055c8dcd7ca..f5e9bb416fe 100644 --- a/mysql-test/suite/storage_engine/type_varchar.result +++ b/mysql-test/suite/storage_engine/type_varchar.result @@ -51,7 +51,7 @@ INSERT INTO t1 (v0,v1,v64,v65000) VALUES ('','y','Once there, double check that * MySQL 5.0 Certification Study Guide, By Paul DuBois, Stefan Hinz, Carsten Pedersen o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. '); -SELECT * FROM t1; +SELECT v0,v1,v64,v65000 FROM t1; v0 v1 v64 v65000 diff --git a/mysql-test/suite/storage_engine/update.result b/mysql-test/suite/storage_engine/update.result index 3b96558c7c5..a07a1b57a5c 100644 --- a/mysql-test/suite/storage_engine/update.result +++ b/mysql-test/suite/storage_engine/update.result @@ -3,7 +3,7 @@ CREATE TABLE t1 (a , b ) ENGINE= 100; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 NULL 1 NULL @@ -33,7 +33,7 @@ a b 5 NULL 5 NULL UPDATE t1 SET b = 'update' WHERE a <= 4 ORDER BY b DESC, a ASC LIMIT 1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 NULL 1 update diff --git a/mysql-test/suite/storage_engine/update.test b/mysql-test/suite/storage_engine/update.test index 4f892fa547d..ad36382f8be 100644 --- a/mysql-test/suite/storage_engine/update.test +++ b/mysql-test/suite/storage_engine/update.test @@ -24,16 +24,16 @@ if ($mysql_errname) if (!$mysql_errname) { --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; UPDATE t1 SET a=a-100, b=DEFAULT WHERE a>100; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; # ORDER BY and LIMIT UPDATE t1 SET b = 'update' WHERE a <= 4 ORDER BY b DESC, a ASC LIMIT 1; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; } # Cleanup diff --git a/mysql-test/suite/storage_engine/update_ignore.result b/mysql-test/suite/storage_engine/update_ignore.result index 26b7168196a..27e62c4f966 100644 --- a/mysql-test/suite/storage_engine/update_ignore.result +++ b/mysql-test/suite/storage_engine/update_ignore.result @@ -5,7 +5,7 @@ INSERT INTO t1 (a,b) SELECT a, b FROM t1; CREATE TABLE t2 (c , d ) ENGINE= ; INSERT INTO t2 (c,d) SELECT b, a FROM t1; UPDATE IGNORE t1 SET b = 'upd1' WHERE b IS NOT NULL ORDER BY a LIMIT 1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 1 upd1 @@ -23,7 +23,7 @@ UPDATE IGNORE t1, t2 SET b = 'upd2a', c = 'upd2b' WHERE c < b OR a != ( SELECT 1 UNION SELECT 2 ); Warnings: Warning 1242 Subquery returns more than 1 row -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 1 upd2a @@ -37,7 +37,7 @@ a b 4 upd2a 5 upd2a 5 upd2a -SELECT * FROM t2; +SELECT c,d FROM t2; c d upd2b 1 upd2b 1 diff --git a/mysql-test/suite/storage_engine/update_ignore.test b/mysql-test/suite/storage_engine/update_ignore.test index ddd4f7405a3..98f817b0e77 100644 --- a/mysql-test/suite/storage_engine/update_ignore.test +++ b/mysql-test/suite/storage_engine/update_ignore.test @@ -26,14 +26,14 @@ if ($mysql_errname) if (!$mysql_errname) { --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; UPDATE IGNORE t1, t2 SET b = 'upd2a', c = 'upd2b' WHERE c < b OR a != ( SELECT 1 UNION SELECT 2 ); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; --sorted_result - SELECT * FROM t2; + SELECT c,d FROM t2; } # Cleanup diff --git a/mysql-test/suite/storage_engine/update_low_prio.result b/mysql-test/suite/storage_engine/update_low_prio.result index 31a31b6be62..1e038103870 100644 --- a/mysql-test/suite/storage_engine/update_low_prio.result +++ b/mysql-test/suite/storage_engine/update_low_prio.result @@ -19,7 +19,7 @@ a+SLEEP(1) 11 12 connection default; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 21 foobar 22 b @@ -37,7 +37,7 @@ a+SLEEP(1) 21 22 connection default; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 41 foobar 42 b @@ -56,7 +56,7 @@ a+SLEEP(1) 41 42 connection default; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 71 foobar 72 b diff --git a/mysql-test/suite/storage_engine/update_low_prio.test b/mysql-test/suite/storage_engine/update_low_prio.test index 6c089c7172f..8cc1ad07d5c 100644 --- a/mysql-test/suite/storage_engine/update_low_prio.test +++ b/mysql-test/suite/storage_engine/update_low_prio.test @@ -76,7 +76,7 @@ if ($mysql_errname) } --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; # UPDATE LOW_PRIORITY @@ -107,7 +107,7 @@ SELECT a+SLEEP(1) FROM t1; --connection default --reap --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; SET LOW_PRIORITY_UPDATES = 1; @@ -152,7 +152,7 @@ if ($mysql_errname) --source unexpected_result.inc } --sorted_result -SELECT * FROM t1; +SELECT a,b FROM t1; --disconnect con1 --disconnect con2 diff --git a/mysql-test/suite/storage_engine/update_multi.result b/mysql-test/suite/storage_engine/update_multi.result index 42b2f239dd2..909cce8213d 100644 --- a/mysql-test/suite/storage_engine/update_multi.result +++ b/mysql-test/suite/storage_engine/update_multi.result @@ -5,7 +5,7 @@ INSERT INTO t1 (a,b) SELECT a, b FROM t1; CREATE TABLE t2 (c , d ) ENGINE= ; INSERT INTO t2 (c,d) SELECT b, a FROM t1; UPDATE t1, t2 SET t1.a = t2.d+100, t2.c = 'multi' WHERE c < b AND a + d != 1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 1 a @@ -19,7 +19,7 @@ a b 101 e 101 foobar 101 foobar -SELECT * FROM t2; +SELECT c,d FROM t2; c d foobar 10000 foobar 10000 @@ -34,7 +34,7 @@ multi 4 multi 5 multi 5 UPDATE t2, t1 SET t2.d = DEFAULT WHERE c = 'foobar' and b = c; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 a 1 a @@ -48,7 +48,7 @@ a b 101 e 101 foobar 101 foobar -SELECT * FROM t2; +SELECT c,d FROM t2; c d foobar NULL foobar NULL diff --git a/mysql-test/suite/storage_engine/update_multi.test b/mysql-test/suite/storage_engine/update_multi.test index 589a8319382..4820eb5df46 100644 --- a/mysql-test/suite/storage_engine/update_multi.test +++ b/mysql-test/suite/storage_engine/update_multi.test @@ -26,15 +26,15 @@ if ($mysql_errname) if (!$mysql_errname) { --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; --sorted_result - SELECT * FROM t2; + SELECT c,d FROM t2; UPDATE t2, t1 SET t2.d = DEFAULT WHERE c = 'foobar' and b = c; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; --sorted_result - SELECT * FROM t2; + SELECT c,d FROM t2; } # Cleanup diff --git a/mysql-test/suite/storage_engine/update_with_keys.result b/mysql-test/suite/storage_engine/update_with_keys.result index 8250f31a19e..ed62c96a5e6 100644 --- a/mysql-test/suite/storage_engine/update_with_keys.result +++ b/mysql-test/suite/storage_engine/update_with_keys.result @@ -5,7 +5,7 @@ UPDATE t1 SET a=100, b='f' WHERE b IN ('b','c'); UPDATE t1 SET b='m' WHERE b = 'f'; UPDATE t1 SET b='z' WHERE a < 2; UPDATE t1 SET b=''; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 100 @@ -25,7 +25,7 @@ ERROR 23000: Duplicate entry '205' for key 'a' # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). # If you got a difference in error message, just add it to rdiff file UPDATE t1 SET a=12345 ORDER BY a, b LIMIT 1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 12345 a 200 f @@ -51,7 +51,7 @@ ERROR 23000: Duplicate entry '4-d' for key 'a' # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). # If you got a difference in error message, just add it to rdiff file UPDATE t1 SET a=a+1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 101 a 2 a @@ -74,7 +74,7 @@ ERROR 23000: Duplicate entry '205' for key 'PRIMARY' # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). # If you got a difference in error message, just add it to rdiff file UPDATE t1 SET a=12345 ORDER BY a DESC, b LIMIT 1; -SELECT * FROM t1; +SELECT a,b FROM t1; a b 0 a 12345 e diff --git a/mysql-test/suite/storage_engine/update_with_keys.test b/mysql-test/suite/storage_engine/update_with_keys.test index 578ee3b3294..77843365cef 100644 --- a/mysql-test/suite/storage_engine/update_with_keys.test +++ b/mysql-test/suite/storage_engine/update_with_keys.test @@ -32,7 +32,7 @@ if (!$mysql_errname) UPDATE t1 SET b='z' WHERE a < 2; UPDATE t1 SET b=''; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; } DROP TABLE t1; } @@ -62,7 +62,7 @@ if (!$mysql_errname) --source check_errors.inc UPDATE t1 SET a=12345 ORDER BY a, b LIMIT 1; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; # We'll check that the next update causes an error, # but won't check the result because it might be different depending @@ -101,7 +101,7 @@ if (!$mysql_errname) --source check_errors.inc UPDATE t1 SET a=a+1; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; --let $error_codes = ER_DUP_ENTRY,ER_DUP_KEY UPDATE t1 SET b='z'; --source check_errors.inc @@ -135,7 +135,7 @@ if (!$mysql_errname) UPDATE t1 SET a=12345 ORDER BY a DESC, b LIMIT 1; --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; # We'll check that the next update causes an error, # but won't check the result because it might be different depending diff --git a/mysql-test/suite/storage_engine/vcol.result b/mysql-test/suite/storage_engine/vcol.result index bae7636f6cb..d51ab038576 100644 --- a/mysql-test/suite/storage_engine/vcol.result +++ b/mysql-test/suite/storage_engine/vcol.result @@ -9,7 +9,7 @@ INSERT INTO t1 (a,b) VALUES (3,3),(4,4); Warnings: Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' ignored -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 2 2 3 @@ -26,7 +26,7 @@ INSERT INTO t1 (a,b) VALUES (3,3),(4,4); Warnings: Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' ignored -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 2 2 3 @@ -43,7 +43,7 @@ INSERT INTO t1 (a,b) VALUES (3,3),(4,4); Warnings: Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' ignored -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 2 2 3 @@ -60,7 +60,7 @@ INSERT INTO t1 (a,b) VALUES (3,3),(4,4); Warnings: Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' ignored -SELECT * FROM t1; +SELECT a,b FROM t1; a b 1 2 2 3 diff --git a/mysql-test/suite/storage_engine/vcol.test b/mysql-test/suite/storage_engine/vcol.test index 90819ffbd47..e6257ab324b 100644 --- a/mysql-test/suite/storage_engine/vcol.test +++ b/mysql-test/suite/storage_engine/vcol.test @@ -24,7 +24,7 @@ if (!$mysql_errname) INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a,b) VALUES (3,3),(4,4); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; @@ -37,7 +37,7 @@ if (!$mysql_errname) INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a,b) VALUES (3,3),(4,4); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; @@ -50,7 +50,7 @@ if (!$mysql_errname) INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a,b) VALUES (3,3),(4,4); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; @@ -63,7 +63,7 @@ if (!$mysql_errname) INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a,b) VALUES (3,3),(4,4); --sorted_result - SELECT * FROM t1; + SELECT a,b FROM t1; DROP TABLE t1; } diff --git a/storage/innobase/mysql-test/storage_engine/autoinc_secondary.rdiff b/storage/innobase/mysql-test/storage_engine/autoinc_secondary.rdiff index c24594c5024..00cda7c4435 100644 --- a/storage/innobase/mysql-test/storage_engine/autoinc_secondary.rdiff +++ b/storage/innobase/mysql-test/storage_engine/autoinc_secondary.rdiff @@ -8,7 +8,7 @@ -SELECT LAST_INSERT_ID(); -LAST_INSERT_ID() -1 --SELECT * FROM t1; +-SELECT a,b FROM t1; -a b -a 1 -a 2 diff --git a/storage/innobase/mysql-test/storage_engine/insert_delayed.rdiff b/storage/innobase/mysql-test/storage_engine/insert_delayed.rdiff index 62895fa928f..9e6cddf03f0 100644 --- a/storage/innobase/mysql-test/storage_engine/insert_delayed.rdiff +++ b/storage/innobase/mysql-test/storage_engine/insert_delayed.rdiff @@ -1,5 +1,5 @@ ---- suite/storage_engine/insert_delayed.result 2012-07-12 20:04:07.143544998 +0400 -+++ suite/storage_engine/insert_delayed.reject 2012-07-15 17:49:34.551810189 +0400 +--- suite/storage_engine/insert_delayed.result 2013-01-23 01:23:49.461254916 +0400 ++++ suite/storage_engine/insert_delayed.reject 2013-01-23 01:47:05.975698364 +0400 @@ -5,7 +5,16 @@ connect con0,localhost,root,,; SET lock_wait_timeout = 1; @@ -14,7 +14,7 @@ +# ------------------------------------------- INSERT DELAYED INTO t1 SET a=4, b='d'; +ERROR HY000: DELAYED option not supported for table 't1' - INSERT DELAYED INTO t1 SELECT 5, 'e'; + INSERT DELAYED INTO t1 (a,b) SELECT 5, 'e'; ERROR HY000: Lock wait timeout exceeded; try restarting transaction disconnect con0; @@ -20,6 +29,4 @@ diff --git a/storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff b/storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff index aab866fde83..7ddc57e0ead 100644 --- a/storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff +++ b/storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff @@ -1,12 +1,12 @@ ---- suite/storage_engine/parts/repair_table.result 2012-07-15 01:22:58.861853325 +0400 -+++ suite/storage_engine/parts/repair_table.reject 2012-07-15 20:07:11.268009209 +0400 +--- suite/storage_engine/parts/repair_table.result 2013-01-23 01:35:44.388267080 +0400 ++++ suite/storage_engine/parts/repair_table.reject 2013-01-23 01:44:40.337529283 +0400 @@ -9,27 +9,27 @@ INSERT INTO t2 (a,b) SELECT a, b FROM t1; ALTER TABLE t1 REPAIR PARTITION p0; Table Op Msg_type Msg_text -test.t1 repair status OK +test.t1 repair note The storage engine for the table doesn't support repair - INSERT INTO t1 VALUES (3,'c'); + INSERT INTO t1 (a,b) VALUES (3,'c'); ALTER TABLE t1 REPAIR PARTITION NO_WRITE_TO_BINLOG p0, p1; Table Op Msg_type Msg_text -test.t1 repair status OK @@ -21,7 +21,7 @@ Table Op Msg_type Msg_text -test.t1 repair status OK +test.t1 repair note The storage engine for the table doesn't support repair - INSERT INTO t1 VALUES (10,'j'); + INSERT INTO t1 (a,b) VALUES (10,'j'); ALTER TABLE t1 REPAIR PARTITION p1 QUICK USE_FRM; Table Op Msg_type Msg_text -test.t1 repair status OK @@ -112,7 +112,7 @@ -test.t1 check error Size of datafile is: 26 Should be: 39 -test.t1 check error Partition p0 returned error -test.t1 check error Corrupt --SELECT * FROM t1; +-SELECT a,b FROM t1; -a b -8 h -10 j @@ -136,7 +136,7 @@ -test.t1 check warning Found 3 key parts. Should be: 2 -test.t1 check error Partition p0 returned error -test.t1 check error Corrupt --SELECT * FROM t1; +-SELECT a,b FROM t1; -a b -8 h -10 j @@ -160,7 +160,7 @@ -test.t1 check error Size of datafile is: 39 Should be: 52 -test.t1 check error Partition p1 returned error -test.t1 check error Corrupt --SELECT * FROM t1; +-SELECT a,b FROM t1; -a b -8 h -10 j @@ -187,7 +187,7 @@ -test.t1 check warning Found 4 key parts. Should be: 3 -test.t1 check error Partition p1 returned error -test.t1 check error Corrupt --SELECT * FROM t1; +-SELECT a,b FROM t1; -a b -8 h -10 j diff --git a/storage/innobase/mysql-test/storage_engine/repair_table.rdiff b/storage/innobase/mysql-test/storage_engine/repair_table.rdiff index 9c51fea47ff..ae5b863eae1 100644 --- a/storage/innobase/mysql-test/storage_engine/repair_table.rdiff +++ b/storage/innobase/mysql-test/storage_engine/repair_table.rdiff @@ -57,7 +57,7 @@ -test.t1 check Error Incorrect file format 't1' -test.t1 check error Corrupt +test.t1 check status OK - SELECT * FROM t1; + SELECT a,b FROM t1; -ERROR HY000: Incorrect file format 't1' +a b +1 a @@ -107,7 +107,7 @@ -Table Op Msg_type Msg_text -test.t1 check error Size of datafile is: 39 Should be: 65 -test.t1 check error Corrupt --SELECT * FROM t1; +-SELECT a,b FROM t1; -ERROR HY000: Incorrect key file for table 't1'; try to repair it -# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). -# If you got a difference in error message, just add it to rdiff file @@ -122,7 +122,7 @@ -test.t1 check warning Table is marked as crashed and last repair failed -test.t1 check error Size of datafile is: 39 Should be: 65 -test.t1 check error Corrupt --SELECT * FROM t1; +-SELECT a,b FROM t1; -ERROR HY000: Table './test/t1' is marked as crashed and last (automatic?) repair failed -# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). -# If you got a difference in error message, just add it to rdiff file diff --git a/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff b/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff index 7fce0a108e9..53241fe331e 100644 --- a/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff +++ b/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff @@ -2,19 +2,19 @@ +++ suite/storage_engine/type_char_indexes.reject 2012-07-15 17:51:55.810034331 +0400 @@ -98,7 +98,7 @@ SET SESSION optimizer_switch = 'engine_condition_pushdown=on'; - EXPLAIN SELECT * FROM t1 WHERE c > 'a'; + EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; id select_type table type possible_keys key key_len ref rows Extra -# # # range c_v c_v # # # Using index condition +# # # range c_v c_v # # # Using where - SELECT * FROM t1 WHERE c > 'a'; + SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; c c20 v16 v128 b char3 varchar1a varchar1b @@ -135,7 +135,7 @@ r3a - EXPLAIN SELECT * FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; + EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; id select_type table type possible_keys key key_len ref rows Extra -# # # range # v16 # # # # +# # # ALL # NULL # # # # - SELECT * FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; + SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; c c20 v16 v128 a char1 varchar1a varchar1b diff --git a/storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff b/storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff index 9a9566deafb..9061900182e 100644 --- a/storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff +++ b/storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff @@ -1,5 +1,5 @@ ---- suite/storage_engine/type_spatial_indexes.result 2012-07-12 04:52:40.840023344 +0400 -+++ suite/storage_engine/type_spatial_indexes.reject 2012-07-15 19:27:32.761911079 +0400 +--- suite/storage_engine/type_spatial_indexes.result 2013-01-23 01:25:45.367797786 +0400 ++++ suite/storage_engine/type_spatial_indexes.reject 2013-01-23 01:46:17.560307029 +0400 @@ -702,699 +702,15 @@ DROP DATABASE IF EXISTS gis_ogs; CREATE DATABASE gis_ogs; @@ -79,43 +79,43 @@ -Field Type Null Key Default Extra -fid int(11) YES NULL -g geometry NO NULL --INSERT INTO gis_point VALUES +-INSERT INTO gis_point (fid,g) VALUES -(101, PointFromText('POINT(10 10)')), -(102, PointFromText('POINT(20 10)')), -(103, PointFromText('POINT(20 20)')), -(104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); --INSERT INTO gis_line VALUES +-INSERT INTO gis_line (fid,g) VALUES -(105, LineFromText('LINESTRING(0 0,0 10,10 0)')), -(106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), -(107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); --INSERT INTO gis_polygon VALUES +-INSERT INTO gis_polygon (fid,g) VALUES -(108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), -(109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), -(110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); --INSERT INTO gis_multi_point VALUES +-INSERT INTO gis_multi_point (fid,g) VALUES -(111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), -(112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), -(113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); --INSERT INTO gis_multi_line VALUES +-INSERT INTO gis_multi_line (fid,g) VALUES -(114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), -(115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), -(116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); --INSERT INTO gis_multi_polygon VALUES +-INSERT INTO gis_multi_polygon (fid,g) VALUES -(117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), -(118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), -(119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); --INSERT INTO gis_geometrycollection VALUES +-INSERT INTO gis_geometrycollection (fid,g) VALUES -(120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), -(121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), -(122, GeomFromText('GeometryCollection()')), -(123, GeomFromText('GeometryCollection EMPTY')); --INSERT into gis_geometry SELECT * FROM gis_point; --INSERT into gis_geometry SELECT * FROM gis_line; --INSERT into gis_geometry SELECT * FROM gis_polygon; --INSERT into gis_geometry SELECT * FROM gis_multi_point; --INSERT into gis_geometry SELECT * FROM gis_multi_line; --INSERT into gis_geometry SELECT * FROM gis_multi_polygon; --INSERT into gis_geometry SELECT * FROM gis_geometrycollection; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_point; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_line; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_polygon; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_point; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_line; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_polygon; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_geometrycollection; -SELECT fid, AsText(g) FROM gis_point; -fid AsText(g) -101 POINT(10 10) @@ -433,7 +433,7 @@ -DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; -USE gis_ogs; -# Lakes --INSERT INTO lakes VALUES ( +-INSERT INTO lakes (fid,name,shore) VALUES ( -101, 'BLUE LAKE', -PolyFromText( -'POLYGON( @@ -442,68 +442,68 @@ - )', -101)); -# Road Segments --INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2, +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(102, 'Route 5', NULL, 2, -LineFromText( -'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); --INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4, +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(103, 'Route 5', 'Main Street', 4, -LineFromText( -'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); --INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2, +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(104, 'Route 5', NULL, 2, -LineFromText( -'LINESTRING( 70 38, 72 48 )' ,101)); --INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4, +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(105, 'Main Street', NULL, 4, -LineFromText( -'LINESTRING( 70 38, 84 42 )' ,101)); --INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(106, 'Dirt Road by Green Forest', NULL, -1, -LineFromText( -'LINESTRING( 28 26, 28 0 )',101)); -# DividedRoutes --INSERT INTO divided_routes VALUES(119, 'Route 75', 4, +-INSERT INTO divided_routes (fid,name,num_lanes,centerlines) VALUES(119, 'Route 75', 4, -MLineFromText( -'MULTILINESTRING((10 48,10 21,10 0), - (16 0,16 23,16 48))', 101)); -# Forests --INSERT INTO forests VALUES(109, 'Green Forest', +-INSERT INTO forests (fid,name,boundary) VALUES(109, 'Green Forest', -MPolyFromText( -'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), - (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', -101)); -# Bridges --INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText( +-INSERT INTO bridges (fid,name,position) VALUES(110, 'Cam Bridge', PointFromText( -'POINT( 44 31 )', 101)); -# Streams --INSERT INTO streams VALUES(111, 'Cam Stream', +-INSERT INTO streams (fid,name,centerline) VALUES(111, 'Cam Stream', -LineFromText( -'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); --INSERT INTO streams VALUES(112, NULL, +-INSERT INTO streams (fid,name,centerline) VALUES(112, NULL, -LineFromText( -'LINESTRING( 76 0, 78 4, 73 9 )', 101)); -# Buildings --INSERT INTO buildings VALUES(113, '123 Main Street', +-INSERT INTO buildings (fid,name,position,footprint) VALUES(113, '123 Main Street', -PointFromText( -'POINT( 52 30 )', 101), -PolyFromText( -'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); --INSERT INTO buildings VALUES(114, '215 Main Street', +-INSERT INTO buildings (fid,name,position,footprint) VALUES(114, '215 Main Street', -PointFromText( -'POINT( 64 33 )', 101), -PolyFromText( -'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101)); -# Ponds --INSERT INTO ponds VALUES(120, NULL, 'Stock Pond', +-INSERT INTO ponds (fid,name,type,shores) VALUES(120, NULL, 'Stock Pond', -MPolyFromText( -'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), - ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); -# Named Places --INSERT INTO named_places VALUES(117, 'Ashton', +-INSERT INTO named_places (fid,name,boundary) VALUES(117, 'Ashton', -PolyFromText( -'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); --INSERT INTO named_places VALUES(118, 'Goose Island', +-INSERT INTO named_places (fid,name,boundary) VALUES(118, 'Goose Island', -PolyFromText( -'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); -# Map Neatlines --INSERT INTO map_neatlines VALUES(115, +-INSERT INTO map_neatlines (fid,neatline) VALUES(115, -PolyFromText( -'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); -SELECT Dimension(shore) diff --git a/storage/innobase/mysql-test/storage_engine/vcol.rdiff b/storage/innobase/mysql-test/storage_engine/vcol.rdiff index 2226062834e..23b26a52228 100644 --- a/storage/innobase/mysql-test/storage_engine/vcol.rdiff +++ b/storage/innobase/mysql-test/storage_engine/vcol.rdiff @@ -12,7 +12,7 @@ -Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' ignored --SELECT * FROM t1; +-SELECT a,b FROM t1; -a b -1 2 -2 3 @@ -29,7 +29,7 @@ -Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' ignored --SELECT * FROM t1; +-SELECT a,b FROM t1; -a b -1 2 -2 3 @@ -46,7 +46,7 @@ -Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' ignored --SELECT * FROM t1; +-SELECT a,b FROM t1; -a b -1 2 -2 3 @@ -63,7 +63,7 @@ -Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' ignored --SELECT * FROM t1; +-SELECT a,b FROM t1; -a b -1 2 -2 3 diff --git a/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff b/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff index 3caf2ad6c3a..07c03fc8d3e 100644 --- a/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff +++ b/storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff @@ -7,15 +7,15 @@ -DROP TABLE t1; -CREATE TABLE t1 (a ) ENGINE= ; -INSERT INTO t1 (a) VALUES (1),(2); --SELECT * FROM t1; +-SELECT a FROM t1; -a -1 -2 -ALTER TABLE t1 DISCARD TABLESPACE; --SELECT * FROM t1; +-SELECT a FROM t1; -ERROR HY000: Got error -1 from storage engine -ALTER TABLE t1 IMPORT TABLESPACE; --SELECT * FROM t1; +-SELECT a FROM t1; -a -1 -2 diff --git a/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff b/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff index 67157754c04..31da75e5ea5 100644 --- a/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff +++ b/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff @@ -44,12 +44,12 @@ +# Also, this problem may cause a chain effect (more errors of different kinds in the test). +# ------------------------------------------- DELETE FROM t2 WHERE a=2; - SELECT * FROM t1; + SELECT a,b FROM t1; a b 1 c -2 d +3 d - SELECT * FROM t2; + SELECT a,b FROM t2; a b -1 a +3 b @@ -90,7 +90,7 @@ +# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. +# Also, this problem may cause a chain effect (more errors of different kinds in the test). +# ------------------------------------------- - SELECT * FROM t2; + SELECT a,b FROM t2; a b -5 a -5 a @@ -117,7 +117,7 @@ +# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. +# Also, this problem may cause a chain effect (more errors of different kinds in the test). +# ------------------------------------------- - SELECT * FROM t2; + SELECT a,b FROM t2; a b +1 a +1 a diff --git a/storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff b/storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff index 8d1434ad2fe..b460b5b4763 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff @@ -1,9 +1,20 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MyISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -13a20 -> 1 +--- suite/storage_engine/trx/cons_snapshot_repeatable_read.result 2013-01-22 22:05:05.246633000 +0400 ++++ suite/storage_engine/trx/cons_snapshot_repeatable_read.reject 2013-01-23 02:44:05.336711176 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MyISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + connect con2,localhost,root,,; +@@ -11,6 +17,7 @@ + # If consistent read works on this isolation level (REPEATABLE READ), the following SELECT should not return the value we inserted (1) + SELECT a FROM t1; + a ++1 + COMMIT; + connection default; + disconnect con1; diff --git a/storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff b/storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff index 8d1434ad2fe..d5f1a03084e 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff @@ -1,9 +1,20 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MyISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -13a20 -> 1 +--- suite/storage_engine/trx/cons_snapshot_serializable.result 2013-01-22 22:05:05.246633000 +0400 ++++ suite/storage_engine/trx/cons_snapshot_serializable.reject 2013-01-23 02:44:05.928703734 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MyISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + connect con2,localhost,root,,; +@@ -11,6 +17,7 @@ + # If consistent read works on this isolation level (SERIALIZABLE), the following SELECT should not return the value we inserted (1) + SELECT a FROM t1; + a ++1 + COMMIT; + connection default; + disconnect con1; diff --git a/storage/myisam/mysql-test/storage_engine/trx/delete.rdiff b/storage/myisam/mysql-test/storage_engine/trx/delete.rdiff index 491b4636796..d7111ab28fc 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/delete.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/delete.rdiff @@ -22,7 +22,7 @@ ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back - SELECT * FROM t1; + SELECT a,b FROM t1; a b -10000 foobar -10000 foobar diff --git a/storage/myisam/mysql-test/storage_engine/trx/insert.rdiff b/storage/myisam/mysql-test/storage_engine/trx/insert.rdiff index 4619db1d095..cee69633860 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/insert.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/insert.rdiff @@ -22,7 +22,7 @@ ROLLBACK; +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back - SELECT * FROM t1; + SELECT a,b FROM t1; a b +0 test 1 a @@ -44,7 +44,7 @@ +Warning 1196 Some non-transactional changed tables couldn't be rolled back INSERT INTO t1 (b,a) VALUES ('test1',10); COMMIT; - SELECT * FROM t1; + SELECT a,b FROM t1; a b +0 test 1 a diff --git a/storage/myisam/mysql-test/storage_engine/trx/level_read_committed.rdiff b/storage/myisam/mysql-test/storage_engine/trx/level_read_committed.rdiff index c0cc9ff9351..94e3fc83e1e 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/level_read_committed.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/level_read_committed.rdiff @@ -1,44 +1,94 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MyISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -18a25 -> 1 -25a33,34 -> 1 -> 2 -30a40,43 -> 1 -> 101 -> 102 -> 2 -34a48,49 -> 101 -> 102 -39a55,56 -> 101 -> 102 -44a62,63 -> 101 -> 102 -51a71,72 -> 101 -> 102 -54a76,77 -> 301 -> 302 -58a82,83 -> 101 -> 102 -61a87,88 -> 301 -> 302 -65a93,94 -> 101 -> 102 -68a98,99 -> 301 -> 302 +--- suite/storage_engine/trx/level_read_committed.result 2013-01-22 22:05:05.246633000 +0400 ++++ suite/storage_engine/trx/level_read_committed.reject 2013-01-23 02:44:06.572695636 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MyISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; +@@ -16,6 +22,7 @@ + connection con1; + SELECT a FROM t1; + a ++1 + connection con2; + INSERT INTO t1 (a) VALUES (2); + # WARNING: Statement ended with errno 0, errname ''. +@@ -23,25 +30,37 @@ + connection con1; + SELECT a FROM t1; + a ++1 ++2 + INSERT INTO t1 (a) SELECT a+100 FROM t1; + # WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + connection con2; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + COMMIT; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + connection con1; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + INSERT INTO t1 (a) SELECT a+200 FROM t1; + # WARNING: Statement ended with errno 0, errname ''. +@@ -49,23 +68,35 @@ + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + 201 + 202 ++301 ++302 + COMMIT; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + 201 + 202 ++301 ++302 + connection con2; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + 201 + 202 ++301 ++302 + connection default; + disconnect con1; + disconnect con2; diff --git a/storage/myisam/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff b/storage/myisam/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff index 2a7ddd33c8c..91a2786cb68 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff @@ -1,7 +1,12 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MyISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- +--- suite/storage_engine/trx/level_read_uncommitted.result 2013-01-22 22:05:05.246633000 +0400 ++++ suite/storage_engine/trx/level_read_uncommitted.reject 2013-01-23 02:44:07.196687792 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MyISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; diff --git a/storage/myisam/mysql-test/storage_engine/trx/level_repeatable_read.rdiff b/storage/myisam/mysql-test/storage_engine/trx/level_repeatable_read.rdiff index 8b8df802275..2c265900004 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/level_repeatable_read.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/level_repeatable_read.rdiff @@ -1,53 +1,96 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MyISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -18a25 -> 1 -25a33,34 -> 1 -> 2 -27,28c36 -< ERROR HY000: Lock wait timeout exceeded; try restarting transaction -< # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ---- -> # WARNING: Statement ended with errno 0, errname ''. -31a40,43 -> 1 -> 101 -> 102 -> 2 -35a48,49 -> 101 -> 102 -40a55,56 -> 101 -> 102 -44a61,64 -> 1 -> 101 -> 102 -> 2 -49a70,73 -> 1 -> 101 -> 102 -> 2 -51a76,77 -> 301 -> 302 -55a82,83 -> 101 -> 102 -58a87,88 -> 301 -> 302 -62a93,94 -> 101 -> 102 -65a98,99 -> 301 -> 302 +--- suite/storage_engine/trx/level_repeatable_read.result 2013-01-22 22:05:05.246633000 +0400 ++++ suite/storage_engine/trx/level_repeatable_read.reject 2013-01-23 02:44:07.776680499 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MyISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ; +@@ -16,6 +22,7 @@ + connection con1; + SELECT a FROM t1; + a ++1 + connection con2; + INSERT INTO t1 (a) VALUES (2); + # WARNING: Statement ended with errno 0, errname ''. +@@ -23,46 +30,73 @@ + connection con1; + SELECT a FROM t1; + a ++1 ++2 + INSERT INTO t1 (a) SELECT a+100 FROM t1; +-ERROR HY000: Lock wait timeout exceeded; try restarting transaction +-# WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ++# WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + connection con2; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + COMMIT; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + connection con1; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + INSERT INTO t1 (a) SELECT a+200 FROM t1; + # WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + 201 + 202 ++301 ++302 + COMMIT; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + 201 + 202 ++301 ++302 + connection con2; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + 201 + 202 ++301 ++302 + connection default; + disconnect con1; + disconnect con2; diff --git a/storage/myisam/mysql-test/storage_engine/trx/level_serializable.rdiff b/storage/myisam/mysql-test/storage_engine/trx/level_serializable.rdiff index bbcb8ac1838..7955036e000 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/level_serializable.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/level_serializable.rdiff @@ -1,69 +1,103 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MyISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -14,15c20 -< ERROR HY000: Lock wait timeout exceeded; try restarting transaction -< # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ---- -> # WARNING: Statement ended with errno 0, errname ''. -19a25 -> 1 -22,23c28 -< ERROR HY000: Lock wait timeout exceeded; try restarting transaction -< # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ---- -> # WARNING: Statement ended with errno 0, errname ''. -27a33,34 -> 1 -> 2 -32a40,43 -> 1 -> 101 -> 102 -> 2 -35a47,50 -> 1 -> 101 -> 102 -> 2 -38a54,57 -> 1 -> 101 -> 102 -> 2 -41a61,64 -> 1 -> 101 -> 102 -> 2 -46a70,77 -> 1 -> 101 -> 102 -> 2 -> 201 -> 202 -> 301 -> 302 -49a81,88 -> 1 -> 101 -> 102 -> 2 -> 201 -> 202 -> 301 -> 302 -52a92,99 -> 1 -> 101 -> 102 -> 2 -> 201 -> 202 -> 301 -> 302 +--- suite/storage_engine/trx/level_serializable.result 2013-01-22 22:05:05.246633000 +0400 ++++ suite/storage_engine/trx/level_serializable.reject 2013-01-23 02:44:08.384672856 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MyISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE; +@@ -11,45 +17,86 @@ + connection con2; + BEGIN; + INSERT INTO t1 (a) VALUES(1); +-ERROR HY000: Lock wait timeout exceeded; try restarting transaction +-# WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ++# WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + connection con1; + SELECT a FROM t1; + a ++1 + connection con2; + INSERT INTO t1 (a) VALUES (2); +-ERROR HY000: Lock wait timeout exceeded; try restarting transaction +-# WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ++# WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + connection con1; + SELECT a FROM t1; + a ++1 ++2 + INSERT INTO t1 (a) SELECT a+100 FROM t1; + # WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + connection con2; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + COMMIT; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + connection con1; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + INSERT INTO t1 (a) SELECT a+200 FROM t1; + # WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 ++201 ++202 ++301 ++302 + COMMIT; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 ++201 ++202 ++301 ++302 + connection con2; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 ++201 ++202 ++301 ++302 + connection default; + disconnect con1; + disconnect con2; diff --git a/storage/myisam/mysql-test/storage_engine/trx/select_for_update.rdiff b/storage/myisam/mysql-test/storage_engine/trx/select_for_update.rdiff index 08e0802a28f..044ce56da43 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/select_for_update.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/select_for_update.rdiff @@ -13,7 +13,7 @@ @@ -14,16 +20,33 @@ 1 a 3 a - SELECT * FROM t1 WHERE b='a' LOCK IN SHARE MODE; + SELECT a,b FROM t1 WHERE b='a' LOCK IN SHARE MODE; -ERROR HY000: Lock wait timeout exceeded; try restarting transaction +a b +1 a @@ -38,7 +38,7 @@ +# ------------------------------------------- connection con1; COMMIT; - SELECT * FROM t1; + SELECT a,b FROM t1; a b -1 a +1 c diff --git a/storage/myisam/mysql-test/storage_engine/trx/select_lock_in_share_mode.rdiff b/storage/myisam/mysql-test/storage_engine/trx/select_lock_in_share_mode.rdiff index 97941bbdb13..e1e8d3050e7 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/select_lock_in_share_mode.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/select_lock_in_share_mode.rdiff @@ -25,7 +25,7 @@ +# ------------------------------------------- connection con1; COMMIT; - SELECT * FROM t1; + SELECT a,b FROM t1; a b -1 a +1 c diff --git a/storage/myisam/mysql-test/storage_engine/trx/update.rdiff b/storage/myisam/mysql-test/storage_engine/trx/update.rdiff index 131286d613c..ca3b77e7cec 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/update.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/update.rdiff @@ -31,7 +31,7 @@ +Warning 1196 Some non-transactional changed tables couldn't be rolled back UPDATE t1 SET b = 'upd' WHERE a = 10050; COMMIT; - SELECT * FROM t1; + SELECT a,b FROM t1; a b 10050 upd 10050 upd diff --git a/storage/myisam/mysql-test/storage_engine/trx/xa.rdiff b/storage/myisam/mysql-test/storage_engine/trx/xa.rdiff index f445ad909f3..73c3796b13b 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/xa.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/xa.rdiff @@ -12,21 +12,21 @@ connect con2,localhost,root,,; @@ -9,17 +15,22 @@ connection con1; - SELECT * FROM t1; + SELECT a FROM t1; a +1 connection con2; INSERT INTO t1 (a) VALUES (2); XA END 'xa1'; connection con1; - SELECT * FROM t1; + SELECT a FROM t1; a +1 +2 connection con2; XA PREPARE 'xa1'; connection con1; - SELECT * FROM t1; + SELECT a FROM t1; a +1 +2 @@ -78,7 +78,7 @@ +Warnings: +Warning 1196 Some non-transactional changed tables couldn't be rolled back connection con1; - SELECT * FROM t1; + SELECT a FROM t1; a @@ -93,4 +114,6 @@ 2 diff --git a/storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff b/storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff index f4629fb19a0..e637643d59d 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff @@ -20,7 +20,7 @@ +ERROR XAE04: XAER_NOTA: Unknown XID XA COMMIT 'xa2'; +ERROR XAE04: XAER_NOTA: Unknown XID - SELECT * FROM t1; + SELECT a FROM t1; a +1 +2 diff --git a/storage/myisammrg/mysql-test/storage_engine/alter_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/alter_table.rdiff index 447a38a5b2b..b2ec2129d04 100644 --- a/storage/myisammrg/mysql-test/storage_engine/alter_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/alter_table.rdiff @@ -1,68 +1,151 @@ -11c11 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -19c19 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -27c27 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -35c35 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -43c43 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -51c51 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -59c59 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -67c67 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -75c75 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -82c82 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -91c91 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t2`) -100c100 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -107c107 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -122c122 -< ) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs ---- -> ) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -130c130 -< ) ENGINE= DEFAULT CHARSET=utf8 ---- -> ) ENGINE= DEFAULT CHARSET=utf8 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -138c138 -< ) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci ---- -> ) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -146c146 -< ) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci ---- -> ) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- alter_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ alter_table.reject 2013-01-23 02:50:10.652118538 +0400 +@@ -8,7 +8,7 @@ + `a` int(11) DEFAULT NULL, + `c` char(8) DEFAULT NULL, + `b` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 ALTER COLUMN a SET DEFAULT '0'; + SHOW CREATE TABLE t1; + Table Create Table +@@ -16,7 +16,7 @@ + `a` int(11) DEFAULT '0', + `c` char(8) DEFAULT NULL, + `b` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 ALTER a DROP DEFAULT; + SHOW CREATE TABLE t1; + Table Create Table +@@ -24,7 +24,7 @@ + `a` int(11), + `c` char(8) DEFAULT NULL, + `b` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 CHANGE COLUMN b b1 FIRST; + SHOW CREATE TABLE t1; + Table Create Table +@@ -32,7 +32,7 @@ + `b1` char(8) DEFAULT NULL, + `a` int(11), + `c` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 CHANGE b1 b AFTER c; + SHOW CREATE TABLE t1; + Table Create Table +@@ -40,7 +40,7 @@ + `a` int(11), + `c` char(8) DEFAULT NULL, + `b` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 CHANGE b b ; + SHOW CREATE TABLE t1; + Table Create Table +@@ -48,7 +48,7 @@ + `a` int(11), + `c` char(8) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 MODIFY COLUMN b ; + SHOW CREATE TABLE t1; + Table Create Table +@@ -56,7 +56,7 @@ + `a` int(11), + `c` char(8) DEFAULT NULL, + `b` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 MODIFY COLUMN b FIRST; + SHOW CREATE TABLE t1; + Table Create Table +@@ -64,7 +64,7 @@ + `b` char(8) DEFAULT NULL, + `a` int(11), + `c` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 MODIFY COLUMN b AFTER a; + SHOW CREATE TABLE t1; + Table Create Table +@@ -72,14 +72,14 @@ + `a` int(11), + `b` int(11) DEFAULT NULL, + `c` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 DROP COLUMN b; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11), + `c` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 RENAME TO t2; + SHOW CREATE TABLE t1; + ERROR 42S02: Table 'test.t1' doesn't exist +@@ -88,7 +88,7 @@ + t2 CREATE TABLE `t2` ( + `a` int(11), + `c` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t2`) + DROP TABLE t2; + CREATE TABLE t1 (a , b ) ENGINE= ; + INSERT INTO t1 (a,b) VALUES (1,5),(2,2),(4,3); +@@ -97,14 +97,14 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 ORDER BY b ASC, a DESC; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + SELECT a,b FROM t1; + a b + 2 2 +@@ -119,7 +119,7 @@ + `a` int(11) DEFAULT NULL, + `b` char(8) COLLATE latin1_general_cs DEFAULT NULL, + `c` char(8) COLLATE latin1_general_cs DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs ++) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 CONVERT TO CHARACTER SET utf8; + SHOW CREATE TABLE t1; + Table Create Table +@@ -127,7 +127,7 @@ + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL, + `c` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=utf8 ++) ENGINE= DEFAULT CHARSET=utf8 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 DEFAULT CHARACTER SET = latin1 COLLATE latin1_general_ci; + SHOW CREATE TABLE t1; + Table Create Table +@@ -135,7 +135,7 @@ + `a` int(11) DEFAULT NULL, + `b` char(8) CHARACTER SET utf8 DEFAULT NULL, + `c` char(8) CHARACTER SET utf8 DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci ++) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 FORCE; + SHOW CREATE TABLE t1; + Table Create Table +@@ -143,5 +143,5 @@ + `a` int(11) DEFAULT NULL, + `b` char(8) CHARACTER SET utf8 DEFAULT NULL, + `c` char(8) CHARACTER SET utf8 DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci ++) ENGINE= DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff b/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff index cfc821582ed..1091d6250b9 100644 --- a/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff @@ -1,27 +1,32 @@ -4,18c4,13 -< DROP TABLE t1; -< CREATE TABLE t1 (a ) ENGINE= ; -< INSERT INTO t1 (a) VALUES (1),(2); -< SELECT * FROM t1; -< a -< 1 -< 2 -< ALTER TABLE t1 DISCARD TABLESPACE; -< SELECT * FROM t1; -< ERROR HY000: Got error -1 from storage engine -< ALTER TABLE t1 IMPORT TABLESPACE; -< SELECT * FROM t1; -< a -< 1 -< 2 ---- -> ERROR HY000: 'test.t1' is not BASE TABLE -> # ERROR: Statement ended with errno 1347, errname ER_WRONG_OBJECT (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ ALTER TABLE t1 DISCARD TABLESPACE ] -> # The statement|command finished with ER_WRONG_OBJECT. -> # Tablespace operations or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- +--- alter_tablespace.result 2013-01-22 22:05:05.246633000 +0400 ++++ alter_tablespace.reject 2013-01-23 02:50:11.288110543 +0400 +@@ -1,19 +1,14 @@ + DROP TABLE IF EXISTS t1, t2; + CREATE TABLE t1 (a ) ENGINE= ; + ALTER TABLE t1 DISCARD TABLESPACE; +-DROP TABLE t1; +-CREATE TABLE t1 (a ) ENGINE= ; +-INSERT INTO t1 (a) VALUES (1),(2); +-SELECT a FROM t1; +-a +-1 +-2 +-ALTER TABLE t1 DISCARD TABLESPACE; +-SELECT a FROM t1; +-ERROR HY000: Got error -1 from storage engine +-ALTER TABLE t1 IMPORT TABLESPACE; +-SELECT a FROM t1; +-a +-1 +-2 ++ERROR HY000: 'test.t1' is not BASE TABLE ++# ERROR: Statement ended with errno 1347, errname ER_WRONG_OBJECT (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ ALTER TABLE t1 DISCARD TABLESPACE ] ++# The statement|command finished with ER_WRONG_OBJECT. ++# Tablespace operations or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/analyze_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/analyze_table.rdiff index 139bcc00a81..9854a986cc5 100644 --- a/storage/myisammrg/mysql-test/storage_engine/analyze_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/analyze_table.rdiff @@ -1,22 +1,34 @@ -8c8 -< test.t1 analyze status OK ---- -> test.t1 analyze note The storage engine for the table doesn't support analyze -12c12 -< test.t2 analyze status OK ---- -> test.t2 analyze note The storage engine for the table doesn't support analyze -17,18c17,18 -< test.t1 analyze status OK -< test.t2 analyze status OK ---- -> test.t1 analyze note The storage engine for the table doesn't support analyze -> test.t2 analyze note The storage engine for the table doesn't support analyze -24c24 -< test.t1 analyze status OK ---- -> test.t1 analyze note The storage engine for the table doesn't support analyze -28c28 -< test.t1 analyze status OK ---- -> test.t1 analyze note The storage engine for the table doesn't support analyze +--- analyze_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ analyze_table.reject 2013-01-23 02:50:11.912102699 +0400 +@@ -5,25 +5,25 @@ + INSERT INTO t1 (a,b) VALUES (3,'c'); + ANALYZE TABLE t1; + Table Op Msg_type Msg_text +-test.t1 analyze status OK ++test.t1 analyze note The storage engine for the table doesn't support analyze + INSERT INTO t2 (a,b) VALUES (4,'d'); + ANALYZE NO_WRITE_TO_BINLOG TABLE t2; + Table Op Msg_type Msg_text +-test.t2 analyze status OK ++test.t2 analyze note The storage engine for the table doesn't support analyze + INSERT INTO t1 (a,b) VALUES (5,'e'); + INSERT INTO t2 (a,b) VALUES (6,'f'); + ANALYZE LOCAL TABLE t1, t2; + Table Op Msg_type Msg_text +-test.t1 analyze status OK +-test.t2 analyze status OK ++test.t1 analyze note The storage engine for the table doesn't support analyze ++test.t2 analyze note The storage engine for the table doesn't support analyze + DROP TABLE t1, t2; + CREATE TABLE t1 (a , (a)) ENGINE= ; + INSERT INTO t1 (a) VALUES (1),(2),(4),(7); + ANALYZE TABLE t1; + Table Op Msg_type Msg_text +-test.t1 analyze status OK ++test.t1 analyze note The storage engine for the table doesn't support analyze + INSERT INTO t1 (a) VALUES (8),(10),(11),(12); + ANALYZE TABLE t1; + Table Op Msg_type Msg_text +-test.t1 analyze status OK ++test.t1 analyze note The storage engine for the table doesn't support analyze + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/autoincrement.rdiff b/storage/myisammrg/mysql-test/storage_engine/autoincrement.rdiff index e9095aa3944..68264bdeb8d 100644 --- a/storage/myisammrg/mysql-test/storage_engine/autoincrement.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/autoincrement.rdiff @@ -1,34 +1,64 @@ -9c9 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -55c55 -< t1 # # # # # # # # 6 # # # # # # # ---- -> t1 # # # # # # # # 0 # # # # # # # -62c62 -< t1 # # # # # # # # # 8 # # # # # # # ---- -> t1 # # # # # # # # # 0 # # # # # # # -81c81 -< t1 # # # # # # # # # 10 # # # # # # # ---- -> t1 # # # # # # # # # 0 # # # # # # # -85c85 -< t1 # # # # # # # # # 21 # # # # # # # ---- -> t1 # # # # # # # # # 0 # # # # # # # -106c106 -< t1 # # # # # # # # # 22 # # # # # # # ---- -> t1 # # # # # # # # # 0 # # # # # # # -128,129c128,129 -< 100 a -< 101 b ---- -> 1 a -> 2 b -132c132 -< 100 ---- -> 1 +--- autoincrement.result 2013-01-22 22:05:05.246633000 +0400 ++++ autoincrement.reject 2013-01-23 02:50:12.848090932 +0400 +@@ -6,7 +6,7 @@ + `a` int(11) NOT NULL AUTO_INCREMENT, + `b` char(8) DEFAULT NULL, + KEY `a` (`a`) +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + INSERT INTO t1 (b) VALUES ('a'),('b'); + SELECT a,b FROM t1 ORDER BY a; + a b +@@ -52,14 +52,14 @@ + SET sql_mode = ''; + SHOW TABLE STATUS FROM test LIKE 't1'; + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment +-t1 # # # # # # # # 6 # # # # # # # ++t1 # # # # # # # # 0 # # # # # # # + INSERT INTO t1 (a,b) VALUES (6,'g'),(7,'h'); + SELECT LAST_INSERT_ID(); + LAST_INSERT_ID() + 5 + SHOW TABLE STATUS FROM test LIKE 't1'; + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment +-t1 # # # # # # # # # 8 # # # # # # # ++t1 # # # # # # # # # 0 # # # # # # # + INSERT INTO t1 (a,b) VALUES (NULL,'i'),(9,'j'); + SELECT a,b FROM t1 ORDER BY a; + a b +@@ -78,11 +78,11 @@ + 8 + SHOW TABLE STATUS FROM test LIKE 't1'; + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment +-t1 # # # # # # # # # 10 # # # # # # # ++t1 # # # # # # # # # 0 # # # # # # # + INSERT INTO t1 (a,b) VALUES (20,'k'); + SHOW TABLE STATUS FROM test LIKE 't1'; + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment +-t1 # # # # # # # # # 21 # # # # # # # ++t1 # # # # # # # # # 0 # # # # # # # + INSERT INTO t1 (a,b) VALUES (NULL,'l'); + SELECT a,b FROM t1 ORDER BY a; + a b +@@ -103,7 +103,7 @@ + 21 + SHOW TABLE STATUS FROM test LIKE 't1'; + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment +-t1 # # # # # # # # # 22 # # # # # # # ++t1 # # # # # # # # # 0 # # # # # # # + INSERT INTO t1 (a,b) VALUES (-5,'m'); + SELECT a,b FROM t1 ORDER BY a; + a b +@@ -125,9 +125,9 @@ + INSERT INTO t1 (a,b) VALUES (NULL,'a'),(NULL,'b'); + SELECT a,b FROM t1; + a b +-100 a +-101 b ++1 a ++2 b + SELECT LAST_INSERT_ID(); + LAST_INSERT_ID() +-100 ++1 + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/cache_index.rdiff b/storage/myisammrg/mysql-test/storage_engine/cache_index.rdiff index e10b22a8e66..612c8d38311 100644 --- a/storage/myisammrg/mysql-test/storage_engine/cache_index.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/cache_index.rdiff @@ -1,46 +1,71 @@ -15,16c15,16 -< test.t1 assign_to_keycache status OK -< test.t2 assign_to_keycache status OK ---- -> test.t1 assign_to_keycache note The storage engine for the table doesn't support assign_to_keycache -> test.t2 assign_to_keycache note The storage engine for the table doesn't support assign_to_keycache -19,20c19,20 -< test.t1 preload_keys status OK -< test.t2 preload_keys status OK ---- -> test.t1 preload_keys note The storage engine for the table doesn't support preload_keys -> test.t2 preload_keys note The storage engine for the table doesn't support preload_keys -25,26c25,26 -< test.t1 preload_keys status OK -< test.t2 preload_keys status OK ---- -> test.t1 preload_keys note The storage engine for the table doesn't support preload_keys -> test.t2 preload_keys note The storage engine for the table doesn't support preload_keys -31c31 -< test.t1 preload_keys status OK ---- -> test.t1 preload_keys note The storage engine for the table doesn't support preload_keys -35c35 -< test.t1 assign_to_keycache status OK ---- -> test.t1 assign_to_keycache note The storage engine for the table doesn't support assign_to_keycache -39c39 -< test.t1 preload_keys status OK ---- -> test.t1 preload_keys note The storage engine for the table doesn't support preload_keys -50c50 -< test.t1 assign_to_keycache status OK ---- -> test.t1 assign_to_keycache note The storage engine for the table doesn't support assign_to_keycache -54c54 -< test.t1 preload_keys status OK ---- -> test.t1 preload_keys note The storage engine for the table doesn't support preload_keys -62c62 -< test.t1 assign_to_keycache status OK ---- -> test.t1 assign_to_keycache note The storage engine for the table doesn't support assign_to_keycache -66c66 -< test.t1 preload_keys status OK ---- -> test.t1 preload_keys note The storage engine for the table doesn't support preload_keys +--- cache_index.result 2013-01-22 22:05:05.246633000 +0400 ++++ cache_index.reject 2013-01-23 02:50:13.468083137 +0400 +@@ -12,31 +12,31 @@ + SET GLOBAL .key_buffer_size=128*1024; + CACHE INDEX t1 INDEX (a), t2 IN ; + Table Op Msg_type Msg_text +-test.t1 assign_to_keycache status OK +-test.t2 assign_to_keycache status OK ++test.t1 assign_to_keycache note The storage engine for the table doesn't support assign_to_keycache ++test.t2 assign_to_keycache note The storage engine for the table doesn't support assign_to_keycache + LOAD INDEX INTO CACHE t1, t2; + Table Op Msg_type Msg_text +-test.t1 preload_keys status OK +-test.t2 preload_keys status OK ++test.t1 preload_keys note The storage engine for the table doesn't support preload_keys ++test.t2 preload_keys note The storage engine for the table doesn't support preload_keys + INSERT INTO t1 (a,b) VALUES (3,'c'),(4,'d'); + SET GLOBAL .key_buffer_size=8*1024; + LOAD INDEX INTO CACHE t1, t2 IGNORE LEAVES; + Table Op Msg_type Msg_text +-test.t1 preload_keys status OK +-test.t2 preload_keys status OK ++test.t1 preload_keys note The storage engine for the table doesn't support preload_keys ++test.t2 preload_keys note The storage engine for the table doesn't support preload_keys + SET GLOBAL .key_cache_age_threshold = 100, .key_cache_block_size = 512, .key_cache_division_limit = 1, .key_cache_segments=2; + INSERT INTO t1 (a,b) VALUES (5,'e'),(6,'f'); + LOAD INDEX INTO CACHE t1; + Table Op Msg_type Msg_text +-test.t1 preload_keys status OK ++test.t1 preload_keys note The storage engine for the table doesn't support preload_keys + SET GLOBAL new_.key_buffer_size=128*1024; + CACHE INDEX t1 IN new_; + Table Op Msg_type Msg_text +-test.t1 assign_to_keycache status OK ++test.t1 assign_to_keycache note The storage engine for the table doesn't support assign_to_keycache + INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h'); + LOAD INDEX INTO CACHE t1 IGNORE LEAVES; + Table Op Msg_type Msg_text +-test.t1 preload_keys status OK ++test.t1 preload_keys note The storage engine for the table doesn't support preload_keys + INSERT INTO t1 (a,b) VALUES (9,'i'); + DROP TABLE t2; + DROP TABLE t1; +@@ -47,11 +47,11 @@ + ) ENGINE= ; + CACHE INDEX t1 IN ; + Table Op Msg_type Msg_text +-test.t1 assign_to_keycache status OK ++test.t1 assign_to_keycache note The storage engine for the table doesn't support assign_to_keycache + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); + LOAD INDEX INTO CACHE t1; + Table Op Msg_type Msg_text +-test.t1 preload_keys status OK ++test.t1 preload_keys note The storage engine for the table doesn't support preload_keys + DROP TABLE t1; + CREATE TABLE t1 (a , + b , +@@ -59,11 +59,11 @@ + ) ENGINE= ; + CACHE INDEX t1 IN ; + Table Op Msg_type Msg_text +-test.t1 assign_to_keycache status OK ++test.t1 assign_to_keycache note The storage engine for the table doesn't support assign_to_keycache + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); + LOAD INDEX INTO CACHE t1; + Table Op Msg_type Msg_text +-test.t1 preload_keys status OK ++test.t1 preload_keys note The storage engine for the table doesn't support preload_keys + DROP TABLE t1; + SET GLOBAL .key_buffer_size=0; + SET GLOBAL new_.key_buffer_size=0; diff --git a/storage/myisammrg/mysql-test/storage_engine/char_indexes.rdiff b/storage/myisammrg/mysql-test/storage_engine/char_indexes.rdiff deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/storage/myisammrg/mysql-test/storage_engine/checksum_table_live.rdiff b/storage/myisammrg/mysql-test/storage_engine/checksum_table_live.rdiff index 1710cc18fea..f09aec971a9 100644 --- a/storage/myisammrg/mysql-test/storage_engine/checksum_table_live.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/checksum_table_live.rdiff @@ -1,6 +1,13 @@ -14,15c14,15 -< test.t1 4272806499 -< test.t2 0 ---- -> test.t1 NULL -> test.t2 NULL +--- checksum_table_live.result 2013-01-22 22:05:05.246633000 +0400 ++++ checksum_table_live.reject 2013-01-23 02:50:14.440070917 +0400 +@@ -11,8 +11,8 @@ + test.t1 4272806499 + CHECKSUM TABLE t1, t2 QUICK; + Table Checksum +-test.t1 4272806499 +-test.t2 0 ++test.t1 NULL ++test.t2 NULL + CHECKSUM TABLE t1, t2 EXTENDED; + Table Checksum + test.t1 4272806499 diff --git a/storage/myisammrg/mysql-test/storage_engine/create_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/create_table.rdiff index 5d3578ad3cd..585e5c915ba 100644 --- a/storage/myisammrg/mysql-test/storage_engine/create_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/create_table.rdiff @@ -1,37 +1,57 @@ -7c7 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -16c16 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -22c22 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -27,36c27,35 -< SHOW CREATE TABLE t1; -< Table Create Table -< t1 CREATE TABLE `t1` ( -< `1` bigint(20) NOT NULL DEFAULT '0' -< ) ENGINE= DEFAULT CHARSET=latin1 -< SELECT * FROM t1; -< 1 -< 1 -< 2 -< DROP TABLE t1; ---- -> ERROR HY000: 'test.t1' is not BASE TABLE -> # ERROR: Statement ended with errno 1347, errname ER_WRONG_OBJECT (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command finished with ER_WRONG_OBJECT. -> # CREATE TABLE .. AS SELECT or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -43c42 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- create_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ create_table.reject 2013-01-23 02:50:19.544006752 +0400 +@@ -4,7 +4,7 @@ + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + CREATE TABLE IF NOT EXISTS t1 (a ) ENGINE= ; + Warnings: + Note 1050 Table 't1' already exists +@@ -13,33 +13,32 @@ + Table Create Table + t2 CREATE TABLE `t2` ( + `a` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + CREATE TEMPORARY TABLE t2 LIKE t1; + SHOW CREATE TABLE t2; + Table Create Table + t2 CREATE TEMPORARY TABLE `t2` ( + `a` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TEMPORARY TABLE t2; + DROP TABLE t2; + DROP TABLE IF EXISTS t1; + CREATE TABLE t1 ENGINE= AS SELECT 1 UNION SELECT 2; +-SHOW CREATE TABLE t1; +-Table Create Table +-t1 CREATE TABLE `t1` ( +- `1` bigint(20) NOT NULL DEFAULT '0' +-) ENGINE= DEFAULT CHARSET=latin1 +-SELECT * FROM t1; +-1 +-1 +-2 +-DROP TABLE t1; ++ERROR HY000: 'test.t1' is not BASE TABLE ++# ERROR: Statement ended with errno 1347, errname ER_WRONG_OBJECT (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command finished with ER_WRONG_OBJECT. ++# CREATE TABLE .. AS SELECT or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + SET storage_engine = ; + CREATE TABLE t1 (a ) ENGINE= ; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + FLUSH LOGS; + DROP TABLE IF EXISTS t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff b/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff index 7362bd282a5..f716b7f2fe8 100644 --- a/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff @@ -1,138 +1,147 @@ -15,17c15,16 -< KEY `a` (`a`), -< CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`) -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> KEY `a` (`a`) -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t2`) -19c18,25 -< ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)) ---- -> # ERROR: Statement succeeded (expected results: ER_NO_REFERENCED_ROW_2) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command succeeded unexpectedly. -> # Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -23c29,36 -< ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)) ---- -> # ERROR: Statement succeeded (expected results: ER_NO_REFERENCED_ROW_2) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command succeeded unexpectedly. -> # Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -25c38 -< ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)) ---- -> # ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED_2) -27c40,47 -< ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)) ---- -> # ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED_2) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command succeeded unexpectedly. -> # Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -32c52 -< 2 d ---- -> 3 d -35c55,56 -< 1 a ---- -> 3 b -> 3 b -37c58,65 -< ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails ---- -> # ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command succeeded unexpectedly. -> # Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -49,51c77,78 -< KEY `a` (`a`), -< CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`) ON DELETE CASCADE ON UPDATE CASCADE -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> KEY `a` (`a`) -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t2`) -53c80 -< ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`) ON DELETE CASCADE ON UPDATE CASCADE) ---- -> # ERROR: Statement succeeded (expected results: ER_NO_REFERENCED_ROW_2) -54a82 -> ERROR 42S02: Table 'test.t1' doesn't exist -56a85,92 -> ERROR 42S02: Table 'test.t1' doesn't exist -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command finished with ER_NO_SUCH_TABLE. -> # UPDATE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -59,64c95,104 -< 5 a -< 5 a -< 5 b -< 5 c -< 5 d -< 5 e ---- -> 1 a -> 1 a -> 2 b -> 2 b -> 3 a -> 3 c -> 3 c -> 4 d -> 4 d -> 4 e -65a106,113 -> ERROR 42S02: Table 'test.t1' doesn't exist -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command finished with ER_NO_SUCH_TABLE. -> # DELETE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -67a116,125 -> 1 a -> 1 a -> 2 b -> 2 b -> 3 a -> 3 c -> 3 c -> 4 d -> 4 d -> 4 e -69c127,135 -< ERROR 42000: Cannot truncate a table referenced in a foreign key constraint (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `test`.`t1` (`a`)) ---- -> ERROR 42S02: Table 'test.t1' doesn't exist -> # ERROR: Statement ended with errno 1146, errname ER_NO_SUCH_TABLE (expected results: ER_TRUNCATE_ILLEGAL_FK) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command finished with ER_NO_SUCH_TABLE. -> # Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -71a138 -> ERROR 42S02: Unknown table 't1' +--- foreign_keys.result 2013-01-22 22:05:05.246633000 +0400 ++++ foreign_keys.reject 2013-01-23 02:50:28.187898084 +0400 +@@ -12,29 +12,57 @@ + t2 CREATE TABLE `t2` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL, +- KEY `a` (`a`), +- CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`) +-) ENGINE= DEFAULT CHARSET=latin1 ++ KEY `a` (`a`) ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t2`) + INSERT INTO t2 (a,b) VALUES (1,'a'),(2,'b'); +-ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)) ++# ERROR: Statement succeeded (expected results: ER_NO_REFERENCED_ROW_2) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command succeeded unexpectedly. ++# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + INSERT INTO t1 (a,b) VALUES (1,'c'),(2,'d'); + INSERT INTO t2 (a,b) VALUES (1,'a'),(2,'b'); + UPDATE t2 SET a=a+1; +-ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)) ++# ERROR: Statement succeeded (expected results: ER_NO_REFERENCED_ROW_2) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command succeeded unexpectedly. ++# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + UPDATE t1 SET a=3 WHERE a=2; +-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)) ++# ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED_2) + DELETE FROM t1 WHERE a=2; +-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)) ++# ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED_2) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command succeeded unexpectedly. ++# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DELETE FROM t2 WHERE a=2; + SELECT a,b FROM t1; + a b + 1 c +-2 d ++3 d + SELECT a,b FROM t2; + a b +-1 a ++3 b ++3 b + DROP TABLE t1; +-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails ++# ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command succeeded unexpectedly. ++# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP TABLE t2; + CREATE TABLE t2 (a , + b , +@@ -46,26 +74,65 @@ + t2 CREATE TABLE `t2` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL, +- KEY `a` (`a`), +- CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`) ON DELETE CASCADE ON UPDATE CASCADE +-) ENGINE= DEFAULT CHARSET=latin1 ++ KEY `a` (`a`) ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t2`) + INSERT INTO t2 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'); +-ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`) ON DELETE CASCADE ON UPDATE CASCADE) ++# ERROR: Statement succeeded (expected results: ER_NO_REFERENCED_ROW_2) + INSERT INTO t1 (a,b) VALUES (3,'a'),(4,'a'); ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t2 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(4,'e'),(3,'a'); + UPDATE t1 SET a=a+1; ++ERROR 42S02: Table 'test.t1' doesn't exist ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command finished with ER_NO_SUCH_TABLE. ++# UPDATE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + SELECT a,b FROM t2; + a b +-5 a +-5 a +-5 b +-5 c +-5 d +-5 e ++1 a ++1 a ++2 b ++2 b ++3 a ++3 c ++3 c ++4 d ++4 d ++4 e + DELETE FROM t1 WHERE b='a' LIMIT 2; ++ERROR 42S02: Table 'test.t1' doesn't exist ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command finished with ER_NO_SUCH_TABLE. ++# DELETE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + SELECT a,b FROM t2; + a b ++1 a ++1 a ++2 b ++2 b ++3 a ++3 c ++3 c ++4 d ++4 d ++4 e + TRUNCATE TABLE t1; +-ERROR 42000: Cannot truncate a table referenced in a foreign key constraint (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `test`.`t1` (`a`)) ++ERROR 42S02: Table 'test.t1' doesn't exist ++# ERROR: Statement ended with errno 1146, errname ER_NO_SUCH_TABLE (expected results: ER_TRUNCATE_ILLEGAL_FK) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command finished with ER_NO_SUCH_TABLE. ++# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP TABLE t2; + DROP TABLE t1; ++ERROR 42S02: Unknown table 't1' diff --git a/storage/myisammrg/mysql-test/storage_engine/fulltext_search.rdiff b/storage/myisammrg/mysql-test/storage_engine/fulltext_search.rdiff index 262370f01ed..7234cdfd2fa 100644 --- a/storage/myisammrg/mysql-test/storage_engine/fulltext_search.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/fulltext_search.rdiff @@ -1,142 +1,150 @@ -7,64c7,15 -< SHOW INDEXES IN t1; -< Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -< t1 1 v1 1 v1 # # NULL NULL YES FULLTEXT -< INSERT INTO t1 (v0,v1,v2) VALUES ('text1','Here is a list of recommended books on MariaDB and MySQL. We\'ve provided links to Amazon.com here for convenience, but they can be found at many other bookstores, both online and off. -< If you want to have your favorite MySQL / MariaDB book listed here, please leave a comment. -< For developers who want to code on MariaDB or MySQL -< * Understanding MySQL Internals by Sasha Pachev, former MySQL developer at MySQL AB. -< o This is the only book we know about that describes the internals of MariaDB / MySQL. A must have for anyone who wants to understand and develop on MariaDB! -< o Not all topics are covered and some parts are slightly outdated, but still the best book on this topic. -< * MySQL 5.1 Plugin Development by Sergei Golubchik and Andrew Hutchings -< o A must read for anyone wanting to write a plugin for MariaDB, written by the Sergei who designed the plugin interface for MySQL and MariaDB! -< For MariaDB / MySQL end users -< * MariaDB Crash Course by Ben Forta -< o First MariaDB book! -< o For people who want to learn SQL and the basics of MariaDB. -< o Now shipping. Purchase at Amazon.com or your favorite bookseller. -< * SQL-99 Complete, Really by Peter Gulutzan & Trudy Pelzer. -< o Everything you wanted to know about the SQL 99 standard. Excellent reference book! -< o Free to read in the Knowledgebase! -< * MySQL (4th Edition) by Paul DuBois -< o The \'default\' book to read if you wont to learn to use MySQL / MariaDB. -< * MySQL Cookbook by Paul DuBois -< o A lot of examples of how to use MySQL. As with all of Paul\'s books, it\'s worth its weight in gold and even enjoyable reading for such a \'dry\' subject. -< * High Performance MySQL, Second Edition, By Baron Schwartz, Peter Zaitsev, Vadim Tkachenko, Jeremy D. Zawodny, Arjen Lentz, Derek J. Balling, et al. -< o \"High Performance MySQL is the definitive guide to building fast, reliable systems with MySQL. Written by noted experts with years of real-world experience building very large systems, this book covers every aspect of MySQL performance in detail, and focuses on robustness, security, and data integrity. Learn advanced techniques in depth so you can bring out MySQL\'s full power.\" (From the book description at O\'Reilly) -< -< * MySQL Admin Cookbook -< o A quick step-by-step guide for MySQL users and database administrators to tackle real-world challenges with MySQL configuration and administration -< -< * MySQL 5.0 Certification Study Guide, By Paul DuBois, Stefan Hinz, Carsten Pedersen -< o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. ', -< 'There are several reasons why contributing code is one of the easiest and most rewarding ways to contribute to MariaDB: -< -< 1. We are very responsive toward reviews of submitted code and as soon as the review is done, the submitted code is merged into an existing MariaDB tree and made available to everyone, not just select customers. -< 2. Code reviews are performed by the MariaDB core development team and the quality, detail, and timeliness of our reviews are better than you will find elsewhere. -< 3. With MariaDB everyone has access to the latest code. -< 4. If a patch is very safe and/or very useful we are willing to push it into the stable code (as long as it can\'t break any existing applications). We are willing to do this to ensure the freedom to add small, needed fixes on a stable release so users don\'t have to wait a year for something to be added which is critical to their business. -< 5. If you are an active contributor, you can become a member of maria-captains, even if you aren\'t working for Monty Program Ab. All captains have the same rights as any other captain to accept and reject patches. Our development model is truly open for everyone. -< The Contributing Code page details many of the actual steps involved in working with the MariaDB source code. It\'s important that you use the same tools and submit patches in the same way as other developers to keep development running smoothly.' -< ), ('text2','test1','test2'); -< SELECT v0 FROM t1 WHERE MATCH(v1) AGAINST ('contributing' IN NATURAL LANGUAGE MODE); -< v0 -< INSERT INTO t1 (v0,v1,v2) VALUES ('text3','test','test'); -< SELECT v0, MATCH(v1) AGAINST('contributing' IN NATURAL LANGUAGE MODE) AS rating FROM t1 WHERE MATCH(v1) AGAINST ('contributing' IN NATURAL LANGUAGE MODE); -< v0 rating -< INSERT INTO t1 (v0,v1,v2) VALUES ('text4','Contributing more...','...is a good idea'),('text5','test','test'); -< SELECT v0, MATCH(v1) AGAINST('contributing') AS rating FROM t1 WHERE MATCH(v1) AGAINST ('contributing'); -< v0 rating -< text4 1.3705332279205322 -< SELECT v0 FROM t1 WHERE MATCH(v1,v2) AGAINST ('-test1 +critical +Cook*' IN BOOLEAN MODE); -< v0 -< text1 -< SELECT v0 FROM t1 WHERE MATCH(v1,v2) AGAINST ('-patch +critical +Cook*' IN BOOLEAN MODE); -< v0 -< SELECT v0, MATCH(v1) AGAINST('database' WITH QUERY EXPANSION) AS rating FROM t1 WHERE MATCH(v1) AGAINST ('database' WITH QUERY EXPANSION); -< v0 rating -< text1 178.11756896972656 -< DROP TABLE t1; ---- -> ERROR HY000: The used table type doesn't support FULLTEXT indexes -> # ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command finished with ER_TABLE_CANT_HANDLE_FT. -> # FULLTEXT indexes or VARCHAR|TEXT data types or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -71,132c22,30 -< SHOW INDEXES IN t1; -< Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -< t1 1 v1 1 v1 # # NULL NULL YES FULLTEXT -< t1 1 v1_v2 1 v1 # # NULL NULL YES FULLTEXT -< t1 1 v1_v2 2 v2 # # NULL NULL YES FULLTEXT -< INSERT INTO t1 (v0,v1,v2) VALUES ('text1','Here is a list of recommended books on MariaDB and MySQL. We\'ve provided links to Amazon.com here for convenience, but they can be found at many other bookstores, both online and off. -< If you want to have your favorite MySQL / MariaDB book listed here, please leave a comment. -< For developers who want to code on MariaDB or MySQL -< * Understanding MySQL Internals by Sasha Pachev, former MySQL developer at MySQL AB. -< o This is the only book we know about that describes the internals of MariaDB / MySQL. A must have for anyone who wants to understand and develop on MariaDB! -< o Not all topics are covered and some parts are slightly outdated, but still the best book on this topic. -< * MySQL 5.1 Plugin Development by Sergei Golubchik and Andrew Hutchings -< o A must read for anyone wanting to write a plugin for MariaDB, written by the Sergei who designed the plugin interface for MySQL and MariaDB! -< For MariaDB / MySQL end users -< * MariaDB Crash Course by Ben Forta -< o First MariaDB book! -< o For people who want to learn SQL and the basics of MariaDB. -< o Now shipping. Purchase at Amazon.com or your favorite bookseller. -< * SQL-99 Complete, Really by Peter Gulutzan & Trudy Pelzer. -< o Everything you wanted to know about the SQL 99 standard. Excellent reference book! -< o Free to read in the Knowledgebase! -< * MySQL (4th Edition) by Paul DuBois -< o The \'default\' book to read if you wont to learn to use MySQL / MariaDB. -< * MySQL Cookbook by Paul DuBois -< o A lot of examples of how to use MySQL. As with all of Paul\'s books, it\'s worth its weight in gold and even enjoyable reading for such a \'dry\' subject. -< * High Performance MySQL, Second Edition, By Baron Schwartz, Peter Zaitsev, Vadim Tkachenko, Jeremy D. Zawodny, Arjen Lentz, Derek J. Balling, et al. -< o \"High Performance MySQL is the definitive guide to building fast, reliable systems with MySQL. Written by noted experts with years of real-world experience building very large systems, this book covers every aspect of MySQL performance in detail, and focuses on robustness, security, and data integrity. Learn advanced techniques in depth so you can bring out MySQL\'s full power.\" (From the book description at O\'Reilly) -< -< * MySQL Admin Cookbook -< o A quick step-by-step guide for MySQL users and database administrators to tackle real-world challenges with MySQL configuration and administration -< -< * MySQL 5.0 Certification Study Guide, By Paul DuBois, Stefan Hinz, Carsten Pedersen -< o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. ', -< 'There are several reasons why contributing code is one of the easiest and most rewarding ways to contribute to MariaDB: -< -< 1. We are very responsive toward reviews of submitted code and as soon as the review is done, the submitted code is merged into an existing MariaDB tree and made available to everyone, not just select customers. -< 2. Code reviews are performed by the MariaDB core development team and the quality, detail, and timeliness of our reviews are better than you will find elsewhere. -< 3. With MariaDB everyone has access to the latest code. -< 4. If a patch is very safe and/or very useful we are willing to push it into the stable code (as long as it can\'t break any existing applications). We are willing to do this to ensure the freedom to add small, needed fixes on a stable release so users don\'t have to wait a year for something to be added which is critical to their business. -< 5. If you are an active contributor, you can become a member of maria-captains, even if you aren\'t working for Monty Program Ab. All captains have the same rights as any other captain to accept and reject patches. Our development model is truly open for everyone. -< The Contributing Code page details many of the actual steps involved in working with the MariaDB source code. It\'s important that you use the same tools and submit patches in the same way as other developers to keep development running smoothly.' -< ), ('text2','test1','test2'); -< SELECT v0 FROM t1 WHERE MATCH(v1,v2) AGAINST ('contributing' IN NATURAL LANGUAGE MODE); -< v0 -< INSERT INTO t1 (v0,v1,v2) VALUES ('text3','test','test'); -< SELECT v0, MATCH(v1,v2) AGAINST('contributing' IN NATURAL LANGUAGE MODE) AS rating FROM t1 WHERE MATCH(v1,v2) AGAINST ('contributing' IN NATURAL LANGUAGE MODE); -< v0 rating -< text1 0.2809644043445587 -< INSERT INTO t1 (v0,v1,v2) VALUES ('text4','Contributing more...','...is a good idea'),('text5','test','test'); -< SELECT v0, MATCH(v1) AGAINST('contributing') AS rating FROM t1 WHERE MATCH(v1) AGAINST ('contributing'); -< v0 rating -< text4 1.3705332279205322 -< SELECT v0 FROM t1 WHERE MATCH(v1,v2) AGAINST ('-test1 +critical +Cook*' IN BOOLEAN MODE); -< v0 -< text1 -< SELECT v0 FROM t1 WHERE MATCH(v1,v2) AGAINST ('-patch +critical +Cook*' IN BOOLEAN MODE); -< v0 -< SELECT v0, MATCH(v1,v2) AGAINST('database' WITH QUERY EXPANSION) AS rating FROM t1 WHERE MATCH(v1,v2) AGAINST ('database' WITH QUERY EXPANSION); -< v0 rating -< text1 190.56150817871094 -< text4 1.1758291721343994 -< DROP TABLE t1; ---- -> ERROR HY000: The used table type doesn't support FULLTEXT indexes -> # ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command finished with ER_TABLE_CANT_HANDLE_FT. -> # FULLTEXT indexes or multiple keys or VARCHAR|TEXT data types or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- +--- fulltext_search.result 2013-01-22 22:05:05.246633000 +0400 ++++ fulltext_search.reject 2013-01-23 02:50:28.807890289 +0400 +@@ -4,129 +4,27 @@ + v2 TEXT , + FULLTEXT v1 (v1) + ) ENGINE= ; +-SHOW INDEXES IN t1; +-Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 1 v1 1 v1 # # NULL NULL YES FULLTEXT +-INSERT INTO t1 (v0,v1,v2) VALUES ('text1','Here is a list of recommended books on MariaDB and MySQL. We\'ve provided links to Amazon.com here for convenience, but they can be found at many other bookstores, both online and off. +-If you want to have your favorite MySQL / MariaDB book listed here, please leave a comment. +-For developers who want to code on MariaDB or MySQL +-* Understanding MySQL Internals by Sasha Pachev, former MySQL developer at MySQL AB. +-o This is the only book we know about that describes the internals of MariaDB / MySQL. A must have for anyone who wants to understand and develop on MariaDB! +-o Not all topics are covered and some parts are slightly outdated, but still the best book on this topic. +-* MySQL 5.1 Plugin Development by Sergei Golubchik and Andrew Hutchings +-o A must read for anyone wanting to write a plugin for MariaDB, written by the Sergei who designed the plugin interface for MySQL and MariaDB! +-For MariaDB / MySQL end users +-* MariaDB Crash Course by Ben Forta +-o First MariaDB book! +-o For people who want to learn SQL and the basics of MariaDB. +-o Now shipping. Purchase at Amazon.com or your favorite bookseller. +-* SQL-99 Complete, Really by Peter Gulutzan & Trudy Pelzer. +-o Everything you wanted to know about the SQL 99 standard. Excellent reference book! +-o Free to read in the Knowledgebase! +-* MySQL (4th Edition) by Paul DuBois +-o The \'default\' book to read if you wont to learn to use MySQL / MariaDB. +-* MySQL Cookbook by Paul DuBois +-o A lot of examples of how to use MySQL. As with all of Paul\'s books, it\'s worth its weight in gold and even enjoyable reading for such a \'dry\' subject. +-* High Performance MySQL, Second Edition, By Baron Schwartz, Peter Zaitsev, Vadim Tkachenko, Jeremy D. Zawodny, Arjen Lentz, Derek J. Balling, et al. +-o \"High Performance MySQL is the definitive guide to building fast, reliable systems with MySQL. Written by noted experts with years of real-world experience building very large systems, this book covers every aspect of MySQL performance in detail, and focuses on robustness, security, and data integrity. Learn advanced techniques in depth so you can bring out MySQL\'s full power.\" (From the book description at O\'Reilly) +- +- * MySQL Admin Cookbook +- o A quick step-by-step guide for MySQL users and database administrators to tackle real-world challenges with MySQL configuration and administration +- +- * MySQL 5.0 Certification Study Guide, By Paul DuBois, Stefan Hinz, Carsten Pedersen +- o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. ', +-'There are several reasons why contributing code is one of the easiest and most rewarding ways to contribute to MariaDB: +- +- 1. We are very responsive toward reviews of submitted code and as soon as the review is done, the submitted code is merged into an existing MariaDB tree and made available to everyone, not just select customers. +- 2. Code reviews are performed by the MariaDB core development team and the quality, detail, and timeliness of our reviews are better than you will find elsewhere. +- 3. With MariaDB everyone has access to the latest code. +- 4. If a patch is very safe and/or very useful we are willing to push it into the stable code (as long as it can\'t break any existing applications). We are willing to do this to ensure the freedom to add small, needed fixes on a stable release so users don\'t have to wait a year for something to be added which is critical to their business. +- 5. If you are an active contributor, you can become a member of maria-captains, even if you aren\'t working for Monty Program Ab. All captains have the same rights as any other captain to accept and reject patches. Our development model is truly open for everyone. +-The Contributing Code page details many of the actual steps involved in working with the MariaDB source code. It\'s important that you use the same tools and submit patches in the same way as other developers to keep development running smoothly.' +- ), ('text2','test1','test2'); +-SELECT v0 FROM t1 WHERE MATCH(v1) AGAINST ('contributing' IN NATURAL LANGUAGE MODE); +-v0 +-INSERT INTO t1 (v0,v1,v2) VALUES ('text3','test','test'); +-SELECT v0, MATCH(v1) AGAINST('contributing' IN NATURAL LANGUAGE MODE) AS rating FROM t1 WHERE MATCH(v1) AGAINST ('contributing' IN NATURAL LANGUAGE MODE); +-v0 rating +-INSERT INTO t1 (v0,v1,v2) VALUES ('text4','Contributing more...','...is a good idea'),('text5','test','test'); +-SELECT v0, MATCH(v1) AGAINST('contributing') AS rating FROM t1 WHERE MATCH(v1) AGAINST ('contributing'); +-v0 rating +-text4 1.3705332279205322 +-SELECT v0 FROM t1 WHERE MATCH(v1,v2) AGAINST ('-test1 +critical +Cook*' IN BOOLEAN MODE); +-v0 +-text1 +-SELECT v0 FROM t1 WHERE MATCH(v1,v2) AGAINST ('-patch +critical +Cook*' IN BOOLEAN MODE); +-v0 +-SELECT v0, MATCH(v1) AGAINST('database' WITH QUERY EXPANSION) AS rating FROM t1 WHERE MATCH(v1) AGAINST ('database' WITH QUERY EXPANSION); +-v0 rating +-text1 178.11756896972656 +-DROP TABLE t1; ++ERROR HY000: The used table type doesn't support FULLTEXT indexes ++# ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command finished with ER_TABLE_CANT_HANDLE_FT. ++# FULLTEXT indexes or VARCHAR|TEXT data types or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + CREATE TABLE t1 (v0 VARCHAR(64) , + v1 VARCHAR(16384) , + v2 TEXT , + FULLTEXT v1 (v1), + FULLTEXT v1_v2 (v1,v2) + ) ENGINE= ; +-SHOW INDEXES IN t1; +-Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 1 v1 1 v1 # # NULL NULL YES FULLTEXT +-t1 1 v1_v2 1 v1 # # NULL NULL YES FULLTEXT +-t1 1 v1_v2 2 v2 # # NULL NULL YES FULLTEXT +-INSERT INTO t1 (v0,v1,v2) VALUES ('text1','Here is a list of recommended books on MariaDB and MySQL. We\'ve provided links to Amazon.com here for convenience, but they can be found at many other bookstores, both online and off. +-If you want to have your favorite MySQL / MariaDB book listed here, please leave a comment. +-For developers who want to code on MariaDB or MySQL +-* Understanding MySQL Internals by Sasha Pachev, former MySQL developer at MySQL AB. +-o This is the only book we know about that describes the internals of MariaDB / MySQL. A must have for anyone who wants to understand and develop on MariaDB! +-o Not all topics are covered and some parts are slightly outdated, but still the best book on this topic. +-* MySQL 5.1 Plugin Development by Sergei Golubchik and Andrew Hutchings +-o A must read for anyone wanting to write a plugin for MariaDB, written by the Sergei who designed the plugin interface for MySQL and MariaDB! +-For MariaDB / MySQL end users +-* MariaDB Crash Course by Ben Forta +-o First MariaDB book! +-o For people who want to learn SQL and the basics of MariaDB. +-o Now shipping. Purchase at Amazon.com or your favorite bookseller. +-* SQL-99 Complete, Really by Peter Gulutzan & Trudy Pelzer. +-o Everything you wanted to know about the SQL 99 standard. Excellent reference book! +-o Free to read in the Knowledgebase! +-* MySQL (4th Edition) by Paul DuBois +-o The \'default\' book to read if you wont to learn to use MySQL / MariaDB. +-* MySQL Cookbook by Paul DuBois +-o A lot of examples of how to use MySQL. As with all of Paul\'s books, it\'s worth its weight in gold and even enjoyable reading for such a \'dry\' subject. +-* High Performance MySQL, Second Edition, By Baron Schwartz, Peter Zaitsev, Vadim Tkachenko, Jeremy D. Zawodny, Arjen Lentz, Derek J. Balling, et al. +-o \"High Performance MySQL is the definitive guide to building fast, reliable systems with MySQL. Written by noted experts with years of real-world experience building very large systems, this book covers every aspect of MySQL performance in detail, and focuses on robustness, security, and data integrity. Learn advanced techniques in depth so you can bring out MySQL\'s full power.\" (From the book description at O\'Reilly) +- +- * MySQL Admin Cookbook +- o A quick step-by-step guide for MySQL users and database administrators to tackle real-world challenges with MySQL configuration and administration +- +- * MySQL 5.0 Certification Study Guide, By Paul DuBois, Stefan Hinz, Carsten Pedersen +- o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. ', +-'There are several reasons why contributing code is one of the easiest and most rewarding ways to contribute to MariaDB: +- +- 1. We are very responsive toward reviews of submitted code and as soon as the review is done, the submitted code is merged into an existing MariaDB tree and made available to everyone, not just select customers. +- 2. Code reviews are performed by the MariaDB core development team and the quality, detail, and timeliness of our reviews are better than you will find elsewhere. +- 3. With MariaDB everyone has access to the latest code. +- 4. If a patch is very safe and/or very useful we are willing to push it into the stable code (as long as it can\'t break any existing applications). We are willing to do this to ensure the freedom to add small, needed fixes on a stable release so users don\'t have to wait a year for something to be added which is critical to their business. +- 5. If you are an active contributor, you can become a member of maria-captains, even if you aren\'t working for Monty Program Ab. All captains have the same rights as any other captain to accept and reject patches. Our development model is truly open for everyone. +-The Contributing Code page details many of the actual steps involved in working with the MariaDB source code. It\'s important that you use the same tools and submit patches in the same way as other developers to keep development running smoothly.' +- ), ('text2','test1','test2'); +-SELECT v0 FROM t1 WHERE MATCH(v1,v2) AGAINST ('contributing' IN NATURAL LANGUAGE MODE); +-v0 +-INSERT INTO t1 (v0,v1,v2) VALUES ('text3','test','test'); +-SELECT v0, MATCH(v1,v2) AGAINST('contributing' IN NATURAL LANGUAGE MODE) AS rating FROM t1 WHERE MATCH(v1,v2) AGAINST ('contributing' IN NATURAL LANGUAGE MODE); +-v0 rating +-text1 0.2809644043445587 +-INSERT INTO t1 (v0,v1,v2) VALUES ('text4','Contributing more...','...is a good idea'),('text5','test','test'); +-SELECT v0, MATCH(v1) AGAINST('contributing') AS rating FROM t1 WHERE MATCH(v1) AGAINST ('contributing'); +-v0 rating +-text4 1.3705332279205322 +-SELECT v0 FROM t1 WHERE MATCH(v1,v2) AGAINST ('-test1 +critical +Cook*' IN BOOLEAN MODE); +-v0 +-text1 +-SELECT v0 FROM t1 WHERE MATCH(v1,v2) AGAINST ('-patch +critical +Cook*' IN BOOLEAN MODE); +-v0 +-SELECT v0, MATCH(v1,v2) AGAINST('database' WITH QUERY EXPANSION) AS rating FROM t1 WHERE MATCH(v1,v2) AGAINST ('database' WITH QUERY EXPANSION); +-v0 rating +-text1 190.56150817871094 +-text4 1.1758291721343994 +-DROP TABLE t1; ++ERROR HY000: The used table type doesn't support FULLTEXT indexes ++# ERROR: Statement ended with errno 1214, errname ER_TABLE_CANT_HANDLE_FT (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command finished with ER_TABLE_CANT_HANDLE_FT. ++# FULLTEXT indexes or multiple keys or VARCHAR|TEXT data types or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- diff --git a/storage/myisammrg/mysql-test/storage_engine/handler.rdiff b/storage/myisammrg/mysql-test/storage_engine/handler.rdiff index f0c01085ad9..c56cfae0e3a 100644 --- a/storage/myisammrg/mysql-test/storage_engine/handler.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/handler.rdiff @@ -1,79 +1,88 @@ -5,47c5,12 -< HANDLER t1 READ FIRST; -< ERROR 42S02: Unknown table 't1' in HANDLER -< HANDLER h1 READ FIRST; -< a b -< foobar 1000 -< HANDLER h1 READ NEXT; -< a b -< a 1 -< HANDLER h1 READ FIRST WHERE a < 'foo'; -< a b -< a 1 -< HANDLER h1 READ NEXT; -< a b -< bar 200 -< HANDLER h1 READ NEXT; -< a b -< foo 100 -< HANDLER h1 READ NEXT; -< a b -< HANDLER h1 READ FIRST LIMIT 2; -< a b -< foobar 1000 -< a 1 -< HANDLER h1 READ NEXT; -< a b -< bar 200 -< HANDLER h1 READ NEXT WHERE b>500 LIMIT 2; -< a b -< HANDLER t1 OPEN; -< HANDLER h1 READ FIRST WHERE b>500 LIMIT 5; -< a b -< foobar 1000 -< HANDLER t1 READ NEXT; -< a b -< foobar 1000 -< HANDLER h1 READ NEXT WHERE b<100; -< a b -< HANDLER t1 CLOSE; -< HANDLER h1 READ FIRST; -< a b -< foobar 1000 -< HANDLER t1 CLOSE; -< ERROR 42S02: Unknown table 't1' in HANDLER ---- -> ERROR HY000: Table storage engine for 'h1' doesn't have this option -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command finished with ER_ILLEGAL_HA. -> # Functionality or the syntax or the mix could be unsupported. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -54,76c19 -< HANDLER h1 READ a = (100); -< a b -< 100 f -< HANDLER h1 READ a <= (100) WHERE b < 'f'; -< a b -< 2 c -< HANDLER h1 READ a > (2) WHERE b IS NOT NULL LIMIT 2; -< a b -< 100 f -< 101 b -< HANDLER h1 READ a FIRST; -< a b -< 1 a -< HANDLER h1 READ a LAST; -< a b -< 200 b -< HANDLER h1 READ a PREV; -< a b -< 101 b -< HANDLER h1 READ a NEXT; -< a b -< 200 b -< HANDLER h1 CLOSE; ---- -> ERROR HY000: Table storage engine for 'h1' doesn't have this option +--- handler.result 2013-01-22 22:05:05.246633000 +0400 ++++ handler.reject 2013-01-23 02:50:29.411882697 +0400 +@@ -2,76 +2,19 @@ + CREATE TABLE t1 (a , b ) ENGINE= ; + INSERT INTO t1 (a,b) VALUES ('foobar',1000),('a',1),('bar',200),('foo',100); + HANDLER t1 OPEN AS h1; +-HANDLER t1 READ FIRST; +-ERROR 42S02: Unknown table 't1' in HANDLER +-HANDLER h1 READ FIRST; +-a b +-foobar 1000 +-HANDLER h1 READ NEXT; +-a b +-a 1 +-HANDLER h1 READ FIRST WHERE a < 'foo'; +-a b +-a 1 +-HANDLER h1 READ NEXT; +-a b +-bar 200 +-HANDLER h1 READ NEXT; +-a b +-foo 100 +-HANDLER h1 READ NEXT; +-a b +-HANDLER h1 READ FIRST LIMIT 2; +-a b +-foobar 1000 +-a 1 +-HANDLER h1 READ NEXT; +-a b +-bar 200 +-HANDLER h1 READ NEXT WHERE b>500 LIMIT 2; +-a b +-HANDLER t1 OPEN; +-HANDLER h1 READ FIRST WHERE b>500 LIMIT 5; +-a b +-foobar 1000 +-HANDLER t1 READ NEXT; +-a b +-foobar 1000 +-HANDLER h1 READ NEXT WHERE b<100; +-a b +-HANDLER t1 CLOSE; +-HANDLER h1 READ FIRST; +-a b +-foobar 1000 +-HANDLER t1 CLOSE; +-ERROR 42S02: Unknown table 't1' in HANDLER ++ERROR HY000: Table storage engine for 'h1' doesn't have this option ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command finished with ER_ILLEGAL_HA. ++# Functionality or the syntax or the mix could be unsupported. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP TABLE t1; + HANDLER h1 CLOSE; + ERROR 42S02: Unknown table 'h1' in HANDLER + CREATE TABLE t1 (a , b , (a)) ENGINE= ; + INSERT INTO t1 (b,a) VALUES ('a',1),('b',200),('f',100),('b',101),('c',2); + HANDLER t1 OPEN AS h1; +-HANDLER h1 READ a = (100); +-a b +-100 f +-HANDLER h1 READ a <= (100) WHERE b < 'f'; +-a b +-2 c +-HANDLER h1 READ a > (2) WHERE b IS NOT NULL LIMIT 2; +-a b +-100 f +-101 b +-HANDLER h1 READ a FIRST; +-a b +-1 a +-HANDLER h1 READ a LAST; +-a b +-200 b +-HANDLER h1 READ a PREV; +-a b +-101 b +-HANDLER h1 READ a NEXT; +-a b +-200 b +-HANDLER h1 CLOSE; ++ERROR HY000: Table storage engine for 'h1' doesn't have this option + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/index.rdiff b/storage/myisammrg/mysql-test/storage_engine/index.rdiff index 6e6f18e39bc..bf6806979ec 100644 --- a/storage/myisammrg/mysql-test/storage_engine/index.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/index.rdiff @@ -1,6 +1,11 @@ -64,66c64 -< ERROR 23000: Duplicate entry '1' for key 'a' -< # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). -< # If you got a difference in error message, just add it to rdiff file ---- -> # ERROR: Statement succeeded (expected results: ER_DUP_ENTRY,ER_DUP_KEY) +--- index.result 2013-01-22 22:05:05.246633000 +0400 ++++ index.reject 2013-01-23 02:50:30.111873897 +0400 +@@ -61,7 +61,5 @@ + ALTER TABLE t1 DROP INDEX a; + INSERT INTO t1 (a,b) VALUES (1,'c'); + ALTER TABLE t1 ADD UNIQUE INDEX a(a) ; +-ERROR 23000: Duplicate entry '1' for key 'a' +-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). +-# If you got a difference in error message, just add it to rdiff file ++# ERROR: Statement succeeded (expected results: ER_DUP_ENTRY,ER_DUP_KEY) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/index_enable_disable.rdiff b/storage/myisammrg/mysql-test/storage_engine/index_enable_disable.rdiff index 8913f17a2a6..7b89e177ffb 100644 --- a/storage/myisammrg/mysql-test/storage_engine/index_enable_disable.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/index_enable_disable.rdiff @@ -1,17 +1,33 @@ -13a14,15 -> Warnings: -> Note 1031 Table storage engine for 't1' doesn't have this option -16c18 -< t1 1 a 1 a # # NULL NULL YES BTREE disabled ---- -> t1 1 a 1 a # # NULL NULL YES BTREE -19c21 -< 1 SIMPLE t1 ALL NULL NULL NULL NULL 19 Using filesort ---- -> 1 SIMPLE t1 index NULL a 5 NULL 19 Using index -22a25,26 -> Warnings: -> Note 1031 Table storage engine for 't1' doesn't have this option -34a39,40 -> Warnings: -> Note 1031 Table storage engine for 't1' doesn't have this option +--- index_enable_disable.result 2013-01-22 22:05:05.246633000 +0400 ++++ index_enable_disable.reject 2013-01-23 02:50:30.723866202 +0400 +@@ -11,15 +11,19 @@ + Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment + t1 1 a 1 a # # NULL NULL YES BTREE + ALTER TABLE t1 DISABLE KEYS; ++Warnings: ++Note 1031 Table storage engine for 't1' doesn't have this option + SHOW INDEX IN t1; + Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 1 a 1 a # # NULL NULL YES BTREE disabled ++t1 1 a 1 a # # NULL NULL YES BTREE + EXPLAIN SELECT a FROM t1 ORDER BY a; + id select_type table type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 ALL NULL NULL NULL NULL 19 Using filesort ++1 SIMPLE t1 index NULL a 5 NULL 19 Using index + INSERT INTO t1 (a) VALUES + (11),(12),(13),(14),(15),(16),(17),(18),(19),(20); + ALTER TABLE t1 ENABLE KEYS; ++Warnings: ++Note 1031 Table storage engine for 't1' doesn't have this option + SHOW INDEX IN t1; + Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment + t1 1 a 1 a # # NULL NULL YES BTREE +@@ -32,6 +36,8 @@ + (1),(2),(3),(4),(5),(6),(7),(8),(9), + (21),(22),(23),(24),(25),(26),(27),(28),(29); + ALTER TABLE t1 DISABLE KEYS; ++Warnings: ++Note 1031 Table storage engine for 't1' doesn't have this option + INSERT INTO t1 (a) VALUES (29); + ERROR 23000: Duplicate entry '29' for key 'a' + # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). diff --git a/storage/myisammrg/mysql-test/storage_engine/index_type_btree.rdiff b/storage/myisammrg/mysql-test/storage_engine/index_type_btree.rdiff index 6e6f18e39bc..1874b0d5891 100644 --- a/storage/myisammrg/mysql-test/storage_engine/index_type_btree.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/index_type_btree.rdiff @@ -1,6 +1,11 @@ -64,66c64 -< ERROR 23000: Duplicate entry '1' for key 'a' -< # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). -< # If you got a difference in error message, just add it to rdiff file ---- -> # ERROR: Statement succeeded (expected results: ER_DUP_ENTRY,ER_DUP_KEY) +--- index_type_btree.result 2013-01-22 22:05:05.246633000 +0400 ++++ index_type_btree.reject 2013-01-23 02:50:31.963850614 +0400 +@@ -61,7 +61,5 @@ + ALTER TABLE t1 DROP INDEX a; + INSERT INTO t1 (a,b) VALUES (1,'c'); + ALTER TABLE t1 ADD UNIQUE INDEX a(a) USING BTREE; +-ERROR 23000: Duplicate entry '1' for key 'a' +-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). +-# If you got a difference in error message, just add it to rdiff file ++# ERROR: Statement succeeded (expected results: ER_DUP_ENTRY,ER_DUP_KEY) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/index_type_hash.rdiff b/storage/myisammrg/mysql-test/storage_engine/index_type_hash.rdiff index 1b57afe5b64..f6fd1e391aa 100644 --- a/storage/myisammrg/mysql-test/storage_engine/index_type_hash.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/index_type_hash.rdiff @@ -1,34 +1,69 @@ -7c7 -< t1 1 a 1 a # # NULL NULL # HASH ---- -> t1 1 a 1 a # # NULL NULL # BTREE -15,16c15,16 -< t1 1 a_b 1 a # # NULL NULL # HASH a_b index -< t1 1 a_b 2 b # # NULL NULL # HASH a_b index ---- -> t1 1 a_b 1 a # # NULL NULL # BTREE a_b index -> t1 1 a_b 2 b # # NULL NULL # BTREE a_b index -25,26c25,26 -< t1 1 a 1 a # # NULL NULL # HASH -< t1 1 b 1 b # # NULL NULL # HASH ---- -> t1 1 a 1 a # # NULL NULL # BTREE -> t1 1 b 1 b # # NULL NULL # BTREE -34c34 -< t1 0 a 1 a # # NULL NULL # HASH ---- -> t1 0 a 1 a # # NULL NULL # BTREE -46c46 -< t1 1 a 1 a # # NULL NULL # HASH simple index on a ---- -> t1 1 a 1 a # # NULL NULL # BTREE simple index on a -55c55 -< t1 0 a 1 a # # NULL NULL # HASH ---- -> t1 0 a 1 a # # NULL NULL # BTREE -64,66c64 -< ERROR 23000: Duplicate entry '1' for key 'a' -< # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). -< # If you got a difference in error message, just add it to rdiff file ---- -> # ERROR: Statement succeeded (expected results: ER_DUP_ENTRY,ER_DUP_KEY) +--- index_type_hash.result 2013-01-22 22:05:05.246633000 +0400 ++++ index_type_hash.reject 2013-01-23 02:50:32.647842015 +0400 +@@ -4,7 +4,7 @@ + ) ENGINE= ; + SHOW KEYS IN t1; + Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 1 a 1 a # # NULL NULL # HASH ++t1 1 a 1 a # # NULL NULL # BTREE + DROP TABLE t1; + CREATE TABLE t1 (a , + b , +@@ -12,8 +12,8 @@ + ) ENGINE= ; + SHOW KEYS IN t1; + Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 1 a_b 1 a # # NULL NULL # HASH a_b index +-t1 1 a_b 2 b # # NULL NULL # HASH a_b index ++t1 1 a_b 1 a # # NULL NULL # BTREE a_b index ++t1 1 a_b 2 b # # NULL NULL # BTREE a_b index + DROP TABLE t1; + CREATE TABLE t1 (a , + b , +@@ -22,8 +22,8 @@ + ) ENGINE= ; + SHOW KEYS IN t1; + Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 1 a 1 a # # NULL NULL # HASH +-t1 1 b 1 b # # NULL NULL # HASH ++t1 1 a 1 a # # NULL NULL # BTREE ++t1 1 b 1 b # # NULL NULL # BTREE + DROP TABLE t1; + CREATE TABLE t1 (a , + b , +@@ -31,7 +31,7 @@ + ) ENGINE= ; + SHOW KEYS IN t1; + Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 0 a 1 a # # NULL NULL # HASH ++t1 0 a 1 a # # NULL NULL # BTREE + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); + INSERT INTO t1 (a,b) VALUES (1,'c'); + ERROR 23000: Duplicate entry '1' for key 'a' +@@ -43,7 +43,7 @@ + ALTER TABLE t1 ADD (a) USING HASH COMMENT 'simple index on a'; + SHOW INDEX FROM t1; + Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 1 a 1 a # # NULL NULL # HASH simple index on a ++t1 1 a 1 a # # NULL NULL # BTREE simple index on a + ALTER TABLE t1 DROP KEY a; + DROP TABLE t1; + CREATE TABLE t1 (a , +@@ -52,7 +52,7 @@ + ) ENGINE= ; + SHOW KEYS IN t1; + Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 0 a 1 a # # NULL NULL # HASH ++t1 0 a 1 a # # NULL NULL # BTREE + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); + INSERT INTO t1 (a,b) VALUES (1,'c'); + ERROR 23000: Duplicate entry '1' for key 'a' +@@ -61,7 +61,5 @@ + ALTER TABLE t1 DROP INDEX a; + INSERT INTO t1 (a,b) VALUES (1,'c'); + ALTER TABLE t1 ADD UNIQUE INDEX a(a) USING HASH; +-ERROR 23000: Duplicate entry '1' for key 'a' +-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). +-# If you got a difference in error message, just add it to rdiff file ++# ERROR: Statement succeeded (expected results: ER_DUP_ENTRY,ER_DUP_KEY) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/insert_delayed.rdiff b/storage/myisammrg/mysql-test/storage_engine/insert_delayed.rdiff index e0d0eefabe4..24ffa2ab82f 100644 --- a/storage/myisammrg/mysql-test/storage_engine/insert_delayed.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/insert_delayed.rdiff @@ -1,14 +1,26 @@ -7a8,15 -> ERROR HY000: DELAYED option not supported for table 't1' -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command finished with ER_DELAYED_NOT_SUPPORTED. -> # INSERT DELAYED or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -8a17 -> ERROR HY000: DELAYED option not supported for table 't1' -23,24d31 -< 3 c -< 4 d +--- insert_delayed.result 2013-01-23 01:23:49.461254916 +0400 ++++ insert_delayed.reject 2013-01-23 02:50:34.475819034 +0400 +@@ -5,7 +5,16 @@ + connect con0,localhost,root,,; + SET lock_wait_timeout = 1; + INSERT DELAYED INTO t1 (a,b) VALUES (3,'c'); ++ERROR HY000: DELAYED option not supported for table 't1' ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command finished with ER_DELAYED_NOT_SUPPORTED. ++# INSERT DELAYED or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + INSERT DELAYED INTO t1 SET a=4, b='d'; ++ERROR HY000: DELAYED option not supported for table 't1' + INSERT DELAYED INTO t1 (a,b) SELECT 5, 'e'; + ERROR HY000: Lock wait timeout exceeded; try restarting transaction + disconnect con0; +@@ -20,6 +29,4 @@ + a b + 1 f + 2 b +-3 c +-4 d + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/lock.rdiff b/storage/myisammrg/mysql-test/storage_engine/lock.rdiff index d035648551a..598e47b6883 100644 --- a/storage/myisammrg/mysql-test/storage_engine/lock.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/lock.rdiff @@ -1,62 +1,80 @@ -44a45,46 -> ERROR HY000: Table 't1' was not locked with LOCK TABLES -> # ERROR: Statement ended with errno 1100, errname ER_TABLE_NOT_LOCKED (expected to succeed) -45a48,49 -> ERROR HY000: Table 't2' was not locked with LOCK TABLES -> # ERROR: Statement ended with errno 1100, errname ER_TABLE_NOT_LOCKED (expected to succeed) -46a51 -> ERROR HY000: Table 't2' was not locked with LOCK TABLES -47a53 -> ERROR HY000: Table 't2' was not locked with LOCK TABLES -48a55 -> ERROR 42S02: Table 'test.t1' doesn't exist -49a57 -> ERROR 42S02: Table 'test.t1' doesn't exist -50a59 -> ERROR 42S02: Table 'test.t1' doesn't exist -52a62 -> ERROR 42S02: Table 'test.t1' doesn't exist -54c64,65 -< ERROR HY000: Table 't1' was not locked with LOCK TABLES ---- -> ERROR 42S02: Table 'test.t1' doesn't exist -> # ERROR: Statement ended with errno 1146, errname ER_NO_SUCH_TABLE (expected results: ER_TABLE_NOT_LOCKED) -56a68 -> ERROR 42S02: Table 'test.t1' doesn't exist -57a70 -> ERROR 42S02: Table 'test.t1' doesn't exist -59c72,73 -< ERROR HY000: Table 't2' was not locked with LOCK TABLES ---- -> ERROR 42S02: Unknown table 't1,t2' -> # ERROR: Statement ended with errno 1051, errname ER_BAD_TABLE_ERROR (expected results: ER_TABLE_NOT_LOCKED) -61a76 -> ERROR 42S02: Unknown table 't1,t2' -67a83,84 -> ERROR HY000: Table 't1' was not locked with LOCK TABLES -> # ERROR: Statement ended with errno 1100, errname ER_TABLE_NOT_LOCKED (expected to succeed) -68a86,87 -> ERROR HY000: Table 't2' was not locked with LOCK TABLES -> # ERROR: Statement ended with errno 1100, errname ER_TABLE_NOT_LOCKED (expected to succeed) -69a89,90 -> ERROR HY000: Table 't3' was not locked with LOCK TABLES -> # ERROR: Statement ended with errno 1100, errname ER_TABLE_NOT_LOCKED (expected to succeed) -70a92 -> ERROR 42S02: Table 'test.t1' doesn't exist -71a94,103 -> ERROR 42S02: Table 'test.t2' doesn't exist -> # ERROR: Statement ended with errno 1146, errname ER_NO_SUCH_TABLE (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ ALTER TABLE t2 ADD COLUMN c2 INT(11) /*!*/ /*Custom column options*/ ] -> # The statement|command finished with ER_NO_SUCH_TABLE. -> # ALTER TABLE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -72a105 -> ERROR 42S02: Unknown table 't1,t2,t3' -109c142 -< a b ---- -> ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist +--- lock.result 2013-01-23 01:24:01.797100027 +0400 ++++ lock.reject 2013-01-23 02:50:53.291582487 +0400 +@@ -42,34 +42,67 @@ + UPDATE t1 SET id=1 WHERE id=-1; + DROP TABLE t1,t2; + CREATE TABLE t1 (i1 , nr ) ENGINE= ; ++ERROR HY000: Table 't1' was not locked with LOCK TABLES ++# ERROR: Statement ended with errno 1100, errname ER_TABLE_NOT_LOCKED (expected to succeed) + CREATE TABLE t2 (nr , nm ) ENGINE= ; ++ERROR HY000: Table 't2' was not locked with LOCK TABLES ++# ERROR: Statement ended with errno 1100, errname ER_TABLE_NOT_LOCKED (expected to succeed) + INSERT INTO t2 (nr,nm) VALUES (1,3); ++ERROR HY000: Table 't2' was not locked with LOCK TABLES + INSERT INTO t2 (nr,nm) VALUES (2,4); ++ERROR HY000: Table 't2' was not locked with LOCK TABLES + lock tables t1 write, t2 read; ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t1 (i1,nr) SELECT 1, nr FROM t2 WHERE nm=3; ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t1 (i1,nr) SELECT 2, nr FROM t2 WHERE nm=4; ++ERROR 42S02: Table 'test.t1' doesn't exist + UNLOCK TABLES; + LOCK TABLES t1 WRITE; ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t1 (i1,nr) SELECT i1, nr FROM t1; +-ERROR HY000: Table 't1' was not locked with LOCK TABLES ++ERROR 42S02: Table 'test.t1' doesn't exist ++# ERROR: Statement ended with errno 1146, errname ER_NO_SUCH_TABLE (expected results: ER_TABLE_NOT_LOCKED) + UNLOCK TABLES; + LOCK TABLES t1 WRITE, t1 AS t1_alias READ; ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t1 (i1,nr) SELECT i1, nr FROM t1 AS t1_alias; ++ERROR 42S02: Table 'test.t1' doesn't exist + DROP TABLE t1,t2; +-ERROR HY000: Table 't2' was not locked with LOCK TABLES ++ERROR 42S02: Unknown table 't1,t2' ++# ERROR: Statement ended with errno 1051, errname ER_BAD_TABLE_ERROR (expected results: ER_TABLE_NOT_LOCKED) + UNLOCK TABLES; + DROP TABLE t1,t2; ++ERROR 42S02: Unknown table 't1,t2' + CREATE TABLE t1 (a , b ) ENGINE= ; + CREATE TABLE t2 (a , b ) ENGINE= ; + CREATE TABLE t3 (a , b ) ENGINE= ; + LOCK TABLES t1 WRITE, t2 WRITE, t3 WRITE; + DROP TABLE t2, t3, t1; + CREATE TABLE t1 (a , b ) ENGINE= ; ++ERROR HY000: Table 't1' was not locked with LOCK TABLES ++# ERROR: Statement ended with errno 1100, errname ER_TABLE_NOT_LOCKED (expected to succeed) + CREATE TABLE t2 (a , b ) ENGINE= ; ++ERROR HY000: Table 't2' was not locked with LOCK TABLES ++# ERROR: Statement ended with errno 1100, errname ER_TABLE_NOT_LOCKED (expected to succeed) + CREATE TABLE t3 (a , b ) ENGINE= ; ++ERROR HY000: Table 't3' was not locked with LOCK TABLES ++# ERROR: Statement ended with errno 1100, errname ER_TABLE_NOT_LOCKED (expected to succeed) + LOCK TABLES t1 WRITE, t2 WRITE, t3 WRITE, t1 AS t4 READ; ++ERROR 42S02: Table 'test.t1' doesn't exist + ALTER TABLE t2 ADD COLUMN c2 ; ++ERROR 42S02: Table 'test.t2' doesn't exist ++# ERROR: Statement ended with errno 1146, errname ER_NO_SUCH_TABLE (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ ALTER TABLE t2 ADD COLUMN c2 INT(11) /*!*/ /*Custom column options*/ ] ++# The statement|command finished with ER_NO_SUCH_TABLE. ++# ALTER TABLE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP TABLE t1, t2, t3; ++ERROR 42S02: Unknown table 't1,t2,t3' + CREATE TABLE t1 (a , b ) ENGINE= ; + CREATE TABLE t2 (a , b ) ENGINE= ; + LOCK TABLE t1 READ, t2 READ; +@@ -106,6 +139,6 @@ + FLUSH TABLE t1; + DROP TEMPORARY TABLE t1; + SELECT a,b FROM t1; +-a b ++ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist + UNLOCK TABLES; + DROP TABLE t1, t2; diff --git a/storage/myisammrg/mysql-test/storage_engine/optimize_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/optimize_table.rdiff index f74c49cedea..1b611adf25a 100644 --- a/storage/myisammrg/mysql-test/storage_engine/optimize_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/optimize_table.rdiff @@ -1,24 +1,35 @@ -8c8 -< test.t1 optimize status OK ---- -> test.t1 optimize note The storage engine for the table doesn't support optimize -12c12 -< test.t2 optimize status OK ---- -> test.t2 optimize note The storage engine for the table doesn't support optimize -17,18c17,18 -< test.t1 optimize status OK -< test.t2 optimize status OK ---- -> test.t1 optimize note The storage engine for the table doesn't support optimize -> test.t2 optimize note The storage engine for the table doesn't support optimize -21,22c21,22 -< test.t1 optimize status Table is already up to date -< test.t2 optimize status Table is already up to date ---- -> test.t1 optimize note The storage engine for the table doesn't support optimize -> test.t2 optimize note The storage engine for the table doesn't support optimize -28c28 -< test.t1 optimize status OK ---- -> test.t1 optimize note The storage engine for the table doesn't support optimize +--- optimize_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ optimize_table.reject 2013-01-23 02:50:54.339569313 +0400 +@@ -5,25 +5,25 @@ + INSERT INTO t1 (a,b) VALUES (3,'c'),(4,'d'); + OPTIMIZE TABLE t1; + Table Op Msg_type Msg_text +-test.t1 optimize status OK ++test.t1 optimize note The storage engine for the table doesn't support optimize + INSERT INTO t2 (a,b) VALUES (4,'d'); + OPTIMIZE NO_WRITE_TO_BINLOG TABLE t2; + Table Op Msg_type Msg_text +-test.t2 optimize status OK ++test.t2 optimize note The storage engine for the table doesn't support optimize + INSERT INTO t2 (a,b) VALUES (5,'e'); + INSERT INTO t1 (a,b) VALUES (6,'f'); + OPTIMIZE LOCAL TABLE t1, t2; + Table Op Msg_type Msg_text +-test.t1 optimize status OK +-test.t2 optimize status OK ++test.t1 optimize note The storage engine for the table doesn't support optimize ++test.t2 optimize note The storage engine for the table doesn't support optimize + OPTIMIZE TABLE t1, t2; + Table Op Msg_type Msg_text +-test.t1 optimize status Table is already up to date +-test.t2 optimize status Table is already up to date ++test.t1 optimize note The storage engine for the table doesn't support optimize ++test.t2 optimize note The storage engine for the table doesn't support optimize + DROP TABLE t1, t2; + CREATE TABLE t1 (a , b , (a)) ENGINE= ; + INSERT INTO t1 (a,b) VALUES (1,'a'),(100,'b'),(2,'c'),(3,'d'); + OPTIMIZE TABLE t1; + Table Op Msg_type Msg_text +-test.t1 optimize status OK ++test.t1 optimize note The storage engine for the table doesn't support optimize + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/alter_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/alter_table.rdiff index a2cb0c1dcb1..4c7ba7d8232 100644 --- a/storage/myisammrg/mysql-test/storage_engine/parts/alter_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/parts/alter_table.rdiff @@ -1,63 +1,68 @@ -3,36c3,12 -< INSERT INTO t1 (a) VALUES (1),(2),(2),(3),(4); -< ALTER TABLE t1 ADD PARTITION PARTITIONS 2; -< EXPLAIN PARTiTIONS SELECT a FROM t1 WHERE a = 3; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p3 # # # # # # # -< ALTER TABLE t1 COALESCE PARTITION 1; -< EXPLAIN PARTiTIONS SELECT a FROM t1 WHERE a = 3; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0 # # # # # # # -< ALTER TABLE t1 REORGANIZE PARTITION; -< EXPLAIN PARTiTIONS SELECT a FROM t1 WHERE a = 2; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0 # # # # # # # -< ALTER TABLE t1 REBUILD PARTITION p0; -< EXPLAIN PARTiTIONS SELECT a FROM t1; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0 # # # # # # # -< ALTER TABLE t1 REMOVE PARTITIONING; -< EXPLAIN PARTiTIONS SELECT a FROM t1; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 NULL # # # # # # # -< ALTER TABLE t1 PARTITION BY LIST(a) (PARTITION p0 VALUES IN (1,2,3), PARTITION p1 VALUES IN (101,102)); -< ERROR HY000: Table has no partition for value 4 -< ALTER TABLE t1 PARTITION BY LIST(a) (PARTITION p0 VALUES IN (1,2,3,4), PARTITION p1 VALUES IN (101,102)); -< INSERT INTO t1 (a) VALUES (50); -< ERROR HY000: Table has no partition for value 50 -< ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES IN (50,51)); -< INSERT INTO t1 (a) VALUES (50); -< ALTER TABLE t1 DROP PARTITION p1; -< ALTER TABLE t1 REORGANIZE PARTITION p0, p2 INTO (PARTITION p0 VALUES IN (1,2,3), PARTITION p1 VALUES IN (4), PARTITION p2 VALUES IN (50,51), PARTITION p3 VALUES IN (101,102)); -< EXPLAIN PARTiTIONS SELECT a FROM t1 WHERE a = 2; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0 # # # # # # # -< DROP TABLE t1; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -41,42c17,29 -< ALTER TABLE t1 DROP PARTITION abc; -< DROP TABLE t1; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY LIST(a) SUBPARTITION by HASH(b) ( -> PARTITION abc VALUES IN (1,2,3), -> PARTITION def VALUES IN (100,101,102) -> ) ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or subpartitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- +--- alter_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ alter_table.reject 2013-01-23 03:16:22.620356221 +0400 +@@ -1,42 +1,29 @@ + DROP TABLE IF EXISTS t1; + CREATE TABLE t1 (a ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; +-INSERT INTO t1 (a) VALUES (1),(2),(2),(3),(4); +-ALTER TABLE t1 ADD PARTITION PARTITIONS 2; +-EXPLAIN PARTiTIONS SELECT a FROM t1 WHERE a = 3; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p3 # # # # # # # +-ALTER TABLE t1 COALESCE PARTITION 1; +-EXPLAIN PARTiTIONS SELECT a FROM t1 WHERE a = 3; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0 # # # # # # # +-ALTER TABLE t1 REORGANIZE PARTITION; +-EXPLAIN PARTiTIONS SELECT a FROM t1 WHERE a = 2; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0 # # # # # # # +-ALTER TABLE t1 REBUILD PARTITION p0; +-EXPLAIN PARTiTIONS SELECT a FROM t1; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0 # # # # # # # +-ALTER TABLE t1 REMOVE PARTITIONING; +-EXPLAIN PARTiTIONS SELECT a FROM t1; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 NULL # # # # # # # +-ALTER TABLE t1 PARTITION BY LIST(a) (PARTITION p0 VALUES IN (1,2,3), PARTITION p1 VALUES IN (101,102)); +-ERROR HY000: Table has no partition for value 4 +-ALTER TABLE t1 PARTITION BY LIST(a) (PARTITION p0 VALUES IN (1,2,3,4), PARTITION p1 VALUES IN (101,102)); +-INSERT INTO t1 (a) VALUES (50); +-ERROR HY000: Table has no partition for value 50 +-ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES IN (50,51)); +-INSERT INTO t1 (a) VALUES (50); +-ALTER TABLE t1 DROP PARTITION p1; +-ALTER TABLE t1 REORGANIZE PARTITION p0, p2 INTO (PARTITION p0 VALUES IN (1,2,3), PARTITION p1 VALUES IN (4), PARTITION p2 VALUES IN (50,51), PARTITION p3 VALUES IN (101,102)); +-EXPLAIN PARTiTIONS SELECT a FROM t1 WHERE a = 2; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0 # # # # # # # +-DROP TABLE t1; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY LIST(a) SUBPARTITION by HASH(b) ( + PARTITION abc VALUES IN (1,2,3), + PARTITION def VALUES IN (100,101,102) + ); +-ALTER TABLE t1 DROP PARTITION abc; +-DROP TABLE t1; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY LIST(a) SUBPARTITION by HASH(b) ( ++PARTITION abc VALUES IN (1,2,3), ++PARTITION def VALUES IN (100,101,102) ++) ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or subpartitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/analyze_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/analyze_table.rdiff index ce29f3dcf52..d1934b9d2ac 100644 --- a/storage/myisammrg/mysql-test/storage_engine/parts/analyze_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/parts/analyze_table.rdiff @@ -1,83 +1,87 @@ -3,18c3,12 -< INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); -< CREATE TABLE t2 (a , b ) ENGINE= ; -< INSERT INTO t2 (a,b) SELECT a,b FROM t1; -< INSERT INTO t1 (a,b) VALUES (3,'c'); -< ALTER TABLE t1 ANALYZE PARTITION p0; -< Table Op Msg_type Msg_text -< test.t1 analyze status OK -< INSERT INTO t2 (a,b) VALUES (4,'d'), (1000,'e'); -< ALTER TABLE t1 ANALYZE PARTITION LOCAL ALL; -< Table Op Msg_type Msg_text -< test.t1 analyze status OK -< INSERT INTO t1 (a,b) VALUES (5,'f'),(50,'g'); -< ALTER TABLE t1 ANALYZE PARTITION NO_WRITE_TO_BINLOG p1,p0; -< Table Op Msg_type Msg_text -< test.t1 analyze status OK -< DROP TABLE t1, t2; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -20a15,16 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -21a18 -> ERROR 42S02: Table 'test.t1' doesn't exist -22a20,21 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -23a23 -> ERROR 42S02: Table 'test.t1' doesn't exist -26c26,27 -< test.t1 analyze status OK ---- -> test.t1 analyze Error Table 'test.t1' doesn't exist -> test.t1 analyze status Operation failed -27a29 -> ERROR 42S02: Table 'test.t2' doesn't exist -30c32,33 -< test.t2 analyze status OK ---- -> test.t2 analyze Error Table 'test.t2' doesn't exist -> test.t2 analyze status Operation failed -31a35 -> ERROR 42S02: Table 'test.t1' doesn't exist -32a37 -> ERROR 42S02: Table 'test.t2' doesn't exist -35,36c40,43 -< test.t1 analyze status OK -< test.t2 analyze status OK ---- -> test.t1 analyze Error Table 'test.t1' doesn't exist -> test.t1 analyze status Operation failed -> test.t2 analyze Error Table 'test.t2' doesn't exist -> test.t2 analyze status Operation failed -37a45 -> ERROR 42S02: Unknown table 't1,t2' -38a47,48 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -39a50 -> ERROR 42S02: Table 'test.t1' doesn't exist -42c53,54 -< test.t1 analyze status OK ---- -> test.t1 analyze Error Table 'test.t1' doesn't exist -> test.t1 analyze status Operation failed -43a56 -> ERROR 42S02: Table 'test.t1' doesn't exist -46c59,60 -< test.t1 analyze status OK ---- -> test.t1 analyze Error Table 'test.t1' doesn't exist -> test.t1 analyze status Operation failed -47a62 -> ERROR 42S02: Unknown table 't1' +--- analyze_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ analyze_table.reject 2013-01-23 03:16:23.240348427 +0400 +@@ -1,47 +1,62 @@ + DROP TABLE IF EXISTS t1,t2; + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; +-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); +-CREATE TABLE t2 (a , b ) ENGINE= ; +-INSERT INTO t2 (a,b) SELECT a,b FROM t1; +-INSERT INTO t1 (a,b) VALUES (3,'c'); +-ALTER TABLE t1 ANALYZE PARTITION p0; +-Table Op Msg_type Msg_text +-test.t1 analyze status OK +-INSERT INTO t2 (a,b) VALUES (4,'d'), (1000,'e'); +-ALTER TABLE t1 ANALYZE PARTITION LOCAL ALL; +-Table Op Msg_type Msg_text +-test.t1 analyze status OK +-INSERT INTO t1 (a,b) VALUES (5,'f'),(50,'g'); +-ALTER TABLE t1 ANALYZE PARTITION NO_WRITE_TO_BINLOG p1,p0; +-Table Op Msg_type Msg_text +-test.t1 analyze status OK +-DROP TABLE t1, t2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP TABLE IF EXISTS t1,t2; + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); ++ERROR 42S02: Table 'test.t1' doesn't exist + CREATE TABLE t2 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a,b) VALUES (3,'c'); ++ERROR 42S02: Table 'test.t1' doesn't exist + ANALYZE TABLE t1; + Table Op Msg_type Msg_text +-test.t1 analyze status OK ++test.t1 analyze Error Table 'test.t1' doesn't exist ++test.t1 analyze status Operation failed + INSERT INTO t2 (a,b) VALUES (4,'d'); ++ERROR 42S02: Table 'test.t2' doesn't exist + ANALYZE NO_WRITE_TO_BINLOG TABLE t2; + Table Op Msg_type Msg_text +-test.t2 analyze status OK ++test.t2 analyze Error Table 'test.t2' doesn't exist ++test.t2 analyze status Operation failed + INSERT INTO t1 (a,b) VALUES (5,'e'); ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t2 (a,b) VALUES (6,'f'); ++ERROR 42S02: Table 'test.t2' doesn't exist + ANALYZE LOCAL TABLE t1, t2; + Table Op Msg_type Msg_text +-test.t1 analyze status OK +-test.t2 analyze status OK ++test.t1 analyze Error Table 'test.t1' doesn't exist ++test.t1 analyze status Operation failed ++test.t2 analyze Error Table 'test.t2' doesn't exist ++test.t2 analyze status Operation failed + DROP TABLE t1, t2; ++ERROR 42S02: Unknown table 't1,t2' + CREATE TABLE t1 (a , (a)) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a) VALUES (1),(2),(4),(7); ++ERROR 42S02: Table 'test.t1' doesn't exist + ANALYZE TABLE t1; + Table Op Msg_type Msg_text +-test.t1 analyze status OK ++test.t1 analyze Error Table 'test.t1' doesn't exist ++test.t1 analyze status Operation failed + INSERT INTO t1 (a) VALUES (8),(10),(11),(12); ++ERROR 42S02: Table 'test.t1' doesn't exist + ANALYZE TABLE t1; + Table Op Msg_type Msg_text +-test.t1 analyze status OK ++test.t1 analyze Error Table 'test.t1' doesn't exist ++test.t1 analyze status Operation failed + DROP TABLE t1; ++ERROR 42S02: Unknown table 't1' diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/check_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/check_table.rdiff index 3f3db85a23e..21ccf192e08 100644 --- a/storage/myisammrg/mysql-test/storage_engine/parts/check_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/parts/check_table.rdiff @@ -1,172 +1,176 @@ -3,36c3,12 -< INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); -< CREATE TABLE t2 (a , b ) ENGINE= PARTITION BY RANGE(a) ( -< PARTITION p0 VALUES LESS THAN (100), -< PARTITION p1 VALUES LESS THAN MAXVALUE -< ); -< INSERT INTO t2 (a,b) SELECT a, b FROM t1; -< ALTER TABLE t1 CHECK PARTITION p0; -< Table Op Msg_type Msg_text -< test.t1 check status OK -< INSERT INTO t1 (a,b) VALUES (3,'c'); -< ALTER TABLE t1 CHECK PARTITION p0, p1 FOR UPGRADE; -< Table Op Msg_type Msg_text -< test.t1 check status OK -< INSERT INTO t2 (a,b) VALUES (10000,'e'); -< ALTER TABLE t2 CHECK PARTITION p0 QUICK; -< Table Op Msg_type Msg_text -< test.t2 check status OK -< INSERT INTO t1 (a,b) VALUES (6,'f'); -< ALTER TABLE t1 CHECK PARTITION p1 FAST; -< Table Op Msg_type Msg_text -< test.t1 check status OK -< INSERT INTO t2 (a,b) VALUES (8,'h'); -< ALTER TABLE t2 CHECK PARTITION p1 MEDIUM; -< Table Op Msg_type Msg_text -< test.t2 check status OK -< INSERT INTO t1 (a,b) VALUES (9,'i'); -< ALTER TABLE t1 CHECK PARTITION ALL EXTENDED; -< Table Op Msg_type Msg_text -< test.t1 check status OK -< INSERT INTO t1 (a,b) VALUES (11,'k'); -< ALTER TABLE t1 CHECK PARTITION p0 CHANGED; -< Table Op Msg_type Msg_text -< test.t1 check status OK -< DROP TABLE t1, t2; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -38a15,16 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -39a18 -> ERROR 42S02: Table 'test.t1' doesn't exist -40a20,21 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -43c24,25 -< test.t1 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -44a27 -> ERROR 42S02: Table 'test.t1' doesn't exist -45a29 -> ERROR 42S02: Table 'test.t2' doesn't exist -48,49c32,35 -< test.t1 check status OK -< test.t2 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -> test.t2 check Error Table 'test.t2' doesn't exist -> test.t2 check status Operation failed -50a37 -> ERROR 42S02: Table 'test.t2' doesn't exist -53c40,41 -< test.t2 check status OK ---- -> test.t2 check Error Table 'test.t2' doesn't exist -> test.t2 check status Operation failed -54a43 -> ERROR 42S02: Table 'test.t1' doesn't exist -57c46,47 -< test.t1 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -58a49 -> ERROR 42S02: Table 'test.t1' doesn't exist -59a51 -> ERROR 42S02: Table 'test.t2' doesn't exist -62,63c54,57 -< test.t2 check status OK -< test.t1 check status OK ---- -> test.t2 check Error Table 'test.t2' doesn't exist -> test.t2 check status Operation failed -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -64a59 -> ERROR 42S02: Table 'test.t1' doesn't exist -65a61 -> ERROR 42S02: Table 'test.t2' doesn't exist -68,69c64,67 -< test.t1 check status OK -< test.t2 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -> test.t2 check Error Table 'test.t2' doesn't exist -> test.t2 check status Operation failed -70a69 -> ERROR 42S02: Table 'test.t1' doesn't exist -73c72,73 -< test.t1 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -74a75 -> ERROR 42S02: Unknown table 't1,t2' -75a77,78 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -76a80 -> ERROR 42S02: Table 'test.t1' doesn't exist -79c83,84 -< test.t1 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -80a86 -> ERROR 42S02: Table 'test.t1' doesn't exist -83c89,90 -< test.t1 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -84a92 -> ERROR 42S02: Table 'test.t1' doesn't exist -87c95,96 -< test.t1 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -88a98 -> ERROR 42S02: Table 'test.t1' doesn't exist -91c101,102 -< test.t1 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -92a104 -> ERROR 42S02: Table 'test.t1' doesn't exist -95c107,108 -< test.t1 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -96a110 -> ERROR 42S02: Table 'test.t1' doesn't exist -99c113,114 -< test.t1 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -100a116 -> ERROR 42S02: Table 'test.t1' doesn't exist -103c119,120 -< test.t1 check status OK ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -104a122 -> ERROR 42S02: Unknown table 't1' +--- check_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ check_table.reject 2013-01-23 03:16:23.872340482 +0400 +@@ -1,104 +1,122 @@ + DROP TABLE IF EXISTS t1, t2; + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; +-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); +-CREATE TABLE t2 (a , b ) ENGINE= PARTITION BY RANGE(a) ( +-PARTITION p0 VALUES LESS THAN (100), +-PARTITION p1 VALUES LESS THAN MAXVALUE +-); +-INSERT INTO t2 (a,b) SELECT a, b FROM t1; +-ALTER TABLE t1 CHECK PARTITION p0; +-Table Op Msg_type Msg_text +-test.t1 check status OK +-INSERT INTO t1 (a,b) VALUES (3,'c'); +-ALTER TABLE t1 CHECK PARTITION p0, p1 FOR UPGRADE; +-Table Op Msg_type Msg_text +-test.t1 check status OK +-INSERT INTO t2 (a,b) VALUES (10000,'e'); +-ALTER TABLE t2 CHECK PARTITION p0 QUICK; +-Table Op Msg_type Msg_text +-test.t2 check status OK +-INSERT INTO t1 (a,b) VALUES (6,'f'); +-ALTER TABLE t1 CHECK PARTITION p1 FAST; +-Table Op Msg_type Msg_text +-test.t1 check status OK +-INSERT INTO t2 (a,b) VALUES (8,'h'); +-ALTER TABLE t2 CHECK PARTITION p1 MEDIUM; +-Table Op Msg_type Msg_text +-test.t2 check status OK +-INSERT INTO t1 (a,b) VALUES (9,'i'); +-ALTER TABLE t1 CHECK PARTITION ALL EXTENDED; +-Table Op Msg_type Msg_text +-test.t1 check status OK +-INSERT INTO t1 (a,b) VALUES (11,'k'); +-ALTER TABLE t1 CHECK PARTITION p0 CHANGED; +-Table Op Msg_type Msg_text +-test.t1 check status OK +-DROP TABLE t1, t2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP TABLE IF EXISTS t1,t2; + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); ++ERROR 42S02: Table 'test.t1' doesn't exist + CREATE TABLE t2 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + CHECK TABLE t1; + Table Op Msg_type Msg_text +-test.t1 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + INSERT INTO t1 (a,b) VALUES (3,'c'); ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t2 (a,b) VALUES (4,'d'); ++ERROR 42S02: Table 'test.t2' doesn't exist + CHECK TABLE t1, t2 FOR UPGRADE; + Table Op Msg_type Msg_text +-test.t1 check status OK +-test.t2 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed ++test.t2 check Error Table 'test.t2' doesn't exist ++test.t2 check status Operation failed + INSERT INTO t2 (a,b) VALUES (5,'e'); ++ERROR 42S02: Table 'test.t2' doesn't exist + CHECK TABLE t2 QUICK; + Table Op Msg_type Msg_text +-test.t2 check status OK ++test.t2 check Error Table 'test.t2' doesn't exist ++test.t2 check status Operation failed + INSERT INTO t1 (a,b) VALUES (6,'f'); ++ERROR 42S02: Table 'test.t1' doesn't exist + CHECK TABLE t1 FAST; + Table Op Msg_type Msg_text +-test.t1 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + INSERT INTO t1 (a,b) VALUES (7,'g'); ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t2 (a,b) VALUES (8,'h'); ++ERROR 42S02: Table 'test.t2' doesn't exist + CHECK TABLE t2, t1 MEDIUM; + Table Op Msg_type Msg_text +-test.t2 check status OK +-test.t1 check status OK ++test.t2 check Error Table 'test.t2' doesn't exist ++test.t2 check status Operation failed ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + INSERT INTO t1 (a,b) VALUES (9,'i'); ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t2 (a,b) VALUES (10,'j'); ++ERROR 42S02: Table 'test.t2' doesn't exist + CHECK TABLE t1, t2 EXTENDED; + Table Op Msg_type Msg_text +-test.t1 check status OK +-test.t2 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed ++test.t2 check Error Table 'test.t2' doesn't exist ++test.t2 check status Operation failed + INSERT INTO t1 (a,b) VALUES (11,'k'); ++ERROR 42S02: Table 'test.t1' doesn't exist + CHECK TABLE t1 CHANGED; + Table Op Msg_type Msg_text +-test.t1 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + DROP TABLE t1, t2; ++ERROR 42S02: Unknown table 't1,t2' + CREATE TABLE t1 (a , (a)) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a) VALUES (1),(2),(5); ++ERROR 42S02: Table 'test.t1' doesn't exist + CHECK TABLE t1; + Table Op Msg_type Msg_text +-test.t1 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + INSERT INTO t1 (a) VALUES (6),(8),(12); ++ERROR 42S02: Table 'test.t1' doesn't exist + CHECK TABLE t1 FOR UPGRADE; + Table Op Msg_type Msg_text +-test.t1 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + INSERT INTO t1 (a) VALUES (13),(15),(16); ++ERROR 42S02: Table 'test.t1' doesn't exist + CHECK TABLE t1 QUICK; + Table Op Msg_type Msg_text +-test.t1 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + INSERT INTO t1 (a) VALUES (17),(120),(132); ++ERROR 42S02: Table 'test.t1' doesn't exist + CHECK TABLE t1 FAST; + Table Op Msg_type Msg_text +-test.t1 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + INSERT INTO t1 (a) VALUES (801),(900),(7714); ++ERROR 42S02: Table 'test.t1' doesn't exist + CHECK TABLE t1 MEDIUM; + Table Op Msg_type Msg_text +-test.t1 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + INSERT INTO t1 (a) VALUES (8760),(10023),(12000); ++ERROR 42S02: Table 'test.t1' doesn't exist + CHECK TABLE t1 EXTENDED; + Table Op Msg_type Msg_text +-test.t1 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + INSERT INTO t1 (a) VALUES (13345),(24456),(78302),(143028); ++ERROR 42S02: Table 'test.t1' doesn't exist + CHECK TABLE t1 CHANGED; + Table Op Msg_type Msg_text +-test.t1 check status OK ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + DROP TABLE t1; ++ERROR 42S02: Unknown table 't1' diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/checksum_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/checksum_table.rdiff index bc5b07686bf..3d9ebdfe5c4 100644 --- a/storage/myisammrg/mysql-test/storage_engine/parts/checksum_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/parts/checksum_table.rdiff @@ -1,81 +1,89 @@ -2a3,4 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -3a6 -> ERROR 42S02: Table 'test.t1' doesn't exist -4a8,9 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -7c12,14 -< test.t1 4272806499 ---- -> test.t1 NULL -> Warnings: -> Error 1146 Table 'test.t1' doesn't exist -10,11c17,21 -< test.t2 0 -< test.t1 4272806499 ---- -> test.t2 NULL -> test.t1 NULL -> Warnings: -> Error 1146 Table 'test.t2' doesn't exist -> Error 1146 Table 'test.t1' doesn't exist -15a26,28 -> Warnings: -> Error 1146 Table 'test.t1' doesn't exist -> Error 1146 Table 'test.t2' doesn't exist -18,19c31,35 -< test.t1 4272806499 -< test.t2 0 ---- -> test.t1 NULL -> test.t2 NULL -> Warnings: -> Error 1146 Table 'test.t1' doesn't exist -> Error 1146 Table 'test.t2' doesn't exist -20a37 -> ERROR 42S02: Unknown table 't1,t2' -22a40,41 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -23a43 -> ERROR 42S02: Table 'test.t1' doesn't exist -24a45,46 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -27c49,51 -< test.t1 0 ---- -> test.t1 NULL -> Warnings: -> Error 1146 Table 'test.t1' doesn't exist -30,31c54,58 -< test.t2 0 -< test.t1 0 ---- -> test.t2 NULL -> test.t1 NULL -> Warnings: -> Error 1146 Table 'test.t2' doesn't exist -> Error 1146 Table 'test.t1' doesn't exist -34,35c61,65 -< test.t1 0 -< test.t2 0 ---- -> test.t1 NULL -> test.t2 NULL -> Warnings: -> Error 1146 Table 'test.t1' doesn't exist -> Error 1146 Table 'test.t2' doesn't exist -38,39c68,72 -< test.t1 4272806499 -< test.t2 0 ---- -> test.t1 NULL -> test.t2 NULL -> Warnings: -> Error 1146 Table 'test.t1' doesn't exist -> Error 1146 Table 'test.t2' doesn't exist -40a74 -> ERROR 42S02: Unknown table 't1,t2' +--- checksum_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ checksum_table.reject 2013-01-23 03:16:24.496332636 +0400 +@@ -1,40 +1,74 @@ + DROP TABLE IF EXISTS t1,t2; + CREATE TABLE t1 (a , b ) ENGINE= CHECKSUM=0 PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); ++ERROR 42S02: Table 'test.t1' doesn't exist + CREATE TABLE t2 (a , b ) ENGINE= CHECKSUM=0 PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + CHECKSUM TABLE t1; + Table Checksum +-test.t1 4272806499 ++test.t1 NULL ++Warnings: ++Error 1146 Table 'test.t1' doesn't exist + CHECKSUM TABLE t2, t1; + Table Checksum +-test.t2 0 +-test.t1 4272806499 ++test.t2 NULL ++test.t1 NULL ++Warnings: ++Error 1146 Table 'test.t2' doesn't exist ++Error 1146 Table 'test.t1' doesn't exist + CHECKSUM TABLE t1, t2 QUICK; + Table Checksum + test.t1 NULL + test.t2 NULL ++Warnings: ++Error 1146 Table 'test.t1' doesn't exist ++Error 1146 Table 'test.t2' doesn't exist + CHECKSUM TABLE t1, t2 EXTENDED; + Table Checksum +-test.t1 4272806499 +-test.t2 0 ++test.t1 NULL ++test.t2 NULL ++Warnings: ++Error 1146 Table 'test.t1' doesn't exist ++Error 1146 Table 'test.t2' doesn't exist + DROP TABLE t1, t2; ++ERROR 42S02: Unknown table 't1,t2' + DROP TABLE IF EXISTS t1,t2; + CREATE TABLE t1 (a , b ) ENGINE= CHECKSUM=1 PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); ++ERROR 42S02: Table 'test.t1' doesn't exist + CREATE TABLE t2 (a , b ) ENGINE= CHECKSUM=1 PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + CHECKSUM TABLE t1; + Table Checksum +-test.t1 0 ++test.t1 NULL ++Warnings: ++Error 1146 Table 'test.t1' doesn't exist + CHECKSUM TABLE t2, t1; + Table Checksum +-test.t2 0 +-test.t1 0 ++test.t2 NULL ++test.t1 NULL ++Warnings: ++Error 1146 Table 'test.t2' doesn't exist ++Error 1146 Table 'test.t1' doesn't exist + CHECKSUM TABLE t1, t2 QUICK; + Table Checksum +-test.t1 0 +-test.t2 0 ++test.t1 NULL ++test.t2 NULL ++Warnings: ++Error 1146 Table 'test.t1' doesn't exist ++Error 1146 Table 'test.t2' doesn't exist + CHECKSUM TABLE t1, t2 EXTENDED; + Table Checksum +-test.t1 4272806499 +-test.t2 0 ++test.t1 NULL ++test.t2 NULL ++Warnings: ++Error 1146 Table 'test.t1' doesn't exist ++Error 1146 Table 'test.t2' doesn't exist + DROP TABLE t1, t2; ++ERROR 42S02: Unknown table 't1,t2' diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/create_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/create_table.rdiff index 11fbc4812dc..d6aa75f1c44 100644 --- a/storage/myisammrg/mysql-test/storage_engine/parts/create_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/parts/create_table.rdiff @@ -1,156 +1,159 @@ -3,10c3,12 -< INSERT INTO t1 (a) VALUES (1),(2),(3),(2); -< EXPLAIN PARTITIONS SELECT a FROM t1; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0,p1 # # # # # # # -< EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a=2; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0 # # # # # # # -< DROP TABLE t1; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -12,19c14,23 -< INSERT INTO t1 (a) VALUES ('a'),('b'),('c'); -< EXPLAIN PARTITIONS SELECT a FROM t1; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0,p1 # # # # # # # -< EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a = 'b'; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p1 # # # # # # # -< DROP TABLE t1; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY KEY(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or CHAR types or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -21,31c25,34 -< SHOW INDEX IN t1; -< Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -< t1 1 a 1 a # # NULL NULL # # -< INSERT INTO t1 (a) VALUES (1),(2),(3),(5); -< EXPLAIN PARTITIONS SELECT a FROM t1; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0,p1 # # # # # # # -< EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a IN (1,3); -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0 # # # # # # # -< DROP TABLE t1; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom indexed column options*/, /*!INDEX*/ /*Custom index*/ (a)) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY KEY(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or indexes or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -33,43c36,45 -< SHOW INDEX IN t1; -< Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -< t1 0 PRIMARY 1 a # # NULL NULL # # -< INSERT INTO t1 (a) VALUES (1),(200),(3),(2); -< EXPLAIN PARTITIONS SELECT a FROM t1; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0,p1 # # # # # # # -< EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a=2; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p1 # # # # # # # -< DROP TABLE t1; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom indexed column options*/ PRIMARY KEY) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY KEY() PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # PK or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -48,58c50,63 -< INSERT INTO t1 (a) VALUES (1),(2),(400); -< EXPLAIN PARTITIONS SELECT a FROM t1; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0,p1 # # # # # # # -< EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a = 2; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0 # # # # # # # -< INSERT INTO t1 (a) VALUES (10000); -< ERROR HY000: Table has no partition for value 10000 -< DROP TABLE t1; -< CREATE TABLE t1 (a ) ENGINE= PARTITION BY LIST(a) ( ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY RANGE(a) ( -> PARTITION p0 VALUES LESS THAN (10), -> PARTITION p1 VALUES LESS THAN (1000) -> ) ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -> CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY LIST(a) SUBPARTITION by HASH(b) ( -62,72c67,70 -< INSERT INTO t1 (a) VALUES (1),(101),(1); -< EXPLAIN PARTITIONS SELECT a FROM t1; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 abc,def # # # # # # # -< EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a = 100; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE NULL NULL # # # # # # # -< INSERT INTO t1 (a) VALUES (50); -< ERROR HY000: Table has no partition for value 50 -< DROP TABLE t1; -< CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY LIST(a) SUBPARTITION by HASH(b) ( ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY LIST(a) SUBPARTITION by HASH(b) ( -75,91c73,79 -< ); -< SHOW INDEX IN t1; -< Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment -< INSERT INTO t1 (a,b) VALUES (1,1),(101,2),(1,3); -< EXPLAIN PARTITIONS SELECT a FROM t1; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 abc_abcsp0,def_defsp0 # # # # # # # -< EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a = 100; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE NULL NULL # # # # # # # -< SELECT TABLE_SCHEMA, TABLE_NAME, PARTITION_NAME, SUBPARTITION_NAME, PARTITION_METHOD, SUBPARTITION_METHOD -< FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME = 't1'; -< TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_METHOD SUBPARTITION_METHOD -< test t1 abc abcsp0 LIST HASH -< test t1 def defsp0 LIST HASH -< SELECT * FROM INFORMATION_SCHEMA.PARTITIONS; -< DROP TABLE t1; ---- -> ) ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or subpartitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- +--- create_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ create_table.reject 2013-01-23 03:16:25.160324290 +0400 +@@ -1,91 +1,79 @@ + DROP TABLE IF EXISTS t1; + CREATE TABLE t1 (a ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; +-INSERT INTO t1 (a) VALUES (1),(2),(3),(2); +-EXPLAIN PARTITIONS SELECT a FROM t1; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0,p1 # # # # # # # +-EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a=2; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0 # # # # # # # +-DROP TABLE t1; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + CREATE TABLE t1 (a ) ENGINE= PARTITION BY KEY(a) PARTITIONS 2; +-INSERT INTO t1 (a) VALUES ('a'),('b'),('c'); +-EXPLAIN PARTITIONS SELECT a FROM t1; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0,p1 # # # # # # # +-EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a = 'b'; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p1 # # # # # # # +-DROP TABLE t1; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY KEY(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or CHAR types or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + CREATE TABLE t1 (a , (a)) ENGINE= PARTITION BY KEY(a) PARTITIONS 2; +-SHOW INDEX IN t1; +-Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 1 a 1 a # # NULL NULL # # +-INSERT INTO t1 (a) VALUES (1),(2),(3),(5); +-EXPLAIN PARTITIONS SELECT a FROM t1; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0,p1 # # # # # # # +-EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a IN (1,3); +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0 # # # # # # # +-DROP TABLE t1; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom indexed column options*/, /*!INDEX*/ /*Custom index*/ (a)) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY KEY(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or indexes or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + CREATE TABLE t1 (a PRIMARY KEY) ENGINE= PARTITION BY KEY() PARTITIONS 2; +-SHOW INDEX IN t1; +-Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-t1 0 PRIMARY 1 a # # NULL NULL # # +-INSERT INTO t1 (a) VALUES (1),(200),(3),(2); +-EXPLAIN PARTITIONS SELECT a FROM t1; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0,p1 # # # # # # # +-EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a=2; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p1 # # # # # # # +-DROP TABLE t1; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom indexed column options*/ PRIMARY KEY) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY KEY() PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# PK or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + CREATE TABLE t1 (a ) ENGINE= PARTITION BY RANGE(a) ( + PARTITION p0 VALUES LESS THAN (10), + PARTITION p1 VALUES LESS THAN (1000) + ); +-INSERT INTO t1 (a) VALUES (1),(2),(400); +-EXPLAIN PARTITIONS SELECT a FROM t1; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0,p1 # # # # # # # +-EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a = 2; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0 # # # # # # # +-INSERT INTO t1 (a) VALUES (10000); +-ERROR HY000: Table has no partition for value 10000 +-DROP TABLE t1; +-CREATE TABLE t1 (a ) ENGINE= PARTITION BY LIST(a) ( ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY RANGE(a) ( ++PARTITION p0 VALUES LESS THAN (10), ++PARTITION p1 VALUES LESS THAN (1000) ++) ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- ++CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY LIST(a) SUBPARTITION by HASH(b) ( + PARTITION abc VALUES IN (1,2,3), + PARTITION def VALUES IN (100,101,102) + ); +-INSERT INTO t1 (a) VALUES (1),(101),(1); +-EXPLAIN PARTITIONS SELECT a FROM t1; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 abc,def # # # # # # # +-EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a = 100; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE NULL NULL # # # # # # # +-INSERT INTO t1 (a) VALUES (50); +-ERROR HY000: Table has no partition for value 50 +-DROP TABLE t1; +-CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY LIST(a) SUBPARTITION by HASH(b) ( ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY LIST(a) SUBPARTITION by HASH(b) ( + PARTITION abc VALUES IN (1,2,3), + PARTITION def VALUES IN (100,101,102) +-); +-SHOW INDEX IN t1; +-Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment +-INSERT INTO t1 (a,b) VALUES (1,1),(101,2),(1,3); +-EXPLAIN PARTITIONS SELECT a FROM t1; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 abc_abcsp0,def_defsp0 # # # # # # # +-EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a = 100; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE NULL NULL # # # # # # # +-SELECT TABLE_SCHEMA, TABLE_NAME, PARTITION_NAME, SUBPARTITION_NAME, PARTITION_METHOD, SUBPARTITION_METHOD +-FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME = 't1'; +-TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_METHOD SUBPARTITION_METHOD +-test t1 abc abcsp0 LIST HASH +-test t1 def defsp0 LIST HASH +-SELECT * FROM INFORMATION_SCHEMA.PARTITIONS; +-DROP TABLE t1; ++) ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or subpartitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/optimize_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/optimize_table.rdiff index 350d93fe91f..242b3778846 100644 --- a/storage/myisammrg/mysql-test/storage_engine/parts/optimize_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/parts/optimize_table.rdiff @@ -1,91 +1,95 @@ -3,25c3,12 -< INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); -< CREATE TABLE t2 (a , b ) ENGINE= PARTITION BY RANGE(a) ( -< PARTITION p0 VALUES LESS THAN (100), -< PARTITION p1 VALUES LESS THAN MAXVALUE -< ); -< INSERT INTO t2 (a,b) SELECT a, b FROM t1; -< INSERT INTO t1 (a,b) VALUES (3,'c'),(4,'d'); -< ALTER TABLE t1 OPTIMIZE PARTITION p1; -< Table Op Msg_type Msg_text -< test.t1 optimize status OK -< INSERT INTO t2 (a,b) VALUES (4,'d'); -< ALTER TABLE t2 OPTIMIZE PARTITION p0 NO_WRITE_TO_BINLOG; -< Table Op Msg_type Msg_text -< test.t2 optimize status OK -< INSERT INTO t1 (a,b) VALUES (6,'f'); -< ALTER TABLE t1 OPTIMIZE PARTITION ALL LOCAL; -< Table Op Msg_type Msg_text -< test.t1 optimize status OK -< INSERT INTO t2 (a,b) VALUES (5,'e'); -< ALTER TABLE t2 OPTIMIZE PARTITION p1,p0; -< Table Op Msg_type Msg_text -< test.t2 optimize status OK -< DROP TABLE t1, t2; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -27a15,16 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -28a18 -> ERROR 42S02: Table 'test.t1' doesn't exist -29a20,21 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -30a23 -> ERROR 42S02: Table 'test.t1' doesn't exist -33c26,27 -< test.t1 optimize status OK ---- -> test.t1 optimize Error Table 'test.t1' doesn't exist -> test.t1 optimize status Operation failed -34a29 -> ERROR 42S02: Table 'test.t2' doesn't exist -37c32,33 -< test.t2 optimize status OK ---- -> test.t2 optimize Error Table 'test.t2' doesn't exist -> test.t2 optimize status Operation failed -38a35 -> ERROR 42S02: Table 'test.t2' doesn't exist -39a37 -> ERROR 42S02: Table 'test.t1' doesn't exist -42,43c40,43 -< test.t1 optimize status OK -< test.t2 optimize status OK ---- -> test.t1 optimize Error Table 'test.t1' doesn't exist -> test.t1 optimize status Operation failed -> test.t2 optimize Error Table 'test.t2' doesn't exist -> test.t2 optimize status Operation failed -46,47c46,49 -< test.t1 optimize status OK -< test.t2 optimize status OK ---- -> test.t1 optimize Error Table 'test.t1' doesn't exist -> test.t1 optimize status Operation failed -> test.t2 optimize Error Table 'test.t2' doesn't exist -> test.t2 optimize status Operation failed -48a51 -> ERROR 42S02: Unknown table 't1,t2' -49a53,54 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -50a56 -> ERROR 42S02: Table 'test.t1' doesn't exist -53c59,60 -< test.t1 optimize status OK ---- -> test.t1 optimize Error Table 'test.t1' doesn't exist -> test.t1 optimize status Operation failed -54a62 -> ERROR 42S02: Unknown table 't1' +--- optimize_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ optimize_table.reject 2013-01-23 03:16:25.780316495 +0400 +@@ -1,54 +1,62 @@ + DROP TABLE IF EXISTS t1,t2; + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; +-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); +-CREATE TABLE t2 (a , b ) ENGINE= PARTITION BY RANGE(a) ( +-PARTITION p0 VALUES LESS THAN (100), +-PARTITION p1 VALUES LESS THAN MAXVALUE +-); +-INSERT INTO t2 (a,b) SELECT a, b FROM t1; +-INSERT INTO t1 (a,b) VALUES (3,'c'),(4,'d'); +-ALTER TABLE t1 OPTIMIZE PARTITION p1; +-Table Op Msg_type Msg_text +-test.t1 optimize status OK +-INSERT INTO t2 (a,b) VALUES (4,'d'); +-ALTER TABLE t2 OPTIMIZE PARTITION p0 NO_WRITE_TO_BINLOG; +-Table Op Msg_type Msg_text +-test.t2 optimize status OK +-INSERT INTO t1 (a,b) VALUES (6,'f'); +-ALTER TABLE t1 OPTIMIZE PARTITION ALL LOCAL; +-Table Op Msg_type Msg_text +-test.t1 optimize status OK +-INSERT INTO t2 (a,b) VALUES (5,'e'); +-ALTER TABLE t2 OPTIMIZE PARTITION p1,p0; +-Table Op Msg_type Msg_text +-test.t2 optimize status OK +-DROP TABLE t1, t2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP TABLE IF EXISTS t1,t2; + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); ++ERROR 42S02: Table 'test.t1' doesn't exist + CREATE TABLE t2 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a,b) VALUES (3,'c'),(4,'d'); ++ERROR 42S02: Table 'test.t1' doesn't exist + OPTIMIZE TABLE t1; + Table Op Msg_type Msg_text +-test.t1 optimize status OK ++test.t1 optimize Error Table 'test.t1' doesn't exist ++test.t1 optimize status Operation failed + INSERT INTO t2 (a,b) VALUES (4,'d'); ++ERROR 42S02: Table 'test.t2' doesn't exist + OPTIMIZE NO_WRITE_TO_BINLOG TABLE t2; + Table Op Msg_type Msg_text +-test.t2 optimize status OK ++test.t2 optimize Error Table 'test.t2' doesn't exist ++test.t2 optimize status Operation failed + INSERT INTO t2 (a,b) VALUES (5,'e'); ++ERROR 42S02: Table 'test.t2' doesn't exist + INSERT INTO t1 (a,b) VALUES (6,'f'); ++ERROR 42S02: Table 'test.t1' doesn't exist + OPTIMIZE LOCAL TABLE t1, t2; + Table Op Msg_type Msg_text +-test.t1 optimize status OK +-test.t2 optimize status OK ++test.t1 optimize Error Table 'test.t1' doesn't exist ++test.t1 optimize status Operation failed ++test.t2 optimize Error Table 'test.t2' doesn't exist ++test.t2 optimize status Operation failed + OPTIMIZE TABLE t1, t2; + Table Op Msg_type Msg_text +-test.t1 optimize status OK +-test.t2 optimize status OK ++test.t1 optimize Error Table 'test.t1' doesn't exist ++test.t1 optimize status Operation failed ++test.t2 optimize Error Table 'test.t2' doesn't exist ++test.t2 optimize status Operation failed + DROP TABLE t1, t2; ++ERROR 42S02: Unknown table 't1,t2' + CREATE TABLE t1 (a , b , (a)) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a,b) VALUES (1,'a'),(100,'b'),(2,'c'),(3,'d'); ++ERROR 42S02: Table 'test.t1' doesn't exist + OPTIMIZE TABLE t1; + Table Op Msg_type Msg_text +-test.t1 optimize status OK ++test.t1 optimize Error Table 'test.t1' doesn't exist ++test.t1 optimize status Operation failed + DROP TABLE t1; ++ERROR 42S02: Unknown table 't1' diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff index 4c39421261c..2b5d5f68346 100644 --- a/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff @@ -1,295 +1,303 @@ -4,33c4,13 -< INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); -< CREATE TABLE t2 (a , b ) ENGINE= PARTITION BY RANGE(a) ( -< PARTITION p0 VALUES LESS THAN (100), -< PARTITION p1 VALUES LESS THAN MAXVALUE -< ); -< INSERT INTO t2 (a,b) SELECT a, b FROM t1; -< ALTER TABLE t1 REPAIR PARTITION p0; -< Table Op Msg_type Msg_text -< test.t1 repair status OK -< INSERT INTO t1 VALUES (3,'c'); -< ALTER TABLE t1 REPAIR PARTITION NO_WRITE_TO_BINLOG p0, p1; -< Table Op Msg_type Msg_text -< test.t1 repair status OK -< INSERT INTO t2 (a,b) VALUES (5,'e'),(6,'f'); -< ALTER TABLE t2 REPAIR PARTITION LOCAL p1; -< Table Op Msg_type Msg_text -< test.t2 repair status OK -< INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h'); -< ALTER TABLE t1 REPAIR PARTITION LOCAL ALL EXTENDED; -< Table Op Msg_type Msg_text -< test.t1 repair status OK -< INSERT INTO t1 VALUES (10,'j'); -< ALTER TABLE t1 REPAIR PARTITION p1 QUICK USE_FRM; -< Table Op Msg_type Msg_text -< test.t1 repair status OK -< INSERT INTO t2 (a,b) VALUES (12,'l'); -< ALTER TABLE t2 REPAIR PARTITION NO_WRITE_TO_BINLOG ALL QUICK EXTENDED USE_FRM; -< Table Op Msg_type Msg_text -< test.t2 repair status OK -< DROP TABLE t1, t2; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -35a16,17 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -36a19 -> ERROR 42S02: Table 'test.t1' doesn't exist -37a21,22 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -40c25,26 -< test.t1 repair status OK ---- -> test.t1 repair Error Table 'test.t1' doesn't exist -> test.t1 repair status Operation failed -41a28 -> ERROR 42S02: Table 'test.t1' doesn't exist -42a30 -> ERROR 42S02: Table 'test.t2' doesn't exist -45,46c33,36 -< test.t1 repair status OK -< test.t2 repair status OK ---- -> test.t1 repair Error Table 'test.t1' doesn't exist -> test.t1 repair status Operation failed -> test.t2 repair Error Table 'test.t2' doesn't exist -> test.t2 repair status Operation failed -47a38 -> ERROR 42S02: Table 'test.t2' doesn't exist -50c41,42 -< test.t2 repair status OK ---- -> test.t2 repair Error Table 'test.t2' doesn't exist -> test.t2 repair status Operation failed -51a44 -> ERROR 42S02: Table 'test.t1' doesn't exist -52a46 -> ERROR 42S02: Table 'test.t2' doesn't exist -55,56c49,52 -< test.t2 repair status OK -< test.t1 repair status OK ---- -> test.t2 repair Error Table 'test.t2' doesn't exist -> test.t2 repair status Operation failed -> test.t1 repair Error Table 'test.t1' doesn't exist -> test.t1 repair status Operation failed -57a54 -> ERROR 42S02: Table 'test.t1' doesn't exist -58a56 -> ERROR 42S02: Table 'test.t2' doesn't exist -61,62c59,62 -< test.t1 repair status OK -< test.t2 repair status OK ---- -> test.t1 repair Error Table 'test.t1' doesn't exist -> test.t1 repair status Operation failed -> test.t2 repair Error Table 'test.t2' doesn't exist -> test.t2 repair status Operation failed -63a64 -> ERROR 42S02: Table 'test.t1' doesn't exist -64a66 -> ERROR 42S02: Table 'test.t2' doesn't exist -67,68c69,72 -< test.t1 repair status OK -< test.t2 repair status OK ---- -> test.t1 repair Error Table 'test.t1' doesn't exist -> test.t1 repair status Operation failed -> test.t2 repair Error Table 'test.t2' doesn't exist -> test.t2 repair status Operation failed -71,73c75,76 -< ERROR HY000: Failed to read from the .par file -< # Statement ended with one of expected results (0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY). -< # If you got a difference in error message, just add it to rdiff file ---- -> ERROR 42S02: Table 'test.t1' doesn't exist -> # ERROR: Statement ended with errno 1146, errname ER_NO_SUCH_TABLE (expected results: 0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY) -76,78c79,80 -< test.t1 check Error Failed to read from the .par file -< test.t1 check Error Incorrect information in file: './test/t1.frm' -< test.t1 check error Corrupt ---- -> test.t1 check Error Table 'test.t1' doesn't exist -> test.t1 check status Operation failed -80,82c82,83 -< ERROR HY000: Failed to read from the .par file -< # Statement ended with one of expected results (0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY). -< # If you got a difference in error message, just add it to rdiff file ---- -> ERROR 42S02: Table 'test.t1' doesn't exist -> # ERROR: Statement ended with errno 1146, errname ER_NO_SUCH_TABLE (expected results: 0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY) -85,87c86,87 -< test.t1 repair Error Failed to read from the .par file -< test.t1 repair Error Incorrect information in file: './test/t1.frm' -< test.t1 repair error Corrupt ---- -> test.t1 repair Error Table 'test.t1' doesn't exist -> test.t1 repair status Operation failed -88a89 -> ERROR 42S02: Unknown table 't1,t2' -93a95,96 -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -96c99,100 -< test.t1 repair status OK ---- -> test.t1 repair Error Table 'test.t1' doesn't exist -> test.t1 repair status Operation failed -97a102 -> ERROR 42S02: Table 'test.t1' doesn't exist -100c105,106 -< test.t1 repair status OK ---- -> test.t1 repair Error Table 'test.t1' doesn't exist -> test.t1 repair status Operation failed -101a108 -> ERROR 42S02: Table 'test.t1' doesn't exist -104,235c111,112 -< test.t1 repair status OK -< t1#P#p0.MYD -< t1#P#p0.MYI -< t1#P#p1.MYD -< t1#P#p1.MYI -< t1.frm -< t1.par -< INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); -< # Statement ended with one of expected results (0,144). -< # If you got a difference in error message, just add it to rdiff file -< FLUSH TABLE t1; -< Restoring /test/t1#P#p0.MYD -< CHECK TABLE t1; -< Table Op Msg_type Msg_text -< test.t1 check error Size of datafile is: 26 Should be: 39 -< test.t1 check error Partition p0 returned error -< test.t1 check error Corrupt -< SELECT * FROM t1; -< a b -< 8 h -< 10 j -< 7 g -< 15 o -< Warnings: -< Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired -< Error 1194 Table 't1' is marked as crashed and should be repaired -< Error 1034 Number of rows changed from 3 to 2 -< # Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). -< # If you got a difference in error message, just add it to rdiff file -< INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); -< # Statement ended with one of expected results (0,144). -< # If you got a difference in error message, just add it to rdiff file -< FLUSH TABLE t1; -< Restoring /test/t1#P#p0.MYI -< CHECK TABLE t1; -< Table Op Msg_type Msg_text -< test.t1 check warning Size of datafile is: 39 Should be: 26 -< test.t1 check error Record-count is not ok; is 3 Should be: 2 -< test.t1 check warning Found 3 key parts. Should be: 2 -< test.t1 check error Partition p0 returned error -< test.t1 check error Corrupt -< SELECT * FROM t1; -< a b -< 8 h -< 10 j -< 14 n -< 7 g -< 15 o -< 15 o -< Warnings: -< Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired -< Error 1194 Table 't1' is marked as crashed and should be repaired -< Error 1034 Number of rows changed from 2 to 3 -< # Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). -< # If you got a difference in error message, just add it to rdiff file -< INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); -< # Statement ended with one of expected results (0,144). -< # If you got a difference in error message, just add it to rdiff file -< FLUSH TABLE t1; -< Restoring /test/t1#P#p1.MYD -< CHECK TABLE t1; -< Table Op Msg_type Msg_text -< test.t1 check error Size of datafile is: 39 Should be: 52 -< test.t1 check error Partition p1 returned error -< test.t1 check error Corrupt -< SELECT * FROM t1; -< a b -< 8 h -< 10 j -< 14 n -< 14 n -< 7 g -< 15 o -< 15 o -< Warnings: -< Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired -< Error 1194 Table 't1' is marked as crashed and should be repaired -< Error 1034 Number of rows changed from 4 to 3 -< # Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). -< # If you got a difference in error message, just add it to rdiff file -< INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); -< # Statement ended with one of expected results (0,144). -< # If you got a difference in error message, just add it to rdiff file -< FLUSH TABLE t1; -< Restoring /test/t1#P#p1.MYI -< CHECK TABLE t1; -< Table Op Msg_type Msg_text -< test.t1 check warning Size of datafile is: 52 Should be: 39 -< test.t1 check error Record-count is not ok; is 4 Should be: 3 -< test.t1 check warning Found 4 key parts. Should be: 3 -< test.t1 check error Partition p1 returned error -< test.t1 check error Corrupt -< SELECT * FROM t1; -< a b -< 8 h -< 10 j -< 14 n -< 14 n -< 14 n -< 7 g -< 15 o -< 15 o -< 15 o -< Warnings: -< Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired -< Error 1194 Table 't1' is marked as crashed and should be repaired -< Error 1034 Number of rows changed from 3 to 4 -< # Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). -< # If you got a difference in error message, just add it to rdiff file -< INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); -< # Statement ended with one of expected results (0,144). -< # If you got a difference in error message, just add it to rdiff file -< FLUSH TABLE t1; -< Restoring /test/t1.par -< CHECK TABLE t1; -< Table Op Msg_type Msg_text -< test.t1 check status OK -< SELECT * FROM t1; -< a b -< 8 h -< 10 j -< 14 n -< 14 n -< 14 n -< 14 n -< 7 g -< 15 o -< 15 o -< 15 o -< 15 o -< # Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). -< # If you got a difference in error message, just add it to rdiff file ---- -> test.t1 repair Error Table 'test.t1' doesn't exist -> test.t1 repair status Operation failed -236a114 -> ERROR 42S02: Unknown table 't1' +--- repair_table.result 2013-01-23 01:35:44.388267080 +0400 ++++ repair_table.reject 2013-01-23 03:16:26.468307847 +0400 +@@ -1,236 +1,114 @@ + call mtr.add_suppression("Table '.*t1.*' is marked as crashed and should be repaired"); + DROP TABLE IF EXISTS t1, t2; + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; +-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); +-CREATE TABLE t2 (a , b ) ENGINE= PARTITION BY RANGE(a) ( +-PARTITION p0 VALUES LESS THAN (100), +-PARTITION p1 VALUES LESS THAN MAXVALUE +-); +-INSERT INTO t2 (a,b) SELECT a, b FROM t1; +-ALTER TABLE t1 REPAIR PARTITION p0; +-Table Op Msg_type Msg_text +-test.t1 repair status OK +-INSERT INTO t1 (a,b) VALUES (3,'c'); +-ALTER TABLE t1 REPAIR PARTITION NO_WRITE_TO_BINLOG p0, p1; +-Table Op Msg_type Msg_text +-test.t1 repair status OK +-INSERT INTO t2 (a,b) VALUES (5,'e'),(6,'f'); +-ALTER TABLE t2 REPAIR PARTITION LOCAL p1; +-Table Op Msg_type Msg_text +-test.t2 repair status OK +-INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h'); +-ALTER TABLE t1 REPAIR PARTITION LOCAL ALL EXTENDED; +-Table Op Msg_type Msg_text +-test.t1 repair status OK +-INSERT INTO t1 (a,b) VALUES (10,'j'); +-ALTER TABLE t1 REPAIR PARTITION p1 QUICK USE_FRM; +-Table Op Msg_type Msg_text +-test.t1 repair status OK +-INSERT INTO t2 (a,b) VALUES (12,'l'); +-ALTER TABLE t2 REPAIR PARTITION NO_WRITE_TO_BINLOG ALL QUICK EXTENDED USE_FRM; +-Table Op Msg_type Msg_text +-test.t2 repair status OK +-DROP TABLE t1, t2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP TABLE IF EXISTS t1,t2; + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); ++ERROR 42S02: Table 'test.t1' doesn't exist + CREATE TABLE t2 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + REPAIR TABLE t1; + Table Op Msg_type Msg_text +-test.t1 repair status OK ++test.t1 repair Error Table 'test.t1' doesn't exist ++test.t1 repair status Operation failed + INSERT INTO t1 (a,b) VALUES (3,'c'); ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t2 (a,b) VALUES (4,'d'); ++ERROR 42S02: Table 'test.t2' doesn't exist + REPAIR NO_WRITE_TO_BINLOG TABLE t1, t2; + Table Op Msg_type Msg_text +-test.t1 repair status OK +-test.t2 repair status OK ++test.t1 repair Error Table 'test.t1' doesn't exist ++test.t1 repair status Operation failed ++test.t2 repair Error Table 'test.t2' doesn't exist ++test.t2 repair status Operation failed + INSERT INTO t2 (a,b) VALUES (5,'e'),(6,'f'); ++ERROR 42S02: Table 'test.t2' doesn't exist + REPAIR LOCAL TABLE t2; + Table Op Msg_type Msg_text +-test.t2 repair status OK ++test.t2 repair Error Table 'test.t2' doesn't exist ++test.t2 repair status Operation failed + INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h'); ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t2 (a,b) VALUES (9,'i'); ++ERROR 42S02: Table 'test.t2' doesn't exist + REPAIR LOCAL TABLE t2, t1 EXTENDED; + Table Op Msg_type Msg_text +-test.t2 repair status OK +-test.t1 repair status OK ++test.t2 repair Error Table 'test.t2' doesn't exist ++test.t2 repair status Operation failed ++test.t1 repair Error Table 'test.t1' doesn't exist ++test.t1 repair status Operation failed + INSERT INTO t1 (a,b) VALUES (10,'j'); ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t2 (a,b) VALUES (11,'k'); ++ERROR 42S02: Table 'test.t2' doesn't exist + REPAIR TABLE t1, t2 QUICK USE_FRM; + Table Op Msg_type Msg_text +-test.t1 repair status OK +-test.t2 repair status OK ++test.t1 repair Error Table 'test.t1' doesn't exist ++test.t1 repair status Operation failed ++test.t2 repair Error Table 'test.t2' doesn't exist ++test.t2 repair status Operation failed + INSERT INTO t1 (a,b) VALUES (12,'l'); ++ERROR 42S02: Table 'test.t1' doesn't exist + INSERT INTO t2 (a,b) VALUES (13,'m'); ++ERROR 42S02: Table 'test.t2' doesn't exist + REPAIR NO_WRITE_TO_BINLOG TABLE t1, t2 QUICK EXTENDED USE_FRM; + Table Op Msg_type Msg_text +-test.t1 repair status OK +-test.t2 repair status OK ++test.t1 repair Error Table 'test.t1' doesn't exist ++test.t1 repair status Operation failed ++test.t2 repair Error Table 'test.t2' doesn't exist ++test.t2 repair status Operation failed + FLUSH TABLE t1; + INSERT INTO t1 (a,b) VALUES (14,'n'); +-ERROR HY000: Failed to read from the .par file +-# Statement ended with one of expected results (0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY). +-# If you got a difference in error message, just add it to rdiff file ++ERROR 42S02: Table 'test.t1' doesn't exist ++# ERROR: Statement ended with errno 1146, errname ER_NO_SUCH_TABLE (expected results: 0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY) + CHECK TABLE t1; + Table Op Msg_type Msg_text +-test.t1 check Error Failed to read from the .par file +-test.t1 check Error Incorrect information in file: './test/t1.frm' +-test.t1 check error Corrupt ++test.t1 check Error Table 'test.t1' doesn't exist ++test.t1 check status Operation failed + SELECT a,b FROM t1; +-ERROR HY000: Failed to read from the .par file +-# Statement ended with one of expected results (0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY). +-# If you got a difference in error message, just add it to rdiff file ++ERROR 42S02: Table 'test.t1' doesn't exist ++# ERROR: Statement ended with errno 1146, errname ER_NO_SUCH_TABLE (expected results: 0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY) + REPAIR TABLE t1; + Table Op Msg_type Msg_text +-test.t1 repair Error Failed to read from the .par file +-test.t1 repair Error Incorrect information in file: './test/t1.frm' +-test.t1 repair error Corrupt ++test.t1 repair Error Table 'test.t1' doesn't exist ++test.t1 repair status Operation failed + DROP TABLE t1, t2; ++ERROR 42S02: Unknown table 't1,t2' + call mtr.add_suppression("Got an error from thread_id=.*"); + call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table"); + call mtr.add_suppression(" '\..test.t1'"); + call mtr.add_suppression("Couldn't repair table: test.t1"); + CREATE TABLE t1 (a , b , (a)) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) + REPAIR TABLE t1; + Table Op Msg_type Msg_text +-test.t1 repair status OK ++test.t1 repair Error Table 'test.t1' doesn't exist ++test.t1 repair status Operation failed + INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h'); ++ERROR 42S02: Table 'test.t1' doesn't exist + REPAIR TABLE t1 EXTENDED; + Table Op Msg_type Msg_text +-test.t1 repair status OK ++test.t1 repair Error Table 'test.t1' doesn't exist ++test.t1 repair status Operation failed + INSERT INTO t1 (a,b) VALUES (10,'j'); ++ERROR 42S02: Table 'test.t1' doesn't exist + REPAIR TABLE t1 USE_FRM; + Table Op Msg_type Msg_text +-test.t1 repair status OK +-t1#P#p0.MYD +-t1#P#p0.MYI +-t1#P#p1.MYD +-t1#P#p1.MYI +-t1.frm +-t1.par +-INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); +-# Statement ended with one of expected results (0,144). +-# If you got a difference in error message, just add it to rdiff file +-FLUSH TABLE t1; +-Restoring /test/t1#P#p0.MYD +-CHECK TABLE t1; +-Table Op Msg_type Msg_text +-test.t1 check error Size of datafile is: 26 Should be: 39 +-test.t1 check error Partition p0 returned error +-test.t1 check error Corrupt +-SELECT a,b FROM t1; +-a b +-8 h +-10 j +-7 g +-15 o +-Warnings: +-Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired +-Error 1194 Table 't1' is marked as crashed and should be repaired +-Error 1034 Number of rows changed from 3 to 2 +-# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). +-# If you got a difference in error message, just add it to rdiff file +-INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); +-# Statement ended with one of expected results (0,144). +-# If you got a difference in error message, just add it to rdiff file +-FLUSH TABLE t1; +-Restoring /test/t1#P#p0.MYI +-CHECK TABLE t1; +-Table Op Msg_type Msg_text +-test.t1 check warning Size of datafile is: 39 Should be: 26 +-test.t1 check error Record-count is not ok; is 3 Should be: 2 +-test.t1 check warning Found 3 key parts. Should be: 2 +-test.t1 check error Partition p0 returned error +-test.t1 check error Corrupt +-SELECT a,b FROM t1; +-a b +-8 h +-10 j +-14 n +-7 g +-15 o +-15 o +-Warnings: +-Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired +-Error 1194 Table 't1' is marked as crashed and should be repaired +-Error 1034 Number of rows changed from 2 to 3 +-# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). +-# If you got a difference in error message, just add it to rdiff file +-INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); +-# Statement ended with one of expected results (0,144). +-# If you got a difference in error message, just add it to rdiff file +-FLUSH TABLE t1; +-Restoring /test/t1#P#p1.MYD +-CHECK TABLE t1; +-Table Op Msg_type Msg_text +-test.t1 check error Size of datafile is: 39 Should be: 52 +-test.t1 check error Partition p1 returned error +-test.t1 check error Corrupt +-SELECT a,b FROM t1; +-a b +-8 h +-10 j +-14 n +-14 n +-7 g +-15 o +-15 o +-Warnings: +-Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired +-Error 1194 Table 't1' is marked as crashed and should be repaired +-Error 1034 Number of rows changed from 4 to 3 +-# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). +-# If you got a difference in error message, just add it to rdiff file +-INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); +-# Statement ended with one of expected results (0,144). +-# If you got a difference in error message, just add it to rdiff file +-FLUSH TABLE t1; +-Restoring /test/t1#P#p1.MYI +-CHECK TABLE t1; +-Table Op Msg_type Msg_text +-test.t1 check warning Size of datafile is: 52 Should be: 39 +-test.t1 check error Record-count is not ok; is 4 Should be: 3 +-test.t1 check warning Found 4 key parts. Should be: 3 +-test.t1 check error Partition p1 returned error +-test.t1 check error Corrupt +-SELECT a,b FROM t1; +-a b +-8 h +-10 j +-14 n +-14 n +-14 n +-7 g +-15 o +-15 o +-15 o +-Warnings: +-Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired +-Error 1194 Table 't1' is marked as crashed and should be repaired +-Error 1034 Number of rows changed from 3 to 4 +-# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). +-# If you got a difference in error message, just add it to rdiff file +-INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); +-# Statement ended with one of expected results (0,144). +-# If you got a difference in error message, just add it to rdiff file +-FLUSH TABLE t1; +-Restoring /test/t1.par +-CHECK TABLE t1; +-Table Op Msg_type Msg_text +-test.t1 check status OK +-SELECT a,b FROM t1; +-a b +-8 h +-10 j +-14 n +-14 n +-14 n +-14 n +-7 g +-15 o +-15 o +-15 o +-15 o +-# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). +-# If you got a difference in error message, just add it to rdiff file ++test.t1 repair Error Table 'test.t1' doesn't exist ++test.t1 repair status Operation failed + DROP TABLE t1; ++ERROR 42S02: Unknown table 't1' diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff index 2c1364d52e1..01bf3702a3f 100644 --- a/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff @@ -1,100 +1,101 @@ -3,8c3,12 -< TRUNCATE TABLE t1; -< INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c'); -< TRUNCATE TABLE t1; -< SELECT * FROM t1; -< a b -< DROP TABLE t1; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -10,52c14,23 -< SHOW CREATE TABLE t1; -< Table Create Table -< t1 CREATE TABLE `t1` ( -< `a` int(11) NOT NULL AUTO_INCREMENT, -< `c` char(8) DEFAULT NULL, -< PRIMARY KEY (`a`) -< ) ENGINE= DEFAULT CHARSET=latin1 -< /*!50100 PARTITION BY HASH (a) -< PARTITIONS 2 */ -< INSERT INTO t1 (c) VALUES ('a'),('b'),('c'); -< SHOW CREATE TABLE t1; -< Table Create Table -< t1 CREATE TABLE `t1` ( -< `a` int(11) NOT NULL AUTO_INCREMENT, -< `c` char(8) DEFAULT NULL, -< PRIMARY KEY (`a`) -< ) ENGINE= AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 -< /*!50100 PARTITION BY HASH (a) -< PARTITIONS 2 */ -< TRUNCATE TABLE t1; -< SHOW CREATE TABLE t1; -< Table Create Table -< t1 CREATE TABLE `t1` ( -< `a` int(11) NOT NULL AUTO_INCREMENT, -< `c` char(8) DEFAULT NULL, -< PRIMARY KEY (`a`) -< ) ENGINE= DEFAULT CHARSET=latin1 -< /*!50100 PARTITION BY HASH (a) -< PARTITIONS 2 */ -< INSERT INTO t1 (c) VALUES ('d'); -< SHOW CREATE TABLE t1; -< Table Create Table -< t1 CREATE TABLE `t1` ( -< `a` int(11) NOT NULL AUTO_INCREMENT, -< `c` char(8) DEFAULT NULL, -< PRIMARY KEY (`a`) -< ) ENGINE= AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 -< /*!50100 PARTITION BY HASH (a) -< PARTITIONS 2 */ -< SELECT * FROM t1; -< a c -< 1 d -< DROP TABLE t1; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom indexed column options*/ KEY AUTO_INCREMENT, c CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or PK or auto-increment or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -54,68c25,34 -< INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); -< ALTER TABLE t1 TRUNCATE PARTITION p0; -< SELECT * FROM t1; -< a b -< 1 a -< 101 g -< 3 c -< EXPLAIN PARTITIONS SELECT * FROM t1; -< id select_type table partitions type possible_keys key key_len ref rows Extra -< 1 SIMPLE t1 p0,p1 # # # # # # -< INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c'); -< ALTER TABLE t1 TRUNCATE PARTITION ALL; -< SELECT * FROM t1; -< a b -< DROP TABLE t1; ---- -> ERROR HY000: Engine cannot be used in partitioned tables -> # ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] -> # The statement|command finished with ER_PARTITION_MERGE_ERROR. -> # Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- +--- truncate_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ truncate_table.reject 2013-01-23 03:16:27.076300201 +0400 +@@ -1,68 +1,34 @@ + DROP TABLE IF EXISTS t1; + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; +-TRUNCATE TABLE t1; +-INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c'); +-TRUNCATE TABLE t1; +-SELECT a,b FROM t1; +-a b +-DROP TABLE t1; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + CREATE TABLE t1 (a KEY AUTO_INCREMENT, c ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; +-SHOW CREATE TABLE t1; +-Table Create Table +-t1 CREATE TABLE `t1` ( +- `a` int(11) NOT NULL AUTO_INCREMENT, +- `c` char(8) DEFAULT NULL, +- PRIMARY KEY (`a`) +-) ENGINE= DEFAULT CHARSET=latin1 +-/*!50100 PARTITION BY HASH (a) +-PARTITIONS 2 */ +-INSERT INTO t1 (c) VALUES ('a'),('b'),('c'); +-SHOW CREATE TABLE t1; +-Table Create Table +-t1 CREATE TABLE `t1` ( +- `a` int(11) NOT NULL AUTO_INCREMENT, +- `c` char(8) DEFAULT NULL, +- PRIMARY KEY (`a`) +-) ENGINE= AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 +-/*!50100 PARTITION BY HASH (a) +-PARTITIONS 2 */ +-TRUNCATE TABLE t1; +-SHOW CREATE TABLE t1; +-Table Create Table +-t1 CREATE TABLE `t1` ( +- `a` int(11) NOT NULL AUTO_INCREMENT, +- `c` char(8) DEFAULT NULL, +- PRIMARY KEY (`a`) +-) ENGINE= DEFAULT CHARSET=latin1 +-/*!50100 PARTITION BY HASH (a) +-PARTITIONS 2 */ +-INSERT INTO t1 (c) VALUES ('d'); +-SHOW CREATE TABLE t1; +-Table Create Table +-t1 CREATE TABLE `t1` ( +- `a` int(11) NOT NULL AUTO_INCREMENT, +- `c` char(8) DEFAULT NULL, +- PRIMARY KEY (`a`) +-) ENGINE= AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 +-/*!50100 PARTITION BY HASH (a) +-PARTITIONS 2 */ +-SELECT a,c FROM t1; +-a c +-1 d +-DROP TABLE t1; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom indexed column options*/ KEY AUTO_INCREMENT, c CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or PK or auto-increment or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + CREATE TABLE t1 (a , b ) ENGINE= PARTITION BY HASH(a) PARTITIONS 2; +-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g'); +-ALTER TABLE t1 TRUNCATE PARTITION p0; +-SELECT a,b FROM t1; +-a b +-1 a +-101 g +-3 c +-EXPLAIN PARTITIONS SELECT a,b FROM t1; +-id select_type table partitions type possible_keys key key_len ref rows Extra +-1 SIMPLE t1 p0,p1 # # # # # # +-INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c'); +-ALTER TABLE t1 TRUNCATE PARTITION ALL; +-SELECT a,b FROM t1; +-a b +-DROP TABLE t1; ++ERROR HY000: Engine cannot be used in partitioned tables ++# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST PARTITION BY HASH(a) PARTITIONS 2 ] ++# The statement|command finished with ER_PARTITION_MERGE_ERROR. ++# Partitions or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- diff --git a/storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff index 180647323bc..9ff8f906511 100644 --- a/storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff @@ -1,103 +1,131 @@ -7c7 -< test.t1 repair status OK ---- -> test.t1 repair note The storage engine for the table doesn't support repair -12,13c12,13 -< test.t1 repair status OK -< test.t2 repair status OK ---- -> test.t1 repair note The storage engine for the table doesn't support repair -> test.t2 repair note The storage engine for the table doesn't support repair -17c17 -< test.t2 repair status OK ---- -> test.t2 repair note The storage engine for the table doesn't support repair -22,23c22,23 -< test.t2 repair status OK -< test.t1 repair status OK ---- -> test.t2 repair note The storage engine for the table doesn't support repair -> test.t1 repair note The storage engine for the table doesn't support repair -28,31c28,29 -< test.t1 repair warning Number of rows changed from 0 to 6 -< test.t1 repair status OK -< test.t2 repair warning Number of rows changed from 0 to 5 -< test.t2 repair status OK ---- -> test.t1 repair note The storage engine for the table doesn't support repair -> test.t2 repair note The storage engine for the table doesn't support repair -36,39c34,35 -< test.t1 repair warning Number of rows changed from 0 to 7 -< test.t1 repair status OK -< test.t2 repair warning Number of rows changed from 0 to 6 -< test.t2 repair status OK ---- -> test.t1 repair note The storage engine for the table doesn't support repair -> test.t2 repair note The storage engine for the table doesn't support repair -42c38 -< ERROR HY000: Incorrect file format 't1' ---- -> ERROR HY000: Table 't1' is read only -47,48c43 -< test.t1 check Error Incorrect file format 't1' -< test.t1 check error Corrupt ---- -> test.t1 check status OK -50c45 -< ERROR HY000: Incorrect file format 't1' ---- -> a b -55,56c50 -< test.t1 repair Error Incorrect file format 't1' -< test.t1 repair error Corrupt ---- -> test.t1 repair note The storage engine for the table doesn't support repair -65c59 -< test.t1 repair status OK ---- -> test.t1 repair note The storage engine for the table doesn't support repair -69c63 -< test.t1 repair status OK ---- -> test.t1 repair note The storage engine for the table doesn't support repair -73,76c67,68 -< test.t1 repair warning Number of rows changed from 0 to 3 -< test.t1 repair status OK -< t1.MYD -< t1.MYI ---- -> test.t1 repair note The storage engine for the table doesn't support repair -> t1.MRG -82c74 -< Restoring /test/t1.MYD ---- -> Restoring /test/t1.MRG -85,86c77 -< test.t1 check error Size of datafile is: 39 Should be: 65 -< test.t1 check error Corrupt ---- -> test.t1 check status OK -88,103c79,84 -< ERROR HY000: Incorrect key file for table 't1'; try to repair it -< # Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). -< # If you got a difference in error message, just add it to rdiff file -< INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); -< ERROR HY000: Table './test/t1' is marked as crashed and last (automatic?) repair failed -< # Statement ended with one of expected results (0,144). -< # If you got a difference in error message, just add it to rdiff file -< FLUSH TABLE t1; -< Restoring /test/t1.MYI -< CHECK TABLE t1; -< Table Op Msg_type Msg_text -< test.t1 check warning Table is marked as crashed and last repair failed -< test.t1 check error Size of datafile is: 39 Should be: 65 -< test.t1 check error Corrupt -< SELECT * FROM t1; -< ERROR HY000: Table './test/t1' is marked as crashed and last (automatic?) repair failed ---- -> a b -> 7 g -> 8 h -> 10 j -> 14 n -> 15 o +--- repair_table.result 2013-01-23 01:26:05.995538460 +0400 ++++ repair_table.reject 2013-01-23 02:50:55.035560564 +0400 +@@ -4,56 +4,50 @@ + CREATE TABLE t2 (a , b ) ENGINE= ; + REPAIR TABLE t1; + Table Op Msg_type Msg_text +-test.t1 repair status OK ++test.t1 repair note The storage engine for the table doesn't support repair + INSERT INTO t1 (a,b) VALUES (3,'c'); + INSERT INTO t2 (a,b) VALUES (4,'d'); + REPAIR NO_WRITE_TO_BINLOG TABLE t1, t2; + Table Op Msg_type Msg_text +-test.t1 repair status OK +-test.t2 repair status OK ++test.t1 repair note The storage engine for the table doesn't support repair ++test.t2 repair note The storage engine for the table doesn't support repair + INSERT INTO t2 (a,b) VALUES (5,'e'),(6,'f'); + REPAIR LOCAL TABLE t2; + Table Op Msg_type Msg_text +-test.t2 repair status OK ++test.t2 repair note The storage engine for the table doesn't support repair + INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h'); + INSERT INTO t2 (a,b) VALUES (9,'i'); + REPAIR LOCAL TABLE t2, t1 EXTENDED; + Table Op Msg_type Msg_text +-test.t2 repair status OK +-test.t1 repair status OK ++test.t2 repair note The storage engine for the table doesn't support repair ++test.t1 repair note The storage engine for the table doesn't support repair + INSERT INTO t1 (a,b) VALUES (10,'j'); + INSERT INTO t2 (a,b) VALUES (11,'k'); + REPAIR TABLE t1, t2 QUICK USE_FRM; + Table Op Msg_type Msg_text +-test.t1 repair warning Number of rows changed from 0 to 6 +-test.t1 repair status OK +-test.t2 repair warning Number of rows changed from 0 to 5 +-test.t2 repair status OK ++test.t1 repair note The storage engine for the table doesn't support repair ++test.t2 repair note The storage engine for the table doesn't support repair + INSERT INTO t1 (a,b) VALUES (12,'l'); + INSERT INTO t2 (a,b) VALUES (13,'m'); + REPAIR NO_WRITE_TO_BINLOG TABLE t1, t2 QUICK EXTENDED USE_FRM; + Table Op Msg_type Msg_text +-test.t1 repair warning Number of rows changed from 0 to 7 +-test.t1 repair status OK +-test.t2 repair warning Number of rows changed from 0 to 6 +-test.t2 repair status OK ++test.t1 repair note The storage engine for the table doesn't support repair ++test.t2 repair note The storage engine for the table doesn't support repair + FLUSH TABLE t1; + INSERT INTO t1 (a,b) VALUES (14,'n'); +-ERROR HY000: Incorrect file format 't1' ++ERROR HY000: Table 't1' is read only + # Statement ended with one of expected results (0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY). + # If you got a difference in error message, just add it to rdiff file + CHECK TABLE t1; + Table Op Msg_type Msg_text +-test.t1 check Error Incorrect file format 't1' +-test.t1 check error Corrupt ++test.t1 check status OK + SELECT a,b FROM t1; +-ERROR HY000: Incorrect file format 't1' ++a b + # Statement ended with one of expected results (0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY). + # If you got a difference in error message, just add it to rdiff file + REPAIR TABLE t1; + Table Op Msg_type Msg_text +-test.t1 repair Error Incorrect file format 't1' +-test.t1 repair error Corrupt ++test.t1 repair note The storage engine for the table doesn't support repair + DROP TABLE t1, t2; + call mtr.add_suppression("Got an error from thread_id=.*"); + call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table"); +@@ -62,45 +56,32 @@ + CREATE TABLE t1 (a , b , (a)) ENGINE= ; + REPAIR TABLE t1; + Table Op Msg_type Msg_text +-test.t1 repair status OK ++test.t1 repair note The storage engine for the table doesn't support repair + INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h'); + REPAIR TABLE t1 EXTENDED; + Table Op Msg_type Msg_text +-test.t1 repair status OK ++test.t1 repair note The storage engine for the table doesn't support repair + INSERT INTO t1 (a,b) VALUES (10,'j'); + REPAIR TABLE t1 USE_FRM; + Table Op Msg_type Msg_text +-test.t1 repair warning Number of rows changed from 0 to 3 +-test.t1 repair status OK +-t1.MYD +-t1.MYI ++test.t1 repair note The storage engine for the table doesn't support repair ++t1.MRG + t1.frm + INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); + # Statement ended with one of expected results (0,144). + # If you got a difference in error message, just add it to rdiff file + FLUSH TABLE t1; +-Restoring /test/t1.MYD ++Restoring /test/t1.MRG + CHECK TABLE t1; + Table Op Msg_type Msg_text +-test.t1 check error Size of datafile is: 39 Should be: 65 +-test.t1 check error Corrupt ++test.t1 check status OK + SELECT a,b FROM t1; +-ERROR HY000: Incorrect key file for table 't1'; try to repair it +-# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). +-# If you got a difference in error message, just add it to rdiff file +-INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); +-ERROR HY000: Table './test/t1' is marked as crashed and last (automatic?) repair failed +-# Statement ended with one of expected results (0,144). +-# If you got a difference in error message, just add it to rdiff file +-FLUSH TABLE t1; +-Restoring /test/t1.MYI +-CHECK TABLE t1; +-Table Op Msg_type Msg_text +-test.t1 check warning Table is marked as crashed and last repair failed +-test.t1 check error Size of datafile is: 39 Should be: 65 +-test.t1 check error Corrupt +-SELECT a,b FROM t1; +-ERROR HY000: Table './test/t1' is marked as crashed and last (automatic?) repair failed ++a b ++7 g ++8 h ++10 j ++14 n ++15 o + # Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). + # If you got a difference in error message, just add it to rdiff file + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/show_engine.rdiff b/storage/myisammrg/mysql-test/storage_engine/show_engine.rdiff index e7c9b0176b6..e78e6fdad53 100644 --- a/storage/myisammrg/mysql-test/storage_engine/show_engine.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/show_engine.rdiff @@ -1,2 +1,10 @@ -7d6 -< ### Engine status, can be long and changeable ### +--- show_engine.result 2013-01-22 22:05:05.246633000 +0400 ++++ show_engine.reject 2013-01-23 02:50:56.871537482 +0400 +@@ -4,7 +4,6 @@ + # volatile data (timestamps, memory info, etc.) + SHOW ENGINE STATUS; + Type Name Status +- ### Engine status, can be long and changeable ### + # For SHOW MUTEX even the number of lines is volatile, so the result logging is disabled, + # the test only checks that the command does not produce any errors + SHOW ENGINE MUTEX; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_ai.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_ai.rdiff index bca6fa60d13..4de7e81ffba 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_ai.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_ai.rdiff @@ -1,8 +1,16 @@ -7c7 -< ) ENGINE= AUTO_INCREMENT=10 DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -13c13 -< ) ENGINE= AUTO_INCREMENT=100 DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_ai.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_ai.reject 2013-01-23 02:50:57.547528984 +0400 +@@ -4,11 +4,11 @@ + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +-) ENGINE= AUTO_INCREMENT=10 DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 AUTO_INCREMENT=100; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +-) ENGINE= AUTO_INCREMENT=100 DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_avg_row_length.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_avg_row_length.rdiff index 7a3ac54fd3e..2632fabf89d 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_avg_row_length.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_avg_row_length.rdiff @@ -1,8 +1,17 @@ -8c8 -< ) ENGINE= DEFAULT CHARSET=latin1 AVG_ROW_LENGTH=300 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 AVG_ROW_LENGTH=300 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 AVG_ROW_LENGTH=30000000 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 AVG_ROW_LENGTH=30000000 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_avg_row_length.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_avg_row_length.reject 2013-01-23 02:50:58.123521742 +0400 +@@ -5,12 +5,12 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 AVG_ROW_LENGTH=300 ++) ENGINE= DEFAULT CHARSET=latin1 AVG_ROW_LENGTH=300 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 AVG_ROW_LENGTH=30000000; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 AVG_ROW_LENGTH=30000000 ++) ENGINE= DEFAULT CHARSET=latin1 AVG_ROW_LENGTH=30000000 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_checksum.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_checksum.rdiff index ecb3fadb479..baad32dd4db 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_checksum.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_checksum.rdiff @@ -1,8 +1,17 @@ -8c8 -< ) ENGINE= DEFAULT CHARSET=latin1 CHECKSUM=1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 CHECKSUM=1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_checksum.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_checksum.reject 2013-01-23 02:50:58.739513998 +0400 +@@ -5,12 +5,12 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 CHECKSUM=1 ++) ENGINE= DEFAULT CHARSET=latin1 CHECKSUM=1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 CHECKSUM=0; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_connection.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_connection.rdiff index d3ebd87ad1e..3dc06fb2704 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_connection.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_connection.rdiff @@ -1,8 +1,19 @@ -13c13 -< ) ENGINE= DEFAULT CHARSET=latin1 CONNECTION='test_connection' ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) CONNECTION='test_connection' -20c20 -< ) ENGINE= DEFAULT CHARSET=latin1 CONNECTION='test_connection2' ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) CONNECTION='test_connection2' +--- tbl_opt_connection.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_connection.reject 2013-01-23 02:50:59.335506506 +0400 +@@ -10,14 +10,14 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 CONNECTION='test_connection' ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) CONNECTION='test_connection' + ALTER TABLE t1 CONNECTION='test_connection2'; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 CONNECTION='test_connection2' ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) CONNECTION='test_connection2' + DROP TABLE t1; + DROP SERVER test_connection; + DROP SERVER test_connection2; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_data_index_dir.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_data_index_dir.rdiff index 3c15e10d1f1..e6055278b3c 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_data_index_dir.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_data_index_dir.rdiff @@ -1,8 +1,18 @@ -7c7 -< ) ENGINE= DEFAULT CHARSET=latin1 DATA DIRECTORY='' INDEX DIRECTORY='' ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 DATA DIRECTORY='' INDEX DIRECTORY='' ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_data_index_dir.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_data_index_dir.reject 2013-01-23 02:50:59.951498762 +0400 +@@ -4,7 +4,7 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 DATA DIRECTORY='' INDEX DIRECTORY='' ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + Warnings: + Warning 1618 option ignored + SHOW CREATE TABLE t1; +@@ -12,5 +12,5 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 DATA DIRECTORY='' INDEX DIRECTORY='' ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_delay_key_write.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_delay_key_write.rdiff index 5723e425b4d..2c2e40fa4b7 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_delay_key_write.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_delay_key_write.rdiff @@ -1,8 +1,17 @@ -8c8 -< ) ENGINE= DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_delay_key_write.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_delay_key_write.reject 2013-01-23 02:51:00.591490716 +0400 +@@ -5,12 +5,12 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ++) ENGINE= DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 DELAY_KEY_WRITE=0; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_insert_method.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_insert_method.rdiff index 2ced7647483..f5dc536c7ee 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_insert_method.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_insert_method.rdiff @@ -1,8 +1,17 @@ -8c8 -< ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=FIRST ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=FIRST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 UNION=(`mrg`.`t1`) +--- tbl_opt_insert_method.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_insert_method.reject 2013-01-23 02:51:01.211482922 +0400 +@@ -5,12 +5,12 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=FIRST ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=FIRST UNION=(`mrg`.`t1`) + ALTER TABLE t1 INSERT_METHOD=NO; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_key_block_size.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_key_block_size.rdiff index 8378f04ebcb..be90252f0b9 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_key_block_size.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_key_block_size.rdiff @@ -1,8 +1,17 @@ -8c8 -< ) ENGINE= DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=8 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=8 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_key_block_size.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_key_block_size.reject 2013-01-23 02:51:01.787475681 +0400 +@@ -5,12 +5,12 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=8 ++) ENGINE= DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=8 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 KEY_BLOCK_SIZE=1; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1 ++) ENGINE= DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_max_rows.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_max_rows.rdiff index f89147826c6..3eebf8cce9b 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_max_rows.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_max_rows.rdiff @@ -1,8 +1,17 @@ -8c8 -< ) ENGINE= DEFAULT CHARSET=latin1 MAX_ROWS=10000000 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 MAX_ROWS=10000000 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 MAX_ROWS=30000000 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 MAX_ROWS=30000000 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_max_rows.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_max_rows.reject 2013-01-23 02:51:02.403467936 +0400 +@@ -5,12 +5,12 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 MAX_ROWS=10000000 ++) ENGINE= DEFAULT CHARSET=latin1 MAX_ROWS=10000000 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 MAX_ROWS=30000000; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 MAX_ROWS=30000000 ++) ENGINE= DEFAULT CHARSET=latin1 MAX_ROWS=30000000 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_min_rows.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_min_rows.rdiff index 3ce28480dcf..48c7124ca36 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_min_rows.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_min_rows.rdiff @@ -1,8 +1,17 @@ -8c8 -< ) ENGINE= DEFAULT CHARSET=latin1 MIN_ROWS=1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 MIN_ROWS=1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 MIN_ROWS=10000 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 MIN_ROWS=10000 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_min_rows.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_min_rows.reject 2013-01-23 02:51:02.983460644 +0400 +@@ -5,12 +5,12 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 MIN_ROWS=1 ++) ENGINE= DEFAULT CHARSET=latin1 MIN_ROWS=1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 MIN_ROWS=10000; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 MIN_ROWS=10000 ++) ENGINE= DEFAULT CHARSET=latin1 MIN_ROWS=10000 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_pack_keys.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_pack_keys.rdiff index 246c7397a96..ab16cbcb0dc 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_pack_keys.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_pack_keys.rdiff @@ -1,8 +1,17 @@ -8c8 -< ) ENGINE= DEFAULT CHARSET=latin1 PACK_KEYS=1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 PACK_KEYS=1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 PACK_KEYS=0 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 PACK_KEYS=0 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_pack_keys.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_pack_keys.reject 2013-01-23 02:51:03.563453353 +0400 +@@ -5,12 +5,12 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 PACK_KEYS=1 ++) ENGINE= DEFAULT CHARSET=latin1 PACK_KEYS=1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 PACK_KEYS=0; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 PACK_KEYS=0 ++) ENGINE= DEFAULT CHARSET=latin1 PACK_KEYS=0 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_password.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_password.rdiff index b1ef20c6f30..dc8303682db 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_password.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_password.rdiff @@ -1,8 +1,17 @@ -8c8 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_password.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_password.reject 2013-01-23 02:51:04.155445910 +0400 +@@ -5,12 +5,12 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 PASSWORD='new_password'; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_row_format.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_row_format.rdiff index 9c72c7c06ba..f7e0905d4e7 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_row_format.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_row_format.rdiff @@ -1,8 +1,17 @@ -8c8 -< ) ENGINE= DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED ---- -> ) ENGINE= DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED INSERT_METHOD=LAST UNION=(`mrg`.`t1`) -15c15 -< ) ENGINE= DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC ---- -> ) ENGINE= DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_opt_row_format.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_row_format.reject 2013-01-23 02:51:04.743438518 +0400 +@@ -5,12 +5,12 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED ++) ENGINE= DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + ALTER TABLE t1 ROW_FORMAT=DYNAMIC; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC ++) ENGINE= DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_union.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_union.rdiff index f77753f4d6b..e4e098a1b94 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_opt_union.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_opt_union.rdiff @@ -1,8 +1,16 @@ -7c7 -< ) ENGINE= DEFAULT CHARSET=latin1 UNION=(`child1`) ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`child1`) -13c13 -< ) ENGINE= DEFAULT CHARSET=latin1 UNION=(`child1`,`child2`) ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`child1`,`child2`) +--- tbl_opt_union.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_opt_union.reject 2013-01-23 02:51:05.375430573 +0400 +@@ -4,11 +4,11 @@ + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 UNION=(`child1`) ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`child1`) + ALTER TABLE t1 UNION = (child1,child2); + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 UNION=(`child1`,`child2`) ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`child1`,`child2`) + DROP TABLE t1, child1, child2; diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_standard_opts.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_standard_opts.rdiff index 9b7ffc6af76..a929b6df54b 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_standard_opts.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_standard_opts.rdiff @@ -1,8 +1,19 @@ -11c11 -< ) ENGINE= DEFAULT CHARSET=utf8 COMMENT='standard table options' ---- -> ) ENGINE= DEFAULT CHARSET=utf8 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) COMMENT='standard table options' -18c18 -< ) ENGINE= DEFAULT CHARSET=utf8 COMMENT='table altered' ---- -> ) ENGINE= DEFAULT CHARSET=utf8 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) COMMENT='table altered' +--- tbl_standard_opts.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_standard_opts.reject 2013-01-23 02:51:05.991422829 +0400 +@@ -8,14 +8,14 @@ + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=utf8 COMMENT='standard table options' ++) ENGINE= DEFAULT CHARSET=utf8 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) COMMENT='standard table options' + ALTER TABLE t1 COMMENT = 'table altered'; + SHOW CREATE TABLE t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=utf8 COMMENT='table altered' ++) ENGINE= DEFAULT CHARSET=utf8 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) COMMENT='table altered' + ALTER TABLE t1 ENGINE=MEMORY; + SHOW CREATE TABLE t1; + Table Create Table diff --git a/storage/myisammrg/mysql-test/storage_engine/tbl_temporary.rdiff b/storage/myisammrg/mysql-test/storage_engine/tbl_temporary.rdiff index 45a229c98eb..d2c7d4f2836 100644 --- a/storage/myisammrg/mysql-test/storage_engine/tbl_temporary.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/tbl_temporary.rdiff @@ -1,4 +1,10 @@ -9c9 -< ) ENGINE= DEFAULT CHARSET=latin1 ---- -> ) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) +--- tbl_temporary.result 2013-01-22 22:05:05.246633000 +0400 ++++ tbl_temporary.reject 2013-01-23 02:51:06.599415185 +0400 +@@ -6,6 +6,6 @@ + t1 CREATE TEMPORARY TABLE `t1` ( + `a` int(11) DEFAULT NULL, + `b` char(8) DEFAULT NULL +-) ENGINE= DEFAULT CHARSET=latin1 ++) ENGINE= DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`) + DROP TEMPORARY TABLE t1; + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff index 3a89f730540..e4de81bae70 100644 --- a/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff @@ -1,35 +1,48 @@ -12c12 -< t1 # # # # # # # # # 1 # # # # # # # ---- -> t1 # # # # # # # # # 0 # # # # # # # -16c16 -< t1 # # # # # # # # # 4 # # # # # # # ---- -> t1 # # # # # # # # # 0 # # # # # # # -20c20 -< t1 # # # # # # # # # 1 # # # # # # # ---- -> t1 # # # # # # # # # 0 # # # # # # # -24c24 -< t1 # # # # # # # # # 2 # # # # # # # ---- -> t1 # # # # # # # # # 0 # # # # # # # -32,40c32,39 -< HANDLER h1 READ FIRST; -< a b -< 1 a -< TRUNCATE TABLE t1; -< HANDLER h1 READ NEXT; -< ERROR 42S02: Unknown table 'h1' in HANDLER -< HANDLER t1 OPEN AS h2; -< HANDLER h2 READ FIRST; -< a b ---- -> ERROR HY000: Table storage engine for 'h1' doesn't have this option -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command finished with ER_ILLEGAL_HA. -> # HANDLER or the syntax or the mix could be unsupported. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- +--- truncate_table.result 2013-01-22 22:05:05.246633000 +0400 ++++ truncate_table.reject 2013-01-23 02:51:07.507403770 +0400 +@@ -9,19 +9,19 @@ + CREATE TABLE t1 (a KEY AUTO_INCREMENT, c ) ENGINE= ; + SHOW TABLE STATUS LIKE 't1'; + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment +-t1 # # # # # # # # # 1 # # # # # # # ++t1 # # # # # # # # # 0 # # # # # # # + INSERT INTO t1 (c) VALUES ('a'),('b'),('c'); + SHOW TABLE STATUS LIKE 't1'; + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment +-t1 # # # # # # # # # 4 # # # # # # # ++t1 # # # # # # # # # 0 # # # # # # # + TRUNCATE TABLE t1; + SHOW TABLE STATUS LIKE 't1'; + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment +-t1 # # # # # # # # # 1 # # # # # # # ++t1 # # # # # # # # # 0 # # # # # # # + INSERT INTO t1 (c) VALUES ('d'); + SHOW TABLE STATUS LIKE 't1'; + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment +-t1 # # # # # # # # # 2 # # # # # # # ++t1 # # # # # # # # # 0 # # # # # # # + SELECT a,c FROM t1; + a c + 1 d +@@ -29,13 +29,12 @@ + CREATE TABLE t1 (a , b ) ENGINE= ; + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'); + HANDLER t1 OPEN AS h1; +-HANDLER h1 READ FIRST; +-a b +-1 a +-TRUNCATE TABLE t1; +-HANDLER h1 READ NEXT; +-ERROR 42S02: Unknown table 'h1' in HANDLER +-HANDLER t1 OPEN AS h2; +-HANDLER h2 READ FIRST; +-a b ++ERROR HY000: Table storage engine for 'h1' doesn't have this option ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command finished with ER_ILLEGAL_HA. ++# HANDLER or the syntax or the mix could be unsupported. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff index 018b28bd24c..94cfa74f384 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff @@ -1,9 +1,20 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -13a20 -> 1 +--- cons_snapshot_repeatable_read.result 2013-01-22 22:05:05.246633000 +0400 ++++ cons_snapshot_repeatable_read.reject 2013-01-23 03:22:34.255684132 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + connect con2,localhost,root,,; +@@ -11,6 +17,7 @@ + # If consistent read works on this isolation level (REPEATABLE READ), the following SELECT should not return the value we inserted (1) + SELECT a FROM t1; + a ++1 + COMMIT; + connection default; + disconnect con1; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff index 018b28bd24c..a9b9ba7f94b 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff @@ -1,9 +1,20 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -13a20 -> 1 +--- cons_snapshot_serializable.result 2013-01-22 22:05:05.246633000 +0400 ++++ cons_snapshot_serializable.reject 2013-01-23 03:22:34.847676690 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + connect con2,localhost,root,,; +@@ -11,6 +17,7 @@ + # If consistent read works on this isolation level (SERIALIZABLE), the following SELECT should not return the value we inserted (1) + SELECT a FROM t1; + a ++1 + COMMIT; + connection default; + disconnect con1; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/delete.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/delete.rdiff index 45a3e5fb52d..e4249478c76 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/delete.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/delete.rdiff @@ -1,34 +1,50 @@ -0a1,12 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support savepoints. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file (recommended), or add the test to disabled.def. -> # If savepoints should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -48a61,62 -> Warnings: -> Warning 1196 Some non-transactional changed tables couldn't be rolled back -51,64d64 -< 10000 foobar -< 10000 foobar -< 2 b -< 2 b -< 4 d -< 4 d -< 5 e -< 5 e -< 6 f -< 6 f -< 7 g -< 7 g -< 8 h -< 8 h -70a71,72 -> Warnings: -> Warning 1196 Some non-transactional changed tables couldn't be rolled back +--- delete.result 2013-01-22 22:05:05.246633000 +0400 ++++ delete.reject 2013-01-23 03:22:35.419669500 +0400 +@@ -1,3 +1,15 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support savepoints. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file (recommended), or add the test to disabled.def. ++# If savepoints should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + CREATE TABLE t1 (a , b ) ENGINE= ; + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(6,'f'),(7,'g'),(8,'h'),(10000,'foobar'); +@@ -46,27 +58,17 @@ + DELETE FROM t1; + RELEASE SAVEPOINT spt1; + ROLLBACK; ++Warnings: ++Warning 1196 Some non-transactional changed tables couldn't be rolled back + SELECT a,b FROM t1; + a b +-10000 foobar +-10000 foobar +-2 b +-2 b +-4 d +-4 d +-5 e +-5 e +-6 f +-6 f +-7 g +-7 g +-8 h +-8 h + BEGIN; + DELETE FROM t1 WHERE a <= 4 ORDER BY b DESC LIMIT 1; + SAVEPOINT spt1; + DELETE FROM t1; + INSERT INTO t1 (a,b) VALUES (1,'a'); + ROLLBACK TO SAVEPOINT spt1; ++Warnings: ++Warning 1196 Some non-transactional changed tables couldn't be rolled back + COMMIT; + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/insert.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/insert.rdiff index 69981f90e13..d5e99b6d7dc 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/insert.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/insert.rdiff @@ -1,32 +1,65 @@ -0a1,12 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support savepoints. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file (recommended), or add the test to disabled.def. -> # If savepoints should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -23a36,37 -> Warnings: -> Warning 1196 Some non-transactional changed tables couldn't be rolled back -25a40 -> 0 test -33a49,50 -> NULL NULL -> NULL NULL -39a57,58 -> Warnings: -> Warning 1196 Some non-transactional changed tables couldn't be rolled back -43a63 -> 0 test -49a70 -> 11 f -54a76,78 -> NULL NULL -> NULL NULL -> NULL NULL +--- insert.result 2013-01-22 22:05:05.246633000 +0400 ++++ insert.reject 2013-01-23 03:22:35.987662359 +0400 +@@ -1,3 +1,15 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support savepoints. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file (recommended), or add the test to disabled.def. ++# If savepoints should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + CREATE TABLE t1 (a , b ) ENGINE= ; + BEGIN; +@@ -21,8 +33,11 @@ + RELEASE SAVEPOINT spt1; + INSERT INTO t1 (a,b) VALUES (DEFAULT,DEFAULT); + ROLLBACK; ++Warnings: ++Warning 1196 Some non-transactional changed tables couldn't be rolled back + SELECT a,b FROM t1; + a b ++0 test + 1 a + 10 foo + 100 foo +@@ -31,25 +46,34 @@ + 3 c + 4 d + 5 e ++NULL NULL ++NULL NULL + BEGIN; + INSERT t1 (a) VALUE (10),(20); + SAVEPOINT spt1; + INSERT INTO t1 SET a = 11, b = 'f'; + INSERT t1 SET b = DEFAULT; + ROLLBACK TO SAVEPOINT spt1; ++Warnings: ++Warning 1196 Some non-transactional changed tables couldn't be rolled back + INSERT INTO t1 (b,a) VALUES ('test1',10); + COMMIT; + SELECT a,b FROM t1; + a b ++0 test + 1 a + 10 NULL + 10 foo + 10 test1 + 100 foo + 11 abc ++11 f + 2 b + 20 NULL + 3 c + 4 d + 5 e ++NULL NULL ++NULL NULL ++NULL NULL + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/level_read_committed.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/level_read_committed.rdiff index 0837c74f5ff..9e7c340c524 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/level_read_committed.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/level_read_committed.rdiff @@ -1,44 +1,94 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -18a25 -> 1 -25a33,34 -> 1 -> 2 -30a40,43 -> 1 -> 101 -> 102 -> 2 -34a48,49 -> 101 -> 102 -39a55,56 -> 101 -> 102 -44a62,63 -> 101 -> 102 -51a71,72 -> 101 -> 102 -54a76,77 -> 301 -> 302 -58a82,83 -> 101 -> 102 -61a87,88 -> 301 -> 302 -65a93,94 -> 101 -> 102 -68a98,99 -> 301 -> 302 +--- level_read_committed.result 2013-01-22 22:05:05.246633000 +0400 ++++ level_read_committed.reject 2013-01-23 03:22:36.603654615 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; +@@ -16,6 +22,7 @@ + connection con1; + SELECT a FROM t1; + a ++1 + connection con2; + INSERT INTO t1 (a) VALUES (2); + # WARNING: Statement ended with errno 0, errname ''. +@@ -23,25 +30,37 @@ + connection con1; + SELECT a FROM t1; + a ++1 ++2 + INSERT INTO t1 (a) SELECT a+100 FROM t1; + # WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + connection con2; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + COMMIT; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + connection con1; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + INSERT INTO t1 (a) SELECT a+200 FROM t1; + # WARNING: Statement ended with errno 0, errname ''. +@@ -49,23 +68,35 @@ + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + 201 + 202 ++301 ++302 + COMMIT; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + 201 + 202 ++301 ++302 + connection con2; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + 201 + 202 ++301 ++302 + connection default; + disconnect con1; + disconnect con2; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff index bd9569267e5..d44e4aa7a12 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff @@ -1,7 +1,12 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- +--- level_read_uncommitted.result 2013-01-22 22:05:05.246633000 +0400 ++++ level_read_uncommitted.reject 2013-01-23 03:22:37.263646318 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/level_repeatable_read.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/level_repeatable_read.rdiff index 82f7c5c5ba6..b24376a9c28 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/level_repeatable_read.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/level_repeatable_read.rdiff @@ -1,53 +1,96 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -18a25 -> 1 -25a33,34 -> 1 -> 2 -27,28c36 -< ERROR HY000: Lock wait timeout exceeded; try restarting transaction -< # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ---- -> # WARNING: Statement ended with errno 0, errname ''. -31a40,43 -> 1 -> 101 -> 102 -> 2 -35a48,49 -> 101 -> 102 -40a55,56 -> 101 -> 102 -44a61,64 -> 1 -> 101 -> 102 -> 2 -49a70,73 -> 1 -> 101 -> 102 -> 2 -51a76,77 -> 301 -> 302 -55a82,83 -> 101 -> 102 -58a87,88 -> 301 -> 302 -62a93,94 -> 101 -> 102 -65a98,99 -> 301 -> 302 +--- level_repeatable_read.result 2013-01-22 22:05:05.246633000 +0400 ++++ level_repeatable_read.reject 2013-01-23 03:22:37.867638724 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ; +@@ -16,6 +22,7 @@ + connection con1; + SELECT a FROM t1; + a ++1 + connection con2; + INSERT INTO t1 (a) VALUES (2); + # WARNING: Statement ended with errno 0, errname ''. +@@ -23,46 +30,73 @@ + connection con1; + SELECT a FROM t1; + a ++1 ++2 + INSERT INTO t1 (a) SELECT a+100 FROM t1; +-ERROR HY000: Lock wait timeout exceeded; try restarting transaction +-# WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ++# WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + connection con2; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + COMMIT; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + connection con1; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + INSERT INTO t1 (a) SELECT a+200 FROM t1; + # WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + 201 + 202 ++301 ++302 + COMMIT; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + 201 + 202 ++301 ++302 + connection con2; + SELECT a FROM t1; + a + 1 ++101 ++102 + 2 + 201 + 202 ++301 ++302 + connection default; + disconnect con1; + disconnect con2; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/level_serializable.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/level_serializable.rdiff index 3924b3784a9..3567e718459 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/level_serializable.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/level_serializable.rdiff @@ -1,69 +1,103 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -14,15c20 -< ERROR HY000: Lock wait timeout exceeded; try restarting transaction -< # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ---- -> # WARNING: Statement ended with errno 0, errname ''. -19a25 -> 1 -22,23c28 -< ERROR HY000: Lock wait timeout exceeded; try restarting transaction -< # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ---- -> # WARNING: Statement ended with errno 0, errname ''. -27a33,34 -> 1 -> 2 -32a40,43 -> 1 -> 101 -> 102 -> 2 -35a47,50 -> 1 -> 101 -> 102 -> 2 -38a54,57 -> 1 -> 101 -> 102 -> 2 -41a61,64 -> 1 -> 101 -> 102 -> 2 -46a70,77 -> 1 -> 101 -> 102 -> 2 -> 201 -> 202 -> 301 -> 302 -49a81,88 -> 1 -> 101 -> 102 -> 2 -> 201 -> 202 -> 301 -> 302 -52a92,99 -> 1 -> 101 -> 102 -> 2 -> 201 -> 202 -> 301 -> 302 +--- level_serializable.result 2013-01-22 22:05:05.246633000 +0400 ++++ level_serializable.reject 2013-01-23 03:22:38.471631132 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE; +@@ -11,45 +17,86 @@ + connection con2; + BEGIN; + INSERT INTO t1 (a) VALUES(1); +-ERROR HY000: Lock wait timeout exceeded; try restarting transaction +-# WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ++# WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + connection con1; + SELECT a FROM t1; + a ++1 + connection con2; + INSERT INTO t1 (a) VALUES (2); +-ERROR HY000: Lock wait timeout exceeded; try restarting transaction +-# WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ++# WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + connection con1; + SELECT a FROM t1; + a ++1 ++2 + INSERT INTO t1 (a) SELECT a+100 FROM t1; + # WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + connection con2; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + COMMIT; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + connection con1; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 + INSERT INTO t1 (a) SELECT a+200 FROM t1; + # WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 ++201 ++202 ++301 ++302 + COMMIT; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 ++201 ++202 ++301 ++302 + connection con2; + SELECT a FROM t1; + a ++1 ++101 ++102 ++2 ++201 ++202 ++301 ++302 + connection default; + disconnect con1; + disconnect con2; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/select_for_update.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/select_for_update.rdiff index f8ffe67586d..bad014d87ed 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/select_for_update.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/select_for_update.rdiff @@ -1,40 +1,50 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -17c23,33 -< ERROR HY000: Lock wait timeout exceeded; try restarting transaction ---- -> a b -> 1 a -> 3 a -> # ERROR: Statement succeeded (expected results: ER_LOCK_WAIT_TIMEOUT) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command succeeded unexpectedly. -> # SELECT .. FOR UPDATE or LOCK IN SHARE MODE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -19c35,42 -< ERROR HY000: Lock wait timeout exceeded; try restarting transaction ---- -> # ERROR: Statement succeeded (expected results: ER_LOCK_WAIT_TIMEOUT) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command succeeded unexpectedly. -> # UPDATE or SELECT .. FOR UPDATE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -24c47 -< 1 a ---- -> 1 c -26c49 -< 3 a ---- -> 3 c +--- select_for_update.result 2013-01-22 22:05:05.246633000 +0400 ++++ select_for_update.reject 2013-01-23 03:22:39.123622935 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + CREATE TABLE t1 (a , b ) ENGINE= ; + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'a'); +@@ -14,16 +20,33 @@ + 1 a + 3 a + SELECT a,b FROM t1 WHERE b='a' LOCK IN SHARE MODE; +-ERROR HY000: Lock wait timeout exceeded; try restarting transaction ++a b ++1 a ++3 a ++# ERROR: Statement succeeded (expected results: ER_LOCK_WAIT_TIMEOUT) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command succeeded unexpectedly. ++# SELECT .. FOR UPDATE or LOCK IN SHARE MODE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + UPDATE t1 SET b='c' WHERE b='a'; +-ERROR HY000: Lock wait timeout exceeded; try restarting transaction ++# ERROR: Statement succeeded (expected results: ER_LOCK_WAIT_TIMEOUT) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command succeeded unexpectedly. ++# UPDATE or SELECT .. FOR UPDATE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + connection con1; + COMMIT; + SELECT a,b FROM t1; + a b +-1 a ++1 c + 2 b +-3 a ++3 c + disconnect con1; + connection default; + UPDATE t1 SET b='c' WHERE b='a'; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/select_lock_in_share_mode.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/select_lock_in_share_mode.rdiff index e316993830a..db3eec1bc24 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/select_lock_in_share_mode.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/select_lock_in_share_mode.rdiff @@ -1,26 +1,37 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -21c27,34 -< ERROR HY000: Lock wait timeout exceeded; try restarting transaction ---- -> # ERROR: Statement succeeded (expected results: ER_LOCK_WAIT_TIMEOUT) -> # ------------ UNEXPECTED RESULT ------------ -> # The statement|command succeeded unexpectedly. -> # LOCK IN SHARE MODE or UPDATE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -26c39 -< 1 a ---- -> 1 c -28c41 -< 3 a ---- -> 3 c +--- select_lock_in_share_mode.result 2013-01-22 22:05:05.246633000 +0400 ++++ select_lock_in_share_mode.reject 2013-01-23 03:22:39.739615191 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + CREATE TABLE t1 (a , b ) ENGINE= ; + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'a'); +@@ -18,14 +24,21 @@ + 1 a + 3 a + UPDATE t1 SET b='c' WHERE b='a'; +-ERROR HY000: Lock wait timeout exceeded; try restarting transaction ++# ERROR: Statement succeeded (expected results: ER_LOCK_WAIT_TIMEOUT) ++# ------------ UNEXPECTED RESULT ------------ ++# The statement|command succeeded unexpectedly. ++# LOCK IN SHARE MODE or UPDATE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + connection con1; + COMMIT; + SELECT a,b FROM t1; + a b +-1 a ++1 c + 2 b +-3 a ++3 c + disconnect con1; + connection default; + UPDATE t1 SET b='c' WHERE b='a'; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/update.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/update.rdiff index 7ad463053eb..baac054766b 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/update.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/update.rdiff @@ -1,41 +1,58 @@ -0a1,12 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support transactions. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If transactions should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support savepoints. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file (recommended), or add the test to disabled.def. -> # If savepoints should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -26a39,40 -> Warnings: -> Warning 1196 Some non-transactional changed tables couldn't be rolled back -31a46,47 -> Warnings: -> Warning 1196 Some non-transactional changed tables couldn't be rolled back -38,47c54,63 -< 51 update2 -< 51 update2 -< 52 update2 -< 52 update2 -< 53 update2 -< 53 update2 -< 54 update2 -< 54 update2 -< 55 update2 -< 55 update2 ---- -> 51 -> 51 -> 52 -> 52 -> 53 -> 53 -> 54 -> 54 -> 55 -> 55 +--- update.result 2013-01-22 22:05:05.246633000 +0400 ++++ update.reject 2013-01-23 03:22:40.355607446 +0400 +@@ -1,3 +1,15 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support transactions. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If transactions should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support savepoints. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file (recommended), or add the test to disabled.def. ++# If savepoints should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + CREATE TABLE t1 (a , b ) ENGINE= ; + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(10000,'foobar'); +@@ -24,25 +36,29 @@ + UPDATE t1 SET b = 'update' WHERE a <= 4 ORDER BY a DESC, b ASC LIMIT 3; + UPDATE t1 SET b = ''; + ROLLBACK; ++Warnings: ++Warning 1196 Some non-transactional changed tables couldn't be rolled back + BEGIN; + UPDATE t1 SET b = 'update2' WHERE a <= 100; + SAVEPOINT spt1; + UPDATE t1 SET b = ''; + ROLLBACK TO SAVEPOINT spt1; ++Warnings: ++Warning 1196 Some non-transactional changed tables couldn't be rolled back + UPDATE t1 SET b = 'upd' WHERE a = 10050; + COMMIT; + SELECT a,b FROM t1; + a b + 10050 upd + 10050 upd +-51 update2 +-51 update2 +-52 update2 +-52 update2 +-53 update2 +-53 update2 +-54 update2 +-54 update2 +-55 update2 +-55 update2 ++51 ++51 ++52 ++52 ++53 ++53 ++54 ++54 ++55 ++55 + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/xa.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/xa.rdiff index ee7c2a984be..a491287337d 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/xa.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/xa.rdiff @@ -1,34 +1,89 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support XA. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If XA should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -11a18 -> 1 -17a25,26 -> 1 -> 2 -22a32,33 -> 1 -> 2 -40a52 -> 3 -48a61,62 -> 3 -> 4 -67a82 -> 5 -77a93,94 -> 5 -> 6 -86a104,105 -> 5 -> 6 -88a108,109 -> Warnings: -> Warning 1196 Some non-transactional changed tables couldn't be rolled back -95a117,118 -> 5 -> 6 +--- xa.result 2013-01-22 22:05:05.246633000 +0400 ++++ xa.reject 2013-01-23 03:22:41.047598747 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support XA. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If XA should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + DROP TABLE IF EXISTS t1; + connect con1,localhost,root,,; + connect con2,localhost,root,,; +@@ -9,17 +15,22 @@ + connection con1; + SELECT a FROM t1; + a ++1 + connection con2; + INSERT INTO t1 (a) VALUES (2); + XA END 'xa1'; + connection con1; + SELECT a FROM t1; + a ++1 ++2 + connection con2; + XA PREPARE 'xa1'; + connection con1; + SELECT a FROM t1; + a ++1 ++2 + connection con2; + XA RECOVER; + formatID gtrid_length bqual_length data +@@ -38,6 +49,7 @@ + a + 1 + 2 ++3 + connection con2; + INSERT INTO t1 (a) VALUES (4); + XA END 'xa2'; +@@ -46,6 +58,8 @@ + a + 1 + 2 ++3 ++4 + connection con2; + XA COMMIT 'xa2' ONE PHASE; + connection con1; +@@ -65,6 +79,7 @@ + 2 + 3 + 4 ++5 + connection con2; + INSERT INTO t1 (a) VALUES (6); + XA END 'xa3'; +@@ -75,6 +90,8 @@ + 2 + 3 + 4 ++5 ++6 + connection con2; + XA PREPARE 'xa3'; + connection con1; +@@ -84,8 +101,12 @@ + 2 + 3 + 4 ++5 ++6 + connection con2; + XA ROLLBACK 'xa3'; ++Warnings: ++Warning 1196 Some non-transactional changed tables couldn't be rolled back + connection con1; + SELECT a FROM t1; + a +@@ -93,4 +114,6 @@ + 2 + 3 + 4 ++5 ++6 + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff index 362e3a8914a..8dc888a1d58 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff @@ -1,22 +1,33 @@ -0a1,6 -> # -- WARNING ---------------------------------------------------------------- -> # According to I_S.ENGINES, MRG_MYISAM does not support XA. -> # If it is true, the test will most likely fail; you can -> # either create an rdiff file, or add the test to disabled.def. -> # If XA should be supported, check the data in Information Schema. -> # --------------------------------------------------------------------------- -21,22d26 -< 1 3 0 xa1 -< 1 3 0 xa2 -23a28 -> ERROR XAE04: XAER_NOTA: Unknown XID -24a30 -> ERROR XAE04: XAER_NOTA: Unknown XID -26a33,34 -> 1 -> 2 -28a37,40 -> Warnings: -> Error 145 Table './mrg/t1' is marked as crashed and should be repaired -> Error 1194 Table 't1' is marked as crashed and should be repaired -> Error 1034 1 client is using or hasn't closed the table properly +--- xa_recovery.result 2013-01-22 22:05:05.246633000 +0400 ++++ xa_recovery.reject 2013-01-23 03:22:43.247571090 +0400 +@@ -1,3 +1,9 @@ ++# -- WARNING ---------------------------------------------------------------- ++# According to I_S.ENGINES, MRG_MYISAM does not support XA. ++# If it is true, the test will most likely fail; you can ++# either create an rdiff file, or add the test to disabled.def. ++# If XA should be supported, check the data in Information Schema. ++# --------------------------------------------------------------------------- + call mtr.add_suppression("Found 2 prepared XA transactions"); + FLUSH TABLES; + DROP TABLE IF EXISTS t1; +@@ -18,12 +24,18 @@ + connection default; + XA RECOVER; + formatID gtrid_length bqual_length data +-1 3 0 xa1 +-1 3 0 xa2 + XA ROLLBACK 'xa1'; ++ERROR XAE04: XAER_NOTA: Unknown XID + XA COMMIT 'xa2'; ++ERROR XAE04: XAER_NOTA: Unknown XID + SELECT a FROM t1; + a ++1 ++2 + 3 + 4 ++Warnings: ++Error 145 Table './mrg/t1' is marked as crashed and should be repaired ++Error 1194 Table 't1' is marked as crashed and should be repaired ++Error 1034 1 client is using or hasn't closed the table properly + DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff index a0a418e0bcc..c80d4acced5 100644 --- a/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/type_char_indexes.rdiff @@ -1,8 +1,20 @@ -101c101 -< # # # range c_v c_v # # # Using index condition ---- -> # # # ALL c_v NULL # # # Using where -138c138 -< # # # range # v16 # # # # ---- -> # # # ALL # NULL # # # # +--- type_char_indexes.result 2013-01-22 22:05:05.246633000 +0400 ++++ type_char_indexes.reject 2013-01-23 02:51:10.055371738 +0400 +@@ -98,7 +98,7 @@ + SET SESSION optimizer_switch = 'engine_condition_pushdown=on'; + EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; + id select_type table type possible_keys key key_len ref rows Extra +-# # # range c_v c_v # # # Using index condition ++# # # ALL c_v NULL # # # Using where + SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a'; + c c20 v16 v128 + b char3 varchar1a varchar1b +@@ -135,7 +135,7 @@ + r3a + EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; + id select_type table type possible_keys key key_len ref rows Extra +-# # # range # v16 # # # # ++# # # ALL # NULL # # # # + SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; + c c20 v16 v128 + a char1 varchar1a varchar1b diff --git a/storage/myisammrg/mysql-test/storage_engine/type_float_indexes.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_float_indexes.rdiff index 640e1050a99..eb4da4db951 100644 --- a/storage/myisammrg/mysql-test/storage_engine/type_float_indexes.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/type_float_indexes.rdiff @@ -1,4 +1,11 @@ -63c63 -< # # # # # d # # # # ---- -> # # # # # NULL # # # # +--- type_float_indexes.result 2013-01-22 22:05:05.246633000 +0400 ++++ type_float_indexes.reject 2013-01-23 02:51:13.059333973 +0400 +@@ -60,7 +60,7 @@ + ALTER TABLE t1 ADD UNIQUE KEY(d); + EXPLAIN SELECT d FROM t1 WHERE r > 0 and d > 0 ORDER BY d; + id select_type table type possible_keys key key_len ref rows Extra +-# # # # # d # # # # ++# # # # # NULL # # # # + SELECT d FROM t1 WHERE r > 0 and d > 0 ORDER BY d; + d + 1.2345 diff --git a/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff index a4d7d4390b8..dbf29fb8d00 100644 --- a/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff @@ -1,706 +1,712 @@ -5,698c5,14 -< CREATE TABLE gis_line (fid , g LINESTRING) ENGINE= ; -< CREATE TABLE gis_polygon (fid , g POLYGON) ENGINE= ; -< CREATE TABLE gis_multi_point (fid , g MULTIPOINT) ENGINE= ; -< CREATE TABLE gis_multi_line (fid , g MULTILINESTRING) ENGINE= ; -< CREATE TABLE gis_multi_polygon (fid , g MULTIPOLYGON) ENGINE= ; -< CREATE TABLE gis_geometrycollection (fid , g GEOMETRYCOLLECTION) ENGINE= ; -< CREATE TABLE gis_geometry (fid , g GEOMETRY) ENGINE= ; -< USE gis_ogs; -< CREATE TABLE lakes (fid INT , -< name CHAR(64) , -< shore POLYGON) ENGINE= ; -< CREATE TABLE road_segments (fid INT , -< name CHAR(64) , -< aliases CHAR(64) , -< num_lanes INT , -< centerline LINESTRING) ENGINE= ; -< CREATE TABLE divided_routes (fid INT , -< name CHAR(64) , -< num_lanes INT , -< centerlines MULTILINESTRING) ENGINE= ; -< CREATE TABLE forests (fid INT , -< name CHAR(64) , -< boundary MULTIPOLYGON) ENGINE= ; -< CREATE TABLE bridges (fid INT , -< name CHAR(64) , -< position POINT) ENGINE= ; -< CREATE TABLE streams (fid INT , -< name CHAR(64) , -< centerline LINESTRING) ENGINE= ; -< CREATE TABLE buildings (fid INT , -< name CHAR(64) , -< position POINT, -< footprint POLYGON) ENGINE= ; -< CREATE TABLE ponds (fid INT , -< name CHAR(64) , -< type CHAR(64) , -< shores MULTIPOLYGON) ENGINE= ; -< CREATE TABLE named_places (fid INT , -< name CHAR(64) , -< boundary POLYGON) ENGINE= ; -< CREATE TABLE map_neatlines (fid INT , -< neatline POLYGON) ENGINE= ; -< USE test; -< SHOW FIELDS FROM gis_point; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g point YES NULL -< SHOW FIELDS FROM gis_line; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g linestring YES NULL -< SHOW FIELDS FROM gis_polygon; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g polygon YES NULL -< SHOW FIELDS FROM gis_multi_point; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g multipoint YES NULL -< SHOW FIELDS FROM gis_multi_line; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g multilinestring YES NULL -< SHOW FIELDS FROM gis_multi_polygon; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g multipolygon YES NULL -< SHOW FIELDS FROM gis_geometrycollection; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g geometrycollection YES NULL -< SHOW FIELDS FROM gis_geometry; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g geometry YES NULL -< INSERT INTO gis_point VALUES -< (101, PointFromText('POINT(10 10)')), -< (102, PointFromText('POINT(20 10)')), -< (103, PointFromText('POINT(20 20)')), -< (104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); -< INSERT INTO gis_line VALUES -< (105, LineFromText('LINESTRING(0 0,0 10,10 0)')), -< (106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), -< (107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); -< INSERT INTO gis_polygon VALUES -< (108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), -< (109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), -< (110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); -< INSERT INTO gis_multi_point VALUES -< (111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), -< (112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), -< (113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); -< INSERT INTO gis_multi_line VALUES -< (114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), -< (115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), -< (116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); -< INSERT INTO gis_multi_polygon VALUES -< (117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), -< (118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), -< (119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); -< INSERT INTO gis_geometrycollection VALUES -< (120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), -< (121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), -< (122, GeomFromText('GeometryCollection()')), -< (123, GeomFromText('GeometryCollection EMPTY')); -< INSERT into gis_geometry SELECT * FROM gis_point; -< INSERT into gis_geometry SELECT * FROM gis_line; -< INSERT into gis_geometry SELECT * FROM gis_polygon; -< INSERT into gis_geometry SELECT * FROM gis_multi_point; -< INSERT into gis_geometry SELECT * FROM gis_multi_line; -< INSERT into gis_geometry SELECT * FROM gis_multi_polygon; -< INSERT into gis_geometry SELECT * FROM gis_geometrycollection; -< SELECT fid, AsText(g) FROM gis_point; -< fid AsText(g) -< 101 POINT(10 10) -< 102 POINT(20 10) -< 103 POINT(20 20) -< 104 POINT(10 20) -< SELECT fid, AsText(g) FROM gis_line; -< fid AsText(g) -< 105 LINESTRING(0 0,0 10,10 0) -< 106 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 107 LINESTRING(10 10,40 10) -< SELECT fid, AsText(g) FROM gis_polygon; -< fid AsText(g) -< 108 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) -< 110 POLYGON((0 0,30 0,30 30,0 0)) -< SELECT fid, AsText(g) FROM gis_multi_point; -< fid AsText(g) -< 111 MULTIPOINT(0 0,10 10,10 20,20 20) -< 112 MULTIPOINT(1 1,11 11,11 21,21 21) -< 113 MULTIPOINT(3 6,4 10) -< SELECT fid, AsText(g) FROM gis_multi_line; -< fid AsText(g) -< 114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) -< 115 MULTILINESTRING((10 48,10 21,10 0)) -< 116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) -< SELECT fid, AsText(g) FROM gis_multi_polygon; -< fid AsText(g) -< 117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) -< SELECT fid, AsText(g) FROM gis_geometrycollection; -< fid AsText(g) -< 120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) -< 121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) -< 122 GEOMETRYCOLLECTION EMPTY -< 123 GEOMETRYCOLLECTION EMPTY -< SELECT fid, AsText(g) FROM gis_geometry; -< fid AsText(g) -< 101 POINT(10 10) -< 102 POINT(20 10) -< 103 POINT(20 20) -< 104 POINT(10 20) -< 105 LINESTRING(0 0,0 10,10 0) -< 106 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 107 LINESTRING(10 10,40 10) -< 108 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) -< 110 POLYGON((0 0,30 0,30 30,0 0)) -< 111 MULTIPOINT(0 0,10 10,10 20,20 20) -< 112 MULTIPOINT(1 1,11 11,11 21,21 21) -< 113 MULTIPOINT(3 6,4 10) -< 114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) -< 115 MULTILINESTRING((10 48,10 21,10 0)) -< 116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) -< 117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) -< 120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) -< 121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) -< 122 GEOMETRYCOLLECTION EMPTY -< 123 GEOMETRYCOLLECTION EMPTY -< SELECT fid, Dimension(g) FROM gis_geometry; -< fid Dimension(g) -< 101 0 -< 102 0 -< 103 0 -< 104 0 -< 105 1 -< 106 1 -< 107 1 -< 108 2 -< 109 2 -< 110 2 -< 111 0 -< 112 0 -< 113 0 -< 114 1 -< 115 1 -< 116 1 -< 117 2 -< 118 2 -< 119 2 -< 120 1 -< 121 1 -< 122 0 -< 123 0 -< SELECT fid, GeometryType(g) FROM gis_geometry; -< fid GeometryType(g) -< 101 POINT -< 102 POINT -< 103 POINT -< 104 POINT -< 105 LINESTRING -< 106 LINESTRING -< 107 LINESTRING -< 108 POLYGON -< 109 POLYGON -< 110 POLYGON -< 111 MULTIPOINT -< 112 MULTIPOINT -< 113 MULTIPOINT -< 114 MULTILINESTRING -< 115 MULTILINESTRING -< 116 MULTILINESTRING -< 117 MULTIPOLYGON -< 118 MULTIPOLYGON -< 119 MULTIPOLYGON -< 120 GEOMETRYCOLLECTION -< 121 GEOMETRYCOLLECTION -< 122 GEOMETRYCOLLECTION -< 123 GEOMETRYCOLLECTION -< SELECT fid, IsEmpty(g) FROM gis_geometry; -< fid IsEmpty(g) -< 101 0 -< 102 0 -< 103 0 -< 104 0 -< 105 0 -< 106 0 -< 107 0 -< 108 0 -< 109 0 -< 110 0 -< 111 0 -< 112 0 -< 113 0 -< 114 0 -< 115 0 -< 116 0 -< 117 0 -< 118 0 -< 119 0 -< 120 0 -< 121 0 -< 122 0 -< 123 0 -< SELECT fid, AsText(Envelope(g)) FROM gis_geometry; -< fid AsText(Envelope(g)) -< 101 POLYGON((10 10,10 10,10 10,10 10,10 10)) -< 102 POLYGON((20 10,20 10,20 10,20 10,20 10)) -< 103 POLYGON((20 20,20 20,20 20,20 20,20 20)) -< 104 POLYGON((10 20,10 20,10 20,10 20,10 20)) -< 105 POLYGON((0 0,10 0,10 10,0 10,0 0)) -< 106 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 107 POLYGON((10 10,40 10,40 10,10 10,10 10)) -< 108 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 109 POLYGON((0 0,50 0,50 50,0 50,0 0)) -< 110 POLYGON((0 0,30 0,30 30,0 30,0 0)) -< 111 POLYGON((0 0,20 0,20 20,0 20,0 0)) -< 112 POLYGON((1 1,21 1,21 21,1 21,1 1)) -< 113 POLYGON((3 6,4 6,4 10,3 10,3 6)) -< 114 POLYGON((10 0,16 0,16 48,10 48,10 0)) -< 115 POLYGON((10 0,10 0,10 48,10 48,10 0)) -< 116 POLYGON((1 2,21 2,21 8,1 8,1 2)) -< 117 POLYGON((28 0,84 0,84 42,28 42,28 0)) -< 118 POLYGON((28 0,84 0,84 42,28 42,28 0)) -< 119 POLYGON((0 0,3 0,3 3,0 3,0 0)) -< 120 POLYGON((0 0,10 0,10 10,0 10,0 0)) -< 121 POLYGON((3 6,44 6,44 9,3 9,3 6)) -< 122 GEOMETRYCOLLECTION EMPTY -< 123 GEOMETRYCOLLECTION EMPTY -< SELECT fid, X(g) FROM gis_point; -< fid X(g) -< 101 10 -< 102 20 -< 103 20 -< 104 10 -< SELECT fid, Y(g) FROM gis_point; -< fid Y(g) -< 101 10 -< 102 10 -< 103 20 -< 104 20 -< SELECT fid, AsText(StartPoint(g)) FROM gis_line; -< fid AsText(StartPoint(g)) -< 105 POINT(0 0) -< 106 POINT(10 10) -< 107 POINT(10 10) -< SELECT fid, AsText(EndPoint(g)) FROM gis_line; -< fid AsText(EndPoint(g)) -< 105 POINT(10 0) -< 106 POINT(10 10) -< 107 POINT(40 10) -< SELECT fid, GLength(g) FROM gis_line; -< fid GLength(g) -< 105 24.14213562373095 -< 106 40 -< 107 30 -< SELECT fid, NumPoints(g) FROM gis_line; -< fid NumPoints(g) -< 105 3 -< 106 5 -< 107 2 -< SELECT fid, AsText(PointN(g, 2)) FROM gis_line; -< fid AsText(PointN(g, 2)) -< 105 POINT(0 10) -< 106 POINT(20 10) -< 107 POINT(40 10) -< SELECT fid, IsClosed(g) FROM gis_line; -< fid IsClosed(g) -< 105 0 -< 106 1 -< 107 0 -< SELECT fid, AsText(Centroid(g)) FROM gis_polygon; -< fid AsText(Centroid(g)) -< 108 POINT(15 15) -< 109 POINT(25.416666666666668 25.416666666666668) -< 110 POINT(20 10) -< SELECT fid, Area(g) FROM gis_polygon; -< fid Area(g) -< 108 100 -< 109 2400 -< 110 450 -< SELECT fid, AsText(ExteriorRing(g)) FROM gis_polygon; -< fid AsText(ExteriorRing(g)) -< 108 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 109 LINESTRING(0 0,50 0,50 50,0 50,0 0) -< 110 LINESTRING(0 0,30 0,30 30,0 0) -< SELECT fid, NumInteriorRings(g) FROM gis_polygon; -< fid NumInteriorRings(g) -< 108 0 -< 109 1 -< 110 0 -< SELECT fid, AsText(InteriorRingN(g, 1)) FROM gis_polygon; -< fid AsText(InteriorRingN(g, 1)) -< 108 NULL -< 109 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 110 NULL -< SELECT fid, IsClosed(g) FROM gis_multi_line; -< fid IsClosed(g) -< 114 0 -< 115 0 -< 116 0 -< SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; -< fid AsText(Centroid(g)) -< 117 POINT(55.58852775304245 17.426536064113982) -< 118 POINT(55.58852775304245 17.426536064113982) -< 119 POINT(2 2) -< SELECT fid, Area(g) FROM gis_multi_polygon; -< fid Area(g) -< 117 1684.5 -< 118 1684.5 -< 119 4.5 -< SELECT fid, NumGeometries(g) from gis_multi_point; -< fid NumGeometries(g) -< 111 4 -< 112 4 -< 113 2 -< SELECT fid, NumGeometries(g) from gis_multi_line; -< fid NumGeometries(g) -< 114 2 -< 115 1 -< 116 2 -< SELECT fid, NumGeometries(g) from gis_multi_polygon; -< fid NumGeometries(g) -< 117 2 -< 118 2 -< 119 1 -< SELECT fid, NumGeometries(g) from gis_geometrycollection; -< fid NumGeometries(g) -< 120 2 -< 121 2 -< 122 0 -< 123 0 -< SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point; -< fid AsText(GeometryN(g, 2)) -< 111 POINT(10 10) -< 112 POINT(11 11) -< 113 POINT(4 10) -< SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_line; -< fid AsText(GeometryN(g, 2)) -< 114 LINESTRING(16 0,16 23,16 48) -< 115 NULL -< 116 LINESTRING(2 5,5 8,21 7) -< SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_polygon; -< fid AsText(GeometryN(g, 2)) -< 117 POLYGON((59 18,67 18,67 13,59 13,59 18)) -< 118 POLYGON((59 18,67 18,67 13,59 13,59 18)) -< 119 NULL -< SELECT fid, AsText(GeometryN(g, 2)) from gis_geometrycollection; -< fid AsText(GeometryN(g, 2)) -< 120 LINESTRING(0 0,10 10) -< 121 LINESTRING(3 6,7 9) -< 122 NULL -< 123 NULL -< SELECT fid, AsText(GeometryN(g, 1)) from gis_geometrycollection; -< fid AsText(GeometryN(g, 1)) -< 120 POINT(0 0) -< 121 POINT(44 6) -< 122 NULL -< 123 NULL -< SELECT g1.fid as first, g2.fid as second, -< Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, -< Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, -< Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r -< FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; -< first second w c o e d t i r -< 120 120 1 1 0 1 0 1 1 0 -< 120 121 0 0 1 0 0 0 1 0 -< 120 122 0 1 NULL 0 NULL 0 NULL 0 -< 120 123 0 1 NULL 0 NULL 0 NULL 0 -< 121 120 0 0 1 0 0 0 1 0 -< 121 121 1 1 0 1 0 1 1 0 -< 121 122 0 1 NULL 0 NULL 0 NULL 0 -< 121 123 0 1 NULL 0 NULL 0 NULL 0 -< 122 120 1 0 NULL 0 NULL 0 NULL 0 -< 122 121 1 0 NULL 0 NULL 0 NULL 0 -< 122 122 1 1 NULL 1 NULL 0 NULL 0 -< 122 123 1 1 NULL 1 NULL 0 NULL 0 -< 123 120 1 0 NULL 0 NULL 0 NULL 0 -< 123 121 1 0 NULL 0 NULL 0 NULL 0 -< 123 122 1 1 NULL 1 NULL 0 NULL 0 -< 123 123 1 1 NULL 1 NULL 0 NULL 0 -< DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; -< USE gis_ogs; -< # Lakes -< INSERT INTO lakes VALUES ( -< 101, 'BLUE LAKE', -< PolyFromText( -< 'POLYGON( -< (52 18,66 23,73 9,48 6,52 18), -< (59 18,67 18,67 13,59 13,59 18) -< )', -< 101)); -< # Road Segments -< INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2, -< LineFromText( -< 'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); -< INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4, -< LineFromText( -< 'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); -< INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2, -< LineFromText( -< 'LINESTRING( 70 38, 72 48 )' ,101)); -< INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4, -< LineFromText( -< 'LINESTRING( 70 38, 84 42 )' ,101)); -< INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, -< 1, -< LineFromText( -< 'LINESTRING( 28 26, 28 0 )',101)); -< # DividedRoutes -< INSERT INTO divided_routes VALUES(119, 'Route 75', 4, -< MLineFromText( -< 'MULTILINESTRING((10 48,10 21,10 0), -< (16 0,16 23,16 48))', 101)); -< # Forests -< INSERT INTO forests VALUES(109, 'Green Forest', -< MPolyFromText( -< 'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), -< (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', -< 101)); -< # Bridges -< INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText( -< 'POINT( 44 31 )', 101)); -< # Streams -< INSERT INTO streams VALUES(111, 'Cam Stream', -< LineFromText( -< 'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); -< INSERT INTO streams VALUES(112, NULL, -< LineFromText( -< 'LINESTRING( 76 0, 78 4, 73 9 )', 101)); -< # Buildings -< INSERT INTO buildings VALUES(113, '123 Main Street', -< PointFromText( -< 'POINT( 52 30 )', 101), -< PolyFromText( -< 'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); -< INSERT INTO buildings VALUES(114, '215 Main Street', -< PointFromText( -< 'POINT( 64 33 )', 101), -< PolyFromText( -< 'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101)); -< # Ponds -< INSERT INTO ponds VALUES(120, NULL, 'Stock Pond', -< MPolyFromText( -< 'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), -< ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); -< # Named Places -< INSERT INTO named_places VALUES(117, 'Ashton', -< PolyFromText( -< 'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); -< INSERT INTO named_places VALUES(118, 'Goose Island', -< PolyFromText( -< 'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); -< # Map Neatlines -< INSERT INTO map_neatlines VALUES(115, -< PolyFromText( -< 'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); -< SELECT Dimension(shore) -< FROM lakes -< WHERE name = 'Blue Lake'; -< Dimension(shore) -< 2 -< SELECT GeometryType(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< GeometryType(centerlines) -< MULTILINESTRING -< SELECT AsText(boundary) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(boundary) -< POLYGON((67 13,67 18,59 18,59 13,67 13)) -< SELECT AsText(PolyFromWKB(AsBinary(boundary),101)) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(PolyFromWKB(AsBinary(boundary),101)) -< POLYGON((67 13,67 18,59 18,59 13,67 13)) -< SELECT SRID(boundary) -< FROM named_places -< WHERE name = 'Goose Island'; -< SRID(boundary) -< 101 -< SELECT IsEmpty(centerline) -< FROM road_segments -< WHERE name = 'Route 5' -< AND aliases = 'Main Street'; -< IsEmpty(centerline) -< 0 -< SELECT AsText(Envelope(boundary)) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(Envelope(boundary)) -< POLYGON((59 13,67 13,67 18,59 18,59 13)) -< SELECT X(position) -< FROM bridges -< WHERE name = 'Cam Bridge'; -< X(position) -< 44 -< SELECT Y(position) -< FROM bridges -< WHERE name = 'Cam Bridge'; -< Y(position) -< 31 -< SELECT AsText(StartPoint(centerline)) -< FROM road_segments -< WHERE fid = 102; -< AsText(StartPoint(centerline)) -< POINT(0 18) -< SELECT AsText(EndPoint(centerline)) -< FROM road_segments -< WHERE fid = 102; -< AsText(EndPoint(centerline)) -< POINT(44 31) -< SELECT GLength(centerline) -< FROM road_segments -< WHERE fid = 106; -< GLength(centerline) -< 26 -< SELECT NumPoints(centerline) -< FROM road_segments -< WHERE fid = 102; -< NumPoints(centerline) -< 5 -< SELECT AsText(PointN(centerline, 1)) -< FROM road_segments -< WHERE fid = 102; -< AsText(PointN(centerline, 1)) -< POINT(0 18) -< SELECT AsText(Centroid(boundary)) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(Centroid(boundary)) -< POINT(63 15.5) -< SELECT Area(boundary) -< FROM named_places -< WHERE name = 'Goose Island'; -< Area(boundary) -< 40 -< SELECT AsText(ExteriorRing(shore)) -< FROM lakes -< WHERE name = 'Blue Lake'; -< AsText(ExteriorRing(shore)) -< LINESTRING(52 18,66 23,73 9,48 6,52 18) -< SELECT NumInteriorRings(shore) -< FROM lakes -< WHERE name = 'Blue Lake'; -< NumInteriorRings(shore) -< 1 -< SELECT AsText(InteriorRingN(shore, 1)) -< FROM lakes -< WHERE name = 'Blue Lake'; -< AsText(InteriorRingN(shore, 1)) -< LINESTRING(59 18,67 18,67 13,59 13,59 18) -< SELECT NumGeometries(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< NumGeometries(centerlines) -< 2 -< SELECT AsText(GeometryN(centerlines, 2)) -< FROM divided_routes -< WHERE name = 'Route 75'; -< AsText(GeometryN(centerlines, 2)) -< LINESTRING(16 0,16 23,16 48) -< SELECT IsClosed(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< IsClosed(centerlines) -< 0 -< SELECT GLength(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< GLength(centerlines) -< 96 -< SELECT AsText(Centroid(shores)) -< FROM ponds -< WHERE fid = 120; -< AsText(Centroid(shores)) -< POINT(25 42) -< SELECT Area(shores) -< FROM ponds -< WHERE fid = 120; -< Area(shores) -< 8 -< SELECT ST_Equals(boundary, -< PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) -< FROM named_places -< WHERE name = 'Goose Island'; -< ST_Equals(boundary, -< PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) -< 1 -< SELECT ST_Disjoint(centerlines, boundary) -< FROM divided_routes, named_places -< WHERE divided_routes.name = 'Route 75' -< AND named_places.name = 'Ashton'; -< ST_Disjoint(centerlines, boundary) -< 1 -< SELECT ST_Touches(centerline, shore) -< FROM streams, lakes -< WHERE streams.name = 'Cam Stream' -< AND lakes.name = 'Blue Lake'; -< ST_Touches(centerline, shore) -< 1 -< SELECT Crosses(road_segments.centerline, divided_routes.centerlines) -< FROM road_segments, divided_routes -< WHERE road_segments.fid = 102 -< AND divided_routes.name = 'Route 75'; -< Crosses(road_segments.centerline, divided_routes.centerlines) -< 1 -< SELECT ST_Intersects(road_segments.centerline, divided_routes.centerlines) -< FROM road_segments, divided_routes -< WHERE road_segments.fid = 102 -< AND divided_routes.name = 'Route 75'; -< ST_Intersects(road_segments.centerline, divided_routes.centerlines) -< 1 -< SELECT ST_Contains(forests.boundary, named_places.boundary) -< FROM forests, named_places -< WHERE forests.name = 'Green Forest' -< AND named_places.name = 'Ashton'; -< ST_Contains(forests.boundary, named_places.boundary) -< 0 -< SELECT ST_Distance(position, boundary) -< FROM bridges, named_places -< WHERE bridges.name = 'Cam Bridge' -< AND named_places.name = 'Ashton'; -< ST_Distance(position, boundary) -< 12 -< SELECT AsText(ST_Difference(named_places.boundary, forests.boundary)) -< FROM named_places, forests -< WHERE named_places.name = 'Ashton' -< AND forests.name = 'Green Forest'; -< AsText(ST_Difference(named_places.boundary, forests.boundary)) -< POLYGON((56 34,62 48,84 48,84 42,56 34)) -< SELECT AsText(ST_Union(shore, boundary)) -< FROM lakes, named_places -< WHERE lakes.name = 'Blue Lake' -< AND named_places.name = 'Goose Island'; -< AsText(ST_Union(shore, boundary)) -< POLYGON((48 6,52 18,66 23,73 9,48 6)) -< SELECT AsText(ST_SymDifference(shore, boundary)) -< FROM lakes, named_places -< WHERE lakes.name = 'Blue Lake' -< AND named_places.name = 'Ashton'; -< AsText(ST_SymDifference(shore, boundary)) -< MULTIPOLYGON(((48 6,52 18,66 23,73 9,48 6),(59 13,59 18,67 18,67 13,59 13)),((56 30,56 34,62 48,84 48,84 30,56 30))) -< SELECT count(*) -< FROM buildings, bridges -< WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1; -< count(*) -< 1 ---- -> ERROR 42000: The storage engine for the table doesn't support GEOMETRY -> # ERROR: Statement ended with errno 1178, errname ER_CHECK_NOT_IMPLEMENTED (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE gis_point (fid INT(11) /*!*/ /*Custom column options*/, g POINT) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.gis_point) INSERT_METHOD=LAST ] -> # The statement|command finished with ER_CHECK_NOT_IMPLEMENTED. -> # Geometry types or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- +--- type_spatial.result 2013-01-23 01:25:39.143876032 +0400 ++++ type_spatial.reject 2013-01-23 02:51:14.535315418 +0400 +@@ -2,699 +2,15 @@ + DROP DATABASE IF EXISTS gis_ogs; + CREATE DATABASE gis_ogs; + CREATE TABLE gis_point (fid , g POINT) ENGINE= ; +-CREATE TABLE gis_line (fid , g LINESTRING) ENGINE= ; +-CREATE TABLE gis_polygon (fid , g POLYGON) ENGINE= ; +-CREATE TABLE gis_multi_point (fid , g MULTIPOINT) ENGINE= ; +-CREATE TABLE gis_multi_line (fid , g MULTILINESTRING) ENGINE= ; +-CREATE TABLE gis_multi_polygon (fid , g MULTIPOLYGON) ENGINE= ; +-CREATE TABLE gis_geometrycollection (fid , g GEOMETRYCOLLECTION) ENGINE= ; +-CREATE TABLE gis_geometry (fid , g GEOMETRY) ENGINE= ; +-USE gis_ogs; +-CREATE TABLE lakes (fid INT , +-name CHAR(64) , +-shore POLYGON) ENGINE= ; +-CREATE TABLE road_segments (fid INT , +-name CHAR(64) , +-aliases CHAR(64) , +-num_lanes INT , +-centerline LINESTRING) ENGINE= ; +-CREATE TABLE divided_routes (fid INT , +-name CHAR(64) , +-num_lanes INT , +-centerlines MULTILINESTRING) ENGINE= ; +-CREATE TABLE forests (fid INT , +-name CHAR(64) , +-boundary MULTIPOLYGON) ENGINE= ; +-CREATE TABLE bridges (fid INT , +-name CHAR(64) , +-position POINT) ENGINE= ; +-CREATE TABLE streams (fid INT , +-name CHAR(64) , +-centerline LINESTRING) ENGINE= ; +-CREATE TABLE buildings (fid INT , +-name CHAR(64) , +-position POINT, +-footprint POLYGON) ENGINE= ; +-CREATE TABLE ponds (fid INT , +-name CHAR(64) , +-type CHAR(64) , +-shores MULTIPOLYGON) ENGINE= ; +-CREATE TABLE named_places (fid INT , +-name CHAR(64) , +-boundary POLYGON) ENGINE= ; +-CREATE TABLE map_neatlines (fid INT , +-neatline POLYGON) ENGINE= ; +-USE test; +-SHOW FIELDS FROM gis_point; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g point YES NULL +-SHOW FIELDS FROM gis_line; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g linestring YES NULL +-SHOW FIELDS FROM gis_polygon; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g polygon YES NULL +-SHOW FIELDS FROM gis_multi_point; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g multipoint YES NULL +-SHOW FIELDS FROM gis_multi_line; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g multilinestring YES NULL +-SHOW FIELDS FROM gis_multi_polygon; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g multipolygon YES NULL +-SHOW FIELDS FROM gis_geometrycollection; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g geometrycollection YES NULL +-SHOW FIELDS FROM gis_geometry; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g geometry YES NULL +-INSERT INTO gis_point (fid,g) VALUES +-(101, PointFromText('POINT(10 10)')), +-(102, PointFromText('POINT(20 10)')), +-(103, PointFromText('POINT(20 20)')), +-(104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); +-INSERT INTO gis_line (fid,g) VALUES +-(105, LineFromText('LINESTRING(0 0,0 10,10 0)')), +-(106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), +-(107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); +-INSERT INTO gis_polygon (fid,g) VALUES +-(108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), +-(109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), +-(110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); +-INSERT INTO gis_multi_point (fid,g) VALUES +-(111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), +-(112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), +-(113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); +-INSERT INTO gis_multi_line (fid,g) VALUES +-(114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), +-(115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), +-(116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); +-INSERT INTO gis_multi_polygon (fid,g) VALUES +-(117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), +-(118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), +-(119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); +-INSERT INTO gis_geometrycollection (fid,g) VALUES +-(120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), +-(121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), +-(122, GeomFromText('GeometryCollection()')), +-(123, GeomFromText('GeometryCollection EMPTY')); +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_point; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_line; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_polygon; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_point; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_line; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_polygon; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_geometrycollection; +-SELECT fid, AsText(g) FROM gis_point; +-fid AsText(g) +-101 POINT(10 10) +-102 POINT(20 10) +-103 POINT(20 20) +-104 POINT(10 20) +-SELECT fid, AsText(g) FROM gis_line; +-fid AsText(g) +-105 LINESTRING(0 0,0 10,10 0) +-106 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-107 LINESTRING(10 10,40 10) +-SELECT fid, AsText(g) FROM gis_polygon; +-fid AsText(g) +-108 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) +-110 POLYGON((0 0,30 0,30 30,0 0)) +-SELECT fid, AsText(g) FROM gis_multi_point; +-fid AsText(g) +-111 MULTIPOINT(0 0,10 10,10 20,20 20) +-112 MULTIPOINT(1 1,11 11,11 21,21 21) +-113 MULTIPOINT(3 6,4 10) +-SELECT fid, AsText(g) FROM gis_multi_line; +-fid AsText(g) +-114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) +-115 MULTILINESTRING((10 48,10 21,10 0)) +-116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) +-SELECT fid, AsText(g) FROM gis_multi_polygon; +-fid AsText(g) +-117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) +-SELECT fid, AsText(g) FROM gis_geometrycollection; +-fid AsText(g) +-120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) +-121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) +-122 GEOMETRYCOLLECTION EMPTY +-123 GEOMETRYCOLLECTION EMPTY +-SELECT fid, AsText(g) FROM gis_geometry; +-fid AsText(g) +-101 POINT(10 10) +-102 POINT(20 10) +-103 POINT(20 20) +-104 POINT(10 20) +-105 LINESTRING(0 0,0 10,10 0) +-106 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-107 LINESTRING(10 10,40 10) +-108 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) +-110 POLYGON((0 0,30 0,30 30,0 0)) +-111 MULTIPOINT(0 0,10 10,10 20,20 20) +-112 MULTIPOINT(1 1,11 11,11 21,21 21) +-113 MULTIPOINT(3 6,4 10) +-114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) +-115 MULTILINESTRING((10 48,10 21,10 0)) +-116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) +-117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) +-120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) +-121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) +-122 GEOMETRYCOLLECTION EMPTY +-123 GEOMETRYCOLLECTION EMPTY +-SELECT fid, Dimension(g) FROM gis_geometry; +-fid Dimension(g) +-101 0 +-102 0 +-103 0 +-104 0 +-105 1 +-106 1 +-107 1 +-108 2 +-109 2 +-110 2 +-111 0 +-112 0 +-113 0 +-114 1 +-115 1 +-116 1 +-117 2 +-118 2 +-119 2 +-120 1 +-121 1 +-122 0 +-123 0 +-SELECT fid, GeometryType(g) FROM gis_geometry; +-fid GeometryType(g) +-101 POINT +-102 POINT +-103 POINT +-104 POINT +-105 LINESTRING +-106 LINESTRING +-107 LINESTRING +-108 POLYGON +-109 POLYGON +-110 POLYGON +-111 MULTIPOINT +-112 MULTIPOINT +-113 MULTIPOINT +-114 MULTILINESTRING +-115 MULTILINESTRING +-116 MULTILINESTRING +-117 MULTIPOLYGON +-118 MULTIPOLYGON +-119 MULTIPOLYGON +-120 GEOMETRYCOLLECTION +-121 GEOMETRYCOLLECTION +-122 GEOMETRYCOLLECTION +-123 GEOMETRYCOLLECTION +-SELECT fid, IsEmpty(g) FROM gis_geometry; +-fid IsEmpty(g) +-101 0 +-102 0 +-103 0 +-104 0 +-105 0 +-106 0 +-107 0 +-108 0 +-109 0 +-110 0 +-111 0 +-112 0 +-113 0 +-114 0 +-115 0 +-116 0 +-117 0 +-118 0 +-119 0 +-120 0 +-121 0 +-122 0 +-123 0 +-SELECT fid, AsText(Envelope(g)) FROM gis_geometry; +-fid AsText(Envelope(g)) +-101 POLYGON((10 10,10 10,10 10,10 10,10 10)) +-102 POLYGON((20 10,20 10,20 10,20 10,20 10)) +-103 POLYGON((20 20,20 20,20 20,20 20,20 20)) +-104 POLYGON((10 20,10 20,10 20,10 20,10 20)) +-105 POLYGON((0 0,10 0,10 10,0 10,0 0)) +-106 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-107 POLYGON((10 10,40 10,40 10,10 10,10 10)) +-108 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-109 POLYGON((0 0,50 0,50 50,0 50,0 0)) +-110 POLYGON((0 0,30 0,30 30,0 30,0 0)) +-111 POLYGON((0 0,20 0,20 20,0 20,0 0)) +-112 POLYGON((1 1,21 1,21 21,1 21,1 1)) +-113 POLYGON((3 6,4 6,4 10,3 10,3 6)) +-114 POLYGON((10 0,16 0,16 48,10 48,10 0)) +-115 POLYGON((10 0,10 0,10 48,10 48,10 0)) +-116 POLYGON((1 2,21 2,21 8,1 8,1 2)) +-117 POLYGON((28 0,84 0,84 42,28 42,28 0)) +-118 POLYGON((28 0,84 0,84 42,28 42,28 0)) +-119 POLYGON((0 0,3 0,3 3,0 3,0 0)) +-120 POLYGON((0 0,10 0,10 10,0 10,0 0)) +-121 POLYGON((3 6,44 6,44 9,3 9,3 6)) +-122 GEOMETRYCOLLECTION EMPTY +-123 GEOMETRYCOLLECTION EMPTY +-SELECT fid, X(g) FROM gis_point; +-fid X(g) +-101 10 +-102 20 +-103 20 +-104 10 +-SELECT fid, Y(g) FROM gis_point; +-fid Y(g) +-101 10 +-102 10 +-103 20 +-104 20 +-SELECT fid, AsText(StartPoint(g)) FROM gis_line; +-fid AsText(StartPoint(g)) +-105 POINT(0 0) +-106 POINT(10 10) +-107 POINT(10 10) +-SELECT fid, AsText(EndPoint(g)) FROM gis_line; +-fid AsText(EndPoint(g)) +-105 POINT(10 0) +-106 POINT(10 10) +-107 POINT(40 10) +-SELECT fid, GLength(g) FROM gis_line; +-fid GLength(g) +-105 24.14213562373095 +-106 40 +-107 30 +-SELECT fid, NumPoints(g) FROM gis_line; +-fid NumPoints(g) +-105 3 +-106 5 +-107 2 +-SELECT fid, AsText(PointN(g, 2)) FROM gis_line; +-fid AsText(PointN(g, 2)) +-105 POINT(0 10) +-106 POINT(20 10) +-107 POINT(40 10) +-SELECT fid, IsClosed(g) FROM gis_line; +-fid IsClosed(g) +-105 0 +-106 1 +-107 0 +-SELECT fid, AsText(Centroid(g)) FROM gis_polygon; +-fid AsText(Centroid(g)) +-108 POINT(15 15) +-109 POINT(25.416666666666668 25.416666666666668) +-110 POINT(20 10) +-SELECT fid, Area(g) FROM gis_polygon; +-fid Area(g) +-108 100 +-109 2400 +-110 450 +-SELECT fid, AsText(ExteriorRing(g)) FROM gis_polygon; +-fid AsText(ExteriorRing(g)) +-108 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-109 LINESTRING(0 0,50 0,50 50,0 50,0 0) +-110 LINESTRING(0 0,30 0,30 30,0 0) +-SELECT fid, NumInteriorRings(g) FROM gis_polygon; +-fid NumInteriorRings(g) +-108 0 +-109 1 +-110 0 +-SELECT fid, AsText(InteriorRingN(g, 1)) FROM gis_polygon; +-fid AsText(InteriorRingN(g, 1)) +-108 NULL +-109 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-110 NULL +-SELECT fid, IsClosed(g) FROM gis_multi_line; +-fid IsClosed(g) +-114 0 +-115 0 +-116 0 +-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; +-fid AsText(Centroid(g)) +-117 POINT(55.58852775304245 17.426536064113982) +-118 POINT(55.58852775304245 17.426536064113982) +-119 POINT(2 2) +-SELECT fid, Area(g) FROM gis_multi_polygon; +-fid Area(g) +-117 1684.5 +-118 1684.5 +-119 4.5 +-SELECT fid, NumGeometries(g) from gis_multi_point; +-fid NumGeometries(g) +-111 4 +-112 4 +-113 2 +-SELECT fid, NumGeometries(g) from gis_multi_line; +-fid NumGeometries(g) +-114 2 +-115 1 +-116 2 +-SELECT fid, NumGeometries(g) from gis_multi_polygon; +-fid NumGeometries(g) +-117 2 +-118 2 +-119 1 +-SELECT fid, NumGeometries(g) from gis_geometrycollection; +-fid NumGeometries(g) +-120 2 +-121 2 +-122 0 +-123 0 +-SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point; +-fid AsText(GeometryN(g, 2)) +-111 POINT(10 10) +-112 POINT(11 11) +-113 POINT(4 10) +-SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_line; +-fid AsText(GeometryN(g, 2)) +-114 LINESTRING(16 0,16 23,16 48) +-115 NULL +-116 LINESTRING(2 5,5 8,21 7) +-SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_polygon; +-fid AsText(GeometryN(g, 2)) +-117 POLYGON((59 18,67 18,67 13,59 13,59 18)) +-118 POLYGON((59 18,67 18,67 13,59 13,59 18)) +-119 NULL +-SELECT fid, AsText(GeometryN(g, 2)) from gis_geometrycollection; +-fid AsText(GeometryN(g, 2)) +-120 LINESTRING(0 0,10 10) +-121 LINESTRING(3 6,7 9) +-122 NULL +-123 NULL +-SELECT fid, AsText(GeometryN(g, 1)) from gis_geometrycollection; +-fid AsText(GeometryN(g, 1)) +-120 POINT(0 0) +-121 POINT(44 6) +-122 NULL +-123 NULL +-SELECT g1.fid as first, g2.fid as second, +-Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, +-Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, +-Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r +-FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; +-first second w c o e d t i r +-120 120 1 1 0 1 0 1 1 0 +-120 121 0 0 1 0 0 0 1 0 +-120 122 0 1 NULL 0 NULL 0 NULL 0 +-120 123 0 1 NULL 0 NULL 0 NULL 0 +-121 120 0 0 1 0 0 0 1 0 +-121 121 1 1 0 1 0 1 1 0 +-121 122 0 1 NULL 0 NULL 0 NULL 0 +-121 123 0 1 NULL 0 NULL 0 NULL 0 +-122 120 1 0 NULL 0 NULL 0 NULL 0 +-122 121 1 0 NULL 0 NULL 0 NULL 0 +-122 122 1 1 NULL 1 NULL 0 NULL 0 +-122 123 1 1 NULL 1 NULL 0 NULL 0 +-123 120 1 0 NULL 0 NULL 0 NULL 0 +-123 121 1 0 NULL 0 NULL 0 NULL 0 +-123 122 1 1 NULL 1 NULL 0 NULL 0 +-123 123 1 1 NULL 1 NULL 0 NULL 0 +-DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; +-USE gis_ogs; +-# Lakes +-INSERT INTO lakes (fid,name,shore) VALUES ( +-101, 'BLUE LAKE', +-PolyFromText( +-'POLYGON( +- (52 18,66 23,73 9,48 6,52 18), +- (59 18,67 18,67 13,59 13,59 18) +- )', +-101)); +-# Road Segments +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(102, 'Route 5', NULL, 2, +-LineFromText( +-'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(103, 'Route 5', 'Main Street', 4, +-LineFromText( +-'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(104, 'Route 5', NULL, 2, +-LineFromText( +-'LINESTRING( 70 38, 72 48 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(105, 'Main Street', NULL, 4, +-LineFromText( +-'LINESTRING( 70 38, 84 42 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(106, 'Dirt Road by Green Forest', NULL, +-1, +-LineFromText( +-'LINESTRING( 28 26, 28 0 )',101)); +-# DividedRoutes +-INSERT INTO divided_routes (fid,name,num_lanes,centerlines) VALUES(119, 'Route 75', 4, +-MLineFromText( +-'MULTILINESTRING((10 48,10 21,10 0), +- (16 0,16 23,16 48))', 101)); +-# Forests +-INSERT INTO forests (fid,name,boundary) VALUES(109, 'Green Forest', +-MPolyFromText( +-'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), +- (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', +-101)); +-# Bridges +-INSERT INTO bridges (fid,name,position) VALUES(110, 'Cam Bridge', PointFromText( +-'POINT( 44 31 )', 101)); +-# Streams +-INSERT INTO streams (fid,name,centerline) VALUES(111, 'Cam Stream', +-LineFromText( +-'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); +-INSERT INTO streams (fid,name,centerline) VALUES(112, NULL, +-LineFromText( +-'LINESTRING( 76 0, 78 4, 73 9 )', 101)); +-# Buildings +-INSERT INTO buildings (fid,name,position,footprint) VALUES(113, '123 Main Street', +-PointFromText( +-'POINT( 52 30 )', 101), +-PolyFromText( +-'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); +-INSERT INTO buildings (fid,name,position,footprint) VALUES(114, '215 Main Street', +-PointFromText( +-'POINT( 64 33 )', 101), +-PolyFromText( +-'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101)); +-# Ponds +-INSERT INTO ponds (fid,name,type,shores) VALUES(120, NULL, 'Stock Pond', +-MPolyFromText( +-'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), +- ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); +-# Named Places +-INSERT INTO named_places (fid,name,boundary) VALUES(117, 'Ashton', +-PolyFromText( +-'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); +-INSERT INTO named_places (fid,name,boundary) VALUES(118, 'Goose Island', +-PolyFromText( +-'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); +-# Map Neatlines +-INSERT INTO map_neatlines (fid,neatline) VALUES(115, +-PolyFromText( +-'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); +-SELECT Dimension(shore) +-FROM lakes +-WHERE name = 'Blue Lake'; +-Dimension(shore) +-2 +-SELECT GeometryType(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-GeometryType(centerlines) +-MULTILINESTRING +-SELECT AsText(boundary) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(boundary) +-POLYGON((67 13,67 18,59 18,59 13,67 13)) +-SELECT AsText(PolyFromWKB(AsBinary(boundary),101)) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(PolyFromWKB(AsBinary(boundary),101)) +-POLYGON((67 13,67 18,59 18,59 13,67 13)) +-SELECT SRID(boundary) +-FROM named_places +-WHERE name = 'Goose Island'; +-SRID(boundary) +-101 +-SELECT IsEmpty(centerline) +-FROM road_segments +-WHERE name = 'Route 5' +-AND aliases = 'Main Street'; +-IsEmpty(centerline) +-0 +-SELECT AsText(Envelope(boundary)) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(Envelope(boundary)) +-POLYGON((59 13,67 13,67 18,59 18,59 13)) +-SELECT X(position) +-FROM bridges +-WHERE name = 'Cam Bridge'; +-X(position) +-44 +-SELECT Y(position) +-FROM bridges +-WHERE name = 'Cam Bridge'; +-Y(position) +-31 +-SELECT AsText(StartPoint(centerline)) +-FROM road_segments +-WHERE fid = 102; +-AsText(StartPoint(centerline)) +-POINT(0 18) +-SELECT AsText(EndPoint(centerline)) +-FROM road_segments +-WHERE fid = 102; +-AsText(EndPoint(centerline)) +-POINT(44 31) +-SELECT GLength(centerline) +-FROM road_segments +-WHERE fid = 106; +-GLength(centerline) +-26 +-SELECT NumPoints(centerline) +-FROM road_segments +-WHERE fid = 102; +-NumPoints(centerline) +-5 +-SELECT AsText(PointN(centerline, 1)) +-FROM road_segments +-WHERE fid = 102; +-AsText(PointN(centerline, 1)) +-POINT(0 18) +-SELECT AsText(Centroid(boundary)) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(Centroid(boundary)) +-POINT(63 15.5) +-SELECT Area(boundary) +-FROM named_places +-WHERE name = 'Goose Island'; +-Area(boundary) +-40 +-SELECT AsText(ExteriorRing(shore)) +-FROM lakes +-WHERE name = 'Blue Lake'; +-AsText(ExteriorRing(shore)) +-LINESTRING(52 18,66 23,73 9,48 6,52 18) +-SELECT NumInteriorRings(shore) +-FROM lakes +-WHERE name = 'Blue Lake'; +-NumInteriorRings(shore) +-1 +-SELECT AsText(InteriorRingN(shore, 1)) +-FROM lakes +-WHERE name = 'Blue Lake'; +-AsText(InteriorRingN(shore, 1)) +-LINESTRING(59 18,67 18,67 13,59 13,59 18) +-SELECT NumGeometries(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-NumGeometries(centerlines) +-2 +-SELECT AsText(GeometryN(centerlines, 2)) +-FROM divided_routes +-WHERE name = 'Route 75'; +-AsText(GeometryN(centerlines, 2)) +-LINESTRING(16 0,16 23,16 48) +-SELECT IsClosed(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-IsClosed(centerlines) +-0 +-SELECT GLength(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-GLength(centerlines) +-96 +-SELECT AsText(Centroid(shores)) +-FROM ponds +-WHERE fid = 120; +-AsText(Centroid(shores)) +-POINT(25 42) +-SELECT Area(shores) +-FROM ponds +-WHERE fid = 120; +-Area(shores) +-8 +-SELECT ST_Equals(boundary, +-PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) +-FROM named_places +-WHERE name = 'Goose Island'; +-ST_Equals(boundary, +-PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) +-1 +-SELECT ST_Disjoint(centerlines, boundary) +-FROM divided_routes, named_places +-WHERE divided_routes.name = 'Route 75' +-AND named_places.name = 'Ashton'; +-ST_Disjoint(centerlines, boundary) +-1 +-SELECT ST_Touches(centerline, shore) +-FROM streams, lakes +-WHERE streams.name = 'Cam Stream' +-AND lakes.name = 'Blue Lake'; +-ST_Touches(centerline, shore) +-1 +-SELECT Crosses(road_segments.centerline, divided_routes.centerlines) +-FROM road_segments, divided_routes +-WHERE road_segments.fid = 102 +-AND divided_routes.name = 'Route 75'; +-Crosses(road_segments.centerline, divided_routes.centerlines) +-1 +-SELECT ST_Intersects(road_segments.centerline, divided_routes.centerlines) +-FROM road_segments, divided_routes +-WHERE road_segments.fid = 102 +-AND divided_routes.name = 'Route 75'; +-ST_Intersects(road_segments.centerline, divided_routes.centerlines) +-1 +-SELECT ST_Contains(forests.boundary, named_places.boundary) +-FROM forests, named_places +-WHERE forests.name = 'Green Forest' +-AND named_places.name = 'Ashton'; +-ST_Contains(forests.boundary, named_places.boundary) +-0 +-SELECT ST_Distance(position, boundary) +-FROM bridges, named_places +-WHERE bridges.name = 'Cam Bridge' +-AND named_places.name = 'Ashton'; +-ST_Distance(position, boundary) +-12 +-SELECT AsText(ST_Difference(named_places.boundary, forests.boundary)) +-FROM named_places, forests +-WHERE named_places.name = 'Ashton' +-AND forests.name = 'Green Forest'; +-AsText(ST_Difference(named_places.boundary, forests.boundary)) +-POLYGON((56 34,62 48,84 48,84 42,56 34)) +-SELECT AsText(ST_Union(shore, boundary)) +-FROM lakes, named_places +-WHERE lakes.name = 'Blue Lake' +-AND named_places.name = 'Goose Island'; +-AsText(ST_Union(shore, boundary)) +-POLYGON((48 6,52 18,66 23,73 9,48 6)) +-SELECT AsText(ST_SymDifference(shore, boundary)) +-FROM lakes, named_places +-WHERE lakes.name = 'Blue Lake' +-AND named_places.name = 'Ashton'; +-AsText(ST_SymDifference(shore, boundary)) +-MULTIPOLYGON(((48 6,52 18,66 23,73 9,48 6),(59 13,59 18,67 18,67 13,59 13)),((56 30,56 34,62 48,84 48,84 30,56 30))) +-SELECT count(*) +-FROM buildings, bridges +-WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1; +-count(*) +-1 ++ERROR 42000: The storage engine for the table doesn't support GEOMETRY ++# ERROR: Statement ended with errno 1178, errname ER_CHECK_NOT_IMPLEMENTED (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE gis_point (fid INT(11) /*!*/ /*Custom column options*/, g POINT) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.gis_point) INSERT_METHOD=LAST ] ++# The statement|command finished with ER_CHECK_NOT_IMPLEMENTED. ++# Geometry types or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP DATABASE gis_ogs; + USE test; diff --git a/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff index 89f1100f550..20d98db1ff2 100644 --- a/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff @@ -1,1412 +1,1422 @@ -5,698c5,14 -< CREATE TABLE gis_line (fid , g LINESTRING, g(g(256))) ENGINE= ; -< CREATE TABLE gis_polygon (fid , g POLYGON, g(g(512))) ENGINE= ; -< CREATE TABLE gis_multi_point (fid , g MULTIPOINT, g(g(128))) ENGINE= ; -< CREATE TABLE gis_multi_line (fid , g MULTILINESTRING, g(g(256))) ENGINE= ; -< CREATE TABLE gis_multi_polygon (fid , g MULTIPOLYGON) ENGINE= ; -< CREATE TABLE gis_geometrycollection (fid , g GEOMETRYCOLLECTION) ENGINE= ; -< CREATE TABLE gis_geometry (fid , g GEOMETRY) ENGINE= ; -< USE gis_ogs; -< CREATE TABLE lakes (fid INT , -< name CHAR(64) , -< shore POLYGON, s(shore(64))) ENGINE= ; -< CREATE TABLE road_segments (fid INT , -< name CHAR(64) , -< aliases CHAR(64) , -< num_lanes INT , -< centerline LINESTRING, c(centerline(128))) ENGINE= ; -< CREATE TABLE divided_routes (fid INT , -< name CHAR(64) , -< num_lanes INT , -< centerlines MULTILINESTRING, c(centerlines(512))) ENGINE= ; -< CREATE TABLE forests (fid INT , -< name CHAR(64) , -< boundary MULTIPOLYGON, b(boundary(128))) ENGINE= ; -< CREATE TABLE bridges (fid INT , -< name CHAR(64) , -< position POINT, p(`position`(64))) ENGINE= ; -< CREATE TABLE streams (fid INT , -< name CHAR(64) , -< centerline LINESTRING, c(centerline(256))) ENGINE= ; -< CREATE TABLE buildings (fid INT , -< name CHAR(64) , -< position POINT, -< footprint POLYGON, p(`position`(64)), f(footprint(128))) ENGINE= ; -< CREATE TABLE ponds (fid INT , -< name CHAR(64) , -< type CHAR(64) , -< shores MULTIPOLYGON, s(shores(256))) ENGINE= ; -< CREATE TABLE named_places (fid INT , -< name CHAR(64) , -< boundary POLYGON, b(boundary(512))) ENGINE= ; -< CREATE TABLE map_neatlines (fid INT , -< neatline POLYGON, n(neatline(700))) ENGINE= ; -< USE test; -< SHOW FIELDS FROM gis_point; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g point YES MUL NULL -< SHOW FIELDS FROM gis_line; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g linestring YES MUL NULL -< SHOW FIELDS FROM gis_polygon; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g polygon YES MUL NULL -< SHOW FIELDS FROM gis_multi_point; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g multipoint YES MUL NULL -< SHOW FIELDS FROM gis_multi_line; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g multilinestring YES MUL NULL -< SHOW FIELDS FROM gis_multi_polygon; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g multipolygon YES NULL -< SHOW FIELDS FROM gis_geometrycollection; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g geometrycollection YES NULL -< SHOW FIELDS FROM gis_geometry; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g geometry YES NULL -< INSERT INTO gis_point VALUES -< (101, PointFromText('POINT(10 10)')), -< (102, PointFromText('POINT(20 10)')), -< (103, PointFromText('POINT(20 20)')), -< (104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); -< INSERT INTO gis_line VALUES -< (105, LineFromText('LINESTRING(0 0,0 10,10 0)')), -< (106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), -< (107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); -< INSERT INTO gis_polygon VALUES -< (108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), -< (109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), -< (110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); -< INSERT INTO gis_multi_point VALUES -< (111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), -< (112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), -< (113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); -< INSERT INTO gis_multi_line VALUES -< (114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), -< (115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), -< (116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); -< INSERT INTO gis_multi_polygon VALUES -< (117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), -< (118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), -< (119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); -< INSERT INTO gis_geometrycollection VALUES -< (120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), -< (121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), -< (122, GeomFromText('GeometryCollection()')), -< (123, GeomFromText('GeometryCollection EMPTY')); -< INSERT into gis_geometry SELECT * FROM gis_point; -< INSERT into gis_geometry SELECT * FROM gis_line; -< INSERT into gis_geometry SELECT * FROM gis_polygon; -< INSERT into gis_geometry SELECT * FROM gis_multi_point; -< INSERT into gis_geometry SELECT * FROM gis_multi_line; -< INSERT into gis_geometry SELECT * FROM gis_multi_polygon; -< INSERT into gis_geometry SELECT * FROM gis_geometrycollection; -< SELECT fid, AsText(g) FROM gis_point; -< fid AsText(g) -< 101 POINT(10 10) -< 102 POINT(20 10) -< 103 POINT(20 20) -< 104 POINT(10 20) -< SELECT fid, AsText(g) FROM gis_line; -< fid AsText(g) -< 105 LINESTRING(0 0,0 10,10 0) -< 106 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 107 LINESTRING(10 10,40 10) -< SELECT fid, AsText(g) FROM gis_polygon; -< fid AsText(g) -< 108 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) -< 110 POLYGON((0 0,30 0,30 30,0 0)) -< SELECT fid, AsText(g) FROM gis_multi_point; -< fid AsText(g) -< 111 MULTIPOINT(0 0,10 10,10 20,20 20) -< 112 MULTIPOINT(1 1,11 11,11 21,21 21) -< 113 MULTIPOINT(3 6,4 10) -< SELECT fid, AsText(g) FROM gis_multi_line; -< fid AsText(g) -< 114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) -< 115 MULTILINESTRING((10 48,10 21,10 0)) -< 116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) -< SELECT fid, AsText(g) FROM gis_multi_polygon; -< fid AsText(g) -< 117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) -< SELECT fid, AsText(g) FROM gis_geometrycollection; -< fid AsText(g) -< 120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) -< 121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) -< 122 GEOMETRYCOLLECTION EMPTY -< 123 GEOMETRYCOLLECTION EMPTY -< SELECT fid, AsText(g) FROM gis_geometry; -< fid AsText(g) -< 101 POINT(10 10) -< 102 POINT(20 10) -< 103 POINT(20 20) -< 104 POINT(10 20) -< 105 LINESTRING(0 0,0 10,10 0) -< 106 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 107 LINESTRING(10 10,40 10) -< 108 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) -< 110 POLYGON((0 0,30 0,30 30,0 0)) -< 111 MULTIPOINT(0 0,10 10,10 20,20 20) -< 112 MULTIPOINT(1 1,11 11,11 21,21 21) -< 113 MULTIPOINT(3 6,4 10) -< 114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) -< 115 MULTILINESTRING((10 48,10 21,10 0)) -< 116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) -< 117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) -< 120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) -< 121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) -< 122 GEOMETRYCOLLECTION EMPTY -< 123 GEOMETRYCOLLECTION EMPTY -< SELECT fid, Dimension(g) FROM gis_geometry; -< fid Dimension(g) -< 101 0 -< 102 0 -< 103 0 -< 104 0 -< 105 1 -< 106 1 -< 107 1 -< 108 2 -< 109 2 -< 110 2 -< 111 0 -< 112 0 -< 113 0 -< 114 1 -< 115 1 -< 116 1 -< 117 2 -< 118 2 -< 119 2 -< 120 1 -< 121 1 -< 122 0 -< 123 0 -< SELECT fid, GeometryType(g) FROM gis_geometry; -< fid GeometryType(g) -< 101 POINT -< 102 POINT -< 103 POINT -< 104 POINT -< 105 LINESTRING -< 106 LINESTRING -< 107 LINESTRING -< 108 POLYGON -< 109 POLYGON -< 110 POLYGON -< 111 MULTIPOINT -< 112 MULTIPOINT -< 113 MULTIPOINT -< 114 MULTILINESTRING -< 115 MULTILINESTRING -< 116 MULTILINESTRING -< 117 MULTIPOLYGON -< 118 MULTIPOLYGON -< 119 MULTIPOLYGON -< 120 GEOMETRYCOLLECTION -< 121 GEOMETRYCOLLECTION -< 122 GEOMETRYCOLLECTION -< 123 GEOMETRYCOLLECTION -< SELECT fid, IsEmpty(g) FROM gis_geometry; -< fid IsEmpty(g) -< 101 0 -< 102 0 -< 103 0 -< 104 0 -< 105 0 -< 106 0 -< 107 0 -< 108 0 -< 109 0 -< 110 0 -< 111 0 -< 112 0 -< 113 0 -< 114 0 -< 115 0 -< 116 0 -< 117 0 -< 118 0 -< 119 0 -< 120 0 -< 121 0 -< 122 0 -< 123 0 -< SELECT fid, AsText(Envelope(g)) FROM gis_geometry; -< fid AsText(Envelope(g)) -< 101 POLYGON((10 10,10 10,10 10,10 10,10 10)) -< 102 POLYGON((20 10,20 10,20 10,20 10,20 10)) -< 103 POLYGON((20 20,20 20,20 20,20 20,20 20)) -< 104 POLYGON((10 20,10 20,10 20,10 20,10 20)) -< 105 POLYGON((0 0,10 0,10 10,0 10,0 0)) -< 106 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 107 POLYGON((10 10,40 10,40 10,10 10,10 10)) -< 108 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 109 POLYGON((0 0,50 0,50 50,0 50,0 0)) -< 110 POLYGON((0 0,30 0,30 30,0 30,0 0)) -< 111 POLYGON((0 0,20 0,20 20,0 20,0 0)) -< 112 POLYGON((1 1,21 1,21 21,1 21,1 1)) -< 113 POLYGON((3 6,4 6,4 10,3 10,3 6)) -< 114 POLYGON((10 0,16 0,16 48,10 48,10 0)) -< 115 POLYGON((10 0,10 0,10 48,10 48,10 0)) -< 116 POLYGON((1 2,21 2,21 8,1 8,1 2)) -< 117 POLYGON((28 0,84 0,84 42,28 42,28 0)) -< 118 POLYGON((28 0,84 0,84 42,28 42,28 0)) -< 119 POLYGON((0 0,3 0,3 3,0 3,0 0)) -< 120 POLYGON((0 0,10 0,10 10,0 10,0 0)) -< 121 POLYGON((3 6,44 6,44 9,3 9,3 6)) -< 122 GEOMETRYCOLLECTION EMPTY -< 123 GEOMETRYCOLLECTION EMPTY -< SELECT fid, X(g) FROM gis_point; -< fid X(g) -< 101 10 -< 102 20 -< 103 20 -< 104 10 -< SELECT fid, Y(g) FROM gis_point; -< fid Y(g) -< 101 10 -< 102 10 -< 103 20 -< 104 20 -< SELECT fid, AsText(StartPoint(g)) FROM gis_line; -< fid AsText(StartPoint(g)) -< 105 POINT(0 0) -< 106 POINT(10 10) -< 107 POINT(10 10) -< SELECT fid, AsText(EndPoint(g)) FROM gis_line; -< fid AsText(EndPoint(g)) -< 105 POINT(10 0) -< 106 POINT(10 10) -< 107 POINT(40 10) -< SELECT fid, GLength(g) FROM gis_line; -< fid GLength(g) -< 105 24.14213562373095 -< 106 40 -< 107 30 -< SELECT fid, NumPoints(g) FROM gis_line; -< fid NumPoints(g) -< 105 3 -< 106 5 -< 107 2 -< SELECT fid, AsText(PointN(g, 2)) FROM gis_line; -< fid AsText(PointN(g, 2)) -< 105 POINT(0 10) -< 106 POINT(20 10) -< 107 POINT(40 10) -< SELECT fid, IsClosed(g) FROM gis_line; -< fid IsClosed(g) -< 105 0 -< 106 1 -< 107 0 -< SELECT fid, AsText(Centroid(g)) FROM gis_polygon; -< fid AsText(Centroid(g)) -< 108 POINT(15 15) -< 109 POINT(25.416666666666668 25.416666666666668) -< 110 POINT(20 10) -< SELECT fid, Area(g) FROM gis_polygon; -< fid Area(g) -< 108 100 -< 109 2400 -< 110 450 -< SELECT fid, AsText(ExteriorRing(g)) FROM gis_polygon; -< fid AsText(ExteriorRing(g)) -< 108 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 109 LINESTRING(0 0,50 0,50 50,0 50,0 0) -< 110 LINESTRING(0 0,30 0,30 30,0 0) -< SELECT fid, NumInteriorRings(g) FROM gis_polygon; -< fid NumInteriorRings(g) -< 108 0 -< 109 1 -< 110 0 -< SELECT fid, AsText(InteriorRingN(g, 1)) FROM gis_polygon; -< fid AsText(InteriorRingN(g, 1)) -< 108 NULL -< 109 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 110 NULL -< SELECT fid, IsClosed(g) FROM gis_multi_line; -< fid IsClosed(g) -< 114 0 -< 115 0 -< 116 0 -< SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; -< fid AsText(Centroid(g)) -< 117 POINT(55.58852775304245 17.426536064113982) -< 118 POINT(55.58852775304245 17.426536064113982) -< 119 POINT(2 2) -< SELECT fid, Area(g) FROM gis_multi_polygon; -< fid Area(g) -< 117 1684.5 -< 118 1684.5 -< 119 4.5 -< SELECT fid, NumGeometries(g) from gis_multi_point; -< fid NumGeometries(g) -< 111 4 -< 112 4 -< 113 2 -< SELECT fid, NumGeometries(g) from gis_multi_line; -< fid NumGeometries(g) -< 114 2 -< 115 1 -< 116 2 -< SELECT fid, NumGeometries(g) from gis_multi_polygon; -< fid NumGeometries(g) -< 117 2 -< 118 2 -< 119 1 -< SELECT fid, NumGeometries(g) from gis_geometrycollection; -< fid NumGeometries(g) -< 120 2 -< 121 2 -< 122 0 -< 123 0 -< SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point; -< fid AsText(GeometryN(g, 2)) -< 111 POINT(10 10) -< 112 POINT(11 11) -< 113 POINT(4 10) -< SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_line; -< fid AsText(GeometryN(g, 2)) -< 114 LINESTRING(16 0,16 23,16 48) -< 115 NULL -< 116 LINESTRING(2 5,5 8,21 7) -< SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_polygon; -< fid AsText(GeometryN(g, 2)) -< 117 POLYGON((59 18,67 18,67 13,59 13,59 18)) -< 118 POLYGON((59 18,67 18,67 13,59 13,59 18)) -< 119 NULL -< SELECT fid, AsText(GeometryN(g, 2)) from gis_geometrycollection; -< fid AsText(GeometryN(g, 2)) -< 120 LINESTRING(0 0,10 10) -< 121 LINESTRING(3 6,7 9) -< 122 NULL -< 123 NULL -< SELECT fid, AsText(GeometryN(g, 1)) from gis_geometrycollection; -< fid AsText(GeometryN(g, 1)) -< 120 POINT(0 0) -< 121 POINT(44 6) -< 122 NULL -< 123 NULL -< SELECT g1.fid as first, g2.fid as second, -< Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, -< Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, -< Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r -< FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; -< first second w c o e d t i r -< 120 120 1 1 0 1 0 1 1 0 -< 120 121 0 0 1 0 0 0 1 0 -< 120 122 0 1 NULL 0 NULL 0 NULL 0 -< 120 123 0 1 NULL 0 NULL 0 NULL 0 -< 121 120 0 0 1 0 0 0 1 0 -< 121 121 1 1 0 1 0 1 1 0 -< 121 122 0 1 NULL 0 NULL 0 NULL 0 -< 121 123 0 1 NULL 0 NULL 0 NULL 0 -< 122 120 1 0 NULL 0 NULL 0 NULL 0 -< 122 121 1 0 NULL 0 NULL 0 NULL 0 -< 122 122 1 1 NULL 1 NULL 0 NULL 0 -< 122 123 1 1 NULL 1 NULL 0 NULL 0 -< 123 120 1 0 NULL 0 NULL 0 NULL 0 -< 123 121 1 0 NULL 0 NULL 0 NULL 0 -< 123 122 1 1 NULL 1 NULL 0 NULL 0 -< 123 123 1 1 NULL 1 NULL 0 NULL 0 -< DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; -< USE gis_ogs; -< # Lakes -< INSERT INTO lakes VALUES ( -< 101, 'BLUE LAKE', -< PolyFromText( -< 'POLYGON( -< (52 18,66 23,73 9,48 6,52 18), -< (59 18,67 18,67 13,59 13,59 18) -< )', -< 101)); -< # Road Segments -< INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2, -< LineFromText( -< 'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); -< INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4, -< LineFromText( -< 'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); -< INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2, -< LineFromText( -< 'LINESTRING( 70 38, 72 48 )' ,101)); -< INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4, -< LineFromText( -< 'LINESTRING( 70 38, 84 42 )' ,101)); -< INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, -< 1, -< LineFromText( -< 'LINESTRING( 28 26, 28 0 )',101)); -< # DividedRoutes -< INSERT INTO divided_routes VALUES(119, 'Route 75', 4, -< MLineFromText( -< 'MULTILINESTRING((10 48,10 21,10 0), -< (16 0,16 23,16 48))', 101)); -< # Forests -< INSERT INTO forests VALUES(109, 'Green Forest', -< MPolyFromText( -< 'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), -< (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', -< 101)); -< # Bridges -< INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText( -< 'POINT( 44 31 )', 101)); -< # Streams -< INSERT INTO streams VALUES(111, 'Cam Stream', -< LineFromText( -< 'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); -< INSERT INTO streams VALUES(112, NULL, -< LineFromText( -< 'LINESTRING( 76 0, 78 4, 73 9 )', 101)); -< # Buildings -< INSERT INTO buildings VALUES(113, '123 Main Street', -< PointFromText( -< 'POINT( 52 30 )', 101), -< PolyFromText( -< 'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); -< INSERT INTO buildings VALUES(114, '215 Main Street', -< PointFromText( -< 'POINT( 64 33 )', 101), -< PolyFromText( -< 'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101)); -< # Ponds -< INSERT INTO ponds VALUES(120, NULL, 'Stock Pond', -< MPolyFromText( -< 'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), -< ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); -< # Named Places -< INSERT INTO named_places VALUES(117, 'Ashton', -< PolyFromText( -< 'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); -< INSERT INTO named_places VALUES(118, 'Goose Island', -< PolyFromText( -< 'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); -< # Map Neatlines -< INSERT INTO map_neatlines VALUES(115, -< PolyFromText( -< 'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); -< SELECT Dimension(shore) -< FROM lakes -< WHERE name = 'Blue Lake'; -< Dimension(shore) -< 2 -< SELECT GeometryType(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< GeometryType(centerlines) -< MULTILINESTRING -< SELECT AsText(boundary) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(boundary) -< POLYGON((67 13,67 18,59 18,59 13,67 13)) -< SELECT AsText(PolyFromWKB(AsBinary(boundary),101)) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(PolyFromWKB(AsBinary(boundary),101)) -< POLYGON((67 13,67 18,59 18,59 13,67 13)) -< SELECT SRID(boundary) -< FROM named_places -< WHERE name = 'Goose Island'; -< SRID(boundary) -< 101 -< SELECT IsEmpty(centerline) -< FROM road_segments -< WHERE name = 'Route 5' -< AND aliases = 'Main Street'; -< IsEmpty(centerline) -< 0 -< SELECT AsText(Envelope(boundary)) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(Envelope(boundary)) -< POLYGON((59 13,67 13,67 18,59 18,59 13)) -< SELECT X(position) -< FROM bridges -< WHERE name = 'Cam Bridge'; -< X(position) -< 44 -< SELECT Y(position) -< FROM bridges -< WHERE name = 'Cam Bridge'; -< Y(position) -< 31 -< SELECT AsText(StartPoint(centerline)) -< FROM road_segments -< WHERE fid = 102; -< AsText(StartPoint(centerline)) -< POINT(0 18) -< SELECT AsText(EndPoint(centerline)) -< FROM road_segments -< WHERE fid = 102; -< AsText(EndPoint(centerline)) -< POINT(44 31) -< SELECT GLength(centerline) -< FROM road_segments -< WHERE fid = 106; -< GLength(centerline) -< 26 -< SELECT NumPoints(centerline) -< FROM road_segments -< WHERE fid = 102; -< NumPoints(centerline) -< 5 -< SELECT AsText(PointN(centerline, 1)) -< FROM road_segments -< WHERE fid = 102; -< AsText(PointN(centerline, 1)) -< POINT(0 18) -< SELECT AsText(Centroid(boundary)) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(Centroid(boundary)) -< POINT(63 15.5) -< SELECT Area(boundary) -< FROM named_places -< WHERE name = 'Goose Island'; -< Area(boundary) -< 40 -< SELECT AsText(ExteriorRing(shore)) -< FROM lakes -< WHERE name = 'Blue Lake'; -< AsText(ExteriorRing(shore)) -< LINESTRING(52 18,66 23,73 9,48 6,52 18) -< SELECT NumInteriorRings(shore) -< FROM lakes -< WHERE name = 'Blue Lake'; -< NumInteriorRings(shore) -< 1 -< SELECT AsText(InteriorRingN(shore, 1)) -< FROM lakes -< WHERE name = 'Blue Lake'; -< AsText(InteriorRingN(shore, 1)) -< LINESTRING(59 18,67 18,67 13,59 13,59 18) -< SELECT NumGeometries(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< NumGeometries(centerlines) -< 2 -< SELECT AsText(GeometryN(centerlines, 2)) -< FROM divided_routes -< WHERE name = 'Route 75'; -< AsText(GeometryN(centerlines, 2)) -< LINESTRING(16 0,16 23,16 48) -< SELECT IsClosed(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< IsClosed(centerlines) -< 0 -< SELECT GLength(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< GLength(centerlines) -< 96 -< SELECT AsText(Centroid(shores)) -< FROM ponds -< WHERE fid = 120; -< AsText(Centroid(shores)) -< POINT(25 42) -< SELECT Area(shores) -< FROM ponds -< WHERE fid = 120; -< Area(shores) -< 8 -< SELECT ST_Equals(boundary, -< PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) -< FROM named_places -< WHERE name = 'Goose Island'; -< ST_Equals(boundary, -< PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) -< 1 -< SELECT ST_Disjoint(centerlines, boundary) -< FROM divided_routes, named_places -< WHERE divided_routes.name = 'Route 75' -< AND named_places.name = 'Ashton'; -< ST_Disjoint(centerlines, boundary) -< 1 -< SELECT ST_Touches(centerline, shore) -< FROM streams, lakes -< WHERE streams.name = 'Cam Stream' -< AND lakes.name = 'Blue Lake'; -< ST_Touches(centerline, shore) -< 1 -< SELECT Crosses(road_segments.centerline, divided_routes.centerlines) -< FROM road_segments, divided_routes -< WHERE road_segments.fid = 102 -< AND divided_routes.name = 'Route 75'; -< Crosses(road_segments.centerline, divided_routes.centerlines) -< 1 -< SELECT ST_Intersects(road_segments.centerline, divided_routes.centerlines) -< FROM road_segments, divided_routes -< WHERE road_segments.fid = 102 -< AND divided_routes.name = 'Route 75'; -< ST_Intersects(road_segments.centerline, divided_routes.centerlines) -< 1 -< SELECT ST_Contains(forests.boundary, named_places.boundary) -< FROM forests, named_places -< WHERE forests.name = 'Green Forest' -< AND named_places.name = 'Ashton'; -< ST_Contains(forests.boundary, named_places.boundary) -< 0 -< SELECT ST_Distance(position, boundary) -< FROM bridges, named_places -< WHERE bridges.name = 'Cam Bridge' -< AND named_places.name = 'Ashton'; -< ST_Distance(position, boundary) -< 12 -< SELECT AsText(ST_Difference(named_places.boundary, forests.boundary)) -< FROM named_places, forests -< WHERE named_places.name = 'Ashton' -< AND forests.name = 'Green Forest'; -< AsText(ST_Difference(named_places.boundary, forests.boundary)) -< POLYGON((56 34,62 48,84 48,84 42,56 34)) -< SELECT AsText(ST_Union(shore, boundary)) -< FROM lakes, named_places -< WHERE lakes.name = 'Blue Lake' -< AND named_places.name = 'Goose Island'; -< AsText(ST_Union(shore, boundary)) -< POLYGON((48 6,52 18,66 23,73 9,48 6)) -< SELECT AsText(ST_SymDifference(shore, boundary)) -< FROM lakes, named_places -< WHERE lakes.name = 'Blue Lake' -< AND named_places.name = 'Ashton'; -< AsText(ST_SymDifference(shore, boundary)) -< MULTIPOLYGON(((48 6,52 18,66 23,73 9,48 6),(59 13,59 18,67 18,67 13,59 13)),((56 30,56 34,62 48,84 48,84 30,56 30))) -< SELECT count(*) -< FROM buildings, bridges -< WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1; -< count(*) -< 1 ---- -> ERROR 42000: The storage engine for the table doesn't support GEOMETRY -> # ERROR: Statement ended with errno 1178, errname ER_CHECK_NOT_IMPLEMENTED (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE gis_point (fid INT(11) /*!*/ /*Custom column options*/, g POINT, /*!INDEX*/ /*Custom index*/ g(g(128))) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.gis_point) INSERT_METHOD=LAST ] -> # The statement|command finished with ER_CHECK_NOT_IMPLEMENTED. -> # Geometry types or indexes on them or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- -705,1398c21,30 -< CREATE TABLE gis_line (fid , g LINESTRING NOT NULL, SPATIAL INDEX(g)) ENGINE= ; -< CREATE TABLE gis_polygon (fid , g POLYGON NOT NULL, SPATIAL INDEX(g)) ENGINE= ; -< CREATE TABLE gis_multi_point (fid , g MULTIPOINT NOT NULL, SPATIAL INDEX(g)) ENGINE= ; -< CREATE TABLE gis_multi_line (fid , g MULTILINESTRING NOT NULL, SPATIAL INDEX(g)) ENGINE= ; -< CREATE TABLE gis_multi_polygon (fid , g MULTIPOLYGON NOT NULL, SPATIAL INDEX(g)) ENGINE= ; -< CREATE TABLE gis_geometrycollection (fid , g GEOMETRYCOLLECTION NOT NULL, SPATIAL INDEX(g)) ENGINE= ; -< CREATE TABLE gis_geometry (fid , g GEOMETRY NOT NULL) ENGINE= ; -< USE gis_ogs; -< CREATE TABLE lakes (fid INT , -< name CHAR(64) , -< shore POLYGON NOT NULL, SPATIAL INDEX s(shore)) ENGINE= ; -< CREATE TABLE road_segments (fid INT , -< name CHAR(64) , -< aliases CHAR(64) , -< num_lanes INT , -< centerline LINESTRING NOT NULL, SPATIAL INDEX c(centerline)) ENGINE= ; -< CREATE TABLE divided_routes (fid INT , -< name CHAR(64) , -< num_lanes INT , -< centerlines MULTILINESTRING NOT NULL, SPATIAL INDEX c(centerlines)) ENGINE= ; -< CREATE TABLE forests (fid INT , -< name CHAR(64) , -< boundary MULTIPOLYGON NOT NULL, SPATIAL INDEX b(boundary)) ENGINE= ; -< CREATE TABLE bridges (fid INT , -< name CHAR(64) , -< position POINT NOT NULL, SPATIAL INDEX p(position)) ENGINE= ; -< CREATE TABLE streams (fid INT , -< name CHAR(64) , -< centerline LINESTRING NOT NULL, SPATIAL INDEX c(centerline)) ENGINE= ; -< CREATE TABLE buildings (fid INT , -< name CHAR(64) , -< position POINT NOT NULL, -< footprint POLYGON NOT NULL, SPATIAL INDEX p(position), SPATIAL INDEX f(footprint)) ENGINE= ; -< CREATE TABLE ponds (fid INT , -< name CHAR(64) , -< type CHAR(64) , -< shores MULTIPOLYGON NOT NULL, SPATIAL INDEX s(shores)) ENGINE= ; -< CREATE TABLE named_places (fid INT , -< name CHAR(64) , -< boundary POLYGON NOT NULL, SPATIAL INDEX b(boundary)) ENGINE= ; -< CREATE TABLE map_neatlines (fid INT , -< neatline POLYGON NOT NULL, SPATIAL INDEX n(neatline)) ENGINE= ; -< USE test; -< SHOW FIELDS FROM gis_point; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g point NO MUL NULL -< SHOW FIELDS FROM gis_line; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g linestring NO MUL NULL -< SHOW FIELDS FROM gis_polygon; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g polygon NO MUL NULL -< SHOW FIELDS FROM gis_multi_point; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g multipoint NO MUL NULL -< SHOW FIELDS FROM gis_multi_line; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g multilinestring NO MUL NULL -< SHOW FIELDS FROM gis_multi_polygon; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g multipolygon NO MUL NULL -< SHOW FIELDS FROM gis_geometrycollection; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g geometrycollection NO MUL NULL -< SHOW FIELDS FROM gis_geometry; -< Field Type Null Key Default Extra -< fid int(11) YES NULL -< g geometry NO NULL -< INSERT INTO gis_point VALUES -< (101, PointFromText('POINT(10 10)')), -< (102, PointFromText('POINT(20 10)')), -< (103, PointFromText('POINT(20 20)')), -< (104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); -< INSERT INTO gis_line VALUES -< (105, LineFromText('LINESTRING(0 0,0 10,10 0)')), -< (106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), -< (107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); -< INSERT INTO gis_polygon VALUES -< (108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), -< (109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), -< (110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); -< INSERT INTO gis_multi_point VALUES -< (111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), -< (112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), -< (113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); -< INSERT INTO gis_multi_line VALUES -< (114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), -< (115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), -< (116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); -< INSERT INTO gis_multi_polygon VALUES -< (117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), -< (118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), -< (119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); -< INSERT INTO gis_geometrycollection VALUES -< (120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), -< (121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), -< (122, GeomFromText('GeometryCollection()')), -< (123, GeomFromText('GeometryCollection EMPTY')); -< INSERT into gis_geometry SELECT * FROM gis_point; -< INSERT into gis_geometry SELECT * FROM gis_line; -< INSERT into gis_geometry SELECT * FROM gis_polygon; -< INSERT into gis_geometry SELECT * FROM gis_multi_point; -< INSERT into gis_geometry SELECT * FROM gis_multi_line; -< INSERT into gis_geometry SELECT * FROM gis_multi_polygon; -< INSERT into gis_geometry SELECT * FROM gis_geometrycollection; -< SELECT fid, AsText(g) FROM gis_point; -< fid AsText(g) -< 101 POINT(10 10) -< 102 POINT(20 10) -< 103 POINT(20 20) -< 104 POINT(10 20) -< SELECT fid, AsText(g) FROM gis_line; -< fid AsText(g) -< 105 LINESTRING(0 0,0 10,10 0) -< 106 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 107 LINESTRING(10 10,40 10) -< SELECT fid, AsText(g) FROM gis_polygon; -< fid AsText(g) -< 108 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) -< 110 POLYGON((0 0,30 0,30 30,0 0)) -< SELECT fid, AsText(g) FROM gis_multi_point; -< fid AsText(g) -< 111 MULTIPOINT(0 0,10 10,10 20,20 20) -< 112 MULTIPOINT(1 1,11 11,11 21,21 21) -< 113 MULTIPOINT(3 6,4 10) -< SELECT fid, AsText(g) FROM gis_multi_line; -< fid AsText(g) -< 114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) -< 115 MULTILINESTRING((10 48,10 21,10 0)) -< 116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) -< SELECT fid, AsText(g) FROM gis_multi_polygon; -< fid AsText(g) -< 117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) -< SELECT fid, AsText(g) FROM gis_geometrycollection; -< fid AsText(g) -< 120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) -< 121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) -< 122 GEOMETRYCOLLECTION EMPTY -< 123 GEOMETRYCOLLECTION EMPTY -< SELECT fid, AsText(g) FROM gis_geometry; -< fid AsText(g) -< 101 POINT(10 10) -< 102 POINT(20 10) -< 103 POINT(20 20) -< 104 POINT(10 20) -< 105 LINESTRING(0 0,0 10,10 0) -< 106 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 107 LINESTRING(10 10,40 10) -< 108 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) -< 110 POLYGON((0 0,30 0,30 30,0 0)) -< 111 MULTIPOINT(0 0,10 10,10 20,20 20) -< 112 MULTIPOINT(1 1,11 11,11 21,21 21) -< 113 MULTIPOINT(3 6,4 10) -< 114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) -< 115 MULTILINESTRING((10 48,10 21,10 0)) -< 116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) -< 117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) -< 119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) -< 120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) -< 121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) -< 122 GEOMETRYCOLLECTION EMPTY -< 123 GEOMETRYCOLLECTION EMPTY -< SELECT fid, Dimension(g) FROM gis_geometry; -< fid Dimension(g) -< 101 0 -< 102 0 -< 103 0 -< 104 0 -< 105 1 -< 106 1 -< 107 1 -< 108 2 -< 109 2 -< 110 2 -< 111 0 -< 112 0 -< 113 0 -< 114 1 -< 115 1 -< 116 1 -< 117 2 -< 118 2 -< 119 2 -< 120 1 -< 121 1 -< 122 0 -< 123 0 -< SELECT fid, GeometryType(g) FROM gis_geometry; -< fid GeometryType(g) -< 101 POINT -< 102 POINT -< 103 POINT -< 104 POINT -< 105 LINESTRING -< 106 LINESTRING -< 107 LINESTRING -< 108 POLYGON -< 109 POLYGON -< 110 POLYGON -< 111 MULTIPOINT -< 112 MULTIPOINT -< 113 MULTIPOINT -< 114 MULTILINESTRING -< 115 MULTILINESTRING -< 116 MULTILINESTRING -< 117 MULTIPOLYGON -< 118 MULTIPOLYGON -< 119 MULTIPOLYGON -< 120 GEOMETRYCOLLECTION -< 121 GEOMETRYCOLLECTION -< 122 GEOMETRYCOLLECTION -< 123 GEOMETRYCOLLECTION -< SELECT fid, IsEmpty(g) FROM gis_geometry; -< fid IsEmpty(g) -< 101 0 -< 102 0 -< 103 0 -< 104 0 -< 105 0 -< 106 0 -< 107 0 -< 108 0 -< 109 0 -< 110 0 -< 111 0 -< 112 0 -< 113 0 -< 114 0 -< 115 0 -< 116 0 -< 117 0 -< 118 0 -< 119 0 -< 120 0 -< 121 0 -< 122 0 -< 123 0 -< SELECT fid, AsText(Envelope(g)) FROM gis_geometry; -< fid AsText(Envelope(g)) -< 101 POLYGON((10 10,10 10,10 10,10 10,10 10)) -< 102 POLYGON((20 10,20 10,20 10,20 10,20 10)) -< 103 POLYGON((20 20,20 20,20 20,20 20,20 20)) -< 104 POLYGON((10 20,10 20,10 20,10 20,10 20)) -< 105 POLYGON((0 0,10 0,10 10,0 10,0 0)) -< 106 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 107 POLYGON((10 10,40 10,40 10,10 10,10 10)) -< 108 POLYGON((10 10,20 10,20 20,10 20,10 10)) -< 109 POLYGON((0 0,50 0,50 50,0 50,0 0)) -< 110 POLYGON((0 0,30 0,30 30,0 30,0 0)) -< 111 POLYGON((0 0,20 0,20 20,0 20,0 0)) -< 112 POLYGON((1 1,21 1,21 21,1 21,1 1)) -< 113 POLYGON((3 6,4 6,4 10,3 10,3 6)) -< 114 POLYGON((10 0,16 0,16 48,10 48,10 0)) -< 115 POLYGON((10 0,10 0,10 48,10 48,10 0)) -< 116 POLYGON((1 2,21 2,21 8,1 8,1 2)) -< 117 POLYGON((28 0,84 0,84 42,28 42,28 0)) -< 118 POLYGON((28 0,84 0,84 42,28 42,28 0)) -< 119 POLYGON((0 0,3 0,3 3,0 3,0 0)) -< 120 POLYGON((0 0,10 0,10 10,0 10,0 0)) -< 121 POLYGON((3 6,44 6,44 9,3 9,3 6)) -< 122 GEOMETRYCOLLECTION EMPTY -< 123 GEOMETRYCOLLECTION EMPTY -< SELECT fid, X(g) FROM gis_point; -< fid X(g) -< 101 10 -< 102 20 -< 103 20 -< 104 10 -< SELECT fid, Y(g) FROM gis_point; -< fid Y(g) -< 101 10 -< 102 10 -< 103 20 -< 104 20 -< SELECT fid, AsText(StartPoint(g)) FROM gis_line; -< fid AsText(StartPoint(g)) -< 105 POINT(0 0) -< 106 POINT(10 10) -< 107 POINT(10 10) -< SELECT fid, AsText(EndPoint(g)) FROM gis_line; -< fid AsText(EndPoint(g)) -< 105 POINT(10 0) -< 106 POINT(10 10) -< 107 POINT(40 10) -< SELECT fid, GLength(g) FROM gis_line; -< fid GLength(g) -< 105 24.14213562373095 -< 106 40 -< 107 30 -< SELECT fid, NumPoints(g) FROM gis_line; -< fid NumPoints(g) -< 105 3 -< 106 5 -< 107 2 -< SELECT fid, AsText(PointN(g, 2)) FROM gis_line; -< fid AsText(PointN(g, 2)) -< 105 POINT(0 10) -< 106 POINT(20 10) -< 107 POINT(40 10) -< SELECT fid, IsClosed(g) FROM gis_line; -< fid IsClosed(g) -< 105 0 -< 106 1 -< 107 0 -< SELECT fid, AsText(Centroid(g)) FROM gis_polygon; -< fid AsText(Centroid(g)) -< 108 POINT(15 15) -< 109 POINT(25.416666666666668 25.416666666666668) -< 110 POINT(20 10) -< SELECT fid, Area(g) FROM gis_polygon; -< fid Area(g) -< 108 100 -< 109 2400 -< 110 450 -< SELECT fid, AsText(ExteriorRing(g)) FROM gis_polygon; -< fid AsText(ExteriorRing(g)) -< 108 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 109 LINESTRING(0 0,50 0,50 50,0 50,0 0) -< 110 LINESTRING(0 0,30 0,30 30,0 0) -< SELECT fid, NumInteriorRings(g) FROM gis_polygon; -< fid NumInteriorRings(g) -< 108 0 -< 109 1 -< 110 0 -< SELECT fid, AsText(InteriorRingN(g, 1)) FROM gis_polygon; -< fid AsText(InteriorRingN(g, 1)) -< 108 NULL -< 109 LINESTRING(10 10,20 10,20 20,10 20,10 10) -< 110 NULL -< SELECT fid, IsClosed(g) FROM gis_multi_line; -< fid IsClosed(g) -< 114 0 -< 115 0 -< 116 0 -< SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; -< fid AsText(Centroid(g)) -< 117 POINT(55.58852775304245 17.426536064113982) -< 118 POINT(55.58852775304245 17.426536064113982) -< 119 POINT(2 2) -< SELECT fid, Area(g) FROM gis_multi_polygon; -< fid Area(g) -< 117 1684.5 -< 118 1684.5 -< 119 4.5 -< SELECT fid, NumGeometries(g) from gis_multi_point; -< fid NumGeometries(g) -< 111 4 -< 112 4 -< 113 2 -< SELECT fid, NumGeometries(g) from gis_multi_line; -< fid NumGeometries(g) -< 114 2 -< 115 1 -< 116 2 -< SELECT fid, NumGeometries(g) from gis_multi_polygon; -< fid NumGeometries(g) -< 117 2 -< 118 2 -< 119 1 -< SELECT fid, NumGeometries(g) from gis_geometrycollection; -< fid NumGeometries(g) -< 120 2 -< 121 2 -< 122 0 -< 123 0 -< SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point; -< fid AsText(GeometryN(g, 2)) -< 111 POINT(10 10) -< 112 POINT(11 11) -< 113 POINT(4 10) -< SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_line; -< fid AsText(GeometryN(g, 2)) -< 114 LINESTRING(16 0,16 23,16 48) -< 115 NULL -< 116 LINESTRING(2 5,5 8,21 7) -< SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_polygon; -< fid AsText(GeometryN(g, 2)) -< 117 POLYGON((59 18,67 18,67 13,59 13,59 18)) -< 118 POLYGON((59 18,67 18,67 13,59 13,59 18)) -< 119 NULL -< SELECT fid, AsText(GeometryN(g, 2)) from gis_geometrycollection; -< fid AsText(GeometryN(g, 2)) -< 120 LINESTRING(0 0,10 10) -< 121 LINESTRING(3 6,7 9) -< 122 NULL -< 123 NULL -< SELECT fid, AsText(GeometryN(g, 1)) from gis_geometrycollection; -< fid AsText(GeometryN(g, 1)) -< 120 POINT(0 0) -< 121 POINT(44 6) -< 122 NULL -< 123 NULL -< SELECT g1.fid as first, g2.fid as second, -< Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, -< Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, -< Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r -< FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; -< first second w c o e d t i r -< 120 120 1 1 0 1 0 1 1 0 -< 120 121 0 0 1 0 0 0 1 0 -< 120 122 0 1 NULL 0 NULL 0 NULL 0 -< 120 123 0 1 NULL 0 NULL 0 NULL 0 -< 121 120 0 0 1 0 0 0 1 0 -< 121 121 1 1 0 1 0 1 1 0 -< 121 122 0 1 NULL 0 NULL 0 NULL 0 -< 121 123 0 1 NULL 0 NULL 0 NULL 0 -< 122 120 1 0 NULL 0 NULL 0 NULL 0 -< 122 121 1 0 NULL 0 NULL 0 NULL 0 -< 122 122 1 1 NULL 1 NULL 0 NULL 0 -< 122 123 1 1 NULL 1 NULL 0 NULL 0 -< 123 120 1 0 NULL 0 NULL 0 NULL 0 -< 123 121 1 0 NULL 0 NULL 0 NULL 0 -< 123 122 1 1 NULL 1 NULL 0 NULL 0 -< 123 123 1 1 NULL 1 NULL 0 NULL 0 -< DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; -< USE gis_ogs; -< # Lakes -< INSERT INTO lakes VALUES ( -< 101, 'BLUE LAKE', -< PolyFromText( -< 'POLYGON( -< (52 18,66 23,73 9,48 6,52 18), -< (59 18,67 18,67 13,59 13,59 18) -< )', -< 101)); -< # Road Segments -< INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2, -< LineFromText( -< 'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); -< INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4, -< LineFromText( -< 'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); -< INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2, -< LineFromText( -< 'LINESTRING( 70 38, 72 48 )' ,101)); -< INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4, -< LineFromText( -< 'LINESTRING( 70 38, 84 42 )' ,101)); -< INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, -< 1, -< LineFromText( -< 'LINESTRING( 28 26, 28 0 )',101)); -< # DividedRoutes -< INSERT INTO divided_routes VALUES(119, 'Route 75', 4, -< MLineFromText( -< 'MULTILINESTRING((10 48,10 21,10 0), -< (16 0,16 23,16 48))', 101)); -< # Forests -< INSERT INTO forests VALUES(109, 'Green Forest', -< MPolyFromText( -< 'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), -< (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', -< 101)); -< # Bridges -< INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText( -< 'POINT( 44 31 )', 101)); -< # Streams -< INSERT INTO streams VALUES(111, 'Cam Stream', -< LineFromText( -< 'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); -< INSERT INTO streams VALUES(112, NULL, -< LineFromText( -< 'LINESTRING( 76 0, 78 4, 73 9 )', 101)); -< # Buildings -< INSERT INTO buildings VALUES(113, '123 Main Street', -< PointFromText( -< 'POINT( 52 30 )', 101), -< PolyFromText( -< 'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); -< INSERT INTO buildings VALUES(114, '215 Main Street', -< PointFromText( -< 'POINT( 64 33 )', 101), -< PolyFromText( -< 'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101)); -< # Ponds -< INSERT INTO ponds VALUES(120, NULL, 'Stock Pond', -< MPolyFromText( -< 'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), -< ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); -< # Named Places -< INSERT INTO named_places VALUES(117, 'Ashton', -< PolyFromText( -< 'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); -< INSERT INTO named_places VALUES(118, 'Goose Island', -< PolyFromText( -< 'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); -< # Map Neatlines -< INSERT INTO map_neatlines VALUES(115, -< PolyFromText( -< 'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); -< SELECT Dimension(shore) -< FROM lakes -< WHERE name = 'Blue Lake'; -< Dimension(shore) -< 2 -< SELECT GeometryType(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< GeometryType(centerlines) -< MULTILINESTRING -< SELECT AsText(boundary) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(boundary) -< POLYGON((67 13,67 18,59 18,59 13,67 13)) -< SELECT AsText(PolyFromWKB(AsBinary(boundary),101)) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(PolyFromWKB(AsBinary(boundary),101)) -< POLYGON((67 13,67 18,59 18,59 13,67 13)) -< SELECT SRID(boundary) -< FROM named_places -< WHERE name = 'Goose Island'; -< SRID(boundary) -< 101 -< SELECT IsEmpty(centerline) -< FROM road_segments -< WHERE name = 'Route 5' -< AND aliases = 'Main Street'; -< IsEmpty(centerline) -< 0 -< SELECT AsText(Envelope(boundary)) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(Envelope(boundary)) -< POLYGON((59 13,67 13,67 18,59 18,59 13)) -< SELECT X(position) -< FROM bridges -< WHERE name = 'Cam Bridge'; -< X(position) -< 44 -< SELECT Y(position) -< FROM bridges -< WHERE name = 'Cam Bridge'; -< Y(position) -< 31 -< SELECT AsText(StartPoint(centerline)) -< FROM road_segments -< WHERE fid = 102; -< AsText(StartPoint(centerline)) -< POINT(0 18) -< SELECT AsText(EndPoint(centerline)) -< FROM road_segments -< WHERE fid = 102; -< AsText(EndPoint(centerline)) -< POINT(44 31) -< SELECT GLength(centerline) -< FROM road_segments -< WHERE fid = 106; -< GLength(centerline) -< 26 -< SELECT NumPoints(centerline) -< FROM road_segments -< WHERE fid = 102; -< NumPoints(centerline) -< 5 -< SELECT AsText(PointN(centerline, 1)) -< FROM road_segments -< WHERE fid = 102; -< AsText(PointN(centerline, 1)) -< POINT(0 18) -< SELECT AsText(Centroid(boundary)) -< FROM named_places -< WHERE name = 'Goose Island'; -< AsText(Centroid(boundary)) -< POINT(63 15.5) -< SELECT Area(boundary) -< FROM named_places -< WHERE name = 'Goose Island'; -< Area(boundary) -< 40 -< SELECT AsText(ExteriorRing(shore)) -< FROM lakes -< WHERE name = 'Blue Lake'; -< AsText(ExteriorRing(shore)) -< LINESTRING(52 18,66 23,73 9,48 6,52 18) -< SELECT NumInteriorRings(shore) -< FROM lakes -< WHERE name = 'Blue Lake'; -< NumInteriorRings(shore) -< 1 -< SELECT AsText(InteriorRingN(shore, 1)) -< FROM lakes -< WHERE name = 'Blue Lake'; -< AsText(InteriorRingN(shore, 1)) -< LINESTRING(59 18,67 18,67 13,59 13,59 18) -< SELECT NumGeometries(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< NumGeometries(centerlines) -< 2 -< SELECT AsText(GeometryN(centerlines, 2)) -< FROM divided_routes -< WHERE name = 'Route 75'; -< AsText(GeometryN(centerlines, 2)) -< LINESTRING(16 0,16 23,16 48) -< SELECT IsClosed(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< IsClosed(centerlines) -< 0 -< SELECT GLength(centerlines) -< FROM divided_routes -< WHERE name = 'Route 75'; -< GLength(centerlines) -< 96 -< SELECT AsText(Centroid(shores)) -< FROM ponds -< WHERE fid = 120; -< AsText(Centroid(shores)) -< POINT(25 42) -< SELECT Area(shores) -< FROM ponds -< WHERE fid = 120; -< Area(shores) -< 8 -< SELECT ST_Equals(boundary, -< PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) -< FROM named_places -< WHERE name = 'Goose Island'; -< ST_Equals(boundary, -< PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) -< 1 -< SELECT ST_Disjoint(centerlines, boundary) -< FROM divided_routes, named_places -< WHERE divided_routes.name = 'Route 75' -< AND named_places.name = 'Ashton'; -< ST_Disjoint(centerlines, boundary) -< 1 -< SELECT ST_Touches(centerline, shore) -< FROM streams, lakes -< WHERE streams.name = 'Cam Stream' -< AND lakes.name = 'Blue Lake'; -< ST_Touches(centerline, shore) -< 1 -< SELECT Crosses(road_segments.centerline, divided_routes.centerlines) -< FROM road_segments, divided_routes -< WHERE road_segments.fid = 102 -< AND divided_routes.name = 'Route 75'; -< Crosses(road_segments.centerline, divided_routes.centerlines) -< 1 -< SELECT ST_Intersects(road_segments.centerline, divided_routes.centerlines) -< FROM road_segments, divided_routes -< WHERE road_segments.fid = 102 -< AND divided_routes.name = 'Route 75'; -< ST_Intersects(road_segments.centerline, divided_routes.centerlines) -< 1 -< SELECT ST_Contains(forests.boundary, named_places.boundary) -< FROM forests, named_places -< WHERE forests.name = 'Green Forest' -< AND named_places.name = 'Ashton'; -< ST_Contains(forests.boundary, named_places.boundary) -< 0 -< SELECT ST_Distance(position, boundary) -< FROM bridges, named_places -< WHERE bridges.name = 'Cam Bridge' -< AND named_places.name = 'Ashton'; -< ST_Distance(position, boundary) -< 12 -< SELECT AsText(ST_Difference(named_places.boundary, forests.boundary)) -< FROM named_places, forests -< WHERE named_places.name = 'Ashton' -< AND forests.name = 'Green Forest'; -< AsText(ST_Difference(named_places.boundary, forests.boundary)) -< POLYGON((56 34,62 48,84 48,84 42,56 34)) -< SELECT AsText(ST_Union(shore, boundary)) -< FROM lakes, named_places -< WHERE lakes.name = 'Blue Lake' -< AND named_places.name = 'Goose Island'; -< AsText(ST_Union(shore, boundary)) -< POLYGON((48 6,52 18,66 23,73 9,48 6)) -< SELECT AsText(ST_SymDifference(shore, boundary)) -< FROM lakes, named_places -< WHERE lakes.name = 'Blue Lake' -< AND named_places.name = 'Ashton'; -< AsText(ST_SymDifference(shore, boundary)) -< MULTIPOLYGON(((48 6,52 18,66 23,73 9,48 6),(59 13,59 18,67 18,67 13,59 13)),((56 30,56 34,62 48,84 48,84 30,56 30))) -< SELECT count(*) -< FROM buildings, bridges -< WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1; -< count(*) -< 1 ---- -> ERROR 42000: The storage engine for the table doesn't support GEOMETRY -> # ERROR: Statement ended with errno 1178, errname ER_CHECK_NOT_IMPLEMENTED (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE gis_point (fid INT(11) /*!*/ /*Custom column options*/, g POINT NOT NULL, SPATIAL INDEX(g)) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.gis_point) INSERT_METHOD=LAST ] -> # The statement|command finished with ER_CHECK_NOT_IMPLEMENTED. -> # Geometry types or spatial indexes or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- +--- type_spatial_indexes.result 2013-01-23 01:25:45.367797786 +0400 ++++ type_spatial_indexes.reject 2013-01-23 02:51:15.247306467 +0400 +@@ -2,1399 +2,31 @@ + DROP DATABASE IF EXISTS gis_ogs; + CREATE DATABASE gis_ogs; + CREATE TABLE gis_point (fid , g POINT, g(g(128))) ENGINE= ; +-CREATE TABLE gis_line (fid , g LINESTRING, g(g(256))) ENGINE= ; +-CREATE TABLE gis_polygon (fid , g POLYGON, g(g(512))) ENGINE= ; +-CREATE TABLE gis_multi_point (fid , g MULTIPOINT, g(g(128))) ENGINE= ; +-CREATE TABLE gis_multi_line (fid , g MULTILINESTRING, g(g(256))) ENGINE= ; +-CREATE TABLE gis_multi_polygon (fid , g MULTIPOLYGON) ENGINE= ; +-CREATE TABLE gis_geometrycollection (fid , g GEOMETRYCOLLECTION) ENGINE= ; +-CREATE TABLE gis_geometry (fid , g GEOMETRY) ENGINE= ; +-USE gis_ogs; +-CREATE TABLE lakes (fid INT , +-name CHAR(64) , +-shore POLYGON, s(shore(64))) ENGINE= ; +-CREATE TABLE road_segments (fid INT , +-name CHAR(64) , +-aliases CHAR(64) , +-num_lanes INT , +-centerline LINESTRING, c(centerline(128))) ENGINE= ; +-CREATE TABLE divided_routes (fid INT , +-name CHAR(64) , +-num_lanes INT , +-centerlines MULTILINESTRING, c(centerlines(512))) ENGINE= ; +-CREATE TABLE forests (fid INT , +-name CHAR(64) , +-boundary MULTIPOLYGON, b(boundary(128))) ENGINE= ; +-CREATE TABLE bridges (fid INT , +-name CHAR(64) , +-position POINT, p(`position`(64))) ENGINE= ; +-CREATE TABLE streams (fid INT , +-name CHAR(64) , +-centerline LINESTRING, c(centerline(256))) ENGINE= ; +-CREATE TABLE buildings (fid INT , +-name CHAR(64) , +-position POINT, +-footprint POLYGON, p(`position`(64)), f(footprint(128))) ENGINE= ; +-CREATE TABLE ponds (fid INT , +-name CHAR(64) , +-type CHAR(64) , +-shores MULTIPOLYGON, s(shores(256))) ENGINE= ; +-CREATE TABLE named_places (fid INT , +-name CHAR(64) , +-boundary POLYGON, b(boundary(512))) ENGINE= ; +-CREATE TABLE map_neatlines (fid INT , +-neatline POLYGON, n(neatline(700))) ENGINE= ; +-USE test; +-SHOW FIELDS FROM gis_point; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g point YES MUL NULL +-SHOW FIELDS FROM gis_line; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g linestring YES MUL NULL +-SHOW FIELDS FROM gis_polygon; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g polygon YES MUL NULL +-SHOW FIELDS FROM gis_multi_point; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g multipoint YES MUL NULL +-SHOW FIELDS FROM gis_multi_line; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g multilinestring YES MUL NULL +-SHOW FIELDS FROM gis_multi_polygon; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g multipolygon YES NULL +-SHOW FIELDS FROM gis_geometrycollection; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g geometrycollection YES NULL +-SHOW FIELDS FROM gis_geometry; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g geometry YES NULL +-INSERT INTO gis_point (fid,g) VALUES +-(101, PointFromText('POINT(10 10)')), +-(102, PointFromText('POINT(20 10)')), +-(103, PointFromText('POINT(20 20)')), +-(104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); +-INSERT INTO gis_line (fid,g) VALUES +-(105, LineFromText('LINESTRING(0 0,0 10,10 0)')), +-(106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), +-(107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); +-INSERT INTO gis_polygon (fid,g) VALUES +-(108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), +-(109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), +-(110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); +-INSERT INTO gis_multi_point (fid,g) VALUES +-(111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), +-(112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), +-(113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); +-INSERT INTO gis_multi_line (fid,g) VALUES +-(114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), +-(115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), +-(116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); +-INSERT INTO gis_multi_polygon (fid,g) VALUES +-(117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), +-(118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), +-(119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); +-INSERT INTO gis_geometrycollection (fid,g) VALUES +-(120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), +-(121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), +-(122, GeomFromText('GeometryCollection()')), +-(123, GeomFromText('GeometryCollection EMPTY')); +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_point; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_line; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_polygon; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_point; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_line; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_polygon; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_geometrycollection; +-SELECT fid, AsText(g) FROM gis_point; +-fid AsText(g) +-101 POINT(10 10) +-102 POINT(20 10) +-103 POINT(20 20) +-104 POINT(10 20) +-SELECT fid, AsText(g) FROM gis_line; +-fid AsText(g) +-105 LINESTRING(0 0,0 10,10 0) +-106 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-107 LINESTRING(10 10,40 10) +-SELECT fid, AsText(g) FROM gis_polygon; +-fid AsText(g) +-108 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) +-110 POLYGON((0 0,30 0,30 30,0 0)) +-SELECT fid, AsText(g) FROM gis_multi_point; +-fid AsText(g) +-111 MULTIPOINT(0 0,10 10,10 20,20 20) +-112 MULTIPOINT(1 1,11 11,11 21,21 21) +-113 MULTIPOINT(3 6,4 10) +-SELECT fid, AsText(g) FROM gis_multi_line; +-fid AsText(g) +-114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) +-115 MULTILINESTRING((10 48,10 21,10 0)) +-116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) +-SELECT fid, AsText(g) FROM gis_multi_polygon; +-fid AsText(g) +-117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) +-SELECT fid, AsText(g) FROM gis_geometrycollection; +-fid AsText(g) +-120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) +-121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) +-122 GEOMETRYCOLLECTION EMPTY +-123 GEOMETRYCOLLECTION EMPTY +-SELECT fid, AsText(g) FROM gis_geometry; +-fid AsText(g) +-101 POINT(10 10) +-102 POINT(20 10) +-103 POINT(20 20) +-104 POINT(10 20) +-105 LINESTRING(0 0,0 10,10 0) +-106 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-107 LINESTRING(10 10,40 10) +-108 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) +-110 POLYGON((0 0,30 0,30 30,0 0)) +-111 MULTIPOINT(0 0,10 10,10 20,20 20) +-112 MULTIPOINT(1 1,11 11,11 21,21 21) +-113 MULTIPOINT(3 6,4 10) +-114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) +-115 MULTILINESTRING((10 48,10 21,10 0)) +-116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) +-117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) +-120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) +-121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) +-122 GEOMETRYCOLLECTION EMPTY +-123 GEOMETRYCOLLECTION EMPTY +-SELECT fid, Dimension(g) FROM gis_geometry; +-fid Dimension(g) +-101 0 +-102 0 +-103 0 +-104 0 +-105 1 +-106 1 +-107 1 +-108 2 +-109 2 +-110 2 +-111 0 +-112 0 +-113 0 +-114 1 +-115 1 +-116 1 +-117 2 +-118 2 +-119 2 +-120 1 +-121 1 +-122 0 +-123 0 +-SELECT fid, GeometryType(g) FROM gis_geometry; +-fid GeometryType(g) +-101 POINT +-102 POINT +-103 POINT +-104 POINT +-105 LINESTRING +-106 LINESTRING +-107 LINESTRING +-108 POLYGON +-109 POLYGON +-110 POLYGON +-111 MULTIPOINT +-112 MULTIPOINT +-113 MULTIPOINT +-114 MULTILINESTRING +-115 MULTILINESTRING +-116 MULTILINESTRING +-117 MULTIPOLYGON +-118 MULTIPOLYGON +-119 MULTIPOLYGON +-120 GEOMETRYCOLLECTION +-121 GEOMETRYCOLLECTION +-122 GEOMETRYCOLLECTION +-123 GEOMETRYCOLLECTION +-SELECT fid, IsEmpty(g) FROM gis_geometry; +-fid IsEmpty(g) +-101 0 +-102 0 +-103 0 +-104 0 +-105 0 +-106 0 +-107 0 +-108 0 +-109 0 +-110 0 +-111 0 +-112 0 +-113 0 +-114 0 +-115 0 +-116 0 +-117 0 +-118 0 +-119 0 +-120 0 +-121 0 +-122 0 +-123 0 +-SELECT fid, AsText(Envelope(g)) FROM gis_geometry; +-fid AsText(Envelope(g)) +-101 POLYGON((10 10,10 10,10 10,10 10,10 10)) +-102 POLYGON((20 10,20 10,20 10,20 10,20 10)) +-103 POLYGON((20 20,20 20,20 20,20 20,20 20)) +-104 POLYGON((10 20,10 20,10 20,10 20,10 20)) +-105 POLYGON((0 0,10 0,10 10,0 10,0 0)) +-106 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-107 POLYGON((10 10,40 10,40 10,10 10,10 10)) +-108 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-109 POLYGON((0 0,50 0,50 50,0 50,0 0)) +-110 POLYGON((0 0,30 0,30 30,0 30,0 0)) +-111 POLYGON((0 0,20 0,20 20,0 20,0 0)) +-112 POLYGON((1 1,21 1,21 21,1 21,1 1)) +-113 POLYGON((3 6,4 6,4 10,3 10,3 6)) +-114 POLYGON((10 0,16 0,16 48,10 48,10 0)) +-115 POLYGON((10 0,10 0,10 48,10 48,10 0)) +-116 POLYGON((1 2,21 2,21 8,1 8,1 2)) +-117 POLYGON((28 0,84 0,84 42,28 42,28 0)) +-118 POLYGON((28 0,84 0,84 42,28 42,28 0)) +-119 POLYGON((0 0,3 0,3 3,0 3,0 0)) +-120 POLYGON((0 0,10 0,10 10,0 10,0 0)) +-121 POLYGON((3 6,44 6,44 9,3 9,3 6)) +-122 GEOMETRYCOLLECTION EMPTY +-123 GEOMETRYCOLLECTION EMPTY +-SELECT fid, X(g) FROM gis_point; +-fid X(g) +-101 10 +-102 20 +-103 20 +-104 10 +-SELECT fid, Y(g) FROM gis_point; +-fid Y(g) +-101 10 +-102 10 +-103 20 +-104 20 +-SELECT fid, AsText(StartPoint(g)) FROM gis_line; +-fid AsText(StartPoint(g)) +-105 POINT(0 0) +-106 POINT(10 10) +-107 POINT(10 10) +-SELECT fid, AsText(EndPoint(g)) FROM gis_line; +-fid AsText(EndPoint(g)) +-105 POINT(10 0) +-106 POINT(10 10) +-107 POINT(40 10) +-SELECT fid, GLength(g) FROM gis_line; +-fid GLength(g) +-105 24.14213562373095 +-106 40 +-107 30 +-SELECT fid, NumPoints(g) FROM gis_line; +-fid NumPoints(g) +-105 3 +-106 5 +-107 2 +-SELECT fid, AsText(PointN(g, 2)) FROM gis_line; +-fid AsText(PointN(g, 2)) +-105 POINT(0 10) +-106 POINT(20 10) +-107 POINT(40 10) +-SELECT fid, IsClosed(g) FROM gis_line; +-fid IsClosed(g) +-105 0 +-106 1 +-107 0 +-SELECT fid, AsText(Centroid(g)) FROM gis_polygon; +-fid AsText(Centroid(g)) +-108 POINT(15 15) +-109 POINT(25.416666666666668 25.416666666666668) +-110 POINT(20 10) +-SELECT fid, Area(g) FROM gis_polygon; +-fid Area(g) +-108 100 +-109 2400 +-110 450 +-SELECT fid, AsText(ExteriorRing(g)) FROM gis_polygon; +-fid AsText(ExteriorRing(g)) +-108 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-109 LINESTRING(0 0,50 0,50 50,0 50,0 0) +-110 LINESTRING(0 0,30 0,30 30,0 0) +-SELECT fid, NumInteriorRings(g) FROM gis_polygon; +-fid NumInteriorRings(g) +-108 0 +-109 1 +-110 0 +-SELECT fid, AsText(InteriorRingN(g, 1)) FROM gis_polygon; +-fid AsText(InteriorRingN(g, 1)) +-108 NULL +-109 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-110 NULL +-SELECT fid, IsClosed(g) FROM gis_multi_line; +-fid IsClosed(g) +-114 0 +-115 0 +-116 0 +-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; +-fid AsText(Centroid(g)) +-117 POINT(55.58852775304245 17.426536064113982) +-118 POINT(55.58852775304245 17.426536064113982) +-119 POINT(2 2) +-SELECT fid, Area(g) FROM gis_multi_polygon; +-fid Area(g) +-117 1684.5 +-118 1684.5 +-119 4.5 +-SELECT fid, NumGeometries(g) from gis_multi_point; +-fid NumGeometries(g) +-111 4 +-112 4 +-113 2 +-SELECT fid, NumGeometries(g) from gis_multi_line; +-fid NumGeometries(g) +-114 2 +-115 1 +-116 2 +-SELECT fid, NumGeometries(g) from gis_multi_polygon; +-fid NumGeometries(g) +-117 2 +-118 2 +-119 1 +-SELECT fid, NumGeometries(g) from gis_geometrycollection; +-fid NumGeometries(g) +-120 2 +-121 2 +-122 0 +-123 0 +-SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point; +-fid AsText(GeometryN(g, 2)) +-111 POINT(10 10) +-112 POINT(11 11) +-113 POINT(4 10) +-SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_line; +-fid AsText(GeometryN(g, 2)) +-114 LINESTRING(16 0,16 23,16 48) +-115 NULL +-116 LINESTRING(2 5,5 8,21 7) +-SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_polygon; +-fid AsText(GeometryN(g, 2)) +-117 POLYGON((59 18,67 18,67 13,59 13,59 18)) +-118 POLYGON((59 18,67 18,67 13,59 13,59 18)) +-119 NULL +-SELECT fid, AsText(GeometryN(g, 2)) from gis_geometrycollection; +-fid AsText(GeometryN(g, 2)) +-120 LINESTRING(0 0,10 10) +-121 LINESTRING(3 6,7 9) +-122 NULL +-123 NULL +-SELECT fid, AsText(GeometryN(g, 1)) from gis_geometrycollection; +-fid AsText(GeometryN(g, 1)) +-120 POINT(0 0) +-121 POINT(44 6) +-122 NULL +-123 NULL +-SELECT g1.fid as first, g2.fid as second, +-Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, +-Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, +-Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r +-FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; +-first second w c o e d t i r +-120 120 1 1 0 1 0 1 1 0 +-120 121 0 0 1 0 0 0 1 0 +-120 122 0 1 NULL 0 NULL 0 NULL 0 +-120 123 0 1 NULL 0 NULL 0 NULL 0 +-121 120 0 0 1 0 0 0 1 0 +-121 121 1 1 0 1 0 1 1 0 +-121 122 0 1 NULL 0 NULL 0 NULL 0 +-121 123 0 1 NULL 0 NULL 0 NULL 0 +-122 120 1 0 NULL 0 NULL 0 NULL 0 +-122 121 1 0 NULL 0 NULL 0 NULL 0 +-122 122 1 1 NULL 1 NULL 0 NULL 0 +-122 123 1 1 NULL 1 NULL 0 NULL 0 +-123 120 1 0 NULL 0 NULL 0 NULL 0 +-123 121 1 0 NULL 0 NULL 0 NULL 0 +-123 122 1 1 NULL 1 NULL 0 NULL 0 +-123 123 1 1 NULL 1 NULL 0 NULL 0 +-DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; +-USE gis_ogs; +-# Lakes +-INSERT INTO lakes (fid,name,shore) VALUES ( +-101, 'BLUE LAKE', +-PolyFromText( +-'POLYGON( +- (52 18,66 23,73 9,48 6,52 18), +- (59 18,67 18,67 13,59 13,59 18) +- )', +-101)); +-# Road Segments +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(102, 'Route 5', NULL, 2, +-LineFromText( +-'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(103, 'Route 5', 'Main Street', 4, +-LineFromText( +-'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(104, 'Route 5', NULL, 2, +-LineFromText( +-'LINESTRING( 70 38, 72 48 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(105, 'Main Street', NULL, 4, +-LineFromText( +-'LINESTRING( 70 38, 84 42 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(106, 'Dirt Road by Green Forest', NULL, +-1, +-LineFromText( +-'LINESTRING( 28 26, 28 0 )',101)); +-# DividedRoutes +-INSERT INTO divided_routes (fid,name,num_lanes,centerlines) VALUES(119, 'Route 75', 4, +-MLineFromText( +-'MULTILINESTRING((10 48,10 21,10 0), +- (16 0,16 23,16 48))', 101)); +-# Forests +-INSERT INTO forests (fid,name,boundary) VALUES(109, 'Green Forest', +-MPolyFromText( +-'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), +- (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', +-101)); +-# Bridges +-INSERT INTO bridges (fid,name,position) VALUES(110, 'Cam Bridge', PointFromText( +-'POINT( 44 31 )', 101)); +-# Streams +-INSERT INTO streams (fid,name,centerline) VALUES(111, 'Cam Stream', +-LineFromText( +-'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); +-INSERT INTO streams (fid,name,centerline) VALUES(112, NULL, +-LineFromText( +-'LINESTRING( 76 0, 78 4, 73 9 )', 101)); +-# Buildings +-INSERT INTO buildings (fid,name,position,footprint) VALUES(113, '123 Main Street', +-PointFromText( +-'POINT( 52 30 )', 101), +-PolyFromText( +-'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); +-INSERT INTO buildings (fid,name,position,footprint) VALUES(114, '215 Main Street', +-PointFromText( +-'POINT( 64 33 )', 101), +-PolyFromText( +-'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101)); +-# Ponds +-INSERT INTO ponds (fid,name,type,shores) VALUES(120, NULL, 'Stock Pond', +-MPolyFromText( +-'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), +- ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); +-# Named Places +-INSERT INTO named_places (fid,name,boundary) VALUES(117, 'Ashton', +-PolyFromText( +-'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); +-INSERT INTO named_places (fid,name,boundary) VALUES(118, 'Goose Island', +-PolyFromText( +-'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); +-# Map Neatlines +-INSERT INTO map_neatlines (fid,neatline) VALUES(115, +-PolyFromText( +-'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); +-SELECT Dimension(shore) +-FROM lakes +-WHERE name = 'Blue Lake'; +-Dimension(shore) +-2 +-SELECT GeometryType(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-GeometryType(centerlines) +-MULTILINESTRING +-SELECT AsText(boundary) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(boundary) +-POLYGON((67 13,67 18,59 18,59 13,67 13)) +-SELECT AsText(PolyFromWKB(AsBinary(boundary),101)) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(PolyFromWKB(AsBinary(boundary),101)) +-POLYGON((67 13,67 18,59 18,59 13,67 13)) +-SELECT SRID(boundary) +-FROM named_places +-WHERE name = 'Goose Island'; +-SRID(boundary) +-101 +-SELECT IsEmpty(centerline) +-FROM road_segments +-WHERE name = 'Route 5' +-AND aliases = 'Main Street'; +-IsEmpty(centerline) +-0 +-SELECT AsText(Envelope(boundary)) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(Envelope(boundary)) +-POLYGON((59 13,67 13,67 18,59 18,59 13)) +-SELECT X(position) +-FROM bridges +-WHERE name = 'Cam Bridge'; +-X(position) +-44 +-SELECT Y(position) +-FROM bridges +-WHERE name = 'Cam Bridge'; +-Y(position) +-31 +-SELECT AsText(StartPoint(centerline)) +-FROM road_segments +-WHERE fid = 102; +-AsText(StartPoint(centerline)) +-POINT(0 18) +-SELECT AsText(EndPoint(centerline)) +-FROM road_segments +-WHERE fid = 102; +-AsText(EndPoint(centerline)) +-POINT(44 31) +-SELECT GLength(centerline) +-FROM road_segments +-WHERE fid = 106; +-GLength(centerline) +-26 +-SELECT NumPoints(centerline) +-FROM road_segments +-WHERE fid = 102; +-NumPoints(centerline) +-5 +-SELECT AsText(PointN(centerline, 1)) +-FROM road_segments +-WHERE fid = 102; +-AsText(PointN(centerline, 1)) +-POINT(0 18) +-SELECT AsText(Centroid(boundary)) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(Centroid(boundary)) +-POINT(63 15.5) +-SELECT Area(boundary) +-FROM named_places +-WHERE name = 'Goose Island'; +-Area(boundary) +-40 +-SELECT AsText(ExteriorRing(shore)) +-FROM lakes +-WHERE name = 'Blue Lake'; +-AsText(ExteriorRing(shore)) +-LINESTRING(52 18,66 23,73 9,48 6,52 18) +-SELECT NumInteriorRings(shore) +-FROM lakes +-WHERE name = 'Blue Lake'; +-NumInteriorRings(shore) +-1 +-SELECT AsText(InteriorRingN(shore, 1)) +-FROM lakes +-WHERE name = 'Blue Lake'; +-AsText(InteriorRingN(shore, 1)) +-LINESTRING(59 18,67 18,67 13,59 13,59 18) +-SELECT NumGeometries(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-NumGeometries(centerlines) +-2 +-SELECT AsText(GeometryN(centerlines, 2)) +-FROM divided_routes +-WHERE name = 'Route 75'; +-AsText(GeometryN(centerlines, 2)) +-LINESTRING(16 0,16 23,16 48) +-SELECT IsClosed(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-IsClosed(centerlines) +-0 +-SELECT GLength(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-GLength(centerlines) +-96 +-SELECT AsText(Centroid(shores)) +-FROM ponds +-WHERE fid = 120; +-AsText(Centroid(shores)) +-POINT(25 42) +-SELECT Area(shores) +-FROM ponds +-WHERE fid = 120; +-Area(shores) +-8 +-SELECT ST_Equals(boundary, +-PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) +-FROM named_places +-WHERE name = 'Goose Island'; +-ST_Equals(boundary, +-PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) +-1 +-SELECT ST_Disjoint(centerlines, boundary) +-FROM divided_routes, named_places +-WHERE divided_routes.name = 'Route 75' +-AND named_places.name = 'Ashton'; +-ST_Disjoint(centerlines, boundary) +-1 +-SELECT ST_Touches(centerline, shore) +-FROM streams, lakes +-WHERE streams.name = 'Cam Stream' +-AND lakes.name = 'Blue Lake'; +-ST_Touches(centerline, shore) +-1 +-SELECT Crosses(road_segments.centerline, divided_routes.centerlines) +-FROM road_segments, divided_routes +-WHERE road_segments.fid = 102 +-AND divided_routes.name = 'Route 75'; +-Crosses(road_segments.centerline, divided_routes.centerlines) +-1 +-SELECT ST_Intersects(road_segments.centerline, divided_routes.centerlines) +-FROM road_segments, divided_routes +-WHERE road_segments.fid = 102 +-AND divided_routes.name = 'Route 75'; +-ST_Intersects(road_segments.centerline, divided_routes.centerlines) +-1 +-SELECT ST_Contains(forests.boundary, named_places.boundary) +-FROM forests, named_places +-WHERE forests.name = 'Green Forest' +-AND named_places.name = 'Ashton'; +-ST_Contains(forests.boundary, named_places.boundary) +-0 +-SELECT ST_Distance(position, boundary) +-FROM bridges, named_places +-WHERE bridges.name = 'Cam Bridge' +-AND named_places.name = 'Ashton'; +-ST_Distance(position, boundary) +-12 +-SELECT AsText(ST_Difference(named_places.boundary, forests.boundary)) +-FROM named_places, forests +-WHERE named_places.name = 'Ashton' +-AND forests.name = 'Green Forest'; +-AsText(ST_Difference(named_places.boundary, forests.boundary)) +-POLYGON((56 34,62 48,84 48,84 42,56 34)) +-SELECT AsText(ST_Union(shore, boundary)) +-FROM lakes, named_places +-WHERE lakes.name = 'Blue Lake' +-AND named_places.name = 'Goose Island'; +-AsText(ST_Union(shore, boundary)) +-POLYGON((48 6,52 18,66 23,73 9,48 6)) +-SELECT AsText(ST_SymDifference(shore, boundary)) +-FROM lakes, named_places +-WHERE lakes.name = 'Blue Lake' +-AND named_places.name = 'Ashton'; +-AsText(ST_SymDifference(shore, boundary)) +-MULTIPOLYGON(((48 6,52 18,66 23,73 9,48 6),(59 13,59 18,67 18,67 13,59 13)),((56 30,56 34,62 48,84 48,84 30,56 30))) +-SELECT count(*) +-FROM buildings, bridges +-WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1; +-count(*) +-1 ++ERROR 42000: The storage engine for the table doesn't support GEOMETRY ++# ERROR: Statement ended with errno 1178, errname ER_CHECK_NOT_IMPLEMENTED (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE gis_point (fid INT(11) /*!*/ /*Custom column options*/, g POINT, /*!INDEX*/ /*Custom index*/ g(g(128))) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.gis_point) INSERT_METHOD=LAST ] ++# The statement|command finished with ER_CHECK_NOT_IMPLEMENTED. ++# Geometry types or indexes on them or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP DATABASE gis_ogs; + USE test; + DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; + DROP DATABASE IF EXISTS gis_ogs; + CREATE DATABASE gis_ogs; + CREATE TABLE gis_point (fid , g POINT NOT NULL, SPATIAL INDEX(g)) ENGINE= ; +-CREATE TABLE gis_line (fid , g LINESTRING NOT NULL, SPATIAL INDEX(g)) ENGINE= ; +-CREATE TABLE gis_polygon (fid , g POLYGON NOT NULL, SPATIAL INDEX(g)) ENGINE= ; +-CREATE TABLE gis_multi_point (fid , g MULTIPOINT NOT NULL, SPATIAL INDEX(g)) ENGINE= ; +-CREATE TABLE gis_multi_line (fid , g MULTILINESTRING NOT NULL, SPATIAL INDEX(g)) ENGINE= ; +-CREATE TABLE gis_multi_polygon (fid , g MULTIPOLYGON NOT NULL, SPATIAL INDEX(g)) ENGINE= ; +-CREATE TABLE gis_geometrycollection (fid , g GEOMETRYCOLLECTION NOT NULL, SPATIAL INDEX(g)) ENGINE= ; +-CREATE TABLE gis_geometry (fid , g GEOMETRY NOT NULL) ENGINE= ; +-USE gis_ogs; +-CREATE TABLE lakes (fid INT , +-name CHAR(64) , +-shore POLYGON NOT NULL, SPATIAL INDEX s(shore)) ENGINE= ; +-CREATE TABLE road_segments (fid INT , +-name CHAR(64) , +-aliases CHAR(64) , +-num_lanes INT , +-centerline LINESTRING NOT NULL, SPATIAL INDEX c(centerline)) ENGINE= ; +-CREATE TABLE divided_routes (fid INT , +-name CHAR(64) , +-num_lanes INT , +-centerlines MULTILINESTRING NOT NULL, SPATIAL INDEX c(centerlines)) ENGINE= ; +-CREATE TABLE forests (fid INT , +-name CHAR(64) , +-boundary MULTIPOLYGON NOT NULL, SPATIAL INDEX b(boundary)) ENGINE= ; +-CREATE TABLE bridges (fid INT , +-name CHAR(64) , +-position POINT NOT NULL, SPATIAL INDEX p(position)) ENGINE= ; +-CREATE TABLE streams (fid INT , +-name CHAR(64) , +-centerline LINESTRING NOT NULL, SPATIAL INDEX c(centerline)) ENGINE= ; +-CREATE TABLE buildings (fid INT , +-name CHAR(64) , +-position POINT NOT NULL, +-footprint POLYGON NOT NULL, SPATIAL INDEX p(position), SPATIAL INDEX f(footprint)) ENGINE= ; +-CREATE TABLE ponds (fid INT , +-name CHAR(64) , +-type CHAR(64) , +-shores MULTIPOLYGON NOT NULL, SPATIAL INDEX s(shores)) ENGINE= ; +-CREATE TABLE named_places (fid INT , +-name CHAR(64) , +-boundary POLYGON NOT NULL, SPATIAL INDEX b(boundary)) ENGINE= ; +-CREATE TABLE map_neatlines (fid INT , +-neatline POLYGON NOT NULL, SPATIAL INDEX n(neatline)) ENGINE= ; +-USE test; +-SHOW FIELDS FROM gis_point; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g point NO MUL NULL +-SHOW FIELDS FROM gis_line; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g linestring NO MUL NULL +-SHOW FIELDS FROM gis_polygon; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g polygon NO MUL NULL +-SHOW FIELDS FROM gis_multi_point; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g multipoint NO MUL NULL +-SHOW FIELDS FROM gis_multi_line; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g multilinestring NO MUL NULL +-SHOW FIELDS FROM gis_multi_polygon; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g multipolygon NO MUL NULL +-SHOW FIELDS FROM gis_geometrycollection; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g geometrycollection NO MUL NULL +-SHOW FIELDS FROM gis_geometry; +-Field Type Null Key Default Extra +-fid int(11) YES NULL +-g geometry NO NULL +-INSERT INTO gis_point (fid,g) VALUES +-(101, PointFromText('POINT(10 10)')), +-(102, PointFromText('POINT(20 10)')), +-(103, PointFromText('POINT(20 20)')), +-(104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); +-INSERT INTO gis_line (fid,g) VALUES +-(105, LineFromText('LINESTRING(0 0,0 10,10 0)')), +-(106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), +-(107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10))))); +-INSERT INTO gis_polygon (fid,g) VALUES +-(108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), +-(109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), +-(110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))))); +-INSERT INTO gis_multi_point (fid,g) VALUES +-(111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), +-(112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), +-(113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10))))); +-INSERT INTO gis_multi_line (fid,g) VALUES +-(114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), +-(115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), +-(116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))))); +-INSERT INTO gis_multi_polygon (fid,g) VALUES +-(117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), +-(118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), +-(119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))))); +-INSERT INTO gis_geometrycollection (fid,g) VALUES +-(120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), +-(121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))), +-(122, GeomFromText('GeometryCollection()')), +-(123, GeomFromText('GeometryCollection EMPTY')); +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_point; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_line; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_polygon; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_point; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_line; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_polygon; +-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_geometrycollection; +-SELECT fid, AsText(g) FROM gis_point; +-fid AsText(g) +-101 POINT(10 10) +-102 POINT(20 10) +-103 POINT(20 20) +-104 POINT(10 20) +-SELECT fid, AsText(g) FROM gis_line; +-fid AsText(g) +-105 LINESTRING(0 0,0 10,10 0) +-106 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-107 LINESTRING(10 10,40 10) +-SELECT fid, AsText(g) FROM gis_polygon; +-fid AsText(g) +-108 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) +-110 POLYGON((0 0,30 0,30 30,0 0)) +-SELECT fid, AsText(g) FROM gis_multi_point; +-fid AsText(g) +-111 MULTIPOINT(0 0,10 10,10 20,20 20) +-112 MULTIPOINT(1 1,11 11,11 21,21 21) +-113 MULTIPOINT(3 6,4 10) +-SELECT fid, AsText(g) FROM gis_multi_line; +-fid AsText(g) +-114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) +-115 MULTILINESTRING((10 48,10 21,10 0)) +-116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) +-SELECT fid, AsText(g) FROM gis_multi_polygon; +-fid AsText(g) +-117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) +-SELECT fid, AsText(g) FROM gis_geometrycollection; +-fid AsText(g) +-120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) +-121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) +-122 GEOMETRYCOLLECTION EMPTY +-123 GEOMETRYCOLLECTION EMPTY +-SELECT fid, AsText(g) FROM gis_geometry; +-fid AsText(g) +-101 POINT(10 10) +-102 POINT(20 10) +-103 POINT(20 20) +-104 POINT(10 20) +-105 LINESTRING(0 0,0 10,10 0) +-106 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-107 LINESTRING(10 10,40 10) +-108 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) +-110 POLYGON((0 0,30 0,30 30,0 0)) +-111 MULTIPOINT(0 0,10 10,10 20,20 20) +-112 MULTIPOINT(1 1,11 11,11 21,21 21) +-113 MULTIPOINT(3 6,4 10) +-114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) +-115 MULTILINESTRING((10 48,10 21,10 0)) +-116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) +-117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) +-119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) +-120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) +-121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) +-122 GEOMETRYCOLLECTION EMPTY +-123 GEOMETRYCOLLECTION EMPTY +-SELECT fid, Dimension(g) FROM gis_geometry; +-fid Dimension(g) +-101 0 +-102 0 +-103 0 +-104 0 +-105 1 +-106 1 +-107 1 +-108 2 +-109 2 +-110 2 +-111 0 +-112 0 +-113 0 +-114 1 +-115 1 +-116 1 +-117 2 +-118 2 +-119 2 +-120 1 +-121 1 +-122 0 +-123 0 +-SELECT fid, GeometryType(g) FROM gis_geometry; +-fid GeometryType(g) +-101 POINT +-102 POINT +-103 POINT +-104 POINT +-105 LINESTRING +-106 LINESTRING +-107 LINESTRING +-108 POLYGON +-109 POLYGON +-110 POLYGON +-111 MULTIPOINT +-112 MULTIPOINT +-113 MULTIPOINT +-114 MULTILINESTRING +-115 MULTILINESTRING +-116 MULTILINESTRING +-117 MULTIPOLYGON +-118 MULTIPOLYGON +-119 MULTIPOLYGON +-120 GEOMETRYCOLLECTION +-121 GEOMETRYCOLLECTION +-122 GEOMETRYCOLLECTION +-123 GEOMETRYCOLLECTION +-SELECT fid, IsEmpty(g) FROM gis_geometry; +-fid IsEmpty(g) +-101 0 +-102 0 +-103 0 +-104 0 +-105 0 +-106 0 +-107 0 +-108 0 +-109 0 +-110 0 +-111 0 +-112 0 +-113 0 +-114 0 +-115 0 +-116 0 +-117 0 +-118 0 +-119 0 +-120 0 +-121 0 +-122 0 +-123 0 +-SELECT fid, AsText(Envelope(g)) FROM gis_geometry; +-fid AsText(Envelope(g)) +-101 POLYGON((10 10,10 10,10 10,10 10,10 10)) +-102 POLYGON((20 10,20 10,20 10,20 10,20 10)) +-103 POLYGON((20 20,20 20,20 20,20 20,20 20)) +-104 POLYGON((10 20,10 20,10 20,10 20,10 20)) +-105 POLYGON((0 0,10 0,10 10,0 10,0 0)) +-106 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-107 POLYGON((10 10,40 10,40 10,10 10,10 10)) +-108 POLYGON((10 10,20 10,20 20,10 20,10 10)) +-109 POLYGON((0 0,50 0,50 50,0 50,0 0)) +-110 POLYGON((0 0,30 0,30 30,0 30,0 0)) +-111 POLYGON((0 0,20 0,20 20,0 20,0 0)) +-112 POLYGON((1 1,21 1,21 21,1 21,1 1)) +-113 POLYGON((3 6,4 6,4 10,3 10,3 6)) +-114 POLYGON((10 0,16 0,16 48,10 48,10 0)) +-115 POLYGON((10 0,10 0,10 48,10 48,10 0)) +-116 POLYGON((1 2,21 2,21 8,1 8,1 2)) +-117 POLYGON((28 0,84 0,84 42,28 42,28 0)) +-118 POLYGON((28 0,84 0,84 42,28 42,28 0)) +-119 POLYGON((0 0,3 0,3 3,0 3,0 0)) +-120 POLYGON((0 0,10 0,10 10,0 10,0 0)) +-121 POLYGON((3 6,44 6,44 9,3 9,3 6)) +-122 GEOMETRYCOLLECTION EMPTY +-123 GEOMETRYCOLLECTION EMPTY +-SELECT fid, X(g) FROM gis_point; +-fid X(g) +-101 10 +-102 20 +-103 20 +-104 10 +-SELECT fid, Y(g) FROM gis_point; +-fid Y(g) +-101 10 +-102 10 +-103 20 +-104 20 +-SELECT fid, AsText(StartPoint(g)) FROM gis_line; +-fid AsText(StartPoint(g)) +-105 POINT(0 0) +-106 POINT(10 10) +-107 POINT(10 10) +-SELECT fid, AsText(EndPoint(g)) FROM gis_line; +-fid AsText(EndPoint(g)) +-105 POINT(10 0) +-106 POINT(10 10) +-107 POINT(40 10) +-SELECT fid, GLength(g) FROM gis_line; +-fid GLength(g) +-105 24.14213562373095 +-106 40 +-107 30 +-SELECT fid, NumPoints(g) FROM gis_line; +-fid NumPoints(g) +-105 3 +-106 5 +-107 2 +-SELECT fid, AsText(PointN(g, 2)) FROM gis_line; +-fid AsText(PointN(g, 2)) +-105 POINT(0 10) +-106 POINT(20 10) +-107 POINT(40 10) +-SELECT fid, IsClosed(g) FROM gis_line; +-fid IsClosed(g) +-105 0 +-106 1 +-107 0 +-SELECT fid, AsText(Centroid(g)) FROM gis_polygon; +-fid AsText(Centroid(g)) +-108 POINT(15 15) +-109 POINT(25.416666666666668 25.416666666666668) +-110 POINT(20 10) +-SELECT fid, Area(g) FROM gis_polygon; +-fid Area(g) +-108 100 +-109 2400 +-110 450 +-SELECT fid, AsText(ExteriorRing(g)) FROM gis_polygon; +-fid AsText(ExteriorRing(g)) +-108 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-109 LINESTRING(0 0,50 0,50 50,0 50,0 0) +-110 LINESTRING(0 0,30 0,30 30,0 0) +-SELECT fid, NumInteriorRings(g) FROM gis_polygon; +-fid NumInteriorRings(g) +-108 0 +-109 1 +-110 0 +-SELECT fid, AsText(InteriorRingN(g, 1)) FROM gis_polygon; +-fid AsText(InteriorRingN(g, 1)) +-108 NULL +-109 LINESTRING(10 10,20 10,20 20,10 20,10 10) +-110 NULL +-SELECT fid, IsClosed(g) FROM gis_multi_line; +-fid IsClosed(g) +-114 0 +-115 0 +-116 0 +-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; +-fid AsText(Centroid(g)) +-117 POINT(55.58852775304245 17.426536064113982) +-118 POINT(55.58852775304245 17.426536064113982) +-119 POINT(2 2) +-SELECT fid, Area(g) FROM gis_multi_polygon; +-fid Area(g) +-117 1684.5 +-118 1684.5 +-119 4.5 +-SELECT fid, NumGeometries(g) from gis_multi_point; +-fid NumGeometries(g) +-111 4 +-112 4 +-113 2 +-SELECT fid, NumGeometries(g) from gis_multi_line; +-fid NumGeometries(g) +-114 2 +-115 1 +-116 2 +-SELECT fid, NumGeometries(g) from gis_multi_polygon; +-fid NumGeometries(g) +-117 2 +-118 2 +-119 1 +-SELECT fid, NumGeometries(g) from gis_geometrycollection; +-fid NumGeometries(g) +-120 2 +-121 2 +-122 0 +-123 0 +-SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point; +-fid AsText(GeometryN(g, 2)) +-111 POINT(10 10) +-112 POINT(11 11) +-113 POINT(4 10) +-SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_line; +-fid AsText(GeometryN(g, 2)) +-114 LINESTRING(16 0,16 23,16 48) +-115 NULL +-116 LINESTRING(2 5,5 8,21 7) +-SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_polygon; +-fid AsText(GeometryN(g, 2)) +-117 POLYGON((59 18,67 18,67 13,59 13,59 18)) +-118 POLYGON((59 18,67 18,67 13,59 13,59 18)) +-119 NULL +-SELECT fid, AsText(GeometryN(g, 2)) from gis_geometrycollection; +-fid AsText(GeometryN(g, 2)) +-120 LINESTRING(0 0,10 10) +-121 LINESTRING(3 6,7 9) +-122 NULL +-123 NULL +-SELECT fid, AsText(GeometryN(g, 1)) from gis_geometrycollection; +-fid AsText(GeometryN(g, 1)) +-120 POINT(0 0) +-121 POINT(44 6) +-122 NULL +-123 NULL +-SELECT g1.fid as first, g2.fid as second, +-Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, +-Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, +-Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r +-FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; +-first second w c o e d t i r +-120 120 1 1 0 1 0 1 1 0 +-120 121 0 0 1 0 0 0 1 0 +-120 122 0 1 NULL 0 NULL 0 NULL 0 +-120 123 0 1 NULL 0 NULL 0 NULL 0 +-121 120 0 0 1 0 0 0 1 0 +-121 121 1 1 0 1 0 1 1 0 +-121 122 0 1 NULL 0 NULL 0 NULL 0 +-121 123 0 1 NULL 0 NULL 0 NULL 0 +-122 120 1 0 NULL 0 NULL 0 NULL 0 +-122 121 1 0 NULL 0 NULL 0 NULL 0 +-122 122 1 1 NULL 1 NULL 0 NULL 0 +-122 123 1 1 NULL 1 NULL 0 NULL 0 +-123 120 1 0 NULL 0 NULL 0 NULL 0 +-123 121 1 0 NULL 0 NULL 0 NULL 0 +-123 122 1 1 NULL 1 NULL 0 NULL 0 +-123 123 1 1 NULL 1 NULL 0 NULL 0 +-DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; +-USE gis_ogs; +-# Lakes +-INSERT INTO lakes (fid,name,shore) VALUES ( +-101, 'BLUE LAKE', +-PolyFromText( +-'POLYGON( +- (52 18,66 23,73 9,48 6,52 18), +- (59 18,67 18,67 13,59 13,59 18) +- )', +-101)); +-# Road Segments +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(102, 'Route 5', NULL, 2, +-LineFromText( +-'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(103, 'Route 5', 'Main Street', 4, +-LineFromText( +-'LINESTRING( 44 31, 56 34, 70 38 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(104, 'Route 5', NULL, 2, +-LineFromText( +-'LINESTRING( 70 38, 72 48 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(105, 'Main Street', NULL, 4, +-LineFromText( +-'LINESTRING( 70 38, 84 42 )' ,101)); +-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(106, 'Dirt Road by Green Forest', NULL, +-1, +-LineFromText( +-'LINESTRING( 28 26, 28 0 )',101)); +-# DividedRoutes +-INSERT INTO divided_routes (fid,name,num_lanes,centerlines) VALUES(119, 'Route 75', 4, +-MLineFromText( +-'MULTILINESTRING((10 48,10 21,10 0), +- (16 0,16 23,16 48))', 101)); +-# Forests +-INSERT INTO forests (fid,name,boundary) VALUES(109, 'Green Forest', +-MPolyFromText( +-'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), +- (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', +-101)); +-# Bridges +-INSERT INTO bridges (fid,name,position) VALUES(110, 'Cam Bridge', PointFromText( +-'POINT( 44 31 )', 101)); +-# Streams +-INSERT INTO streams (fid,name,centerline) VALUES(111, 'Cam Stream', +-LineFromText( +-'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101)); +-INSERT INTO streams (fid,name,centerline) VALUES(112, NULL, +-LineFromText( +-'LINESTRING( 76 0, 78 4, 73 9 )', 101)); +-# Buildings +-INSERT INTO buildings (fid,name,position,footprint) VALUES(113, '123 Main Street', +-PointFromText( +-'POINT( 52 30 )', 101), +-PolyFromText( +-'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101)); +-INSERT INTO buildings (fid,name,position,footprint) VALUES(114, '215 Main Street', +-PointFromText( +-'POINT( 64 33 )', 101), +-PolyFromText( +-'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101)); +-# Ponds +-INSERT INTO ponds (fid,name,type,shores) VALUES(120, NULL, 'Stock Pond', +-MPolyFromText( +-'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), +- ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101)); +-# Named Places +-INSERT INTO named_places (fid,name,boundary) VALUES(117, 'Ashton', +-PolyFromText( +-'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101)); +-INSERT INTO named_places (fid,name,boundary) VALUES(118, 'Goose Island', +-PolyFromText( +-'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101)); +-# Map Neatlines +-INSERT INTO map_neatlines (fid,neatline) VALUES(115, +-PolyFromText( +-'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101)); +-SELECT Dimension(shore) +-FROM lakes +-WHERE name = 'Blue Lake'; +-Dimension(shore) +-2 +-SELECT GeometryType(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-GeometryType(centerlines) +-MULTILINESTRING +-SELECT AsText(boundary) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(boundary) +-POLYGON((67 13,67 18,59 18,59 13,67 13)) +-SELECT AsText(PolyFromWKB(AsBinary(boundary),101)) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(PolyFromWKB(AsBinary(boundary),101)) +-POLYGON((67 13,67 18,59 18,59 13,67 13)) +-SELECT SRID(boundary) +-FROM named_places +-WHERE name = 'Goose Island'; +-SRID(boundary) +-101 +-SELECT IsEmpty(centerline) +-FROM road_segments +-WHERE name = 'Route 5' +-AND aliases = 'Main Street'; +-IsEmpty(centerline) +-0 +-SELECT AsText(Envelope(boundary)) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(Envelope(boundary)) +-POLYGON((59 13,67 13,67 18,59 18,59 13)) +-SELECT X(position) +-FROM bridges +-WHERE name = 'Cam Bridge'; +-X(position) +-44 +-SELECT Y(position) +-FROM bridges +-WHERE name = 'Cam Bridge'; +-Y(position) +-31 +-SELECT AsText(StartPoint(centerline)) +-FROM road_segments +-WHERE fid = 102; +-AsText(StartPoint(centerline)) +-POINT(0 18) +-SELECT AsText(EndPoint(centerline)) +-FROM road_segments +-WHERE fid = 102; +-AsText(EndPoint(centerline)) +-POINT(44 31) +-SELECT GLength(centerline) +-FROM road_segments +-WHERE fid = 106; +-GLength(centerline) +-26 +-SELECT NumPoints(centerline) +-FROM road_segments +-WHERE fid = 102; +-NumPoints(centerline) +-5 +-SELECT AsText(PointN(centerline, 1)) +-FROM road_segments +-WHERE fid = 102; +-AsText(PointN(centerline, 1)) +-POINT(0 18) +-SELECT AsText(Centroid(boundary)) +-FROM named_places +-WHERE name = 'Goose Island'; +-AsText(Centroid(boundary)) +-POINT(63 15.5) +-SELECT Area(boundary) +-FROM named_places +-WHERE name = 'Goose Island'; +-Area(boundary) +-40 +-SELECT AsText(ExteriorRing(shore)) +-FROM lakes +-WHERE name = 'Blue Lake'; +-AsText(ExteriorRing(shore)) +-LINESTRING(52 18,66 23,73 9,48 6,52 18) +-SELECT NumInteriorRings(shore) +-FROM lakes +-WHERE name = 'Blue Lake'; +-NumInteriorRings(shore) +-1 +-SELECT AsText(InteriorRingN(shore, 1)) +-FROM lakes +-WHERE name = 'Blue Lake'; +-AsText(InteriorRingN(shore, 1)) +-LINESTRING(59 18,67 18,67 13,59 13,59 18) +-SELECT NumGeometries(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-NumGeometries(centerlines) +-2 +-SELECT AsText(GeometryN(centerlines, 2)) +-FROM divided_routes +-WHERE name = 'Route 75'; +-AsText(GeometryN(centerlines, 2)) +-LINESTRING(16 0,16 23,16 48) +-SELECT IsClosed(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-IsClosed(centerlines) +-0 +-SELECT GLength(centerlines) +-FROM divided_routes +-WHERE name = 'Route 75'; +-GLength(centerlines) +-96 +-SELECT AsText(Centroid(shores)) +-FROM ponds +-WHERE fid = 120; +-AsText(Centroid(shores)) +-POINT(25 42) +-SELECT Area(shores) +-FROM ponds +-WHERE fid = 120; +-Area(shores) +-8 +-SELECT ST_Equals(boundary, +-PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) +-FROM named_places +-WHERE name = 'Goose Island'; +-ST_Equals(boundary, +-PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1)) +-1 +-SELECT ST_Disjoint(centerlines, boundary) +-FROM divided_routes, named_places +-WHERE divided_routes.name = 'Route 75' +-AND named_places.name = 'Ashton'; +-ST_Disjoint(centerlines, boundary) +-1 +-SELECT ST_Touches(centerline, shore) +-FROM streams, lakes +-WHERE streams.name = 'Cam Stream' +-AND lakes.name = 'Blue Lake'; +-ST_Touches(centerline, shore) +-1 +-SELECT Crosses(road_segments.centerline, divided_routes.centerlines) +-FROM road_segments, divided_routes +-WHERE road_segments.fid = 102 +-AND divided_routes.name = 'Route 75'; +-Crosses(road_segments.centerline, divided_routes.centerlines) +-1 +-SELECT ST_Intersects(road_segments.centerline, divided_routes.centerlines) +-FROM road_segments, divided_routes +-WHERE road_segments.fid = 102 +-AND divided_routes.name = 'Route 75'; +-ST_Intersects(road_segments.centerline, divided_routes.centerlines) +-1 +-SELECT ST_Contains(forests.boundary, named_places.boundary) +-FROM forests, named_places +-WHERE forests.name = 'Green Forest' +-AND named_places.name = 'Ashton'; +-ST_Contains(forests.boundary, named_places.boundary) +-0 +-SELECT ST_Distance(position, boundary) +-FROM bridges, named_places +-WHERE bridges.name = 'Cam Bridge' +-AND named_places.name = 'Ashton'; +-ST_Distance(position, boundary) +-12 +-SELECT AsText(ST_Difference(named_places.boundary, forests.boundary)) +-FROM named_places, forests +-WHERE named_places.name = 'Ashton' +-AND forests.name = 'Green Forest'; +-AsText(ST_Difference(named_places.boundary, forests.boundary)) +-POLYGON((56 34,62 48,84 48,84 42,56 34)) +-SELECT AsText(ST_Union(shore, boundary)) +-FROM lakes, named_places +-WHERE lakes.name = 'Blue Lake' +-AND named_places.name = 'Goose Island'; +-AsText(ST_Union(shore, boundary)) +-POLYGON((48 6,52 18,66 23,73 9,48 6)) +-SELECT AsText(ST_SymDifference(shore, boundary)) +-FROM lakes, named_places +-WHERE lakes.name = 'Blue Lake' +-AND named_places.name = 'Ashton'; +-AsText(ST_SymDifference(shore, boundary)) +-MULTIPOLYGON(((48 6,52 18,66 23,73 9,48 6),(59 13,59 18,67 18,67 13,59 13)),((56 30,56 34,62 48,84 48,84 30,56 30))) +-SELECT count(*) +-FROM buildings, bridges +-WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1; +-count(*) +-1 ++ERROR 42000: The storage engine for the table doesn't support GEOMETRY ++# ERROR: Statement ended with errno 1178, errname ER_CHECK_NOT_IMPLEMENTED (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE gis_point (fid INT(11) /*!*/ /*Custom column options*/, g POINT NOT NULL, SPATIAL INDEX(g)) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.gis_point) INSERT_METHOD=LAST ] ++# The statement|command finished with ER_CHECK_NOT_IMPLEMENTED. ++# Geometry types or spatial indexes or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# ------------------------------------------- + DROP DATABASE gis_ogs; + USE test; diff --git a/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff b/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff index 20431a9c713..8b2710be221 100644 --- a/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff @@ -1,79 +1,82 @@ -3,69c3,12 -< SHOW COLUMNS IN t1; -< Field Type Null Key Default Extra -< a int(11) # # -< b int(11) # # VIRTUAL -< INSERT INTO t1 (a) VALUES (1),(2); -< INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -< Warnings: -< Warning 1906 The value specified for computed column 'b' in table 't1' ignored -< Warning 1906 The value specified for computed column 'b' in table 't1' ignored -< SELECT * FROM t1; -< a b -< 1 2 -< 2 3 -< 3 4 -< 4 5 -< DROP TABLE t1; -< CREATE TABLE t1 (a , b GENERATED ALWAYS AS (a+1) PERSISTENT) ENGINE= ; -< SHOW COLUMNS IN t1; -< Field Type Null Key Default Extra -< a int(11) # # -< b int(11) # # PERSISTENT -< INSERT INTO t1 (a) VALUES (1),(2); -< INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -< Warnings: -< Warning 1906 The value specified for computed column 'b' in table 't1' ignored -< Warning 1906 The value specified for computed column 'b' in table 't1' ignored -< SELECT * FROM t1; -< a b -< 1 2 -< 2 3 -< 3 4 -< 4 5 -< DROP TABLE t1; -< CREATE TABLE t1 (a , b GENERATED ALWAYS AS (a+1) VIRTUAL) ENGINE= ; -< SHOW COLUMNS IN t1; -< Field Type Null Key Default Extra -< a int(11) # # -< b int(11) # # VIRTUAL -< INSERT INTO t1 (a) VALUES (1),(2); -< INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -< Warnings: -< Warning 1906 The value specified for computed column 'b' in table 't1' ignored -< Warning 1906 The value specified for computed column 'b' in table 't1' ignored -< SELECT * FROM t1; -< a b -< 1 2 -< 2 3 -< 3 4 -< 4 5 -< DROP TABLE t1; -< CREATE TABLE t1 (a , b AS (a+1) PERSISTENT) ENGINE= ; -< SHOW COLUMNS IN t1; -< Field Type Null Key Default Extra -< a int(11) # # -< b int(11) # # PERSISTENT -< INSERT INTO t1 (a) VALUES (1),(2); -< INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -< Warnings: -< Warning 1906 The value specified for computed column 'b' in table 't1' ignored -< Warning 1906 The value specified for computed column 'b' in table 't1' ignored -< SELECT * FROM t1; -< a b -< 1 2 -< 2 3 -< 3 4 -< 4 5 -< DROP TABLE t1; ---- -> ERROR HY000: MRG_MYISAM storage engine does not support computed columns -> # ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS (expected to succeed) -> # ------------ UNEXPECTED RESULT ------------ -> # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/ GENERATED ALWAYS AS (a+1)) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST ] -> # The statement|command finished with ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS. -> # Virtual columns or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. -> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. -> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. -> # Also, this problem may cause a chain effect (more errors of different kinds in the test). -> # ------------------------------------------- +--- vcol.result 2013-01-22 22:05:05.246633000 +0400 ++++ vcol.reject 2013-01-23 02:51:26.851160587 +0400 +@@ -1,69 +1,12 @@ + DROP TABLE IF EXISTS t1; + CREATE TABLE t1 (a , b GENERATED ALWAYS AS (a+1)) ENGINE= ; +-SHOW COLUMNS IN t1; +-Field Type Null Key Default Extra +-a int(11) # # +-b int(11) # # VIRTUAL +-INSERT INTO t1 (a) VALUES (1),(2); +-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); +-Warnings: +-Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-SELECT a,b FROM t1; +-a b +-1 2 +-2 3 +-3 4 +-4 5 +-DROP TABLE t1; +-CREATE TABLE t1 (a , b GENERATED ALWAYS AS (a+1) PERSISTENT) ENGINE= ; +-SHOW COLUMNS IN t1; +-Field Type Null Key Default Extra +-a int(11) # # +-b int(11) # # PERSISTENT +-INSERT INTO t1 (a) VALUES (1),(2); +-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); +-Warnings: +-Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-SELECT a,b FROM t1; +-a b +-1 2 +-2 3 +-3 4 +-4 5 +-DROP TABLE t1; +-CREATE TABLE t1 (a , b GENERATED ALWAYS AS (a+1) VIRTUAL) ENGINE= ; +-SHOW COLUMNS IN t1; +-Field Type Null Key Default Extra +-a int(11) # # +-b int(11) # # VIRTUAL +-INSERT INTO t1 (a) VALUES (1),(2); +-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); +-Warnings: +-Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-SELECT a,b FROM t1; +-a b +-1 2 +-2 3 +-3 4 +-4 5 +-DROP TABLE t1; +-CREATE TABLE t1 (a , b AS (a+1) PERSISTENT) ENGINE= ; +-SHOW COLUMNS IN t1; +-Field Type Null Key Default Extra +-a int(11) # # +-b int(11) # # PERSISTENT +-INSERT INTO t1 (a) VALUES (1),(2); +-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); +-Warnings: +-Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-SELECT a,b FROM t1; +-a b +-1 2 +-2 3 +-3 4 +-4 5 +-DROP TABLE t1; ++ERROR HY000: MRG_MYISAM storage engine does not support computed columns ++# ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS (expected to succeed) ++# ------------ UNEXPECTED RESULT ------------ ++# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/ GENERATED ALWAYS AS (a+1)) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST ] ++# The statement|command finished with ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS. ++# Virtual columns or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. ++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. ++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. ++# Also, this problem may cause a chain effect (more errors of different kinds in the test). ++# -------------------------------------------