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

Auto-merge from mysql-next-mr.

Browse Source
This commit is contained in:
Alexander Nozdrin
2010-02-20 12:40:21 +03:00
parent 5b1700bbfa 7ba0546620
commit 77c6baf612
288 changed files with 305780 additions and 33881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/t/variables.test
View File

@ -829,8 +829,8 @@ set global join_buffer_size =@my_join_buffer_size;
# Bug#28580 Repeatation of status variables
#
--replace_column 2 #
show global variables where Variable_name='table_definition_cache' or
Variable_name='table_lock_wait_timeout';
show global variables where Variable_name='table_definition_cache';
# Note: table_lock_wait_timeout no longer exists. See bug#45225.
###########################################################################