database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

Browse Source 
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
This commit is contained in:
unknown
2005-06-01 16:13:24 -07:00
parent 2b3a1494e2 b4953598aa
commit daf8cc671f
7 changed files with 150 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/rpl_failed_optimize.result
View File

@ -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