diff options
| author | unknown <ingo@mysql.com> | 2005-08-30 12:35:37 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-08-30 12:35:37 +0200 |
| commit | 68e31099b087819a5667751f017bed7cee166f25 (patch) | |
| tree | 53c1440916313313e88f5095f3618810e0090262 /mysql-test/r/innodb.result | |
| parent | b9f94a911f274ca5a260850554698d78680a7768 (diff) | |
| parent | e795dc207fd421fed02c9e21fa6dfc75932f11c4 (diff) | |
| download | mariadb-git-68e31099b087819a5667751f017bed7cee166f25.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_delete.cc:
After merge fix.
Diffstat (limited to 'mysql-test/r/innodb.result')
| -rw-r--r-- | mysql-test/r/innodb.result | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 9253c635cb0..d7f7536d401 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1703,6 +1703,22 @@ a_id b_list 3 NULL DROP TABLE t2; DROP TABLE t1; +create temporary table t1 (a int) engine=innodb; +insert into t1 values (4711); +truncate t1; +insert into t1 values (42); +select * from t1; +a +42 +drop table t1; +create table t1 (a int) engine=innodb; +insert into t1 values (4711); +truncate t1; +insert into t1 values (42); +select * from t1; +a +42 +drop table t1; create table t1 (x bigint unsigned not null primary key) engine=innodb; insert into t1(x) values (0xfffffffffffffff0),(0xfffffffffffffff1); select * from t1; @@ -1749,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 |