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

6
mysql-test/suite/storage_engine/lock.result
View File

@@ -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 <INT_COLUMN>, id2 <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
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 <INT_COLUMN>, nr <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
@@ -105,7 +105,7 @@ LOCK TABLE t1 WRITE, t2 WRITE;
CREATE TEMPORARY TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
FLUSH TABLE t1;
DROP TEMPORARY TABLE t1;
SELECT * FROM t1;
SELECT a,b FROM t1;
a b
UNLOCK TABLES;
DROP TABLE t1, t2;