summaryrefslogtreecommitdiff
path: root/storage/rocksdb
diff options
context:
space:
mode:
Diffstat (limited to 'storage/rocksdb')
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result2
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result4
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result4
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result14
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/type_bool.result4
5 files changed, 14 insertions, 14 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
index 3703c208d0b..4ea8cbccc1e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
@@ -77,7 +77,7 @@ SET rocksdb_bulk_load=1;
INSERT INTO t1 VALUES(13, 0);
INSERT INTO t1 VALUES(2, 'test 2');
Warnings:
-Warning 1366 Incorrect integer value: 'test 2' for column 'b' at row 1
+Warning 1366 Incorrect integer value: 'test 2' for column `test`.`t1`.`b` at row 1
INSERT INTO t1 VALUES(@id, @arg04);
SET @@global.table_open_cache=FALSE;
Warnings:
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result
index 2ae965b6cfc..64d87b7116d 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result
@@ -577,8 +577,8 @@ b1 b2
0 0
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
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`b1` at row 1
+Warning 1366 Incorrect integer value: 'b' for column `test`.`t1`.`b2` at row 1
SELECT b1,b2 FROM t1;
b1 b2
-1 -2
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result
index a834310417e..ba651fcbb14 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result
@@ -500,8 +500,8 @@ b1 b2
0 0
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
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`b1` at row 1
+Warning 1366 Incorrect integer value: 'b' for column `test`.`t1`.`b2` at row 1
SELECT b1,b2 FROM t1;
b1 b2
-1 -2
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
index 6a21a339207..e18bb5f9c0c 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
@@ -2451,9 +2451,9 @@ DROP TABLE t1;
CREATE TABLE t2(id INT NOT NULL PRIMARY KEY, data INT) Engine=MEMORY;
INSERT INTO t2 VALUES (100,NULL),(150,"long varchar"),(200,"varchar"),(250,"long long long varchar");
Warnings:
-Warning 1366 Incorrect integer value: 'long varchar' for column 'data' at row 2
-Warning 1366 Incorrect integer value: 'varchar' for column 'data' at row 3
-Warning 1366 Incorrect integer value: 'long long long varchar' for column 'data' at row 4
+Warning 1366 Incorrect integer value: 'long varchar' for column `test`.`t2`.`data` at row 2
+Warning 1366 Incorrect integer value: 'varchar' for column `test`.`t2`.`data` at row 3
+Warning 1366 Incorrect integer value: 'long long long varchar' for column `test`.`t2`.`data` at row 4
create TABLE t1 (a int not null, b int not null, primary key(a,b));
INSERT INTO t1 VALUES (1,1);
SELECT a FROM t1, t2 WHERE a=b AND (b NOT IN (SELECT a FROM t1 WHERE a > 4));
@@ -2542,10 +2542,10 @@ a
truncate t1;
INSERT INTO t1 VALUES(X'042000200020',X'042000200020'),(X'200400200020',X'200400200020');
Warnings:
-Warning 1366 Incorrect integer value: '\x04 \x00 \x00 ' for column 'a' at row 1
-Warning 1366 Incorrect integer value: '\x04 \x00 \x00 ' for column 'b' at row 1
-Warning 1366 Incorrect integer value: ' \x04\x00 \x00 ' for column 'a' at row 2
-Warning 1366 Incorrect integer value: ' \x04\x00 \x00 ' for column 'b' at row 2
+Warning 1366 Incorrect integer value: '\x04 \x00 \x00 ' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect integer value: '\x04 \x00 \x00 ' for column `test`.`t1`.`b` at row 1
+Warning 1366 Incorrect integer value: ' \x04\x00 \x00 ' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect integer value: ' \x04\x00 \x00 ' for column `test`.`t1`.`b` at row 2
UNLOCK TABLES;
DROP TABLE t1;
#
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result b/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result
index 4abfdb49f37..bfe2c18acb4 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result
@@ -45,8 +45,8 @@ b1 b2
0 0
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
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`b1` at row 1
+Warning 1366 Incorrect integer value: 'b' for column `test`.`t1`.`b2` at row 1
SELECT b1,b2 FROM t1;
b1 b2
-1 -2