Skip to content

M
mariadb
Commit 2f9bfd7b authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

5.1 merge

parents a1ae8f9b cfc49f2f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/include/wait_for_slave_param.inc
View file @ 2f9bfd7b
...@@ -79,7 +79,7 @@ if (`SELECT '$_slave_check_configured' = 'No such row'`) ...@@ -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)
{ {
......
mysql-test/suite/funcs_1/r/is_tables_mysql.result
View file @ 2f9bfd7b
...@@ -133,7 +133,7 @@ TABLE_NAME help_category ...@@ -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#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7