5.2 merge

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

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
--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
while ($_slave_continue)
{

View File

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