diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2007-11-23 12:51:14 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2007-11-23 12:51:14 +0100 |
| commit | 850fed3e2a9af7db411af189b10572b78cf8fbb0 (patch) | |
| tree | 6fe38a0e84fbb2f0b75d6fa4ec95f69bd5607343 /mysql-test/r | |
| parent | 14d5ed306c3b2ed85953d491eb2af0fb49a68f62 (diff) | |
| download | mariadb-git-850fed3e2a9af7db411af189b10572b78cf8fbb0.tar.gz | |
Post-merge fixes.
mysql-test/r/innodb.result:
Result change.
mysql-test/suite/rpl/r/rpl_binlog_grant.result:
Result change.
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
Result change.
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
Result change.
mysql-test/suite/rpl/t/disabled.def:
Enabling some tests.
mysql-test/suite/rpl/t/rpl_binlog_grant.test:
Adding missing master-slave.inc, causing previous tests to pollute
the binary log.
mysql-test/suite/rpl_ndb/t/disabled.def:
Enabling some tests.
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index e144589f80c..4379959b60d 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1730,7 +1730,7 @@ Variable_name Value Innodb_rows_deleted 70 show status like "Innodb_rows_inserted"; Variable_name Value -Innodb_rows_inserted 1084 +Innodb_rows_inserted 1082 show status like "Innodb_rows_updated"; Variable_name Value Innodb_rows_updated 885 |