diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-06-02 17:38:58 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-06-02 17:38:58 +0200 |
| commit | a1975dd2c106180ab16836631e6797cff5b4e396 (patch) | |
| tree | 5a5269aab5e458dac39374cf9d5d827c4715dc5a | |
| parent | 0fbe91b45bd2181e4c39b7550081b468ba179457 (diff) | |
| parent | 2f9bfd7b121093b198fc26a22e16187b417ba206 (diff) | |
| download | mariadb-git-a1975dd2c106180ab16836631e6797cff5b4e396.tar.gz | |
5.2 merge
| -rw-r--r-- | mysql-test/include/wait_for_slave_param.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/r/is_tables_mysql.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/wait_for_slave_param.inc b/mysql-test/include/wait_for_slave_param.inc index c9660b0679d..ea319933168 100644 --- a/mysql-test/include/wait_for_slave_param.inc +++ b/mysql-test/include/wait_for_slave_param.inc @@ -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) { diff --git a/mysql-test/suite/funcs_1/r/is_tables_mysql.result b/mysql-test/suite/funcs_1/r/is_tables_mysql.result index 3d58af72550..97cb0f593d6 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_tables_mysql.result @@ -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# |