database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-4028 - Converted rdiff files to uniform

Browse Source 
MDEV-11 - Modifed tests and result files to use explicit column lists
          in INSERT and SELECT statements
This commit is contained in:
Elena Stepanova
2013-02-03 02:53:57 +04:00
parent 1701ee3357
commit 7f444caa0a
213 changed files with 7031 additions and 5955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff
View File

@@ -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 <INT_COLUMN> KEY AUTO_INCREMENT, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
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 <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
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;