diff options
| author | unknown <ingo@mysql.com> | 2005-08-29 21:06:45 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-08-29 21:06:45 +0200 |
| commit | 6e4c74c1ef98af113648f5e57170864e8b0417fc (patch) | |
| tree | 62c45b39973cc6bcc582d8dd88af412401622ac0 | |
| parent | 7f83d7714c0952ded315f6f4038daf80cdf9777c (diff) | |
| download | mariadb-git-6e4c74c1ef98af113648f5e57170864e8b0417fc.tar.gz | |
After merge fix.
mysql-test/r/innodb.result:
After merge fix.
Test for bug 11816 has four more inserts.
| -rw-r--r-- | mysql-test/r/innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/key.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/key.test | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 5114b2ead0e..b9567e3f45f 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -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 diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result index 643ba2b4dee..bc9d3935bc4 100644 --- a/mysql-test/r/key.result +++ b/mysql-test/r/key.result @@ -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 diff --git a/mysql-test/t/key.test b/mysql-test/t/key.test index ed9e15aa7cb..31763b84379 100644 --- a/mysql-test/t/key.test +++ b/mysql-test/t/key.test @@ -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. |