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

40
storage/myisammrg/mysql-test/storage_engine/insert_delayed.rdiff
View File

@@ -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;