Commit 6e4c74c1 authored by unknown's avatar unknown
Browse files

After merge fix. 


mysql-test/r/innodb.result:
  After merge fix.
  Test for bug 11816 has four more inserts.
parent 7f83d771

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -1765,7 +1765,7 @@ Variable_name Value 
Innodb_rows_deleted	2070

show status like "Innodb_rows_inserted";

Variable_name	Value

Innodb_rows_inserted	31718

Innodb_rows_inserted	31722

show status like "Innodb_rows_updated";

Variable_name	Value

Innodb_rows_updated	29530

mysql-test/r/key.result

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ c1 c2 
2	 		Test String

3	 

	Test String

drop table t1;

create table t1 (a varchar(10), b varchar(10), key(a(10),b(10)));

show create table t1;

Table	Create Table

mysql-test/t/key.test

+3 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ insert into t1 values (2,' \t\tTest String'); 
insert into t1 values (3,' \n\tTest String');

update t1 set c2 = 'New Test String' where c1 = 1;

select * from t1;

drop table t1;



#

# If we use a partial field for a key that is actually the length of the

# field, and we extend the field, we end up with a key that includes the

# whole new length of the field.