bzr commit into mysql-next-mr-persistent-stats branch (vasil.dimov:3290)

[vasil.dimov]

#At file:///usr/local/devel/bzrroot/server/mysql-next-mr-persistent-stats/ based on revid:vasil.dimov@stripped

 3290 Vasil Dimov	2010-09-27
      Update .result file with the correct warning message

    modified:
      mysql-test/suite/innodb/r/innodb_stats_drop_locked.result
=== modified file 'mysql-test/suite/innodb/r/innodb_stats_drop_locked.result'
--- a/mysql-test/suite/innodb/r/innodb_stats_drop_locked.result	revid:vasil.dimov@stripped
+++ b/mysql-test/suite/innodb/r/innodb_stats_drop_locked.result	revid:vasil.dimov@stripped
@@ -19,7 +19,7 @@ innodb_stats_drop_locked
 innodb_stats_drop_locked
 ALTER TABLE innodb_stats_drop_locked DROP INDEX c_key;
 Warnings:
-Warning	1205	Unable to instantly delete statistics for index c_key from innodb.index_stats because the rows are locked. They can be deleted later using DELETE FROM innodb.index_stats WHERE database_name = 'test' AND table_name = 'innodb_stats_drop_locked' AND index_name = 'c_key';
+Warning	1205	Unable to delete statistics for index c_key from innodb.index_stats because the rows are locked. They can be deleted later using DELETE FROM innodb.index_stats WHERE database_name = 'test' AND table_name = 'innodb_stats_drop_locked' AND index_name = 'c_key';
 SHOW CREATE TABLE innodb_stats_drop_locked;
 Table	Create Table
 innodb_stats_drop_locked	CREATE TABLE `innodb_stats_drop_locked` (
@@ -27,7 +27,7 @@ innodb_stats_drop_locked	CREATE TABLE `i
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE innodb_stats_drop_locked;
 Warnings:
-Warning	1205	Unable to instantly delete statistics for table test.innodb_stats_drop_locked from innodb.table_stats or innodb.index_stats because the rows are locked. They can be deleted later using DELETE FROM innodb.index_stats WHERE database_name = 'test' AND table_name = 'innodb_stats_drop_locked'; DELETE FROM innodb.table_stats WHERE database_name = 'test' AND table_name = 'innodb_stats_drop_locked';
+Warning	1205	Unable to delete statistics for table test.innodb_stats_drop_locked from innodb.table_stats or innodb.index_stats because the rows are locked. They can be deleted later using DELETE FROM innodb.index_stats WHERE database_name = 'test' AND table_name = 'innodb_stats_drop_locked'; DELETE FROM innodb.table_stats WHERE database_name = 'test' AND table_name = 'innodb_stats_drop_locked';
 SHOW TABLES;
 Tables_in_test
 COMMIT;


Attachment: [text/bzr-bundle] bzr/[e-mail]