1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

5.2 merge

Browse Source
This commit is contained in:
Sergei Golubchik 2014-06-02 17:38:58 +02:00
commit a1975dd2c1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/wait_for_slave_param.inc
View File

@ -79,7 +79,7 @@ if (`SELECT '$_slave_check_configured' = 'No such row'`)
# mysqltest doesn't provide any better way to multiply by 10 # mysqltest doesn't provide any better way to multiply by 10
--let $_wait_for_slave_param_zero= 0 --let $_wait_for_slave_param_zero= 0
--let $_slave_timeout_counter= $_slave_timeout$zero --let $_slave_timeout_counter= $_slave_timeout$_wait_for_slave_param_zero
--let $_slave_continue= 1 --let $_slave_continue= 1
while ($_slave_continue) while ($_slave_continue)
{ {

2
mysql-test/suite/funcs_1/r/is_tables_mysql.result
View File

@ -133,7 +133,7 @@ TABLE_NAME help_category
TABLE_TYPE BASE TABLE TABLE_TYPE BASE TABLE
ENGINE MYISAM_OR_MARIA ENGINE MYISAM_OR_MARIA
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR# TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#