Commit e368a064 authored by Vasil Dimov's avatar Vasil Dimov

Adjust innodb_mysql.result after the resolved conflict from the merge

parent 847ea21e
...@@ -2414,8 +2414,8 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -2414,8 +2414,8 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using where 1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using where
DROP TABLE t1,t2; DROP TABLE t1,t2;
# #
#
# Bug#38999 valgrind warnings for update statement in function compare_record() # Bug#38999 valgrind warnings for update statement in function compare_record()
#
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 values (1),(2),(3),(4),(5); INSERT INTO t1 values (1),(2),(3),(4),(5);
...@@ -2425,7 +2425,9 @@ a ...@@ -2425,7 +2425,9 @@ a
2 2
UPDATE t1,t2 SET t1.a = t1.a + 100 WHERE t1.a = 1; UPDATE t1,t2 SET t1.a = t1.a + 100 WHERE t1.a = 1;
DROP TABLE t1,t2; DROP TABLE t1,t2;
#
# Bug #53830: !table || (!table->read_set || bitmap_is_set(table->read_set, field_index)) # Bug #53830: !table || (!table->read_set || bitmap_is_set(table->read_set, field_index))
#
CREATE TABLE t1 (a INT, b INT, c INT, d INT, CREATE TABLE t1 (a INT, b INT, c INT, d INT,
PRIMARY KEY(a,b,c), KEY(b,d)) PRIMARY KEY(a,b,c), KEY(b,d))
ENGINE=InnoDB; ENGINE=InnoDB;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment