diff options
| author | unknown <jimw@mysql.com> | 2005-06-01 16:13:24 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-06-01 16:13:24 -0700 |
| commit | 9025af7226cb5e1a891f85280fd77a40157f001d (patch) | |
| tree | 07b48233d1829d6cc6c83b78c6070346624e4d2f /mysql-test/r/rpl_failed_optimize.result | |
| parent | b8059bb4d386b9ccaeb6be0f8914af7ab5a24a18 (diff) | |
| parent | 362ab06c4f91d896d1768a3956a6d7213206e5e3 (diff) | |
| download | mariadb-git-9025af7226cb5e1a891f85280fd77a40157f001d.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/lowercase_table2.result:
Auto merged
mysql-test/r/rpl_failed_optimize.result:
Auto merged
vio/viossl.c:
Auto merged
mysql-test/t/func_str.test:
Merge from 4.1
sql/item_func.cc:
Merge from 4.1
sql/sql_table.cc:
Merge from 4.1
Diffstat (limited to 'mysql-test/r/rpl_failed_optimize.result')
| -rw-r--r-- | mysql-test/r/rpl_failed_optimize.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_failed_optimize.result b/mysql-test/r/rpl_failed_optimize.result index c7199e56ec8..fd711f89222 100644 --- a/mysql-test/r/rpl_failed_optimize.result +++ b/mysql-test/r/rpl_failed_optimize.result @@ -9,6 +9,7 @@ BEGIN; INSERT INTO t1 VALUES (1); OPTIMIZE TABLE t1; Table Op Msg_type Msg_text +test.t1 optimize error Lock wait timeout exceeded; try restarting transaction test.t1 optimize status Operation failed Warnings: Error 1205 Lock wait timeout exceeded; try restarting transaction |