diff options
| author | unknown <tsmith@maint1.mysql.com> | 2007-06-21 20:09:04 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint1.mysql.com> | 2007-06-21 20:09:04 +0200 |
| commit | fc7f407a11d314273bba5e8de25f88d8b2ec60f8 (patch) | |
| tree | 10e9c09e10a6be73df293fe46f374384a241d9bc /mysql-test/r/innodb.result | |
| parent | 12e1a9df4f20bfac361b1d47003852f45ecfb88d (diff) | |
| parent | 0e99d690cbb29f859458892fc892065cff9293b2 (diff) | |
| download | mariadb-git-fc7f407a11d314273bba5e8de25f88d8b2ec60f8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
mysql-test/t/innodb.test:
Auto merged
mysql-test/r/innodb.result:
Manual merge
Diffstat (limited to 'mysql-test/r/innodb.result')
| -rw-r--r-- | mysql-test/r/innodb.result | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 1288a586aa8..80b46e5098a 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1673,29 +1673,6 @@ t2 CREATE TABLE `t2` ( CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`b`) REFERENCES `t1` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop table t2, t1; -show status like "binlog_cache_use"; -Variable_name Value -Binlog_cache_use 158 -show status like "binlog_cache_disk_use"; -Variable_name Value -Binlog_cache_disk_use 0 -create table t1 (a int) engine=innodb; -show status like "binlog_cache_use"; -Variable_name Value -Binlog_cache_use 159 -show status like "binlog_cache_disk_use"; -Variable_name Value -Binlog_cache_disk_use 1 -begin; -delete from t1; -commit; -show status like "binlog_cache_use"; -Variable_name Value -Binlog_cache_use 160 -show status like "binlog_cache_disk_use"; -Variable_name Value -Binlog_cache_disk_use 1 -drop table t1; create table t1 (c char(10), index (c,c)) engine=innodb; ERROR 42S21: Duplicate column name 'c' create table t1 (c1 char(10), c2 char(10), index (c1,c2,c1)) engine=innodb; @@ -1815,10 +1792,10 @@ Variable_name Value Innodb_page_size 16384 show status like "Innodb_rows_deleted"; Variable_name Value -Innodb_rows_deleted 2072 +Innodb_rows_deleted 72 show status like "Innodb_rows_inserted"; Variable_name Value -Innodb_rows_inserted 31732 +Innodb_rows_inserted 29732 show status like "Innodb_rows_updated"; Variable_name Value Innodb_rows_updated 29532 |