From 943af08c800c326ab1a2a5482b797cfb7821d7d3 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 Dec 2011 18:08:48 +0100 Subject: [PATCH 01/20] Fix valgrind error after 5.5 merge (the 5.3 fix was accidentally lost in the merge). --- sql/sp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sp.cc b/sql/sp.cc index 56827d410b7..31cbe13a96e 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -732,7 +732,7 @@ static sp_head *sp_compile(THD *thd, String *defstr, ulonglong sql_mode, thd->variables.sql_mode= sql_mode; thd->variables.select_limit= HA_POS_ERROR; - if (parser_state.init(thd, defstr->c_ptr(), defstr->length())) + if (parser_state.init(thd, defstr->c_ptr_safe(), defstr->length())) { thd->variables.sql_mode= old_sql_mode; thd->variables.select_limit= old_select_limit; From c753bedcb1975b0875e2e9e3c176db37b6becbff Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 2 Dec 2011 19:49:05 +0100 Subject: [PATCH 02/20] win64 sysvar portability fixes --- include/my_sys.h | 2 +- .../optimizer_unfixed_bugs/r/bug45221.result | 4 +- .../r/deadlock_timeout_long_basic.result | 3 +- .../r/deadlock_timeout_short_basic.result | 3 +- .../r/debug_binlog_fsync_sleep_basic.result | 3 +- .../r/delayed_insert_limit_basic_64.result | 8 +- .../r/delayed_queue_size_basic_64.result | 8 +- .../r/key_cache_age_threshold_basic_64.result | 4 +- .../r/log_slow_rate_limit_basic.result | 3 +- .../sys_vars/r/log_warnings_basic_64.result | 8 +- .../r/max_binlog_cache_size_basic.result | 6 +- .../r/max_binlog_stmt_cache_size_basic.result | 6 +- .../r/max_connect_errors_basic_64.result | 14 ++- .../r/max_seeks_for_key_basic_64.result | 30 +++--- .../sys_vars/r/max_tmp_tables_basic_64.result | 26 ++++-- .../r/max_write_lock_count_basic_64.result | 20 ++-- .../r/min_examined_row_limit_basic_64.result | 18 ++-- .../r/net_retry_count_basic_64.result | 22 +++-- .../r/progress_report_time_basic.result | 3 +- .../r/query_cache_limit_basic_64.result | 20 ++-- .../query_cache_min_res_unit_basic_64.result | 12 ++- .../r/range_alloc_block_size_basic_64.result | 12 ++- .../slave_transaction_retries_basic_64.result | 8 +- ...ansaction_alloc_block_size_basic_64.result | 4 +- mysys/my_init.c | 2 +- sql/mysqld.cc | 16 ++-- sql/mysqld.h | 7 +- sql/sql_class.h | 8 +- sql/sys_vars.cc | 92 +++++++++---------- 29 files changed, 219 insertions(+), 153 deletions(-) diff --git a/include/my_sys.h b/include/my_sys.h index 4330faa2fa9..dbf999edac8 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -211,7 +211,7 @@ extern void (*error_handler_hook)(uint my_err, const char *str,myf MyFlags); extern void (*fatal_error_handler_hook)(uint my_err, const char *str, myf MyFlags); extern uint my_file_limit; -extern ulong my_thread_stack_size; +extern ulonglong my_thread_stack_size; extern const char *(*proc_info_hook)(MYSQL_THD, const char *, const char *, const char *, const unsigned int); diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result index 657f1f57b2d..45e502ca5a4 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result @@ -36,11 +36,11 @@ SELECT `int_key` FROM CC WHERE `date_nokey` < `datetime_nokey` XOR '2009-11-25' ) ; pk -9 2 +4 5 6 -4 +9 Warnings: Warning 1292 Truncated incorrect INTEGER value: '2009-11-25' Warning 1292 Truncated incorrect INTEGER value: '2009-11-25' diff --git a/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result b/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result index 2a8f239dd39..b227b70133f 100644 --- a/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result +++ b/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result @@ -38,7 +38,8 @@ select @@global.deadlock_timeout_long; set session deadlock_timeout_long=cast(-1 as unsigned int); Warnings: Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1292 Truncated incorrect deadlock_timeout_long value: '18446744073709551615' select @@session.deadlock_timeout_long; @@session.deadlock_timeout_long -18446744073709551615 +4294967295 SET @@global.deadlock_timeout_long = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result b/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result index a789594a843..5b8449142f2 100644 --- a/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result +++ b/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result @@ -38,7 +38,8 @@ select @@global.deadlock_timeout_short; set session deadlock_timeout_short=cast(-1 as unsigned int); Warnings: Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1292 Truncated incorrect deadlock_timeout_short value: '18446744073709551615' select @@session.deadlock_timeout_short; @@session.deadlock_timeout_short -18446744073709551615 +4294967295 SET @@global.deadlock_timeout_short = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result b/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result index adf2b4c39b9..25706a1a3f4 100644 --- a/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result +++ b/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result @@ -35,7 +35,8 @@ select @@global.debug_binlog_fsync_sleep; set global debug_binlog_fsync_sleep=cast(-1 as unsigned int); Warnings: Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1292 Truncated incorrect debug_binlog_fsync_sleep value: '18446744073709551615' select @@global.debug_binlog_fsync_sleep; @@global.debug_binlog_fsync_sleep -18446744073709551615 +4294967295 SET @@global.debug_binlog_fsync_sleep = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result index af73196d14f..3da10bc8416 100644 --- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result @@ -40,19 +40,21 @@ SELECT @@global.delayed_insert_limit; @@global.delayed_insert_limit 1 SET @@global.delayed_insert_limit = 42949672950; +Warnings: +Warning 1292 Truncated incorrect delayed_insert_limit value: '42949672950' SELECT @@global.delayed_insert_limit; @@global.delayed_insert_limit -42949672950 +4294967295 SET @@global.delayed_insert_limit = 429496729.5; ERROR 42000: Incorrect argument type to variable 'delayed_insert_limit' SELECT @@global.delayed_insert_limit; @@global.delayed_insert_limit -42949672950 +4294967295 SET @@global.delayed_insert_limit = ON; ERROR 42000: Incorrect argument type to variable 'delayed_insert_limit' SELECT @@global.delayed_insert_limit; @@global.delayed_insert_limit -42949672950 +4294967295 '#-------------------FN_DYNVARS_024_05----------------------------#' SET @@session.delayed_insert_limit = 0; ERROR HY000: Variable 'delayed_insert_limit' is a GLOBAL variable and should be set with SET GLOBAL diff --git a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result index 8b1936e68c5..f4448b08b1f 100644 --- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result @@ -40,19 +40,21 @@ SELECT @@global.delayed_queue_size; @@global.delayed_queue_size 1 SET @@global.delayed_queue_size = 42949672950; +Warnings: +Warning 1292 Truncated incorrect delayed_queue_size value: '42949672950' SELECT @@global.delayed_queue_size; @@global.delayed_queue_size -42949672950 +4294967295 SET @@global.delayed_queue_size = 429496729.5; ERROR 42000: Incorrect argument type to variable 'delayed_queue_size' SELECT @@global.delayed_queue_size; @@global.delayed_queue_size -42949672950 +4294967295 SET @@global.delayed_queue_size = ON; ERROR 42000: Incorrect argument type to variable 'delayed_queue_size' SELECT @@delayed_queue_size; @@delayed_queue_size -42949672950 +4294967295 '#-------------------FN_DYNVARS_026_05----------------------------#' SET @@session.delayed_queue_size = 0; ERROR HY000: Variable 'delayed_queue_size' is a GLOBAL variable and should be set with SET GLOBAL diff --git a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result index 5e0222e8968..9df9f56bd1f 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result +++ b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result @@ -45,12 +45,12 @@ Warnings: Warning 1292 Truncated incorrect key_cache_age_threshold value: '42949672951' SELECT @@global.key_cache_age_threshold; @@global.key_cache_age_threshold -42949672900 +4294967200 SET @@global.key_cache_age_threshold = 10000.01; ERROR 42000: Incorrect argument type to variable 'key_cache_age_threshold' SELECT @@global.key_cache_age_threshold; @@global.key_cache_age_threshold -42949672900 +4294967200 SET @@global.key_cache_age_threshold = -1024; Warnings: Warning 1292 Truncated incorrect key_cache_age_threshold value: '-1024' diff --git a/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result index 8711d914980..30eebdc9f44 100644 --- a/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result @@ -40,7 +40,8 @@ select @@global.log_slow_rate_limit; set session log_slow_rate_limit=cast(-1 as unsigned int); Warnings: Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1292 Truncated incorrect log_slow_rate_limit value: '18446744073709551615' select @@session.log_slow_rate_limit; @@session.log_slow_rate_limit -18446744073709551615 +4294967295 SET @@global.log_slow_rate_limit = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result b/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result index 838fdff269b..fee7f8966ca 100644 --- a/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result +++ b/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result @@ -70,9 +70,11 @@ SELECT @@session.log_warnings; 65550 '#------------------FN_DYNVARS_067_05-----------------------#' SET @@global.log_warnings = 100000000000; +Warnings: +Warning 1292 Truncated incorrect log_warnings value: '100000000000' SELECT @@global.log_warnings; @@global.log_warnings -100000000000 +4294967295 SET @@global.log_warnings = -1024; Warnings: Warning 1292 Truncated incorrect log_warnings value: '-1024' @@ -90,9 +92,11 @@ SELECT @@global.log_warnings; @@global.log_warnings 0 SET @@session.log_warnings = 100000000000; +Warnings: +Warning 1292 Truncated incorrect log_warnings value: '100000000000' SELECT @@session.log_warnings; @@session.log_warnings -100000000000 +4294967295 SET @@session.log_warnings = -2; Warnings: Warning 1292 Truncated incorrect log_warnings value: '-2' diff --git a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result index d760474affd..d3c3cbd7a44 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result @@ -1,7 +1,7 @@ SET @start_value = @@global.max_binlog_cache_size; SELECT @start_value; @start_value -18446744073709547520 +4294963200 '#--------------------FN_DYNVARS_072_01------------------------#' SET @@global.max_binlog_cache_size = 5000; Warnings: @@ -9,7 +9,7 @@ Warning 1292 Truncated incorrect max_binlog_cache_size value: '5000' SET @@global.max_binlog_cache_size = DEFAULT; SELECT @@global.max_binlog_cache_size; @@global.max_binlog_cache_size -18446744073709547520 +4294963200 '#---------------------FN_DYNVARS_072_02-------------------------#' SET @@global.max_binlog_cache_size = @start_value; SELECT @@global.max_binlog_cache_size = 4294967295; @@ -149,4 +149,4 @@ ERROR 42S22: Unknown column 'max_binlog_cache_size' in 'field list' SET @@global.max_binlog_cache_size = @start_value; SELECT @@global.max_binlog_cache_size; @@global.max_binlog_cache_size -18446744073709547520 +4294963200 diff --git a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result index f2229a0090b..12f40ed87b5 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result @@ -1,7 +1,7 @@ SET @start_value = @@global.max_binlog_stmt_cache_size; SELECT @start_value; @start_value -18446744073709547520 +4294963200 '#--------------------FN_DYNVARS_072_01------------------------#' SET @@global.max_binlog_stmt_cache_size = 5000; Warnings: @@ -9,7 +9,7 @@ Warning 1292 Truncated incorrect max_binlog_stmt_cache_size value: '5000' SET @@global.max_binlog_stmt_cache_size = DEFAULT; SELECT @@global.max_binlog_stmt_cache_size; @@global.max_binlog_stmt_cache_size -18446744073709547520 +4294963200 '#---------------------FN_DYNVARS_072_02-------------------------#' SET @@global.max_binlog_stmt_cache_size = @start_value; SELECT @@global.max_binlog_stmt_cache_size = 4294967295; @@ -149,4 +149,4 @@ ERROR 42S22: Unknown column 'max_binlog_stmt_cache_size' in 'field list' SET @@global.max_binlog_stmt_cache_size = @start_value; SELECT @@global.max_binlog_stmt_cache_size; @@global.max_binlog_stmt_cache_size -18446744073709547520 +4294963200 diff --git a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result index bbc117b65b6..19f6f12a50b 100644 --- a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result +++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result @@ -42,14 +42,16 @@ SELECT @@global.max_connect_errors; @@global.max_connect_errors 1 SET @@global.max_connect_errors = 100000000000; +Warnings: +Warning 1292 Truncated incorrect max_connect_errors value: '100000000000' SELECT @@global.max_connect_errors; @@global.max_connect_errors -100000000000 +4294967295 SET @@global.max_connect_errors = 10000.01; ERROR 42000: Incorrect argument type to variable 'max_connect_errors' SELECT @@global.max_connect_errors; @@global.max_connect_errors -100000000000 +4294967295 SET @@global.max_connect_errors = -1024; Warnings: Warning 1292 Truncated incorrect max_connect_errors value: '-1024' @@ -63,19 +65,21 @@ SELECT @@global.max_connect_errors; @@global.max_connect_errors 1 SET @@global.max_connect_errors = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_connect_errors value: '4294967296' SELECT @@global.max_connect_errors; @@global.max_connect_errors -4294967296 +4294967295 SET @@global.max_connect_errors = ON; ERROR 42000: Incorrect argument type to variable 'max_connect_errors' SELECT @@global.max_connect_errors; @@global.max_connect_errors -4294967296 +4294967295 SET @@global.max_connect_errors = 'test'; ERROR 42000: Incorrect argument type to variable 'max_connect_errors' SELECT @@global.max_connect_errors; @@global.max_connect_errors -4294967296 +4294967295 '#-------------------FN_DYNVARS_073_05----------------------------#' SET @@session.max_connect_errors = 4096; ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be set with SET GLOBAL diff --git a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result index ef48f229abc..2973e7e1efd 100644 --- a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result +++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result @@ -1,31 +1,31 @@ SET @start_global_value = @@global.max_seeks_for_key; SELECT @start_global_value; @start_global_value -18446744073709551615 +4294967295 SET @start_session_value = @@session.max_seeks_for_key; SELECT @start_session_value; @start_session_value -18446744073709551615 +4294967295 '#--------------------FN_DYNVARS_083_01-------------------------#' SET @@global.max_seeks_for_key = 100; SET @@global.max_seeks_for_key = DEFAULT; SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key -18446744073709551615 +4294967295 SET @@session.max_seeks_for_key = 200; SET @@session.max_seeks_for_key = DEFAULT; SELECT @@session.max_seeks_for_key; @@session.max_seeks_for_key -18446744073709551615 +4294967295 '#--------------------FN_DYNVARS_083_02-------------------------#' SET @@global.max_seeks_for_key = DEFAULT; SELECT @@global.max_seeks_for_key = 4294967295; @@global.max_seeks_for_key = 4294967295 -0 +1 SET @@session.max_seeks_for_key = DEFAULT; SELECT @@session.max_seeks_for_key = 4294967295; @@session.max_seeks_for_key = 4294967295 -0 +1 '#--------------------FN_DYNVARS_083_03-------------------------#' SET @@global.max_seeks_for_key = 1; SELECT @@global.max_seeks_for_key; @@ -82,19 +82,21 @@ SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key 1 SET @@global.max_seeks_for_key = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_seeks_for_key value: '4294967296' SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key -4294967296 +4294967295 SET @@global.max_seeks_for_key = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key' SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key -4294967296 +4294967295 SET @@global.max_seeks_for_key = test; ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key' SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key -4294967296 +4294967295 SET @@session.max_seeks_for_key = 0; Warnings: Warning 1292 Truncated incorrect max_seeks_for_key value: '0' @@ -110,14 +112,16 @@ SELECT @@session.max_seeks_for_key; SET @@session.max_seeks_for_key = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key' SET @@session.max_seeks_for_key = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_seeks_for_key value: '4294967296' SELECT @@session.max_seeks_for_key; @@session.max_seeks_for_key -4294967296 +4294967295 SET @@session.max_seeks_for_key = test; ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key' SELECT @@session.max_seeks_for_key; @@session.max_seeks_for_key -4294967296 +4294967295 '#------------------FN_DYNVARS_083_06-----------------------#' SELECT @@global.max_seeks_for_key = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -168,8 +172,8 @@ ERROR 42S22: Unknown column 'max_seeks_for_key' in 'field list' SET @@global.max_seeks_for_key = @start_global_value; SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key -18446744073709551615 +4294967295 SET @@session.max_seeks_for_key = @start_session_value; SELECT @@session.max_seeks_for_key; @@session.max_seeks_for_key -18446744073709551615 +4294967295 diff --git a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result index 32953d24b2b..5daf78fcae1 100644 --- a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result +++ b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result @@ -76,9 +76,11 @@ SELECT @@global.max_tmp_tables; @@global.max_tmp_tables 1 SET @@global.max_tmp_tables = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_tmp_tables value: '4294967296' SELECT @@global.max_tmp_tables; @@global.max_tmp_tables -4294967296 +4294967295 SET @@global.max_tmp_tables = -1; Warnings: Warning 1292 Truncated incorrect max_tmp_tables value: '-1' @@ -86,23 +88,27 @@ SELECT @@global.max_tmp_tables; @@global.max_tmp_tables 1 SET @@global.max_tmp_tables = 429496729500; +Warnings: +Warning 1292 Truncated incorrect max_tmp_tables value: '429496729500' SELECT @@global.max_tmp_tables; @@global.max_tmp_tables -429496729500 +4294967295 SET @@global.max_tmp_tables = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' SELECT @@global.max_tmp_tables; @@global.max_tmp_tables -429496729500 +4294967295 SET @@global.max_tmp_tables = test; ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' SELECT @@global.max_tmp_tables; @@global.max_tmp_tables -429496729500 +4294967295 SET @@session.max_tmp_tables = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_tmp_tables value: '4294967296' SELECT @@session.max_tmp_tables; @@session.max_tmp_tables -4294967296 +4294967295 SET @@session.max_tmp_tables = -1; Warnings: Warning 1292 Truncated incorrect max_tmp_tables value: '-1' @@ -110,9 +116,11 @@ SELECT @@session.max_tmp_tables; @@session.max_tmp_tables 1 SET @@session.max_tmp_tables = 429496729500; +Warnings: +Warning 1292 Truncated incorrect max_tmp_tables value: '429496729500' SELECT @@session.max_tmp_tables; @@session.max_tmp_tables -429496729500 +4294967295 SET @@session.max_tmp_tables = -001; Warnings: Warning 1292 Truncated incorrect max_tmp_tables value: '-1' @@ -122,14 +130,16 @@ SELECT @@session.max_tmp_tables; SET @@session.max_tmp_tables = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' SET @@session.max_tmp_tables = 10737418241; +Warnings: +Warning 1292 Truncated incorrect max_tmp_tables value: '10737418241' SELECT @@session.max_tmp_tables; @@session.max_tmp_tables -10737418241 +4294967295 SET @@session.max_tmp_tables = test; ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' SELECT @@session.max_tmp_tables; @@session.max_tmp_tables -10737418241 +4294967295 '#------------------FN_DYNVARS_086_06-----------------------#' SELECT @@global.max_tmp_tables = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result index af675e40e19..59d92d5cfe8 100644 --- a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result +++ b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result @@ -1,18 +1,18 @@ SET @start_global_value = @@global.max_write_lock_count; SELECT @start_global_value; @start_global_value -18446744073709551615 +4294967295 '#--------------------FN_DYNVARS_088_01-------------------------#' SET @@global.max_write_lock_count = 1000; SET @@global.max_write_lock_count = DEFAULT; SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -18446744073709551615 +4294967295 '#--------------------FN_DYNVARS_088_02-------------------------#' SET @@global.max_write_lock_count = DEFAULT; SELECT @@global.max_write_lock_count = 4294967295; @@global.max_write_lock_count = 4294967295 -0 +1 '#--------------------FN_DYNVARS_088_03-------------------------#' SET @@global.max_write_lock_count = 1; SELECT @@global.max_write_lock_count; @@ -42,9 +42,11 @@ SELECT @@global.max_write_lock_count; @@global.max_write_lock_count 1 SET @@global.max_write_lock_count = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_write_lock_count value: '4294967296' SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -4294967296 +4294967295 SET @@global.max_write_lock_count = -1; Warnings: Warning 1292 Truncated incorrect max_write_lock_count value: '-1' @@ -52,19 +54,21 @@ SELECT @@global.max_write_lock_count; @@global.max_write_lock_count 1 SET @@global.max_write_lock_count = 429496729500; +Warnings: +Warning 1292 Truncated incorrect max_write_lock_count value: '429496729500' SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -429496729500 +4294967295 SET @@global.max_write_lock_count = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_write_lock_count' SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -429496729500 +4294967295 SET @@global.max_write_lock_count = test; ERROR 42000: Incorrect argument type to variable 'max_write_lock_count' SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -429496729500 +4294967295 '#------------------FN_DYNVARS_088_05-----------------------#' SELECT @@global.max_write_lock_count = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -101,4 +105,4 @@ ERROR 42S22: Unknown column 'max_write_lock_count' in 'field list' SET @@global.max_write_lock_count = @start_global_value; SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -18446744073709551615 +4294967295 diff --git a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result index 30ccfce0175..b4b1b9ae402 100644 --- a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result @@ -88,23 +88,27 @@ SELECT @@global.min_examined_row_limit; @@global.min_examined_row_limit 0 SET @@global.min_examined_row_limit = 429496729500; +Warnings: +Warning 1292 Truncated incorrect min_examined_row_limit value: '429496729500' SELECT @@global.min_examined_row_limit; @@global.min_examined_row_limit -429496729500 +4294967295 SET @@global.min_examined_row_limit = 65530.34; ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit' SELECT @@global.min_examined_row_limit; @@global.min_examined_row_limit -429496729500 +4294967295 SET @@global.min_examined_row_limit = test; ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit' SELECT @@global.min_examined_row_limit; @@global.min_examined_row_limit -429496729500 +4294967295 SET @@session.min_examined_row_limit = 4294967296; +Warnings: +Warning 1292 Truncated incorrect min_examined_row_limit value: '4294967296' SELECT @@session.min_examined_row_limit; @@session.min_examined_row_limit -4294967296 +4294967295 SET @@session.min_examined_row_limit = -1; Warnings: Warning 1292 Truncated incorrect min_examined_row_limit value: '-1' @@ -114,14 +118,16 @@ SELECT @@session.min_examined_row_limit; SET @@session.min_examined_row_limit = 65530.34; ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit' SET @@session.min_examined_row_limit = 4294967295021; +Warnings: +Warning 1292 Truncated incorrect min_examined_row_limit value: '4294967295021' SELECT @@session.min_examined_row_limit; @@session.min_examined_row_limit -4294967295021 +4294967295 SET @@session.min_examined_row_limit = test; ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit' SELECT @@session.min_examined_row_limit; @@session.min_examined_row_limit -4294967295021 +4294967295 '#------------------FN_DYNVARS_089_06-----------------------#' SELECT @@global.min_examined_row_limit = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result b/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result index 28f0ca5be0f..46eb9d5e1c0 100644 --- a/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result +++ b/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result @@ -82,23 +82,27 @@ SELECT @@global.net_retry_count; @@global.net_retry_count 1 SET @@global.net_retry_count = 4294967296; +Warnings: +Warning 1292 Truncated incorrect net_retry_count value: '4294967296' SELECT @@global.net_retry_count; @@global.net_retry_count -4294967296 +4294967295 SET @@global.net_retry_count = 429496729500; +Warnings: +Warning 1292 Truncated incorrect net_retry_count value: '429496729500' SELECT @@global.net_retry_count; @@global.net_retry_count -429496729500 +4294967295 SET @@global.net_retry_count = 65530.34; ERROR 42000: Incorrect argument type to variable 'net_retry_count' SELECT @@global.net_retry_count; @@global.net_retry_count -429496729500 +4294967295 SET @@global.net_retry_count = test; ERROR 42000: Incorrect argument type to variable 'net_retry_count' SELECT @@global.net_retry_count; @@global.net_retry_count -429496729500 +4294967295 SET @@session.net_retry_count = 0; Warnings: Warning 1292 Truncated incorrect net_retry_count value: '0' @@ -114,18 +118,22 @@ SELECT @@session.net_retry_count; SET @@session.net_retry_count = 65530.34; ERROR 42000: Incorrect argument type to variable 'net_retry_count' SET @@session.net_retry_count = 6555015425; +Warnings: +Warning 1292 Truncated incorrect net_retry_count value: '6555015425' SELECT @@session.net_retry_count; @@session.net_retry_count -6555015425 +4294967295 SET @@session.net_retry_count = 4294967296; +Warnings: +Warning 1292 Truncated incorrect net_retry_count value: '4294967296' SELECT @@session.net_retry_count; @@session.net_retry_count -4294967296 +4294967295 SET @@session.net_retry_count = test; ERROR 42000: Incorrect argument type to variable 'net_retry_count' SELECT @@session.net_retry_count; @@session.net_retry_count -4294967296 +4294967295 '#------------------FN_DYNVARS_111_06-----------------------#' SELECT @@global.net_retry_count = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/progress_report_time_basic.result b/mysql-test/suite/sys_vars/r/progress_report_time_basic.result index 8436ee699e2..a50dbca2062 100644 --- a/mysql-test/suite/sys_vars/r/progress_report_time_basic.result +++ b/mysql-test/suite/sys_vars/r/progress_report_time_basic.result @@ -38,7 +38,8 @@ select @@global.progress_report_time; set session progress_report_time=cast(-1 as unsigned int); Warnings: Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1292 Truncated incorrect progress_report_time value: '18446744073709551615' select @@session.progress_report_time; @@session.progress_report_time -18446744073709551615 +4294967295 SET @@global.progress_report_time = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result index 3125ee4a415..074075dd2f7 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result @@ -38,18 +38,22 @@ SELECT @@global.query_cache_limit; @@global.query_cache_limit 0 SET @@global.query_cache_limit = 4294967296; +Warnings: +Warning 1292 Truncated incorrect query_cache_limit value: '4294967296' SELECT @@global.query_cache_limit; @@global.query_cache_limit -4294967296 +4294967295 SET @@global.query_cache_limit = 10240022115; +Warnings: +Warning 1292 Truncated incorrect query_cache_limit value: '10240022115' SELECT @@global.query_cache_limit; @@global.query_cache_limit -10240022115 +4294967295 SET @@global.query_cache_limit = 10000.01; ERROR 42000: Incorrect argument type to variable 'query_cache_limit' SELECT @@global.query_cache_limit; @@global.query_cache_limit -10240022115 +4294967295 SET @@global.query_cache_limit = -1024; Warnings: Warning 1292 Truncated incorrect query_cache_limit value: '-1024' @@ -57,25 +61,27 @@ SELECT @@global.query_cache_limit; @@global.query_cache_limit 0 SET @@global.query_cache_limit = 42949672950; +Warnings: +Warning 1292 Truncated incorrect query_cache_limit value: '42949672950' SELECT @@global.query_cache_limit; @@global.query_cache_limit -42949672950 +4294967295 SET @@global.query_cache_limit = ON; ERROR 42000: Incorrect argument type to variable 'query_cache_limit' SELECT @@global.query_cache_limit; @@global.query_cache_limit -42949672950 +4294967295 SET @@global.query_cache_limit = 'test'; ERROR 42000: Incorrect argument type to variable 'query_cache_limit' SELECT @@global.query_cache_limit; @@global.query_cache_limit -42949672950 +4294967295 '#-------------------FN_DYNVARS_131_05----------------------------#' SET @@session.query_cache_limit = 0; ERROR HY000: Variable 'query_cache_limit' is a GLOBAL variable and should be set with SET GLOBAL SELECT @@query_cache_limit; @@query_cache_limit -42949672950 +4294967295 '#----------------------FN_DYNVARS_131_06------------------------#' SELECT @@global.query_cache_limit = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result index 8028098c3c5..91166b676d9 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result @@ -46,6 +46,8 @@ SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit 512 SET @@global.query_cache_min_res_unit = 4294967296; +Warnings: +Warning 1292 Truncated incorrect query_cache_min_res_unit value: '4294967296' SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit 4294967296 @@ -65,25 +67,27 @@ SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit 512 SET @@global.query_cache_min_res_unit = 42949672950; +Warnings: +Warning 1292 Truncated incorrect query_cache_min_res_unit value: '42949672950' SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit -42949672952 +4294967296 SET @@global.query_cache_min_res_unit = ON; ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit' SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit -42949672952 +4294967296 SET @@global.query_cache_min_res_unit = 'test'; ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit' SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit -42949672952 +4294967296 '#-------------------FN_DYNVARS_132_05----------------------------#' SET @@session.query_cache_min_res_unit = 0; ERROR HY000: Variable 'query_cache_min_res_unit' is a GLOBAL variable and should be set with SET GLOBAL SELECT @@query_cache_min_res_unit; @@query_cache_min_res_unit -42949672952 +4294967296 '#----------------------FN_DYNVARS_132_06------------------------#' SELECT @@global.query_cache_min_res_unit = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result index ef91e91ca86..26b32b56e57 100644 --- a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result @@ -86,17 +86,17 @@ Warnings: Warning 1292 Truncated incorrect range_alloc_block_size value: '42949672951' SELECT @@global.range_alloc_block_size; @@global.range_alloc_block_size -42949671936 +4294966272 SET @@global.range_alloc_block_size = 65530.34; ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size' SELECT @@global.range_alloc_block_size; @@global.range_alloc_block_size -42949671936 +4294966272 SET @@global.range_alloc_block_size = test; ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size' SELECT @@global.range_alloc_block_size; @@global.range_alloc_block_size -42949671936 +4294966272 SET @@session.range_alloc_block_size = 0; Warnings: Warning 1292 Truncated incorrect range_alloc_block_size value: '0' @@ -112,14 +112,16 @@ SELECT @@session.range_alloc_block_size; SET @@session.range_alloc_block_size = 65530.34; ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size' SET @@session.range_alloc_block_size = 4294967296; +Warnings: +Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967296' SELECT @@session.range_alloc_block_size; @@session.range_alloc_block_size -4294967296 +4294966272 SET @@session.range_alloc_block_size = test; ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size' SELECT @@session.range_alloc_block_size; @@session.range_alloc_block_size -4294967296 +4294966272 '#------------------FN_DYNVARS_137_06-----------------------#' SELECT @@global.range_alloc_block_size = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result index 9bb422905b4..86a760a5386 100644 --- a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result +++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result @@ -39,9 +39,11 @@ SELECT @@global.slave_transaction_retries; @@global.slave_transaction_retries 4294967295 SET @@global.slave_transaction_retries = 2147483649*2; +Warnings: +Warning 1292 Truncated incorrect slave_transaction_retries value: '4294967298' SELECT @@global.slave_transaction_retries; @@global.slave_transaction_retries -4294967298 +4294967295 SET @@global.slave_transaction_retries = 4294967295; SELECT @@global.slave_transaction_retries; @@global.slave_transaction_retries @@ -61,9 +63,11 @@ SELECT @@global.slave_transaction_retries; @@global.slave_transaction_retries 0 SET @@global.slave_transaction_retries = 2147483649*2147483649; +Warnings: +Warning 1292 Truncated incorrect slave_transaction_retries value: '4611686022722355201' SELECT @@global.slave_transaction_retries; @@global.slave_transaction_retries -4611686022722355201 +4294967295 SET @@global.slave_transaction_retries = 65530.34; ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries' SET @@global.slave_transaction_retries = '100'; diff --git a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result index 3c958439231..a7afc334ba1 100644 --- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result @@ -82,7 +82,7 @@ Warnings: Warning 1292 Truncated incorrect transaction_alloc_block_size value: '123456789201' SELECT @@global.transaction_alloc_block_size; @@global.transaction_alloc_block_size -123456788480 +4294966272 SET @@global.transaction_alloc_block_size = ON; ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size' SET @@global.transaction_alloc_block_size = OFF; @@ -114,7 +114,7 @@ Warnings: Warning 1292 Truncated incorrect transaction_alloc_block_size value: '12345678901' SELECT @@session.transaction_alloc_block_size; @@session.transaction_alloc_block_size -12345678848 +4294966272 SET @@session.transaction_alloc_block_size = ON; ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size' SET @@session.transaction_alloc_block_size = OFF; diff --git a/mysys/my_init.c b/mysys/my_init.c index e366268936b..9e437162633 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -39,7 +39,7 @@ static my_bool win32_init_tcp_ip(); my_bool my_init_done= 0; uint mysys_usage_id= 0; /* Incremented for each my_init() */ -ulong my_thread_stack_size= (sizeof(void*) <= 4)? 65536: ((256-16)*1024); +ulonglong my_thread_stack_size= (sizeof(void*) <= 4)? 65536: ((256-16)*1024); static ulong atoi_octal(const char *str) { diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c43f516fc2e..baba6d45acf 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -473,11 +473,11 @@ uint slave_net_timeout; ulong slave_exec_mode_options; ulonglong slave_type_conversions_options; ulong thread_cache_size=0; -ulong binlog_cache_size=0; -ulong max_binlog_cache_size=0; -ulong binlog_stmt_cache_size=0; -ulong max_binlog_stmt_cache_size=0; -ulong query_cache_size=0; +ulonglong binlog_cache_size=0; +ulonglong max_binlog_cache_size=0; +ulonglong binlog_stmt_cache_size=0; +ulonglong max_binlog_stmt_cache_size=0; +ulonglong query_cache_size=0; ulong refresh_version; /* Increments on each reload */ query_id_t global_query_id; my_atomic_rwlock_t global_query_id_lock; @@ -2800,7 +2800,7 @@ and this may fail.\n\n"); fprintf(stderr, "thread_count=%u\n", thread_count); fprintf(stderr, "It is possible that mysqld could use up to \n\ key_buffer_size + (read_buffer_size + sort_buffer_size)*max_threads = %lu K\n\ -bytes of memory\n", ((ulong) dflt_key_cache->key_cache_mem_size + +bytes of memory\n", (ulong) (dflt_key_cache->key_cache_mem_size + (global_system_variables.read_buff_size + global_system_variables.sortbuff_size) * (thread_scheduler->max_threads + extra_max_connections) + @@ -4885,8 +4885,8 @@ int mysqld_main(int argc, char **argv) if (stack_size && stack_size < my_thread_stack_size) { if (global_system_variables.log_warnings) - sql_print_warning("Asked for %lu thread stack, but got %ld", - my_thread_stack_size, (long) stack_size); + sql_print_warning("Asked for %llu thread stack, but got %zu", + my_thread_stack_size, stack_size); #if defined(__ia64__) || defined(__ia64) my_thread_stack_size= stack_size*2; #else diff --git a/sql/mysqld.h b/sql/mysqld.h index 658d578a995..81e91aef832 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -151,7 +151,8 @@ extern ulong delayed_insert_limit, delayed_queue_size; extern ulong delayed_insert_threads, delayed_insert_writes; extern ulong delayed_rows_in_use,delayed_insert_errors; extern ulong slave_open_temp_tables; -extern ulong query_cache_size, query_cache_min_res_unit; +extern ulonglong query_cache_size; +extern ulong query_cache_min_res_unit; extern ulong slow_launch_threads, slow_launch_time; extern ulong table_cache_size, table_def_size; extern MYSQL_PLUGIN_IMPORT ulong max_connections; @@ -165,8 +166,8 @@ extern int max_user_connections; extern ulong what_to_log,flush_time; extern ulong max_prepared_stmt_count, prepared_stmt_count; extern ulong open_files_limit; -extern ulong binlog_cache_size, binlog_stmt_cache_size; -extern ulong max_binlog_cache_size, max_binlog_stmt_cache_size; +extern ulonglong binlog_cache_size, binlog_stmt_cache_size; +extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size; extern ulong max_binlog_size, max_relay_log_size; extern ulong opt_binlog_rows_event_max_size; extern ulong rpl_recovery_rank, thread_cache_size; diff --git a/sql/sql_class.h b/sql/sql_class.h index f271a6d5cd9..6f49f52331d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -467,11 +467,13 @@ typedef struct system_variables ulonglong join_buff_space_limit; ulonglong log_slow_filter; ulonglong log_slow_verbosity; + ulonglong bulk_insert_buff_size; + ulonglong join_buff_size; + ulonglong sortbuff_size; + ulonglong group_concat_max_len; ha_rows select_limit; ha_rows max_join_size; ulong auto_increment_increment, auto_increment_offset; - ulong bulk_insert_buff_size; - ulong join_buff_size; ulong lock_wait_timeout; ulong join_cache_level; ulong max_allowed_packet; @@ -496,7 +498,6 @@ typedef struct system_variables ulong read_rnd_buff_size; ulong mrr_buff_size; ulong div_precincrement; - ulong sortbuff_size; /* Total size of all buffers used by the subselect_rowid_merge_engine. */ ulong rowid_merge_buff_size; ulong max_sp_recursion_depth; @@ -508,7 +509,6 @@ typedef struct system_variables ulong trans_alloc_block_size; ulong trans_prealloc_size; ulong log_warnings; - ulong group_concat_max_len; /* Flags for slow log filtering */ ulong log_slow_rate_limit; ulong binlog_format; ///< binlog format for this thd (see enum_binlog_format) diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index d01f1892d58..f9516b5f6aa 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -211,23 +211,23 @@ static Sys_var_charptr Sys_basedir( READ_ONLY GLOBAL_VAR(mysql_home_ptr), CMD_LINE(REQUIRED_ARG, 'b'), IN_FS_CHARSET, DEFAULT(0)); -static Sys_var_ulong Sys_binlog_cache_size( +static Sys_var_ulonglong Sys_binlog_cache_size( "binlog_cache_size", "The size of the transactional cache for " "updates to transactional engines for the binary log. " "If you often use transactions containing many statements, " "you can increase this to get more performance", GLOBAL_VAR(binlog_cache_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(IO_SIZE, ULONG_MAX), DEFAULT(32768), BLOCK_SIZE(IO_SIZE)); + VALID_RANGE(IO_SIZE, ULONGLONG_MAX), DEFAULT(32768), BLOCK_SIZE(IO_SIZE)); -static Sys_var_ulong Sys_binlog_stmt_cache_size( +static Sys_var_ulonglong Sys_binlog_stmt_cache_size( "binlog_stmt_cache_size", "The size of the statement cache for " "updates to non-transactional engines for the binary log. " "If you often use statements updating a great number of rows, " "you can increase this to get more performance", GLOBAL_VAR(binlog_stmt_cache_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(IO_SIZE, ULONG_MAX), DEFAULT(32768), BLOCK_SIZE(IO_SIZE)); + VALID_RANGE(IO_SIZE, ULONGLONG_MAX), DEFAULT(32768), BLOCK_SIZE(IO_SIZE)); static bool check_has_super(sys_var *self, THD *thd, set_var *var) { @@ -353,11 +353,11 @@ static Sys_var_mybool Sys_binlog_direct( CMD_LINE(OPT_ARG), DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(binlog_direct_check)); -static Sys_var_ulong Sys_bulk_insert_buff_size( +static Sys_var_ulonglong Sys_bulk_insert_buff_size( "bulk_insert_buffer_size", "Size of tree cache used in bulk " "insert optimisation. Note that this is a limit per thread!", SESSION_VAR(bulk_insert_buff_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(8192*1024), BLOCK_SIZE(1)); + VALID_RANGE(0, ULONGLONG_MAX), DEFAULT(8192*1024), BLOCK_SIZE(1)); static Sys_var_charptr Sys_character_sets_dir( "character_sets_dir", "Directory where character sets are", @@ -611,7 +611,7 @@ static Sys_var_ulong Sys_delayed_insert_limit( "handler will check if there are any SELECT statements pending. " "If so, it allows these to execute before continuing", GLOBAL_VAR(delayed_insert_limit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_LIMIT), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(DELAYED_LIMIT), BLOCK_SIZE(1)); static Sys_var_ulong Sys_delayed_insert_timeout( "delayed_insert_timeout", @@ -627,7 +627,7 @@ static Sys_var_ulong Sys_delayed_queue_size( "DELAYED. If the queue becomes full, any client that does INSERT " "DELAYED will wait until there is room in the queue again", GLOBAL_VAR(delayed_queue_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_QUEUE_SIZE), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(DELAYED_QUEUE_SIZE), BLOCK_SIZE(1)); #ifdef HAVE_EVENT_SCHEDULER static const char *event_scheduler_names[]= { "OFF", "ON", "DISABLED", NullS }; @@ -809,11 +809,11 @@ static Sys_var_ulong Sys_interactive_timeout( CMD_LINE(REQUIRED_ARG), VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -static Sys_var_ulong Sys_join_buffer_size( +static Sys_var_ulonglong Sys_join_buffer_size( "join_buffer_size", "The size of the buffer that is used for joins", SESSION_VAR(join_buff_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(128, ULONG_MAX), DEFAULT(128*1024), BLOCK_SIZE(128)); + VALID_RANGE(128, ULONGLONG_MAX), DEFAULT(128*1024), BLOCK_SIZE(128)); static Sys_var_keycache Sys_key_buffer_size( "key_buffer_size", "The size of the buffer used for " @@ -851,7 +851,7 @@ static Sys_var_keycache Sys_key_cache_age_threshold( "blocks in key cache", KEYCACHE_VAR(param_age_threshold), CMD_LINE(REQUIRED_ARG, OPT_KEY_CACHE_AGE_THRESHOLD), - VALID_RANGE(100, ULONG_MAX), DEFAULT(300), + VALID_RANGE(100, UINT_MAX), DEFAULT(300), BLOCK_SIZE(100), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(change_keycache_param)); @@ -933,7 +933,7 @@ static Sys_var_ulong Sys_log_warnings( "Value can be between 0 and 11. Higher values mean more verbosity", SESSION_VAR(log_warnings), CMD_LINE(OPT_ARG, 'W'), - VALID_RANGE(0, ULONG_MAX), DEFAULT(1), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(1), BLOCK_SIZE(1)); static bool update_cached_long_query_time(sys_var *self, THD *thd, enum_var_type type) @@ -1041,20 +1041,20 @@ static Sys_var_ulong Sys_max_allowed_packet( BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_max_allowed_packet)); -static Sys_var_ulong Sys_max_binlog_cache_size( +static Sys_var_ulonglong Sys_max_binlog_cache_size( "max_binlog_cache_size", "Sets the total size of the transactional cache", GLOBAL_VAR(max_binlog_cache_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(IO_SIZE, ULONG_MAX), - DEFAULT((ULONG_MAX/IO_SIZE)*IO_SIZE), + VALID_RANGE(IO_SIZE, ULONGLONG_MAX), + DEFAULT((UINT_MAX/IO_SIZE)*IO_SIZE), BLOCK_SIZE(IO_SIZE)); -static Sys_var_ulong Sys_max_binlog_stmt_cache_size( +static Sys_var_ulonglong Sys_max_binlog_stmt_cache_size( "max_binlog_stmt_cache_size", "Sets the total size of the statement cache", GLOBAL_VAR(max_binlog_stmt_cache_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(IO_SIZE, ULONG_MAX), - DEFAULT((ULONG_MAX/IO_SIZE)*IO_SIZE), + VALID_RANGE(IO_SIZE, ULONGLONG_MAX), + DEFAULT((UINT_MAX/IO_SIZE)*IO_SIZE), BLOCK_SIZE(IO_SIZE)); static bool fix_max_binlog_size(sys_var *self, THD *thd, enum_var_type type) @@ -1097,7 +1097,7 @@ static Sys_var_ulong Sys_max_connect_errors( "If there is more than this number of interrupted connections from " "a host this host will be blocked from further connections", GLOBAL_VAR(max_connect_errors), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(MAX_CONNECT_ERRORS), + VALID_RANGE(1, UINT_MAX), DEFAULT(MAX_CONNECT_ERRORS), BLOCK_SIZE(1)); static bool check_max_delayed_threads(sys_var *self, THD *thd, set_var *var) @@ -1170,7 +1170,7 @@ static Sys_var_ulong Sys_max_seeks_for_key( "max_seeks_for_key", "Limit assumed max number of seeks when looking up rows based on a key", SESSION_VAR(max_seeks_for_key), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(ULONG_MAX), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(UINT_MAX), BLOCK_SIZE(1)); static Sys_var_ulong Sys_max_length_for_sort_data( "max_length_for_sort_data", @@ -1262,20 +1262,20 @@ static Sys_var_ulong Sys_max_tmp_tables( "max_tmp_tables", "Maximum number of temporary tables a client can keep open at a time", SESSION_VAR(max_tmp_tables), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(32), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(32), BLOCK_SIZE(1)); static Sys_var_ulong Sys_max_write_lock_count( "max_write_lock_count", "After this many write locks, allow some read locks to run in between", GLOBAL_VAR(max_write_lock_count), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(ULONG_MAX), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(UINT_MAX), BLOCK_SIZE(1)); static Sys_var_ulong Sys_min_examined_row_limit( "min_examined_row_limit", "Don't write queries to slow log that examine fewer rows " "than that", SESSION_VAR(min_examined_row_limit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1)); #ifdef _WIN32 static Sys_var_mybool Sys_named_pipe( @@ -1348,7 +1348,7 @@ static Sys_var_ulong Sys_net_retry_count( "If a read on a communication port is interrupted, retry this " "many times before giving up", SESSION_VAR(net_retry_count), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(MYSQLD_NET_RETRY_COUNT), + VALID_RANGE(1, UINT_MAX), DEFAULT(MYSQLD_NET_RETRY_COUNT), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_retry_count)); @@ -1660,7 +1660,7 @@ static Sys_var_ulong Sys_range_alloc_block_size( "range_alloc_block_size", "Allocation block size for storing ranges during optimization", SESSION_VAR(range_alloc_block_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(RANGE_ALLOC_BLOCK_SIZE, ULONG_MAX), + VALID_RANGE(RANGE_ALLOC_BLOCK_SIZE, UINT_MAX), DEFAULT(RANGE_ALLOC_BLOCK_SIZE), BLOCK_SIZE(1024)); static Sys_var_ulong Sys_multi_range_count( @@ -1682,7 +1682,7 @@ static Sys_var_ulong Sys_query_alloc_block_size( "query_alloc_block_size", "Allocation block size for query parsing and execution", SESSION_VAR(query_alloc_block_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1024, ULONG_MAX), DEFAULT(QUERY_ALLOC_BLOCK_SIZE), + VALID_RANGE(1024, UINT_MAX), DEFAULT(QUERY_ALLOC_BLOCK_SIZE), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_thd_mem_root)); @@ -1690,7 +1690,7 @@ static Sys_var_ulong Sys_query_prealloc_size( "query_prealloc_size", "Persistent buffer for query parsing and execution", SESSION_VAR(query_prealloc_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(QUERY_ALLOC_PREALLOC_SIZE, ULONG_MAX), + VALID_RANGE(QUERY_ALLOC_PREALLOC_SIZE, UINT_MAX), DEFAULT(QUERY_ALLOC_PREALLOC_SIZE), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_thd_mem_root)); @@ -1746,10 +1746,10 @@ static Sys_var_ulong Sys_thread_concurrency( READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG), VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1)); -static Sys_var_ulong Sys_thread_stack( +static Sys_var_ulonglong Sys_thread_stack( "thread_stack", "The stack size for each thread", READ_ONLY GLOBAL_VAR(my_thread_stack_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(128*1024, ULONG_MAX), DEFAULT(DEFAULT_THREAD_STACK), + VALID_RANGE(128*1024, ULONGLONG_MAX), DEFAULT(DEFAULT_THREAD_STACK), BLOCK_SIZE(1024)); static Sys_var_charptr Sys_tmpdir( @@ -1776,7 +1776,7 @@ static Sys_var_ulong Sys_trans_alloc_block_size( "transaction_alloc_block_size", "Allocation block size for transactions to be stored in binary log", SESSION_VAR(trans_alloc_block_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1024, ULONG_MAX), DEFAULT(QUERY_ALLOC_BLOCK_SIZE), + VALID_RANGE(1024, UINT_MAX), DEFAULT(QUERY_ALLOC_BLOCK_SIZE), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_trans_mem_root)); @@ -1784,7 +1784,7 @@ static Sys_var_ulong Sys_trans_prealloc_size( "transaction_prealloc_size", "Persistent buffer for transactions to be stored in binary log", SESSION_VAR(trans_prealloc_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1024, ULONG_MAX), DEFAULT(TRANS_ALLOC_PREALLOC_SIZE), + VALID_RANGE(1024, UINT_MAX), DEFAULT(TRANS_ALLOC_PREALLOC_SIZE), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_trans_mem_root)); @@ -1822,11 +1822,11 @@ static bool fix_query_cache_size(sys_var *self, THD *thd, enum_var_type type) query_cache_size= new_cache_size; return false; } -static Sys_var_ulong Sys_query_cache_size( +static Sys_var_ulonglong Sys_query_cache_size( "query_cache_size", "The memory allocated to store results from old queries", GLOBAL_VAR(query_cache_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1024), + VALID_RANGE(0, ULONGLONG_MAX), DEFAULT(0), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_query_cache_size)); @@ -1834,7 +1834,7 @@ static Sys_var_ulong Sys_query_cache_limit( "query_cache_limit", "Don't cache results that are bigger than this", GLOBAL_VAR(query_cache.query_cache_limit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(1024*1024), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(1024*1024), BLOCK_SIZE(1)); static bool fix_qcache_min_res_unit(sys_var *self, THD *thd, enum_var_type type) { @@ -1846,7 +1846,7 @@ static Sys_var_ulong Sys_query_cache_min_res_unit( "query_cache_min_res_unit", "The minimum size for blocks allocated by the query cache", GLOBAL_VAR(query_cache_min_res_unit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(QUERY_CACHE_MIN_RESULT_DATA_SIZE), + VALID_RANGE(0, UINT_MAX), DEFAULT(QUERY_CACHE_MIN_RESULT_DATA_SIZE), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_qcache_min_res_unit)); @@ -1985,11 +1985,11 @@ static Sys_var_ulong Sys_slow_launch_time( GLOBAL_VAR(slow_launch_time), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, LONG_TIMEOUT), DEFAULT(2), BLOCK_SIZE(1)); -static Sys_var_ulong Sys_sort_buffer( +static Sys_var_ulonglong Sys_sort_buffer( "sort_buffer_size", "Each thread that needs to do a sort allocates a buffer of this size", SESSION_VAR(sortbuff_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(MIN_SORT_MEMORY, ULONG_MAX), DEFAULT(MAX_SORT_MEMORY), + VALID_RANGE(MIN_SORT_MEMORY, ULONGLONG_MAX), DEFAULT(MAX_SORT_MEMORY), BLOCK_SIZE(1)); export ulonglong expand_sql_mode(ulonglong sql_mode) @@ -2696,11 +2696,11 @@ static Sys_var_ulong Sys_default_week_format( SESSION_VAR(default_week_format), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 7), DEFAULT(0), BLOCK_SIZE(1)); -static Sys_var_ulong Sys_group_concat_max_len( +static Sys_var_ulonglong Sys_group_concat_max_len( "group_concat_max_len", "The maximum length of the result of function GROUP_CONCAT()", SESSION_VAR(group_concat_max_len), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(4, ULONG_MAX), DEFAULT(1024), BLOCK_SIZE(1)); + VALID_RANGE(4, ULONGLONG_MAX), DEFAULT(1024), BLOCK_SIZE(1)); static char *glob_hostname_ptr; static Sys_var_charptr Sys_hostname( @@ -3120,7 +3120,7 @@ static Sys_var_charptr Sys_slave_skip_errors( static Sys_var_ulonglong Sys_relay_log_space_limit( "relay_log_space_limit", "Maximum space to use for all relay logs", READ_ONLY GLOBAL_VAR(relay_log_space_limit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); + VALID_RANGE(0, ULONGLONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); static Sys_var_uint Sys_sync_relaylog_period( "sync_relay_log", "Synchronously flush relay log to disk after " @@ -3154,7 +3154,7 @@ static Sys_var_ulong Sys_slave_trans_retries( "thread will retry a transaction in case it failed with a deadlock " "or elapsed lock wait timeout, before giving up and stopping", GLOBAL_VAR(slave_trans_retries), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(10), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(10), BLOCK_SIZE(1)); #endif static bool check_locale(sys_var *self, THD *thd, set_var *var) @@ -3252,13 +3252,13 @@ static Sys_var_ulong Sys_deadlock_timeout_depth_short( "deadlock_timeout_short", "Short timeout for the two-step deadlock detection (in microseconds)", SESSION_VAR(wt_timeout_short), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(10000), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(10000), BLOCK_SIZE(1)); static Sys_var_ulong Sys_deadlock_timeout_depth_long( "deadlock_timeout_long", "Long timeout for the two-step deadlock detection (in microseconds)", SESSION_VAR(wt_timeout_long), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(50000000), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(50000000), BLOCK_SIZE(1)); #ifndef DBUG_OFF static Sys_var_ulong Sys_debug_crc_break( @@ -3317,7 +3317,7 @@ static Sys_var_ulong Sys_log_slow_rate_limit( "Increase it to reduce the size of the slow or the performance impact " "of slow logging", SESSION_VAR(log_slow_rate_limit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(1), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(1), BLOCK_SIZE(1)); static const char *log_slow_verbosity_names[]= { "innodb", "query_plan", 0 }; static Sys_var_set Sys_log_slow_verbosity( @@ -3391,7 +3391,7 @@ static Sys_var_ulong Sys_progress_report_time( "Seconds between sending progress reports to the client for " "time-consuming statements. Set to 0 to disable progress reporting.", SESSION_VAR(progress_report_time), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(56), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(56), BLOCK_SIZE(1)); static Sys_var_mybool Sys_thread_alarm( "thread_alarm", @@ -3423,6 +3423,6 @@ static Sys_var_ulong Sys_debug_binlog_fsync_sleep( "Extra sleep (in microseconds) to add to binlog fsync(), for debugging", GLOBAL_VAR(opt_binlog_dbug_fsync_sleep), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1)); #endif From 37c81d81b3940a21b500aff6aeb70e8b1df0b7e8 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 11 Dec 2011 09:00:12 +0100 Subject: [PATCH 03/20] another backtrace resolver that prints source file name and line number --- config.h.cmake | 1 + configure.cmake | 1 + include/my_stacktrace.h | 18 +++++ mysql-test/mysql-test-run.pl | 2 +- mysys/CMakeLists.txt | 5 ++ mysys/my_addr_resolve.c | 131 +++++++++++++++++++++++++++++++++++ mysys/stacktrace.c | 37 ++++++++-- 7 files changed, 189 insertions(+), 6 deletions(-) create mode 100644 mysys/my_addr_resolve.c diff --git a/config.h.cmake b/config.h.cmake index 65f5d93f4d8..eae3a4ba886 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -28,6 +28,7 @@ #cmakedefine HAVE_CRYPT_H 1 #cmakedefine HAVE_CURSES_H 1 #cmakedefine HAVE_CXXABI_H 1 +#cmakedefine HAVE_BFD_H 1 #cmakedefine HAVE_NCURSES_H 1 #cmakedefine HAVE_NDIR_H 1 #cmakedefine HAVE_DIRENT_H 1 diff --git a/configure.cmake b/configure.cmake index 6363a616b41..fd4e22de447 100644 --- a/configure.cmake +++ b/configure.cmake @@ -186,6 +186,7 @@ CHECK_INCLUDE_FILES (aio.h HAVE_AIO_H) CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H) CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H) CHECK_INCLUDE_FILES (cxxabi.h HAVE_CXXABI_H) +CHECK_INCLUDE_FILES (bfd.h HAVE_BFD_H) CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H) CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H) CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H) diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index df5741fa3d8..f5229a4b0af 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -55,6 +55,24 @@ void my_set_exception_pointers(EXCEPTION_POINTERS *ep); #endif #endif +#ifndef SAFEMALLOC +#undef HAVE_BFD_H +#endif + +#ifdef HAVE_BFD_H +#define HAVE_MY_ADDR_RESOLVE 1 +#endif + +#ifdef HAVE_MY_ADDR_RESOLVE +typedef struct { + const char *file; + const char *func; + uint line; +} my_addr_loc; +int my_addr_resolve(void *ptr, my_addr_loc *loc); +const char *my_addr_resolve_init(); +#endif + #ifdef HAVE_WRITE_CORE void my_write_core(int sig); #endif diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 25427b81eff..e3f5cb65507 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4660,7 +4660,7 @@ sub extract_warning_lines ($$) { $Ferr = undef; # Close error log file # mysql_client_test.test sends a COM_DEBUG packet to the server - # to provoke a SAFEMALLOC leak report, ignore any warnings + # to provoke a safemalloc leak report, ignore any warnings # between "Begin/end safemalloc memory dump" if ( grep(/Begin safemalloc memory dump:/, @lines) > 0) { diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index 5b611601955..f258fd7bb7f 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -33,6 +33,7 @@ SET(MYSYS_SOURCES array.c charset-def.c charset.c checksum.c default.c rijndael.c sha1.c string.c thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c tree.c typelib.c base64.c my_memmem.c my_getpagesize.c lf_alloc-pin.c lf_dynarray.c lf_hash.c + my_addr_resolve.c my_atomic.c my_getncpus.c my_safehash.c my_chmod.c my_rnd.c my_uuid.c wqueue.c waiting_threads.c ma_dyncol.c my_rdtsc.c) @@ -70,6 +71,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} ${LIBNSL} ${LIBM} ${LIBRT}) DTRACE_INSTRUMENT(mysys) +IF(HAVE_BFD_H) + TARGET_LINK_LIBRARIES(mysys bfd) +ENDIF(HAVE_BFD_H) + IF (WIN32) TARGET_LINK_LIBRARIES(mysys IPHLPAPI) ENDIF(WIN32) diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c new file mode 100644 index 00000000000..c9c9212eb7d --- /dev/null +++ b/mysys/my_addr_resolve.c @@ -0,0 +1,131 @@ +/* Copyright (C) 2011 Monty Program Ab + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "mysys_priv.h" +#include +#include +#include + +/** + strip the path, leave the file name and the last dirname +*/ +static const char *strip_path(const char *s) +{ + const char *prev, *last; + for(prev= last= s; *s; s++) + if (*s == '/' || *s == '\\') + { + prev= last; + last= s + 1; + } + return prev; +} + +/* + The following is very much single-threaded code and it's only supposed + to be used on shutdown or for a crash report + Or the caller should take care and use mutexes. + + Also it does not free any its memory. For the same reason - + it's only used for crash reports or on shutdown when we already + have a memory leak. +*/ + +#ifdef HAVE_BFD_H +#include +static bfd *bfdh= 0; +static asymbol **symtable= 0; + +/** + finds a file name, a line number, and a function name corresponding to addr. + + the function name is demangled. + the file name is stripped of its path, only the two last components are kept + the resolving logic is mostly based on addr2line of binutils-2.17 + + @return 0 on success, 1 on failure +*/ +int my_addr_resolve(void *ptr, my_addr_loc *loc) +{ + bfd_vma addr= (intptr)ptr; + asection *sec; + + for (sec= bfdh->sections; sec; sec= sec->next) + { + bfd_vma start; + + if ((bfd_get_section_flags(bfdh, sec) & SEC_ALLOC) == 0) + continue; + + start = bfd_get_section_vma(bfdh, sec); + if (addr < start || addr >= start + bfd_get_section_size(sec)) + continue; + + if (bfd_find_nearest_line(bfdh, sec, symtable, addr - start, + &loc->file, &loc->func, &loc->line)) + { + if (loc->file) + loc->file= strip_path(loc->file); + else + loc->file= ""; + + if (loc->func) + { + const char *str= bfd_demangle(bfdh, loc->func, 3); + if (str) + loc->func= str; + } + + return 0; + } + } + + return 1; +} + +const char *my_addr_resolve_init() +{ + if (!bfdh) + { + uint unused; + char **matching; + + bfdh= bfd_openr(my_progname, NULL); + if (!bfdh) + goto err; + + if (bfd_check_format(bfdh, bfd_archive)) + goto err; + if (!bfd_check_format_matches (bfdh, bfd_object, &matching)) + goto err; + + if (bfd_read_minisymbols(bfdh, FALSE, (void *)&symtable, &unused) < 0) + goto err; + } + return 0; + +err: + return bfd_errmsg(bfd_get_error()); +} +#elif defined(HAVE_LIBELF_H) +/* + another possible implementation. +*/ +#elif defined(MY_ADDR_RESOLVE_FORK) +/* + yet another - just execute addr2line or eu-addr2line, whatever available, + pipe the addresses to it, and parse the output +*/ +#endif diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c index d0897fabb52..a7b71a0bca6 100644 --- a/mysys/stacktrace.c +++ b/mysys/stacktrace.c @@ -210,25 +210,52 @@ static void my_demangle_symbols(char **addrs, int n) #endif /* BACKTRACE_DEMANGLE */ +#if HAVE_MY_ADDR_RESOLVE +static int print_with_addr_resolve(void **addrs, int n) +{ + int i; + const char *err; + + if ((err= my_addr_resolve_init())) + { + fprintf(stderr, "(my_addr_resolve failure: %s)\n", err); + return 0; + } + + for (i= 0; i < n; i++) + { + my_addr_loc loc; + if (my_addr_resolve(addrs[i], &loc)) + backtrace_symbols_fd(addrs+i, 1, fileno(stderr)); + else + fprintf(stderr, "%s:%u(%s)[%p]\n", + loc.file, loc.line, loc.func, addrs[i]); + } + return 1; +} +#endif + void my_print_stacktrace(uchar* stack_bottom, ulong thread_stack) { void *addrs[128]; - char **strings= NULL; + char **strings __attribute__((unused)) = NULL; int n = backtrace(addrs, array_elements(addrs)); fprintf(stderr, "stack_bottom = %p thread_stack 0x%lx\n", stack_bottom, thread_stack); +#if HAVE_MY_ADDR_RESOLVE + if (print_with_addr_resolve(addrs, n)) + return; +#endif #if BACKTRACE_DEMANGLE if ((strings= backtrace_symbols(addrs, n))) { my_demangle_symbols(strings, n); free(strings); + return; } #endif #if HAVE_BACKTRACE_SYMBOLS_FD - if (!strings) - { - backtrace_symbols_fd(addrs, n, fileno(stderr)); - } + backtrace_symbols_fd(addrs, n, fileno(stderr)); #endif } From 6cc9d0ffa0b6d9d0f19cf9445fad0e0ba11e38f8 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 12 Dec 2011 22:58:24 +0100 Subject: [PATCH 04/20] move safemalloc out of dbug. remeber a real backtrace for every allocation. make safemalloc to tract C++ new/delete too. collateral fixes to make the test suite pass. --- client/mysql.cc | 6 +- client/mysqladmin.cc | 17 +- client/mysqlbinlog.cc | 26 +-- client/mysqlcheck.c | 2 +- client/mysqlimport.c | 20 +- client/mysqltest.cc | 4 + dbug/CMakeLists.txt | 11 -- dbug/dbug.c | 362 +--------------------------------- dbug/my_main.c | 7 +- dbug/tests-t.pl | 4 +- dbug/tests.c | 9 +- dbug/user.r | 22 +-- extra/perror.c | 2 + include/my_dbug.h | 9 - include/my_stacktrace.h | 1 + include/my_sys.h | 6 +- include/my_valgrind.h | 1 + mysql-test/r/mysqldump.result | 2 +- mysql-test/t/mysqldump.test | 2 +- mysys/CMakeLists.txt | 16 +- mysys/my_malloc.c | 6 +- mysys/my_new.cc | 15 +- mysys/mysys_priv.h | 9 + mysys/safemalloc.c | 341 ++++++++++++++++++++++++++++++++ mysys/typelib.c | 3 + sql/ha_partition.cc | 1 + sql/mysqld.cc | 5 +- storage/pbxt/src/ha_pbxt.cc | 1 + 28 files changed, 455 insertions(+), 455 deletions(-) create mode 100644 mysys/safemalloc.c diff --git a/client/mysql.cc b/client/mysql.cc index 5debadee26c..1074a7aaaed 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1786,11 +1786,13 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; case 'V': usage(1); - exit(0); + status.exit_status= 0; + mysql_end(-1); case 'I': case '?': usage(0); - exit(0); + status.exit_status= 0; + mysql_end(-1); } return 0; } diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 463ec37fae2..4a691ff4e14 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -301,20 +301,17 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), int main(int argc,char *argv[]) { - int error= 0, ho_error; + int error= 0; MYSQL mysql; char **commands, **save_argv; MY_INIT(argv[0]); mysql_init(&mysql); - if (load_defaults("my",load_default_groups,&argc,&argv)) - exit(1); + if ((error= load_defaults("my",load_default_groups,&argc,&argv))) + goto err1; save_argv = argv; /* Save for free_defaults */ - if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option))) - { - free_defaults(save_argv); - exit(ho_error); - } + if ((error=handle_options(&argc, &argv, my_long_options, get_one_option))) + goto err2; if (debug_info_flag) my_end_arg= MY_CHECK_ERROR | MY_GIVE_INFO; if (debug_check_flag) @@ -463,6 +460,7 @@ int main(int argc,char *argv[]) } /* got connection */ mysql_close(&mysql); +err2: mysql_library_end(); my_free(opt_password); my_free(user); @@ -470,8 +468,9 @@ int main(int argc,char *argv[]) my_free(shared_memory_base_name); #endif free_defaults(save_argv); +err1: my_end(my_end_arg); - exit(error ? 1 : 0); + exit(error); return 0; } diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 4de571b546d..8869c3ac81b 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -45,7 +45,7 @@ #include "mysqld.h" -Rpl_filter *binlog_filter; +Rpl_filter *binlog_filter= 0; #define BIN_LOG_HEADER_SIZE 4 #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4) @@ -77,7 +77,7 @@ static void error(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2); static void warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2); static bool one_database=0, to_last_remote_log= 0, disable_log_bin= 0; -static bool opt_hexdump= 0; +static bool opt_hexdump= 0, opt_version= 0; const char *base64_output_mode_names[]= {"NEVER", "AUTO", "ALWAYS", "UNSPEC", "DECODE-ROWS", NullS}; TYPELIB base64_output_mode_typelib= @@ -1430,6 +1430,7 @@ static void cleanup() my_free(user); my_free(const_cast(dirname_for_local_load)); + delete binlog_filter; delete glob_description_event; if (mysql) mysql_close(mysql); @@ -1588,10 +1589,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; case 'V': print_version(); - exit(0); + opt_version= 1; + break; case '?': usage(); - exit(0); + opt_version= 1; + break; } if (tty_password) pass= get_tty_password(NullS); @@ -2303,24 +2306,26 @@ int main(int argc, char** argv) my_init_time(); // for time functions init_alloc_root(&s_mem_root, 16384, 0); + if (load_defaults("my", load_groups, &argc, &argv)) + exit(1); + if (!(binlog_filter= new Rpl_filter)) { error("Failed to create Rpl_filter"); exit(1); } - if (load_defaults("my", load_groups, &argc, &argv)) - exit(1); - defaults_argv= argv; parse_args(&argc, (char***)&argv); - if (!argc) + if (!argc || opt_version) { - usage(); + if (!argc) + usage(); + cleanup(); free_defaults(defaults_argv); my_end(my_end_arg); - exit(1); + exit(!opt_version); } if (opt_base64_output_mode == BASE64_OUTPUT_UNSPEC) @@ -2407,7 +2412,6 @@ int main(int argc, char** argv) my_fclose(result_file, MYF(0)); cleanup(); free_annotate_event(); - delete binlog_filter; free_root(&s_mem_root, MYF(0)); free_defaults(defaults_argv); my_free_open_file_info(); diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 445f4522cef..68456d59041 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -961,6 +961,7 @@ static void safe_exit(int error) DBUG_VOID_RETURN; if (sock) mysql_close(sock); + sf_leaking_memory= 1; /* don't check for memory leaks */ exit(error); DBUG_VOID_RETURN; } @@ -972,7 +973,6 @@ int main(int argc, char **argv) char **defaults_argv; MY_INIT(argv[0]); - mysql_library_init(-1, 0, 0); /* ** Check out the args */ diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 3b9939d7c6d..fabec74052d 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -62,6 +62,8 @@ static char *opt_plugin_dir= 0, *opt_default_auth= 0; static longlong opt_ignore_lines= -1; #include +static char **argv_to_free; + #ifdef HAVE_SMEM static char *shared_memory_base_name=0; #endif @@ -475,10 +477,18 @@ static void db_disconnect(char *host, MYSQL *mysql) static void safe_exit(int error, MYSQL *mysql) { - if (ignore_errors) + if (error && ignore_errors) return; if (mysql) mysql_close(mysql); + +#ifdef HAVE_SMEM + my_free(shared_memory_base_name); +#endif + free_defaults(argv_to_free); + mysql_library_end(); + my_free(opt_password); + my_end(my_end_arg); exit(error); } @@ -597,7 +607,6 @@ error: int main(int argc, char **argv) { int error=0; - char **argv_to_free; MY_INIT(argv[0]); if (load_defaults("my",load_default_groups,&argc,&argv)) @@ -687,11 +696,6 @@ int main(int argc, char **argv) exitcode= error; db_disconnect(current_host, mysql); } - my_free(opt_password); -#ifdef HAVE_SMEM - my_free(shared_memory_base_name); -#endif - free_defaults(argv_to_free); - my_end(my_end_arg); + safe_exit(0, 0); return(exitcode); } diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 386577a4224..89e74a56bfc 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1394,6 +1394,7 @@ static void cleanup_and_exit(int exit_code) } } + sf_leaking_memory= 0; /* all memory should be freed by now */ exit(exit_code); } @@ -8462,6 +8463,9 @@ int main(int argc, char **argv) MY_INIT(argv[0]); DBUG_ENTER("main"); + /* mysqltest has no way to free all its memory correctly */ + sf_leaking_memory= 1; + save_file[0]= 0; TMPDIR[0]= 0; diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt index 0a9af25dba1..a4f30f75f97 100644 --- a/dbug/CMakeLists.txt +++ b/dbug/CMakeLists.txt @@ -17,17 +17,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/dbug ${CMAKE_SOURCE_DIR}/include ) -IF(WIN32) - SET(DEFAULT_SAFEMALLOC OFF) -ELSE() - SET(DEFAULT_SAFEMALLOC ON) -ENDIF() -OPTION(WITH_SAFEMALLOC ${DEFAULT_SAFEMALLOC} "Use safemalloc for debug builds. Will result in slower execution.") - -IF(WITH_SAFEMALLOC) - ADD_DEFINITIONS( -DSAFEMALLOC) -ENDIF() - SET(DBUG_SOURCES dbug.c) ADD_CONVENIENCE_LIBRARY(dbug ${DBUG_SOURCES}) TARGET_LINK_LIBRARIES(dbug mysys) diff --git a/dbug/dbug.c b/dbug/dbug.c index 299d3e0d5da..645aeb100fd 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -98,9 +98,6 @@ #include #endif -#include /* TRASH */ -#include /* my_safe_print_str */ - /* * Manifest constants which may be "tuned" if desired. */ @@ -131,6 +128,7 @@ #define SANITY_CHECK_ON (1 << 12) /* Check memory on every DBUG_ENTER/RETURN */ #define TRACE_ON ((uint)1 << 31) /* Trace enabled. MUST be the highest bit!*/ +#define sf_sanity() (0) #define TRACING (cs->stack->flags & TRACE_ON) #define DEBUGGING (cs->stack->flags & DEBUG_ON) @@ -207,8 +205,6 @@ static BOOLEAN init_done= FALSE; /* Set to TRUE when initialization done */ static struct settings init_settings; static const char *db_process= 0;/* Pointer to process name; argv[0] */ my_bool _dbug_on_= TRUE; /* FALSE if no debugging at all */ -static const char *unknown_func= "?func"; -static const char *unknown_file= "?file"; typedef struct _db_code_state_ { const char *process; /* Pointer to process name; usually argv[0] */ @@ -289,8 +285,6 @@ static void DbugExit(const char *why); static const char *DbugStrTok(const char *s); static void DbugVfprintf(FILE *stream, const char* format, va_list args); -static void DbugErr(CODE_STATE *, uint, const char* format, ...); - /* * Miscellaneous printf format strings. */ @@ -313,9 +307,6 @@ static void DbugErr(CODE_STATE *, uint, const char* format, ...); #define WRITABLE(pathname) (access(pathname, W_OK) == 0) #endif -static int sf_sanity(); -static void sf_terminate(); - /* ** Macros to allow dbugging with threads */ @@ -323,9 +314,6 @@ static void sf_terminate(); #include static pthread_mutex_t THR_LOCK_dbug; -/* this mutex protects all sf_* variables, and nothing else*/ -static pthread_mutex_t sf_mutex; - static CODE_STATE *code_state(void) { CODE_STATE *cs, **cs_ptr; @@ -341,7 +329,6 @@ static CODE_STATE *code_state(void) { init_done=TRUE; pthread_mutex_init(&THR_LOCK_dbug, NULL); - pthread_mutex_init(&sf_mutex, NULL); bzero(&init_settings, sizeof(init_settings)); init_settings.out_file=stderr; init_settings.flags=OPEN_APPEND; @@ -354,8 +341,8 @@ static CODE_STATE *code_state(void) cs=(CODE_STATE*) DbugMalloc(sizeof(*cs)); bzero((uchar*) cs,sizeof(*cs)); cs->process= db_process ? db_process : "dbug"; - cs->func= unknown_func; - cs->file= unknown_file; + cs->func= "?func"; + cs->file= "?file"; cs->stack=&init_settings; *cs_ptr= cs; } @@ -1637,7 +1624,6 @@ void _db_end_() init_settings.keywords= 0; init_settings.processes= 0; FreeState(cs, &tmp, 0); - sf_terminate(); } @@ -2161,346 +2147,4 @@ const char* _db_get_func_(void) return cs->func; } -/* - prints the error message, followed by a stack trace - of the specified depth -*/ -static void DbugErr(CODE_STATE *cs, uint depth, const char* format, ...) -{ - va_list args; - va_start(args,format); - vfprintf(stderr, format, args); - va_end(args); - - if (cs || ((cs= code_state()))) - { - uint i= depth; - struct _db_stack_frame_ *frame= cs->framep; - while (i-- && frame) - { - fprintf(stderr, ", at %s", frame->func); - frame= frame->prev; - } - } - - fprintf(stderr, "\n"); -} - -/******************************************************************** - memory debugger - based on safemalloc, memory sub-system, written by Bjorn Benson -********************************************************************/ - -#ifndef SF_REMEMBER_FRAMES -#define SF_REMEMBER_FRAMES 16 -#endif - -/* - Structure that stores information of an allocated memory block - The data is at &struct_adr+sizeof(struct irem) - Note that sizeof(struct st_irem) % sizeof(double) == 0 -*/ -struct st_irem -{ - struct st_irem *next; /* Linked list of structures */ - struct st_irem *prev; /* Other link */ - size_t datasize; /* Size requested */ - const char *frame[SF_REMEMBER_FRAMES]; /* call stack */ - uint32 marker; /* Underrun marker value */ -}; - -/* - DBUG_MALLOC/DBUG_REALLOC/DBUG_FREE can be called even - before dbug is initialized. We cannot properly take into account - these calls, but we can at least wrap allocated memory - in st_irem's and check for overrun/underruns. - These special irem's - that are not linked into a global list - - are distinguished by a special value in the 'next' pointer. -*/ -#define NOT_LINKED ((struct st_irem *)1) - -size_t sf_malloc_mem_limit= (intptr)~0ULL; -static size_t sf_malloc_cur_memory= 0L; /* Current memory usage */ -static size_t sf_malloc_max_memory= 0L; /* Maximum memory usage */ - -static int sf_malloc_count= 0; /* Number of allocated chunks */ - -static void *sf_min_adress= (void*) (intptr)~0ULL, - *sf_max_adress= 0; - -static struct st_irem *sf_malloc_root = 0; - -#define MAGICSTART 0x14235296 /* A magic value for underrun key */ - -#define MAGICEND0 0x68 /* Magic values for overrun keys */ -#define MAGICEND1 0x34 /* " */ -#define MAGICEND2 0x7A /* " */ -#define MAGICEND3 0x15 /* " */ - -static int bad_ptr(const char *where, void *ptr); -static void free_memory(void *ptr); - -/* - * FUNCTION - * - * _db_malloc_ allocates memory - * - * SYNOPSIS - * - * void *_db_malloc_(size_t size) - * size_t size; Bytes to allocate - */ - -void *_db_malloc_(size_t size) -{ -#ifndef SAFEMALLOC - return malloc(size); -#else - CODE_STATE *cs= code_state(); - struct st_irem *irem; - uchar *data; - struct _db_stack_frame_ *frame; - int i= 0; - - if (size + sf_malloc_cur_memory > sf_malloc_mem_limit) - irem= 0; - else - irem= (struct st_irem *) malloc (sizeof(struct st_irem) + size + 4); - - if (!irem) - return 0; - - compile_time_assert(sizeof(struct st_irem) % sizeof(double) == 0); - - /* Fill up the structure */ - data= (uchar*) (irem + 1); - irem->datasize= size; - irem->prev= 0; - irem->marker= MAGICSTART; - data[size + 0]= MAGICEND0; - data[size + 1]= MAGICEND1; - data[size + 2]= MAGICEND2; - data[size + 3]= MAGICEND3; - - if (cs && cs->framep) - { - for (frame= cs->framep; - i < SF_REMEMBER_FRAMES && frame->func != unknown_func; - i++, frame= frame->prev) - irem->frame[i]= frame->func; - } - - if (i < SF_REMEMBER_FRAMES) - irem->frame[i]= unknown_func; - if (i==0) - irem->frame[0]= (char*)1; - - if (init_done) - { - pthread_mutex_lock(&sf_mutex); - /* Add this structure to the linked list */ - if ((irem->next= sf_malloc_root)) - sf_malloc_root->prev= irem; - sf_malloc_root= irem; - - /* Keep the statistics */ - sf_malloc_count++; - sf_malloc_cur_memory+= size; - set_if_bigger(sf_malloc_max_memory, sf_malloc_cur_memory); - set_if_smaller(sf_min_adress, (void*)data); - set_if_bigger(sf_max_adress, (void*)data); - pthread_mutex_unlock(&sf_mutex); - } - else - { - set_if_bigger(sf_malloc_max_memory, sf_malloc_cur_memory); - set_if_smaller(sf_min_adress, (void*)data); - set_if_bigger(sf_max_adress, (void*)data); - irem->next= NOT_LINKED; - } - - TRASH_ALLOC(data, size); - return data; -#endif -} - -void *_db_realloc_(void *ptr, size_t size) -{ -#ifndef SAFEMALLOC - return realloc(ptr, size); -#else - char *data; - - if (!ptr) - return _db_malloc_(size); - - if (bad_ptr("Reallocating", ptr)) - return 0; - - if ((data= _db_malloc_(size))) - { - struct st_irem *irem= (struct st_irem *)ptr - 1; - set_if_smaller(size, irem->datasize); - memcpy(data, ptr, size); - free_memory(ptr); - } - return data; -#endif -} - -void _db_free_(void *ptr) -{ -#ifndef SAFEMALLOC - free(ptr); -#else - if (!ptr || bad_ptr("Freeing", ptr)) - return; - - free_memory(ptr); -#endif -} - -static void free_memory(void *ptr) -{ - struct st_irem *irem= (struct st_irem *)ptr - 1; - - if (irem->next != NOT_LINKED) - { - pthread_mutex_lock(&sf_mutex); - /* Remove this structure from the linked list */ - if (irem->prev) - irem->prev->next= irem->next; - else - sf_malloc_root= irem->next; - - if (irem->next) - irem->next->prev= irem->prev; - - /* Handle the statistics */ - sf_malloc_cur_memory-= irem->datasize; - sf_malloc_count--; - pthread_mutex_unlock(&sf_mutex); - } - - /* only trash the data and magic values, but keep the stack trace */ - TRASH_FREE((uchar*)(irem + 1) - 4, irem->datasize + 8); - free(irem); - return; -} - -#define SF_ADD_NL 1 -#define SF_USE_SAFE_PRINT 2 -static void print_allocated_at(struct st_irem *irem, int flags) -{ - int i; - const char *allocated= flags & SF_ADD_NL ? "Allocated" : ", allocated"; - - for (i=0; - i < SF_REMEMBER_FRAMES && irem->frame[i] != unknown_func; - i++) - { - fprintf(stderr, "%s at ", i ? "," : allocated); - if (flags & SF_USE_SAFE_PRINT) - my_safe_print_str(irem->frame[i], 80); - else - fputs(irem->frame[i], stderr); - } - if (i && (flags & SF_ADD_NL)) - fprintf(stderr, "\n"); -} - -static int bad_ptr(const char *where, void *ptr) -{ - struct st_irem *irem= (struct st_irem *)ptr - 1; - const uchar *magicend; - - if (((intptr) ptr) % sizeof(double)) - { - DbugErr(0, SF_REMEMBER_FRAMES, "Error: %s wrong aligned pointer", where); - return 1; - } - if (ptr < sf_min_adress || ptr > sf_max_adress) - { - DbugErr(0, SF_REMEMBER_FRAMES, "Error: %s pointer out of range", where); - return 1; - } - if (irem->marker != MAGICSTART) - { - DbugErr(0, SF_REMEMBER_FRAMES, - "Error: %s unallocated data or underrun buffer", where); - /* - we cannot use print_allocated_at here: - if the memory was not allocated, there's nothing to print, - if it was allocated and underrun, call stack may be corrupted - */ - return 1; - } - - magicend= (uchar*)ptr + irem->datasize; - if (magicend[0] != MAGICEND0 || - magicend[1] != MAGICEND1 || - magicend[2] != MAGICEND2 || - magicend[3] != MAGICEND3) - { - DbugErr(0, SF_REMEMBER_FRAMES, "Error: %s overrun buffer", where); - print_allocated_at(irem, SF_ADD_NL); - return 1; - } - - return 0; -} - -/* check all allocated memory list for consistency */ -static int sf_sanity() -{ - struct st_irem *irem; - int flag= 0; - int count= 0; - - pthread_mutex_lock(&sf_mutex); - count= sf_malloc_count; - for (irem= sf_malloc_root; irem && count > 0; count--, irem= irem->next) - flag+= bad_ptr("Safemalloc", irem + 1); - pthread_mutex_unlock(&sf_mutex); - if (count || irem) - { - DbugErr(0, SF_REMEMBER_FRAMES, "Error: Safemalloc link list destroyed"); - return 1; - } - return 0; -} - -/* - * FUNCTION - * - * sf_terminate Report on all the memory pieces that have not been free'd - * - * SYNOPSIS - * - * void sf_terminate() - */ - -static void sf_terminate() -{ - struct st_irem *irem; - - sf_sanity(); - - /* Report on all the memory that was allocated but not free'd */ - if ((irem= sf_malloc_root)) - { - while (irem) - { - fprintf(stderr, "Warning: %6lu bytes at %p are not freed", (ulong) irem->datasize, irem + 1); - print_allocated_at(irem, SF_USE_SAFE_PRINT); - fprintf(stderr, "\n"); - irem= irem->next; - } - fprintf(stderr, "Memory lost: %lu bytes in %d chunks\n", - (ulong) sf_malloc_cur_memory, sf_malloc_count); - } - - return; -} - #endif /* DBUG_OFF */ diff --git a/dbug/my_main.c b/dbug/my_main.c index d8bffe662e2..2b3e92b53cc 100644 --- a/dbug/my_main.c +++ b/dbug/my_main.c @@ -4,6 +4,7 @@ */ #include /* This includes dbug.h */ +#include #include int main (argc, argv) @@ -12,7 +13,7 @@ char *argv[]; { register int result, ix; extern int factorial(int); - my_thread_global_init(); + MY_INIT(argv[0]); { DBUG_ENTER ("main"); @@ -29,6 +30,8 @@ char *argv[]; result = factorial (atoi(argv[ix])); printf ("%d\n", result); } - DBUG_RETURN (0); + DBUG_LEAVE; } + my_end(0); + exit(0); } diff --git a/dbug/tests-t.pl b/dbug/tests-t.pl index 9f517ba3efd..4803627eda2 100755 --- a/dbug/tests-t.pl +++ b/dbug/tests-t.pl @@ -201,7 +201,7 @@ func2: info: s=ko | | main +dbug-tests: >main dbug-tests: | >func1 dbug-tests: | | | >func3 dbug-tests: | | | func3 dbug-tests: | | main +dbug-tests: tests.c: >main dbug-tests: tests.c: | >func1 dbug-tests: tests.c: | | | >func3 dbug-tests: tests.c: | | | /* This includes dbug.h */ +#include #include #include @@ -44,7 +45,7 @@ int main (int argc, char *argv[]) if (argc == 1) return 0; - my_thread_global_init(); + MY_INIT("dbug-tests"); dup2(1, 2); for (i = 1; i < argc; i++) @@ -56,7 +57,6 @@ int main (int argc, char *argv[]) } { DBUG_ENTER ("main"); - DBUG_PROCESS ("dbug-tests"); func1(); DBUG_EXECUTE_IF("dump", { @@ -78,6 +78,9 @@ int main (int argc, char *argv[]) DBUG_PRINT("explain", ("dbug explained: %s", s)); } func2(); - DBUG_RETURN (0); + DBUG_LEAVE; } + DBUG_SET(""); /* to not have my_end() in the traces */ + my_end(0); + return 0; } diff --git a/dbug/user.r b/dbug/user.r index 1ccd46bd21e..8d8a9ce6910 100644 --- a/dbug/user.r +++ b/dbug/user.r @@ -881,20 +881,6 @@ Modifying .I initial value does not affect threads that are already running. Obviously, these macros are only useful in the multi-threaded environment. -.SP 1 -.LI DBUG_MALLOC\ -.LI DBUG_REALLOC\ -.LI DBUG_FREE\ -When these macros are used instead of system malloc(), realloc(), and free(), -.I dbug -built-in memory debugger performs checks for memory overwrites, underwrites, -memory leaks, and accesses to uninitialized or freed memory. Memory leaks are -found as memory not deallocated at shutdown. Memory overwrites and underwrites -are detected when this memory is about to be freed (by -.B DBUG_FREE -macro), unless -.B S -flag is present in the debug control string (see below). .LE .SK @@ -1003,11 +989,9 @@ Most useful with macros used to temporarily alter the debugger state. .LI S -Check the memory allocated with -.B DBUG_MALLOC -and -.B DBUG_REALLOC -for overwrites/underwrites +When compiled with +.I safemalloc +this flag invokes "sanity" memory checks (for overwrites/underwrites) on each .B DBUG_ENTER and diff --git a/extra/perror.c b/extra/perror.c index af5d95d3c5b..8621bed3e11 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -419,6 +419,8 @@ int main(int argc,char *argv[]) if (unknown_error) free(unknown_error); + my_handler_error_unregister(); + my_end(0); exit(error); return error; } diff --git a/include/my_dbug.h b/include/my_dbug.h index 920ba4d4f90..fb5838e8b5c 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -60,9 +60,6 @@ extern void _db_unlock_file_(void); extern FILE *_db_fp_(void); extern void _db_flush_(); extern const char* _db_get_func_(void); -extern void *_db_malloc_(size_t size); -extern void *_db_realloc_(void *ptr, size_t size); -extern void _db_free_(void *ptr); #define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_; \ _db_enter_ (a,__FILE__,__LINE__,&_db_stack_frame_) @@ -95,9 +92,6 @@ extern void _db_free_(void *ptr); #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len)) #define DEBUGGER_OFF do { _dbug_on_= 0; } while(0) #define DEBUGGER_ON do { _dbug_on_= 1; } while(0) -#define DBUG_MALLOC(SIZE) _db_malloc_(SIZE) -#define DBUG_REALLOC(PTR,SIZE) _db_realloc_(PTR,SIZE) -#define DBUG_FREE(PTR) _db_free_(PTR) #define IF_DBUG(A,B) A #ifndef __WIN__ @@ -156,9 +150,6 @@ extern void _db_suicide_(); #define DBUG_EXPLAIN_INITIAL(buf,len) #define DEBUGGER_OFF do { } while(0) #define DEBUGGER_ON do { } while(0) -#define DBUG_MALLOC(SIZE) malloc(SIZE) -#define DBUG_REALLOC(PTR,SIZE) realloc(PTR,SIZE) -#define DBUG_FREE(PTR) free(PTR) #define IF_DBUG(A,B) B #define DBUG_ABORT() do { } while(0) #define DBUG_CRASH_ENTER(func) diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index f5229a4b0af..30f0203a43e 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -55,6 +55,7 @@ void my_set_exception_pointers(EXCEPTION_POINTERS *ep); #endif #endif +/* at the moment, safemalloc is the main user of libbfd */ #ifndef SAFEMALLOC #undef HAVE_BFD_H #endif diff --git a/include/my_sys.h b/include/my_sys.h index dbf999edac8..cb5fa317888 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -153,8 +153,10 @@ extern void *my_realloc(void *oldpoint, size_t Size, myf MyFlags); extern void my_free(void *ptr); extern void *my_memdup(const void *from,size_t length,myf MyFlags); extern char *my_strdup(const char *from,myf MyFlags); -extern char *my_strndup(const char *from, size_t length, - myf MyFlags); +extern char *my_strndup(const char *from, size_t length, myf MyFlags); + +extern int sf_leaking_memory; /* set to 1 to disable memleak detection */ + #if defined(ENABLED_DEBUG_SYNC) extern void (*debug_sync_C_callback_ptr)(const char *, size_t); #define DEBUG_SYNC_C(_sync_point_name_) do { \ diff --git a/include/my_valgrind.h b/include/my_valgrind.h index 87e6c3192dc..f82dd35b369 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -15,6 +15,7 @@ /* Some defines to make it easier to use valgrind */ +#include /* bfill */ #ifdef HAVE_valgrind #define IF_VALGRIND(A,B) A diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 1b0cca2a7b8..2ffc5716348 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -4292,7 +4292,7 @@ Abernathy aberrant aberration drop table words; -mysql-import: Error: 1146, Table 'test.words' doesn't exist, when using table: words +mysqlimport: Error: 1146, Table 'test.words' doesn't exist, when using table: words drop table t1; drop table t2; drop table words2; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 19d47a9dac3..2170b9aa38b 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1747,7 +1747,7 @@ select * from words2; # Drop table "words" and run with threads, should fail drop table words; ---replace_regex /.*mysqlimport(\.exe)*/mysql-import/ +--replace_regex /.*mysqlimport(\.exe)*/mysqlimport/ --error 1 --exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data/words.dat $MYSQLTEST_VARDIR/std_data/words2.dat 2>&1 diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index f258fd7bb7f..ec73140a42e 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -33,7 +33,7 @@ SET(MYSYS_SOURCES array.c charset-def.c charset.c checksum.c default.c rijndael.c sha1.c string.c thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c tree.c typelib.c base64.c my_memmem.c my_getpagesize.c lf_alloc-pin.c lf_dynarray.c lf_hash.c - my_addr_resolve.c + my_addr_resolve.c safemalloc.c my_atomic.c my_getncpus.c my_safehash.c my_chmod.c my_rnd.c my_uuid.c wqueue.c waiting_threads.c ma_dyncol.c my_rdtsc.c) @@ -46,8 +46,18 @@ IF(HAVE_ALARM) SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_alarm.c) ENDIF() -IF(NOT HAVE_CXX_NEW) - # gcc as C++ compiler does not have new/delete +IF(WIN32) + SET(DEFAULT_SAFEMALLOC OFF) +ELSE() + SET(DEFAULT_SAFEMALLOC ON) +ENDIF() +OPTION(WITH_SAFEMALLOC "Use safemalloc for debug builds. Will result in slower execution." ${DEFAULT_SAFEMALLOC}) + +IF(WITH_SAFEMALLOC) + ADD_DEFINITIONS( -DSAFEMALLOC) +ENDIF() + +IF(NOT HAVE_CXX_NEW OR WITH_SAFEMALLOC) SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_new.cc) ADD_DEFINITIONS( -DUSE_MYSYS_NEW) ENDIF() diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 24bccf37ece..82fbe3a63f7 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -37,7 +37,7 @@ void *my_malloc(size_t size, myf my_flags) if (!size) size=1; - point= DBUG_MALLOC(size); + point= sf_malloc(size); DBUG_EXECUTE_IF("simulate_out_of_memory", { my_free(point); @@ -85,7 +85,7 @@ void *my_realloc(void *oldpoint, size_t size, myf my_flags) DBUG_ASSERT(size > 0); if (!oldpoint && (my_flags & MY_ALLOW_ZERO_PTR)) DBUG_RETURN(my_malloc(size, my_flags)); - if ((point= DBUG_REALLOC(oldpoint, size)) == NULL) + if ((point= sf_realloc(oldpoint, size)) == NULL) { if (my_flags & MY_FREE_ON_ERROR) my_free(oldpoint); @@ -111,7 +111,7 @@ void my_free(void *ptr) { DBUG_ENTER("my_free"); DBUG_PRINT("my",("ptr: %p", ptr)); - DBUG_FREE(ptr); + sf_free(ptr); DBUG_VOID_RETURN; } diff --git a/mysys/my_new.cc b/mysys/my_new.cc index 377d9be22a8..8724f9cc4a4 100644 --- a/mysys/my_new.cc +++ b/mysys/my_new.cc @@ -16,7 +16,10 @@ /* This is a replacement of new/delete operators to be used when compiling - with gcc 3.0.x to avoid including libstdc++ + with gcc 3.0.x to avoid including libstdc++ + + It is also used to make all memory allocations to go through + my_malloc/my_free wrappers (for debugging/safemalloc and accounting) */ #include "mysys_priv.h" @@ -25,24 +28,22 @@ void *operator new (size_t sz) { - return (void *) malloc (sz ? sz : 1); + return (void *) my_malloc (sz ? sz : 1, MYF(0)); } void *operator new[] (size_t sz) { - return (void *) malloc (sz ? sz : 1); + return (void *) my_malloc (sz ? sz : 1, MYF(0)); } void operator delete (void *ptr) { - if (ptr) - free(ptr); + my_free(ptr); } void operator delete[] (void *ptr) throw () { - if (ptr) - free(ptr); + my_free(ptr); } C_MODE_START diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index 2c0c8bf82f8..f5d2f301837 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -69,6 +69,15 @@ extern PSI_file_key key_file_proc_meminfo; extern PSI_file_key key_file_charset, key_file_cnf; #endif /* HAVE_PSI_INTERFACE */ +#ifdef SAFEMALLOC +void *sf_malloc(size_t size); +void *sf_realloc(void *ptr, size_t size); +void sf_free(void *ptr); +#else +#define sf_malloc(X) malloc(X) +#define sf_realloc(X,Y) realloc(X,Y) +#define sf_free(X) free(X) +#endif /* EDQUOT is used only in 3 C files only in mysys/. If it does not exist on diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c new file mode 100644 index 00000000000..61ad9af0631 --- /dev/null +++ b/mysys/safemalloc.c @@ -0,0 +1,341 @@ +/* Copyright (C) 2000 MySQL AB, 2011 Monty Program Ab + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +/******************************************************************** + memory debugger + based on safemalloc, memory sub-system, written by Bjorn Benson +********************************************************************/ + + +#include "mysys_priv.h" +#include /* my_addr_resolve */ + +#if HAVE_EXECINFO_H +#include +#endif + +/* + this can be set to 1 if we leak memory and know it + (to disable memory leak tests on exit) +*/ +int sf_leaking_memory= 0; + +#ifdef SAFEMALLOC + +/* this mutex protects all sf_* variables, and nothing else*/ +static pthread_mutex_t sf_mutex; +static int init_done= 0; + +#ifndef SF_REMEMBER_FRAMES +#define SF_REMEMBER_FRAMES 8 +#endif + +/* ignore the first two frames (sf_malloc itself, and my_malloc) */ +#define SF_FRAMES_SKIP 2 + +/* + Structure that stores information of an allocated memory block + The data is at &struct_adr+sizeof(struct irem) + Note that sizeof(struct st_irem) % sizeof(double) == 0 +*/ +struct st_irem +{ + struct st_irem *next; /* Linked list of structures */ + struct st_irem *prev; /* Other link */ + size_t datasize; /* Size requested */ +#ifdef HAVE_BACKTRACE + void *frame[SF_REMEMBER_FRAMES]; /* call stack */ +#endif + uint32 marker; /* Underrun marker value */ +}; + +static int sf_malloc_count= 0; /* Number of allocated chunks */ + +static void *sf_min_adress= (void*) (intptr)~0ULL, + *sf_max_adress= 0; + +static struct st_irem *sf_malloc_root = 0; + +#define MAGICSTART 0x14235296 /* A magic value for underrun key */ + +#define MAGICEND0 0x68 /* Magic values for overrun keys */ +#define MAGICEND1 0x34 /* " */ +#define MAGICEND2 0x7A /* " */ +#define MAGICEND3 0x15 /* " */ + +static int bad_ptr(const char *where, void *ptr); +static void free_memory(void *ptr); +static void sf_terminate(); + +/** + allocates memory +*/ + +void *sf_malloc(size_t size) +{ + struct st_irem *irem; + uchar *data; + + /* + this style of initialization looks like race conditon prone, + but it is safe under the assumption that a program does + at least one malloc() while still being single threaded. + */ + if (!init_done) + { + pthread_mutex_init(&sf_mutex, NULL); + /* disable deadlock detector, because it calls my_malloc() */ + safe_mutex_setflags(&sf_mutex, MYF_NO_DEADLOCK_DETECTION); + atexit(sf_terminate); + init_done= 1; + } + + irem= (struct st_irem *) malloc (sizeof(struct st_irem) + size + 4); + + if (!irem) + return 0; + + /* we guarantee the alignment */ + compile_time_assert(sizeof(struct st_irem) % sizeof(double) == 0); + + /* Fill up the structure */ + data= (uchar*) (irem + 1); + irem->datasize= size; + irem->prev= 0; + irem->marker= MAGICSTART; + data[size + 0]= MAGICEND0; + data[size + 1]= MAGICEND1; + data[size + 2]= MAGICEND2; + data[size + 3]= MAGICEND3; + +#ifdef HAVE_BACKTRACE + { + void *frame[SF_REMEMBER_FRAMES + SF_FRAMES_SKIP]; + int frames= backtrace(frame, array_elements(frame)); + if (frames < SF_FRAMES_SKIP) + frames= 0; + else + { + frames-= SF_FRAMES_SKIP; + memcpy(irem->frame, frame + SF_FRAMES_SKIP, sizeof(void*)*frames); + } + if (frames < SF_REMEMBER_FRAMES) + irem->frame[frames]= 0; + } +#endif + + pthread_mutex_lock(&sf_mutex); + + /* Add this structure to the linked list */ + if ((irem->next= sf_malloc_root)) + sf_malloc_root->prev= irem; + sf_malloc_root= irem; + + /* Keep the statistics */ + sf_malloc_count++; + set_if_smaller(sf_min_adress, (void*)data); + set_if_bigger(sf_max_adress, (void*)data); + + pthread_mutex_unlock(&sf_mutex); + + TRASH_ALLOC(data, size); + return data; +} + +void *sf_realloc(void *ptr, size_t size) +{ + char *data; + + if (!ptr) + return sf_malloc(size); + + if (bad_ptr("Reallocating", ptr)) + return 0; + + if ((data= sf_malloc(size))) + { + struct st_irem *irem= (struct st_irem *)ptr - 1; + set_if_smaller(size, irem->datasize); + memcpy(data, ptr, size); + free_memory(ptr); + } + return data; +} + +void sf_free(void *ptr) +{ + if (!ptr || bad_ptr("Freeing", ptr)) + return; + + free_memory(ptr); +} + +static void free_memory(void *ptr) +{ + struct st_irem *irem= (struct st_irem *)ptr - 1; + + pthread_mutex_lock(&sf_mutex); + /* Remove this structure from the linked list */ + if (irem->prev) + irem->prev->next= irem->next; + else + sf_malloc_root= irem->next; + + if (irem->next) + irem->next->prev= irem->prev; + + /* Handle the statistics */ + sf_malloc_count--; + pthread_mutex_unlock(&sf_mutex); + + /* only trash the data and magic values, but keep the stack trace */ + TRASH_FREE((uchar*)(irem + 1) - 4, irem->datasize + 8); + free(irem); + return; +} + +#ifdef HAVE_BACKTRACE +static void print_stack(void **frame) +{ + const char *err; + int i; + + if ((err= my_addr_resolve_init())) + { + fprintf(stderr, "(my_addr_resolve failure: %s)\n", err); + return; + } + + for (i=0; i < SF_REMEMBER_FRAMES && frame[i]; i++) + { + my_addr_loc loc; + if (i) + fprintf(stderr, ", "); + + if (my_addr_resolve(frame[i], &loc)) + fprintf(stderr, "..."); + else + fprintf(stderr, "%s:%u", loc.file, loc.line); + } + fprintf(stderr, "\n"); +} +#else +#define print_stack(X) fprintf(stderr, "???\n") +#endif + +static void warn(const char *format,...) +{ + va_list args; + va_start(args,format); + vfprintf(stderr, format, args); + va_end(args); + +#ifdef HAVE_BACKTRACE + { + void *frame[SF_REMEMBER_FRAMES + SF_FRAMES_SKIP]; + int frames= backtrace(frame, array_elements(frame)); + if (frames < SF_REMEMBER_FRAMES + SF_FRAMES_SKIP) + frame[frames]= 0; + print_stack(frame + SF_FRAMES_SKIP); + } +#endif +} + +static int bad_ptr(const char *where, void *ptr) +{ + struct st_irem *irem= (struct st_irem *)ptr - 1; + const uchar *magicend; + + if (((intptr) ptr) % sizeof(double)) + { + warn("Error: %s wrong aligned pointer", where); + return 1; + } + if (ptr < sf_min_adress || ptr > sf_max_adress) + { + warn("Error: %s pointer out of range", where); + return 1; + } + if (irem->marker != MAGICSTART) + { + warn("Error: %s unallocated data or underrun buffer", where); + return 1; + } + + magicend= (uchar*)ptr + irem->datasize; + if (magicend[0] != MAGICEND0 || + magicend[1] != MAGICEND1 || + magicend[2] != MAGICEND2 || + magicend[3] != MAGICEND3) + { + warn("Error: %s overrun buffer", where); + fprintf(stderr, ", allocated at "); + print_stack(irem->frame); + return 1; + } + + return 0; +} + +/* check all allocated memory list for consistency */ +static int sf_sanity() +{ + struct st_irem *irem; + int flag= 0; + int count= 0; + + pthread_mutex_lock(&sf_mutex); + count= sf_malloc_count; + for (irem= sf_malloc_root; irem && count > 0; count--, irem= irem->next) + flag+= bad_ptr("Safemalloc", irem + 1); + pthread_mutex_unlock(&sf_mutex); + if (count || irem) + { + warn("Error: Safemalloc link list destroyed"); + return 1; + } + return 0; +} + +/** + report on all the memory pieces that have not been free'd +*/ + +static void sf_terminate() +{ + size_t total= 0; + struct st_irem *irem; + + sf_sanity(); + + /* Report on all the memory that was allocated but not free'd */ + if (!sf_leaking_memory && sf_malloc_root) + { + for (irem= sf_malloc_root; irem; irem= irem->next) + { + fprintf(stderr, "Warning: %4lu bytes lost, allocated at ", + (ulong) irem->datasize); + print_stack(irem->frame); + total+= irem->datasize; + } + fprintf(stderr, "Memory lost: %lu bytes in %d chunks\n", + (ulong) total, sf_malloc_count); + } + + pthread_mutex_destroy(&sf_mutex); + return; +} + +#endif diff --git a/mysys/typelib.c b/mysys/typelib.c index f724e5b27a2..3b4e1014f15 100644 --- a/mysys/typelib.c +++ b/mysys/typelib.c @@ -47,7 +47,10 @@ int find_type_or_exit(const char *x, TYPELIB *typelib, const char *option) { int res; if ((res= find_type_with_warning(x, typelib, option)) <= 0) + { + sf_leaking_memory= 1; /* no memory leak reports here */ exit(1); + } return res; } diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index b4dc3f79e0c..a1e45b36b82 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -6782,6 +6782,7 @@ int ha_partition::final_add_index(handler_add_index *add, bool commit) if (table_arg->key_info == add->key_info) table_arg->key_info= NULL; } + delete add; DBUG_RETURN(0); } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index baba6d45acf..564a8769b6b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -333,8 +333,6 @@ static PSI_rwlock_key key_rwlock_openssl; #endif #endif /* HAVE_PSI_INTERFACE */ -#undef SAFEMALLOC - /* the default log output is log tables */ static bool lower_case_table_names_used= 0; static bool max_long_data_size_used= false; @@ -3509,6 +3507,8 @@ static int init_common_variables() tzset(); // Set tzname + sf_leaking_memory= 0; // no memory leaks from now on + max_system_variables.pseudo_thread_id= (ulong)~0; server_start_time= flush_status_time= my_time(0); @@ -4709,6 +4709,7 @@ int mysqld_main(int argc, char **argv) to be able to read defaults files and parse options. */ my_progname= argv[0]; + sf_leaking_memory= 1; // no safemalloc memory leak reports if we exit early #ifndef _WIN32 // For windows, my_init() is called from the win specific mysqld_main if (my_init()) // init my_sys library & pthreads diff --git a/storage/pbxt/src/ha_pbxt.cc b/storage/pbxt/src/ha_pbxt.cc index f574dbd362a..ff8c85d1977 100644 --- a/storage/pbxt/src/ha_pbxt.cc +++ b/storage/pbxt/src/ha_pbxt.cc @@ -5732,6 +5732,7 @@ int ha_pbxt::create(const char *table_path, TABLE *table_arg, HA_CREATE_INFO *cr catch_(a) { if (tab_def) tab_def->finalize(self); + delete tab_def; dic.dic_table = NULL; err = xt_ha_pbxt_thread_error_for_mysql(thd, self, FALSE); } From 2ccf247e939b39d1f84908a56b8717150e5fd1b4 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 12 Dec 2011 23:58:40 +0100 Subject: [PATCH 05/20] after merge changes: * rename all debugging related command-line options and variables to start from "debug-", and made them all OFF by default. * replace "MySQL" with "MariaDB" in error messages * "Cast ... converted ... integer to it's ... complement" is now a note, not a warning * @@query_cache_strip_comments now has a session scope, not global. --- mysql-test/include/default_mysqld.cnf | 2 +- mysql-test/r/alias.result | 54 +- mysql-test/r/alter_table.result | 8 +- mysql-test/r/analyze.result | 4 +- mysql-test/r/bug46261.result | 4 +- mysql-test/r/bug58669.result | 2 +- mysql-test/r/cast.result | 22 +- mysql-test/r/comments.result | 18 +- mysql-test/r/constraints.result | 12 +- mysql-test/r/create.result | 8 +- mysql-test/r/ctype_errors.result | 2 +- mysql-test/r/ctype_latin1.result | 2 +- mysql-test/r/delete.result | 6 +- mysql-test/r/deprecated_features.result | 18 +- mysql-test/r/derived.result | 6 +- mysql-test/r/dyncol.result | 10 +- mysql-test/r/events_1.result | 4 +- mysql-test/r/events_bugs.result | 30 +- mysql-test/r/events_microsec.result | 10 +- mysql-test/r/flush.result | 10 +- mysql-test/r/foreign_key.result | 20 +- mysql-test/r/fulltext.result | 8 +- mysql-test/r/func_math.result | 30 +- mysql-test/r/func_time.result | 6 +- mysql-test/r/gis.result | 6 +- mysql-test/r/grant2.result | 2 +- mysql-test/r/group_by.result | 4 +- mysql-test/r/having.result | 2 +- mysql-test/r/information_schema.result | 6 +- .../r/information_schema_parameters.result | 2 +- .../r/information_schema_routines.result | 2 +- mysql-test/r/join.result | 4 +- mysql-test/r/key_cache.result | 2 +- mysql-test/r/kill.result | 2 +- mysql-test/r/log_state.result | 12 +- mysql-test/r/multi_update.result | 2 +- mysql-test/r/myisam.result | 6 +- mysql-test/r/mysql.result | 4 +- mysql-test/r/mysqld--help-notwin.result | 27 +- mysql-test/r/mysqldump.result | 4 +- mysql-test/r/mysqltest.result | 64 +- mysql-test/r/olap.result | 6 +- mysql-test/r/outfile.result | Bin 2137 -> 2139 bytes mysql-test/r/parser.result | 168 +- mysql-test/r/parser_not_embedded.result | 32 +- mysql-test/r/parser_precedence.result | 12 +- mysql-test/r/partition.result | 14 +- mysql-test/r/partition_disabled.result | 32 +- mysql-test/r/partition_error.result | 12 +- mysql-test/r/partition_key_cache.result | 10 +- mysql-test/r/partition_myisam.result | 4 +- mysql-test/r/plugin_auth.result | 10 +- mysql-test/r/plugin_auth_qa.result | 54 +- mysql-test/r/ps.result | 28 +- mysql-test/r/ps_1general.result | 24 +- mysql-test/r/ps_2myisam.result | 24 +- mysql-test/r/ps_3innodb.result | 24 +- mysql-test/r/ps_4heap.result | 24 +- mysql-test/r/ps_5merge.result | 48 +- mysql-test/r/ps_ddl.result | 8 +- mysql-test/r/query_cache.result | 4 +- mysql-test/r/read_only.result | 20 +- mysql-test/r/read_only_innodb.result | 6 +- mysql-test/r/renamedb.result | 2 +- mysql-test/r/select.result | 6 +- mysql-test/r/select_jcl6.result | 6 +- mysql-test/r/select_pkeycache.result | 6 +- mysql-test/r/signal.result | 54 +- mysql-test/r/skip_grants.result | 2 +- mysql-test/r/sp-error.result | 24 +- mysql-test/r/sp-ucs2.result | 6 +- mysql-test/r/sp.result | 2 +- mysql-test/r/subselect.result | 126 +- mysql-test/r/subselect3.result | 2 +- mysql-test/r/subselect3_jcl6.result | 2 +- mysql-test/r/subselect4.result | 8 +- mysql-test/r/subselect_mat.result | 2 +- mysql-test/r/subselect_no_mat.result | 126 +- mysql-test/r/subselect_no_opts.result | 126 +- mysql-test/r/subselect_no_scache.result | 126 +- mysql-test/r/subselect_no_semijoin.result | 126 +- mysql-test/r/subselect_notembedded.result | 2 +- mysql-test/r/subselect_sj_mat.result | 2 +- mysql-test/r/trigger-compat.result | 14 +- mysql-test/r/trigger.result | 6 +- mysql-test/r/type_blob.result | 14 +- mysql-test/r/type_decimal.result | 6 +- mysql-test/r/udf.result | 6 +- mysql-test/r/union.result | 2 +- mysql-test/r/user_var.result | 4 +- mysql-test/r/varbinary.result | 2 +- mysql-test/r/variables.result | 20 +- mysql-test/r/warnings.result | 4 +- mysql-test/r/xa.result | 2 +- .../suite/binlog/r/binlog_base64_flag.result | 8 +- .../suite/funcs_1/r/innodb_func_view.result | 36 +- .../funcs_1/r/innodb_storedproc_02.result | 4 +- .../funcs_1/r/innodb_storedproc_08.result | 2 +- .../suite/funcs_1/r/innodb_trig_0102.result | 34 +- .../suite/funcs_1/r/innodb_trig_03e.result | 2 +- .../suite/funcs_1/r/innodb_trig_0407.result | 24 +- .../suite/funcs_1/r/innodb_trig_08.result | 12 +- .../suite/funcs_1/r/innodb_views.result | 108 +- .../suite/funcs_1/r/is_statistics.result | 2 +- .../suite/funcs_1/r/memory_func_view.result | 36 +- .../funcs_1/r/memory_storedproc_02.result | 4 +- .../funcs_1/r/memory_storedproc_08.result | 2 +- .../suite/funcs_1/r/memory_trig_0102.result | 34 +- .../suite/funcs_1/r/memory_trig_03e.result | 2 +- .../suite/funcs_1/r/memory_trig_0407.result | 24 +- .../suite/funcs_1/r/memory_trig_08.result | 12 +- .../suite/funcs_1/r/memory_views.result | 108 +- .../suite/funcs_1/r/myisam_func_view.result | 36 +- .../funcs_1/r/myisam_storedproc_02.result | 4 +- .../funcs_1/r/myisam_storedproc_08.result | 2 +- .../suite/funcs_1/r/myisam_trig_0102.result | 34 +- .../suite/funcs_1/r/myisam_trig_03e.result | 2 +- .../suite/funcs_1/r/myisam_trig_0407.result | 24 +- .../suite/funcs_1/r/myisam_trig_08.result | 12 +- .../funcs_1/r/processlist_priv_no_prot.result | 4 +- mysql-test/suite/funcs_1/r/storedproc.result | 2742 ++++++++--------- mysql-test/suite/handler/aria.result | 4 +- mysql-test/suite/handler/heap.result | 4 +- mysql-test/suite/handler/innodb.result | 4 +- mysql-test/suite/handler/interface.result | 28 +- mysql-test/suite/handler/myisam.result | 4 +- mysql-test/suite/maria/r/maria.result | 6 +- mysql-test/suite/maria/r/maria3.result | 4 +- mysql-test/suite/maria/r/ps_maria.result | 24 +- .../parts/r/partition_alter3_innodb.result | 2 +- .../parts/r/partition_alter3_myisam.result | 2 +- .../parts/r/partition_engine_innodb.result | 10 +- .../parts/r/partition_engine_myisam.result | 10 +- .../parts/r/partition_syntax_innodb.result | 72 +- .../parts/r/partition_syntax_myisam.result | 72 +- mysql-test/suite/pbxt/r/cast.result | 22 +- mysql-test/suite/pbxt/r/create.result | 6 +- mysql-test/suite/pbxt/r/derived.result | 6 +- mysql-test/suite/pbxt/r/group_by.result | 4 +- mysql-test/suite/pbxt/r/having.result | 2 +- mysql-test/suite/pbxt/r/join.result | 4 +- mysql-test/suite/pbxt/r/multi_update.result | 2 +- mysql-test/suite/pbxt/r/olap.result | 6 +- .../suite/pbxt/r/partition_error.result | 12 +- mysql-test/suite/pbxt/r/ps_1general.result | 24 +- mysql-test/suite/pbxt/r/read_only.result | 16 +- mysql-test/suite/pbxt/r/renamedb.result | 2 +- mysql-test/suite/pbxt/r/select.result | 6 +- mysql-test/suite/pbxt/r/select_safe.result | 4 +- mysql-test/suite/pbxt/r/subselect.result | 14 +- mysql-test/suite/pbxt/r/type_decimal.result | 6 +- mysql-test/suite/pbxt/r/udf.result | 6 +- mysql-test/suite/pbxt/r/union.result | 2 +- mysql-test/suite/pbxt/r/user_var.result | 4 +- .../rpl/r/rpl_conditional_comments.result | 2 +- .../suite/rpl/r/rpl_heartbeat_basic.result | 6 +- mysql-test/suite/rpl/r/rpl_read_only.result | 8 +- mysql-test/suite/rpl/r/rpl_rotate_logs.result | 4 +- mysql-test/suite/rpl/t/rpl_000010-slave.opt | 2 +- .../rpl/t/rpl_sporadic_master-master.opt | 2 +- .../r/aria_checkpoint_interval_basic.result | 4 +- .../aria_checkpoint_log_activity_basic.result | 4 +- .../r/aria_group_commit_interval_basic.result | 4 +- .../r/aria_log_file_size_basic.result | 4 +- .../r/aria_max_sort_file_size_basic.result | 4 +- .../aria_pagecache_age_threshold_basic.result | 4 +- ...aria_pagecache_division_limit_basic.result | 4 +- .../r/aria_repair_threads_basic.result | 4 +- .../r/aria_sort_buffer_size_basic.result | 4 +- .../r/automatic_sp_privileges_basic.result | 4 +- .../suite/sys_vars/r/big_tables_basic.result | 4 +- .../r/binlog_cache_size_basic_64.result | 2 +- .../r/binlog_stmt_cache_size_basic_64.result | 2 +- .../r/bulk_insert_buffer_size_basic_64.result | 4 +- .../r/character_set_client_basic.result | 2 +- .../r/character_set_connection_basic.result | 2 +- .../r/character_set_database_basic.result | 4 +- .../r/character_set_filesystem_basic.result | 2 +- .../r/character_set_results_basic.result | Bin 16478 -> 16480 bytes .../r/character_set_server_basic.result | 2 +- .../r/collation_connection_basic.result | 2 +- .../r/collation_database_basic.result | 2 +- .../sys_vars/r/collation_server_basic.result | 2 +- .../sys_vars/r/completion_type_basic.result | 4 +- .../sys_vars/r/concurrent_insert_basic.result | 2 +- .../sys_vars/r/connect_timeout_basic.result | 2 +- .../r/deadlock_search_depth_long_basic.result | 2 +- .../deadlock_search_depth_short_basic.result | 2 +- .../r/deadlock_timeout_long_basic.result | 2 +- .../r/deadlock_timeout_short_basic.result | 2 +- .../r/debug_binlog_fsync_sleep_basic.result | 2 +- .../sys_vars/r/debug_crc_break_basic.result | 2 +- .../r/debug_no_thread_alarm_basic.result | 21 + .../r/default_week_format_basic.result | 4 +- .../r/delayed_insert_limit_basic_64.result | 4 +- .../r/delayed_insert_timeout_basic.result | 4 +- .../r/delayed_queue_size_basic_64.result | 4 +- .../r/div_precision_increment_basic.result | 4 +- .../r/engine_condition_pushdown_basic.result | 56 +- .../sys_vars/r/event_scheduler_basic.result | 4 +- .../sys_vars/r/expire_logs_days_basic.result | 4 +- .../r/extra_max_connections_basic.result | 2 +- .../suite/sys_vars/r/flush_basic.result | 2 +- .../suite/sys_vars/r/flush_time_basic.result | 2 +- .../sys_vars/r/ft_boolean_syntax_basic.result | 2 +- .../suite/sys_vars/r/general_log_basic.result | 4 +- .../suite/sys_vars/r/identity_basic.result | 4 +- .../sys_vars/r/init_connect_basic.result | Bin 3867 -> 3869 bytes .../suite/sys_vars/r/init_slave_basic.result | 2 +- .../suite/sys_vars/r/insert_id_basic.result | 4 +- .../r/join_buffer_space_limit_basic.result | 2 +- .../sys_vars/r/join_cache_level_basic.result | 2 +- .../sys_vars/r/key_buffer_size_basic.result | 4 +- .../r/key_cache_age_threshold_basic_64.result | 4 +- .../r/key_cache_block_size_basic.result | 4 +- .../r/key_cache_division_limit_basic.result | 4 +- .../r/key_cache_segments_basic.result | 2 +- .../sys_vars/r/lc_time_names_basic.result | 2 +- .../sys_vars/r/local_infile_basic.result | 2 +- .../suite/sys_vars/r/local_infile_func.result | 2 +- mysql-test/suite/sys_vars/r/log_basic.result | 6 +- ...log_queries_not_using_indexes_basic.result | 4 +- .../sys_vars/r/log_slow_queries_basic.result | 22 +- .../r/log_slow_rate_limit_basic.result | 2 +- .../r/max_binlog_cache_size_basic.result | 4 +- .../sys_vars/r/max_binlog_size_basic.result | 4 +- .../r/max_binlog_stmt_cache_size_basic.result | 4 +- .../r/max_connect_errors_basic_64.result | 4 +- .../sys_vars/r/max_connections_basic.result | 4 +- .../sys_vars/r/max_join_size_basic.result | 2 +- .../r/max_prepared_stmt_count_basic.result | 4 +- .../r/max_relay_log_size_basic.result | 4 +- .../sys_vars/r/max_user_connections-2.result | 2 +- .../sys_vars/r/mrr_buffer_size_basic.result | 2 +- .../r/multi_range_count_basic_64.result | 64 +- .../r/myisam_stats_method_basic.result | 4 +- .../r/progress_report_time_basic.result | 2 +- .../r/query_cache_limit_basic_64.result | 4 +- .../query_cache_min_res_unit_basic_64.result | 4 +- .../r/query_cache_size_basic_64.result | 4 +- .../r/query_cache_strip_comments_basic.result | 19 +- .../suite/sys_vars/r/read_only_basic.result | 4 +- .../suite/sys_vars/r/read_only_func.result | 2 +- .../sys_vars/r/relay_log_purge_basic.result | 2 +- .../r/rowid_merge_buff_size_basic.result | 2 +- .../r/rpl_recovery_rank_basic_64.result | 34 +- .../suite/sys_vars/r/secure_file_priv2.result | 4 +- .../sys_vars/r/slow_launch_time_basic.result | 4 +- .../sys_vars/r/slow_query_log_basic.result | 4 +- .../sys_vars/r/sql_big_selects_func.result | 2 +- .../sys_vars/r/sql_max_join_size_basic.result | 12 +- .../sys_vars/r/sql_max_join_size_func.result | 14 +- .../suite/sys_vars/r/sql_mode_basic.result | 4 +- .../suite/sys_vars/r/sync_binlog_basic.result | 4 +- .../suite/sys_vars/r/sync_frm_basic.result | 2 +- .../sys_vars/r/sync_master_info_basic.result | 2 +- .../sys_vars/r/sync_relay_log_basic.result | 2 +- .../r/sync_relay_log_info_basic.result | 2 +- .../r/table_definition_cache_basic.result | 2 +- .../sys_vars/r/table_open_cache_basic.result | 2 +- .../sys_vars/r/thread_alarm_basic.result | 21 - .../sys_vars/r/thread_cache_size_basic.result | 2 +- .../suite/sys_vars/r/time_zone_basic.result | 4 +- .../sys_vars/r/tx_isolation_basic.result | 4 +- .../t/debug_no_thread_alarm_basic.test | 21 + .../t/query_cache_strip_comments_basic.test | 19 +- .../suite/sys_vars/t/thread_alarm_basic.test | 21 - .../r/vcol_blocked_sql_funcs_innodb.result | 2 +- .../r/vcol_blocked_sql_funcs_myisam.result | 2 +- .../r/vcol_column_def_options_innodb.result | 26 +- .../r/vcol_column_def_options_myisam.result | 26 +- .../r/vcol_supported_sql_funcs_innodb.result | 12 +- .../r/vcol_supported_sql_funcs_myisam.result | 12 +- sql/item_func.cc | 4 +- sql/mysqld.cc | 26 +- sql/mysqld.h | 3 +- sql/share/errmsg-utf8.txt | 350 +-- sql/sql_cache.cc | 2 +- sql/sql_class.h | 1 + sql/sys_vars.cc | 20 +- 280 files changed, 3327 insertions(+), 3348 deletions(-) create mode 100644 mysql-test/suite/sys_vars/r/debug_no_thread_alarm_basic.result delete mode 100644 mysql-test/suite/sys_vars/r/thread_alarm_basic.result create mode 100644 mysql-test/suite/sys_vars/t/debug_no_thread_alarm_basic.test delete mode 100644 mysql-test/suite/sys_vars/t/thread_alarm_basic.test diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 0354e375d53..c3ac934f7b3 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -26,7 +26,7 @@ connect-timeout= 60 plugin-dir=@OPT.plugindir log-basename=mysqld -disable-sync-sys +debug-no-sync log-bin-trust-function-creators=1 key_buffer_size= 1M diff --git a/mysql-test/r/alias.result b/mysql-test/r/alias.result index 3190e8994e5..9e4ce9f84a9 100644 --- a/mysql-test/r/alias.result +++ b/mysql-test/r/alias.result @@ -81,59 +81,59 @@ insert into t1 values(1,2,3); insert into t1 values(11,22,33); insert into t2 values(99); select t1.* as 'with_alias' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 select t2.* as 'with_alias' from t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias' from t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias' from t2' at line 1 select t1.*, t1.* as 'with_alias' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 select t1.* as 'with_alias', t1.* from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', t1.* from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', t1.* from t1' at line 1 select t1.* as 'with_alias', t1.* as 'alias2' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', t1.* as 'alias2' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', t1.* as 'alias2' from t1' at line 1 select t1.* as 'with_alias', a, t1.* as 'alias2' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', a, t1.* as 'alias2' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', a, t1.* as 'alias2' from t1' at line 1 select a, t1.* as 'with_alias' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 select t1.* as 'with_alias', a from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', a from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', a from t1' at line 1 select a, t1.* as 'with_alias', b from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', b from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', b from t1' at line 1 select (select d from t2 where d > a), t1.* as 'with_alias' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 select t1.* as 'with_alias', (select a from t2 where d > a) from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', (select a from t2 where d > a) from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', (select a from t2 where d > a) from t1' at line 1 select a as 'x', t1.* as 'with_alias' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 select t1.* as 'with_alias', a as 'x' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', a as 'x' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', a as 'x' from t1' at line 1 select a as 'x', t1.* as 'with_alias', b as 'x' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', b as 'x' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', b as 'x' from t1' at line 1 select (select d from t2 where d > a) as 'x', t1.* as 'with_alias' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 select t1.* as 'with_alias', (select a from t2 where d > a) as 'x' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', (select a from t2 where d > a) as 'x' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', (select a from t2 where d > a) as 'x' from t1' at line 1 select (select t2.* as 'x' from t2) from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'x' from t2) from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'x' from t2) from t1' at line 1 select a, (select t2.* as 'x' from t2) from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'x' from t2) from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'x' from t2) from t1' at line 1 select t1.*, (select t2.* as 'x' from t2) from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'x' from t2) from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'x' from t2) from t1' at line 1 insert into t3 select t1.* as 'with_alias' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 insert into t3 select t2.* as 'with_alias', 1, 2 from t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', 1, 2 from t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', 1, 2 from t2' at line 1 insert into t3 select t2.* as 'with_alias', d as 'x', d as 'z' from t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', d as 'x', d as 'z' from t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', d as 'x', d as 'z' from t2' at line 1 insert into t3 select t2.*, t2.* as 'with_alias', 3 from t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', 3 from t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', 3 from t2' at line 1 create table t3 select t1.* as 'with_alias' from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias' from t1' at line 1 create table t3 select t2.* as 'with_alias', 1, 2 from t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', 1, 2 from t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', 1, 2 from t2' at line 1 create table t3 select t2.* as 'with_alias', d as 'x', d as 'z' from t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', d as 'x', d as 'z' from t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', d as 'x', d as 'z' from t2' at line 1 create table t3 select t2.*, t2.* as 'with_alias', 3 from t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as 'with_alias', 3 from t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as 'with_alias', 3 from t2' at line 1 select t1.* from t1; a b c 1 2 3 diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index b62da05b4a2..624cc7afa98 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -696,13 +696,13 @@ section subsection title reviewer 3 3 Stored Functions You 2 3 Server Me alter table table_24562 order by 12; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '12' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '12' at line 1 alter table table_24562 order by (section + 12); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(section + 12)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(section + 12)' at line 1 alter table table_24562 order by length(title); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(title)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(title)' at line 1 alter table table_24562 order by (select 12 from dual); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(select 12 from dual)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(select 12 from dual)' at line 1 alter table table_24562 order by no_such_col; ERROR 42S22: Unknown column 'no_such_col' in 'order clause' drop table table_24562; diff --git a/mysql-test/r/analyze.result b/mysql-test/r/analyze.result index df8a6c42924..9dff94ab08c 100644 --- a/mysql-test/r/analyze.result +++ b/mysql-test/r/analyze.result @@ -59,8 +59,8 @@ drop table t1; End of 4.1 tests create table t1(a int); analyze table t1 extended; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'extended' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'extended' at line 1 optimize table t1 extended; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'extended' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'extended' at line 1 drop table t1; End of 5.0 tests diff --git a/mysql-test/r/bug46261.result b/mysql-test/r/bug46261.result index f54b698e08f..dcc950d1baf 100644 --- a/mysql-test/r/bug46261.result +++ b/mysql-test/r/bug46261.result @@ -2,7 +2,7 @@ # Bug#46261 Plugins can be installed with --skip-grant-tables # INSTALL PLUGIN example SONAME 'ha_example.so'; -ERROR HY000: The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --skip-grant-tables option so it cannot execute this statement UNINSTALL PLUGIN example; -ERROR HY000: The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --skip-grant-tables option so it cannot execute this statement End of 5.1 tests diff --git a/mysql-test/r/bug58669.result b/mysql-test/r/bug58669.result index 5504c5908be..03032e27e94 100644 --- a/mysql-test/r/bug58669.result +++ b/mysql-test/r/bug58669.result @@ -12,6 +12,6 @@ SHOW VARIABLES LIKE "%read_only%"; Variable_name Value read_only ON INSERT INTO db1.t1 VALUES (1); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement DROP DATABASE db1; DROP USER user1@localhost; diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result index 918122385e9..f5f287fea88 100644 --- a/mysql-test/r/cast.result +++ b/mysql-test/r/cast.result @@ -2,12 +2,12 @@ select CAST(1-2 AS UNSIGNED); CAST(1-2 AS UNSIGNED) 18446744073709551615 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER); CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER) -1 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select CAST('10 ' as unsigned integer); CAST('10 ' as unsigned integer) 10 @@ -17,14 +17,14 @@ select cast(-5 as unsigned) | 1, cast(-5 as unsigned) & -1; cast(-5 as unsigned) | 1 cast(-5 as unsigned) & -1 18446744073709551611 18446744073709551611 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select cast(-5 as unsigned) -1, cast(-5 as unsigned) + 1; cast(-5 as unsigned) -1 cast(-5 as unsigned) + 1 18446744073709551610 18446744073709551612 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select ~5, cast(~5 as signed); ~5 cast(~5 as signed) 18446744073709551610 -6 @@ -359,12 +359,12 @@ select cast('9223372036854775809' as signed); cast('9223372036854775809' as signed) -9223372036854775807 Warnings: -Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement select cast('-1' as unsigned); cast('-1' as unsigned) 18446744073709551615 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select cast('abc' as signed); cast('abc' as signed) 0 @@ -554,7 +554,7 @@ select cast('18446744073709551615' as signed); cast('18446744073709551615' as signed) -1 Warnings: -Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement select cast('9223372036854775807' as signed); cast('9223372036854775807' as signed) 9223372036854775807 @@ -565,7 +565,7 @@ select cast(concat('184467440','73709551615') as signed); cast(concat('184467440','73709551615') as signed) -1 Warnings: -Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement select cast(repeat('1',20) as unsigned); cast(repeat('1',20) as unsigned) 11111111111111111111 @@ -573,7 +573,7 @@ select cast(repeat('1',20) as signed); cast(repeat('1',20) as signed) -7335632962598440505 Warnings: -Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement select cast(1.0e+300 as signed int); cast(1.0e+300 as signed int) 9223372036854775807 diff --git a/mysql-test/r/comments.result b/mysql-test/r/comments.result index 77c520b0c64..8aebe95c5ac 100644 --- a/mysql-test/r/comments.result +++ b/mysql-test/r/comments.result @@ -39,11 +39,11 @@ select 2 /*M!99999 +1 */; 2 2 select 2 /*M!0000 +1 */; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '0000 +1 */' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '0000 +1 */' at line 1 select 1/*!2*/; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2*/' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2*/' at line 1 select 1/*!000002*/; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2*/' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2*/' at line 1 select 1/*!999992*/; 1 1 @@ -53,15 +53,15 @@ select 1 + /*!00000 2 */ + 3 /*!99999 noise*/ + 4; drop table if exists table_28779; create table table_28779 (a int); prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*' AND b = 'bar';"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '/*' AND b = 'bar'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '/*' AND b = 'bar'' at line 1 prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*' AND b = 'bar';*"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '/*' AND b = 'bar';*' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '/*' AND b = 'bar';*' at line 1 prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*! AND 2=2;"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*! AND 2=2;*"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '*' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '*' at line 1 prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*!98765' AND b = 'bar';"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '/*!98765' AND b = 'bar'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '/*!98765' AND b = 'bar'' at line 1 prepare bar from "DELETE FROM table_28779 WHERE a = 7 OR 1=1/*!98765' AND b = 'bar';*"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '/*!98765' AND b = 'bar';*' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '/*!98765' AND b = 'bar';*' at line 1 drop table table_28779; diff --git a/mysql-test/r/constraints.result b/mysql-test/r/constraints.result index 46a718e4c42..3821a18b072 100644 --- a/mysql-test/r/constraints.result +++ b/mysql-test/r/constraints.result @@ -29,17 +29,17 @@ t1 CREATE TABLE `t1` ( drop table t1; drop table if exists t_illegal; create table t_illegal (a int, b int, check a>b); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'a>b)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'a>b)' at line 1 create table t_illegal (a int, b int, constraint abc check a>b); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'a>b)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'a>b)' at line 1 create table t_illegal (a int, b int, constraint abc); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 drop table if exists t_11714; create table t_11714(a int, b int); alter table t_11714 add constraint cons1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 drop table t_11714; CREATE TABLE t_illegal (col_1 INT CHECK something (whatever)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'something (whatever))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'something (whatever))' at line 1 CREATE TABLE t_illegal (col_1 INT CHECK something); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'something)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'something)' at line 1 diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index c07e313b3f6..b63131fcca6 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -303,11 +303,11 @@ ERROR 42000: Incorrect database name 'db1 ' create table t1(`a ` int); ERROR 42000: Incorrect column name 'a ' create table t1 (a int,); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 create table t1 (a int,,b int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'b int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'b int)' at line 1 create table t1 (,b int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'b int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'b int)' at line 1 create table t1 (a int, key(a)); create table t2 (b int, foreign key(b) references t1(a), key(b)); drop table if exists t1,t2; @@ -1942,7 +1942,7 @@ CREATE TRIGGER f BEFORE INSERT ON t1 FOR EACH ROW BEGIN UPDATE A SET `pk`=1 WHERE `pk`=0 ; END ;| -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' DROP TABLE t1; DROP TABLE B; # diff --git a/mysql-test/r/ctype_errors.result b/mysql-test/r/ctype_errors.result index b3632454eb1..90d0c28eebf 100644 --- a/mysql-test/r/ctype_errors.result +++ b/mysql-test/r/ctype_errors.result @@ -37,6 +37,6 @@ ERROR 42000: Nezn-Bámá databáze 'nonexistant' SET lc_messages=ru_RU; SET NAMES latin1; SELECT '01234567890123456789012345678901234\'; -ERROR 42000: \0423 \0432\0430\0441 \043E\0448\0438\0431\043A\0430 \0432 \0437\0430\043F\0440\043E\0441\0435. \0418\0437\0443\0447\0438\0442\0435 \0434\043E\043A\0443\043C\0435\043D\0442\0430\0446\0438\044E \043F\043E \0438\0441\043F\043E\043B\044C\0437\0443\0435\043C\043E\0439 \0432\0435\0440\0441\0438\0438 MySQL \043D\0430 \043F\0440\0435\0434\043C\0435\0442 \043A\043E\0440\0440\0435\043A\0442\043D\043E\0433\043E \0441\0438\043D\0442\0430\043A\0441\0438\0441\0430 \043E\043A\043E\043B\043E ''012345678901234567890123456 +ERROR 42000: \0423 \0432\0430\0441 \043E\0448\0438\0431\043A\0430 \0432 \0437\0430\043F\0440\043E\0441\0435. \0418\0437\0443\0447\0438\0442\0435 \0434\043E\043A\0443\043C\0435\043D\0442\0430\0446\0438\044E \043F\043E \0438\0441\043F\043E\043B\044C\0437\0443\0435\043C\043E\0439 \0432\0435\0440\0441\0438\0438 MariaDB \043D\0430 \043F\0440\0435\0434\043C\0435\0442 \043A\043E\0440\0440\0435\043A\0442\043D\043E\0433\043E \0441\0438\043D\0442\0430\043A\0441\0438\0441\0430 \043E\043A\043E\043B\043E ''0123456789012345678901234 # Connection default End of 5.5 tests diff --git a/mysql-test/r/ctype_latin1.result b/mysql-test/r/ctype_latin1.result index 3f51716bc34..6c494b83668 100644 --- a/mysql-test/r/ctype_latin1.result +++ b/mysql-test/r/ctype_latin1.result @@ -365,7 +365,7 @@ c2h ab_def drop table t1; CREATE TABLE „a (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '„a (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '„a (a int)' at line 1 SELECT '„a' as str; str „a diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result index 5e4adbbd6dc..bd5da049523 100644 --- a/mysql-test/r/delete.result +++ b/mysql-test/r/delete.result @@ -251,13 +251,13 @@ a INT ); INSERT INTO db2.t1 (a) SELECT * FROM t2; DELETE FROM t1 alias USING t1, t2 alias WHERE t1.a = alias.a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'alias USING t1, t2 alias WHERE t1.a = alias.a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'alias USING t1, t2 alias WHERE t1.a = alias.a' at line 1 DELETE FROM alias USING t1, t2 alias WHERE t1.a = alias.a; DELETE FROM t1, alias USING t1, t2 alias WHERE t1.a = alias.a; DELETE FROM t1, t2 USING t1, t2 alias WHERE t1.a = alias.a; ERROR 42S02: Unknown table 't2' in MULTI DELETE DELETE FROM db1.t1 alias USING db1.t1, db2.t1 alias WHERE db1.t1.a = alias.a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'alias USING db1.t1, db2.t1 alias WHERE db1.t1.a = alias.a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'alias USING db1.t1, db2.t1 alias WHERE db1.t1.a = alias.a' at line 1 DELETE FROM alias USING db1.t1, db2.t1 alias WHERE db1.t1.a = alias.a; DELETE FROM db2.alias USING db1.t1, db2.t1 alias WHERE db1.t1.a = alias.a; ERROR 42S02: Unknown table 'alias' in MULTI DELETE @@ -265,7 +265,7 @@ DELETE FROM t1 USING t1 WHERE a = 1; SELECT * FROM t1; a DELETE FROM t1 alias USING t1 alias WHERE a = 2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'alias USING t1 alias WHERE a = 2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'alias USING t1 alias WHERE a = 2' at line 1 SELECT * FROM t1; a DROP TABLE t1, t2; diff --git a/mysql-test/r/deprecated_features.result b/mysql-test/r/deprecated_features.result index f214ab8f9e1..fc6c86d065d 100644 --- a/mysql-test/r/deprecated_features.result +++ b/mysql-test/r/deprecated_features.result @@ -5,20 +5,20 @@ ERROR HY000: Unknown system variable 'table_type' select @@table_type='MyISAM'; ERROR HY000: Unknown system variable 'table_type' backup table t1 to 'data.txt'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'backup table t1 to 'data.txt'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'backup table t1 to 'data.txt'' at line 1 restore table t1 from 'data.txt'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'restore table t1 from 'data.txt'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'restore table t1 from 'data.txt'' at line 1 show plugin; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'plugin' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'plugin' at line 1 load table t1 from master; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'table t1 from master' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'table t1 from master' at line 1 load data from master; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from master' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from master' at line 1 SHOW INNODB STATUS; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INNODB STATUS' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INNODB STATUS' at line 1 create table t1 (t6 timestamp) type=myisam; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'type=myisam' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'type=myisam' at line 1 show table types; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'types' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'types' at line 1 show mutex status; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mutex status' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mutex status' at line 1 diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result index 0fc7804297c..cd97c898e18 100644 --- a/mysql-test/r/derived.result +++ b/mysql-test/r/derived.result @@ -213,15 +213,15 @@ a 2 drop table t1; select mail_id, if(folder.f_description!='', folder.f_description, folder.f_name) as folder_name, date, address_id, phrase, address, subject from folder, (select mail.mail_id as mail_id, date_format(mail.h_date, '%b %e, %Y %h:%i') as date, mail.folder_id, sender.address_id as address_id, sender.phrase as phrase, sender.address as address, mail.h_subject as subject from mail left join mxa as mxa_sender on mail.mail_id=mxa_sender.mail_id and mxa_sender.type='from' left join address as sender on mxa_sender.address_id=sender.address_id mxa as mxa_recipient, address as recipient, where 1 and mail.mail_id=mxa_recipient.mail_id and mxa_recipient.address_id=recipient.address_id and mxa_recipient.type='to' and match(sender.phrase, sender.address, sender.comment) against ('jeremy' in boolean mode) and match(recipient.phrase, recipient.address, recipient.comment) against ('monty' in boolean mode) order by mail.h_date desc limit 0, 25 ) as query where query.folder_id=folder.folder_id; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mxa as mxa_recipient, address as recipient, where 1 and mail.mail_id=mxa_r' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mxa as mxa_recipient, address as recipient, where 1 and mail.mail_id=mxa_r' at line 1 create table t1 (a int); insert into t1 values (1),(2),(3); update (select * from t1) as t1 set a = 5; ERROR HY000: The target table t1 of the UPDATE is not updatable delete from (select * from t1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(select * from t1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(select * from t1)' at line 1 insert into (select * from t1) values (5); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(select * from t1) values (5)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(select * from t1) values (5)' at line 1 drop table t1; create table t1 (E1 INTEGER UNSIGNED NOT NULL, E2 INTEGER UNSIGNED NOT NULL, E3 INTEGER UNSIGNED NOT NULL, PRIMARY KEY(E1) ); diff --git a/mysql-test/r/dyncol.result b/mysql-test/r/dyncol.result index f4a858c3029..13543223ad8 100644 --- a/mysql-test/r/dyncol.result +++ b/mysql-test/r/dyncol.result @@ -218,7 +218,7 @@ select column_get(column_create(1, -1212 AS int), 1 as unsigned int); column_get(column_create(1, -1212 AS int), 1 as unsigned int) 18446744073709550404 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 as unsigned int); column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 as unsigned int) 18446744073709551615 @@ -309,7 +309,7 @@ select column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as i column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as int) -1 Warnings: -Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement select column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 as int); column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 as int) 9223372036854775807 @@ -345,7 +345,7 @@ select column_get(COLUMN_CREATE(1, ~0), 1 as signed); column_get(COLUMN_CREATE(1, ~0), 1 as signed) -1 Warnings: -Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement select column_get(COLUMN_CREATE(1, ~0), 1 as unsigned); column_get(COLUMN_CREATE(1, ~0), 1 as unsigned) 18446744073709551615 @@ -356,7 +356,7 @@ select column_get(COLUMN_CREATE(1, -1), 1 as unsigned); column_get(COLUMN_CREATE(1, -1), 1 as unsigned) 18446744073709551615 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement # #column get char # @@ -1146,7 +1146,7 @@ column_list(column_create(1, NULL as integer)) select HEX(COLUMN_CREATE(1, 5, 1, 5)); ERROR 22007: Illegal value used as argument of dynamic column function select HEX(COLUMN_CREATE("", 1, 5, 1, 5)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '))' at line 1 select COLUMN_LIST("a"); ERROR HY000: Encountered illegal format of dynamic column string select column_delete("a", 1); diff --git a/mysql-test/r/events_1.result b/mysql-test/r/events_1.result index 29e81975c87..5a64cf14ef5 100644 --- a/mysql-test/r/events_1.result +++ b/mysql-test/r/events_1.result @@ -223,9 +223,9 @@ user(), 'utf8_general_ci', 'select 1'); show create event root22; -ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND' +ERROR 42000: This version of MariaDB doesn't yet support 'MICROSECOND' SHOW EVENTS; -ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND' +ERROR 42000: This version of MariaDB doesn't yet support 'MICROSECOND' drop event root22; create event root23 on schedule every -100 year do select 1; ERROR HY000: INTERVAL is either not positive or too big diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result index b98d1674a3c..30bc4f89d8c 100644 --- a/mysql-test/r/events_bugs.result +++ b/mysql-test/r/events_bugs.result @@ -41,11 +41,11 @@ Note 1588 Event execution time is in the past and ON COMPLETION NOT PRESERVE is show events; Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 do drop table t' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'starts 10000101000000 do drop table t' at line 1 create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ends 10000101000000 do drop table t' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ends 10000101000000 do drop table t' at line 1 create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 ends 10000101000000 do drop table t' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'starts 10000101000000 ends 10000101000000 do drop table t' at line 1 create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t; ERROR HY000: Incorrect STARTS value: '10000101000000' set global event_scheduler=off; @@ -218,13 +218,13 @@ drop event events_test.mysqltest_user1; drop user mysqltest_user1@localhost; drop database mysqltest_db1; create event e_53 on schedule at (select s1 from ttx) do drop table t; -ERROR 42000: This version of MySQL doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' +ERROR 42000: This version of MariaDB doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' create event e_53 on schedule every (select s1 from ttx) second do drop table t; -ERROR 42000: This version of MySQL doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' +ERROR 42000: This version of MariaDB doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' create event e_53 on schedule every 5 second starts (select s1 from ttx) do drop table t; -ERROR 42000: This version of MySQL doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' +ERROR 42000: This version of MariaDB doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' create event e_53 on schedule every 5 second ends (select s1 from ttx) do drop table t; -ERROR 42000: This version of MySQL doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' +ERROR 42000: This version of MariaDB doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' drop event if exists e_16; drop procedure if exists p_16; create event e_16 on schedule every 1 second do set @a=5; @@ -265,7 +265,7 @@ begin call p22830_wait(); select 123; end| -ERROR 42000: This version of MySQL doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' +ERROR 42000: This version of MariaDB doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' create event e22830_1 on schedule every 1 hour do begin call p22830_wait(); @@ -330,7 +330,7 @@ end 1 HOUR drop procedure p22830_wait; drop function f22830; drop event (select a from t2); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(select a from t2)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(select a from t2)' at line 1 drop event e22830_1; drop event e22830_2; drop event e22830_3; @@ -560,11 +560,11 @@ ERROR HY000: Incorrect AT value: '0every day' CREATE EVENT new_event ON SCHEDULE AT (SELECT "every day") DO SELECT 1; ERROR HY000: Incorrect AT value: 'every day' CREATE EVENT new_event ON SCHEDULE AT NOW() STARTS NOW() DO SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STARTS NOW() DO SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STARTS NOW() DO SELECT 1' at line 1 CREATE EVENT new_event ON SCHEDULE AT NOW() ENDS NOW() DO SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ENDS NOW() DO SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ENDS NOW() DO SELECT 1' at line 1 CREATE EVENT new_event ON SCHEDULE AT NOW() STARTS NOW() ENDS NOW() DO SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STARTS NOW() ENDS NOW() DO SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STARTS NOW() ENDS NOW() DO SELECT 1' at line 1 USE test; SHOW GRANTS FOR CURRENT_USER; Grants for root@localhost @@ -644,13 +644,13 @@ SET GLOBAL READ_ONLY = 1; # CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement ALTER EVENT e1 COMMENT 'comment'; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement DROP EVENT e1; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement # # Connection: root_con (root@localhost/events_test). diff --git a/mysql-test/r/events_microsec.result b/mysql-test/r/events_microsec.result index b96bd551511..2a9f3587706 100644 --- a/mysql-test/r/events_microsec.result +++ b/mysql-test/r/events_microsec.result @@ -1,13 +1,13 @@ create database if not exists events_test; use events_test; CREATE EVENT micro_test ON SCHEDULE EVERY 100 MICROSECOND DO SELECT 1; -ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND' +ERROR 42000: This version of MariaDB doesn't yet support 'MICROSECOND' CREATE EVENT micro_test ON SCHEDULE EVERY 100 DAY_MICROSECOND DO SELECT 1; -ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND' +ERROR 42000: This version of MariaDB doesn't yet support 'MICROSECOND' CREATE EVENT micro_test ON SCHEDULE EVERY 100 HOUR_MICROSECOND DO SELECT 1; -ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND' +ERROR 42000: This version of MariaDB doesn't yet support 'MICROSECOND' CREATE EVENT micro_test ON SCHEDULE EVERY 100 MINUTE_MICROSECOND DO SELECT 1; -ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND' +ERROR 42000: This version of MariaDB doesn't yet support 'MICROSECOND' CREATE EVENT micro_test ON SCHEDULE EVERY 100 SECOND_MICROSECOND DO SELECT 1; -ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND' +ERROR 42000: This version of MariaDB doesn't yet support 'MICROSECOND' drop database events_test; diff --git a/mysql-test/r/flush.result b/mysql-test/r/flush.result index 340a0863790..d3b3cd16210 100644 --- a/mysql-test/r/flush.result +++ b/mysql-test/r/flush.result @@ -117,15 +117,15 @@ drop tables t1, t2; # I. Check the incompatible changes in the grammar. # flush tables with read lock, hosts; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' hosts' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ' hosts' at line 1 flush privileges, tables; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tables' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tables' at line 1 flush privileges, tables with read lock; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tables with read lock' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tables with read lock' at line 1 flush privileges, tables; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tables' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tables' at line 1 flush tables with read lock, tables; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' tables' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ' tables' at line 1 show tables; Tables_in_test # diff --git a/mysql-test/r/foreign_key.result b/mysql-test/r/foreign_key.result index 78702749fa0..5c228b6241b 100644 --- a/mysql-test/r/foreign_key.result +++ b/mysql-test/r/foreign_key.result @@ -44,41 +44,41 @@ drop table if exists t_34455; create table t_34455 ( a int not null, foreign key (a) references t3 (a) match full match partial); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match partial)' at line 3 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match partial)' at line 3 create table t_34455 ( a int not null, foreign key (a) references t3 (a) on delete set default match full); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match full)' at line 3 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match full)' at line 3 create table t_34455 ( a int not null, foreign key (a) references t3 (a) on update set default match full); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match full)' at line 3 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match full)' at line 3 create table t_34455 ( a int not null, foreign key (a) references t3 (a) on delete set default on delete set default); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delete set default)' at line 4 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delete set default)' at line 4 create table t_34455 ( a int not null, foreign key (a) references t3 (a) on update set default on update set default); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'update set default)' at line 4 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'update set default)' at line 4 create table t_34455 (a int not null); alter table t_34455 add foreign key (a) references t3 (a) match full match partial); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match partial)' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match partial)' at line 2 alter table t_34455 add foreign key (a) references t3 (a) on delete set default match full); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match full)' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match full)' at line 2 alter table t_34455 add foreign key (a) references t3 (a) on update set default match full); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match full)' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match full)' at line 2 alter table t_34455 add foreign key (a) references t3 (a) on delete set default on delete set default); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delete set default)' at line 3 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delete set default)' at line 3 alter table t_34455 add foreign key (a) references t3 (a) on update set default on update set default); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'update set default)' at line 3 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'update set default)' at line 3 drop table t_34455; diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index c96937fea34..c067ff02574 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -49,7 +49,7 @@ a b Full-text indexes are called collections Only MyISAM tables support collections select * from t1 where MATCH(a,b) AGAINST ("indexes" IN BOOLEAN MODE WITH QUERY EXPANSION); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'QUERY EXPANSION)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'QUERY EXPANSION)' at line 1 explain select * from t1 where MATCH(a,b) AGAINST ("collections"); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 fulltext a a 0 1 Using where @@ -575,12 +575,12 @@ DROP TABLE t1; # CREATE TABLE t1(col1 TEXT, FULLTEXT INDEX USING BTREE (col1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USING BTREE (col1))' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE (col1))' at line 2 CREATE TABLE t2(col1 TEXT); CREATE FULLTEXT INDEX USING BTREE ON t2(col); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USING BTREE ON t2(col)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE ON t2(col)' at line 1 ALTER TABLE t2 ADD FULLTEXT INDEX USING BTREE (col1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USING BTREE (col1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE (col1)' at line 1 DROP TABLE t2; End of 5.0 tests # diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index fff6e86862c..67f3f664ad8 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -286,54 +286,54 @@ select cast(-2 as unsigned), 18446744073709551614, -2; cast(-2 as unsigned) 18446744073709551614 -2 18446744073709551614 18446744073709551614 -2 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select abs(cast(-2 as unsigned)), abs(18446744073709551614), abs(-2); abs(cast(-2 as unsigned)) abs(18446744073709551614) abs(-2) 18446744073709551614 18446744073709551614 2 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select ceiling(cast(-2 as unsigned)), ceiling(18446744073709551614), ceiling(-2); ceiling(cast(-2 as unsigned)) ceiling(18446744073709551614) ceiling(-2) 18446744073709551614 18446744073709551614 -2 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select floor(cast(-2 as unsigned)), floor(18446744073709551614), floor(-2); floor(cast(-2 as unsigned)) floor(18446744073709551614) floor(-2) 18446744073709551614 18446744073709551614 -2 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select format(cast(-2 as unsigned), 2), format(18446744073709551614, 2), format(-2, 2); format(cast(-2 as unsigned), 2) format(18446744073709551614, 2) format(-2, 2) 18,446,744,073,709,551,614.00 18,446,744,073,709,551,614.00 -2.00 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select sqrt(cast(-2 as unsigned)), sqrt(18446744073709551614), sqrt(-2); sqrt(cast(-2 as unsigned)) sqrt(18446744073709551614) sqrt(-2) 4294967296 4294967296 NULL Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select round(cast(-2 as unsigned), 1), round(18446744073709551614, 1), round(-2, 1); round(cast(-2 as unsigned), 1) round(18446744073709551614, 1) round(-2, 1) 18446744073709551614 18446744073709551614 -2 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select round(4, cast(-2 as unsigned)), round(4, 18446744073709551614), round(4, -2); round(4, cast(-2 as unsigned)) round(4, 18446744073709551614) round(4, -2) 4 4 0 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select truncate(cast(-2 as unsigned), 1), truncate(18446744073709551614, 1), truncate(-2, 1); truncate(cast(-2 as unsigned), 1) truncate(18446744073709551614, 1) truncate(-2, 1) 18446744073709551614 18446744073709551614 -2 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select truncate(4, cast(-2 as unsigned)), truncate(4, 18446744073709551614), truncate(4, -2); truncate(4, cast(-2 as unsigned)) truncate(4, 18446744073709551614) truncate(4, -2) 4 4 0 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select round(10000000000000000000, -19), truncate(10000000000000000000, -19); round(10000000000000000000, -19) truncate(10000000000000000000, -19) 10000000000000000000 10000000000000000000 @@ -386,17 +386,17 @@ select mod(cast(-2 as unsigned), 3), mod(18446744073709551614, 3), mod(-2, 3); mod(cast(-2 as unsigned), 3) mod(18446744073709551614, 3) mod(-2, 3) 2 2 -2 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select mod(5, cast(-2 as unsigned)), mod(5, 18446744073709551614), mod(5, -2); mod(5, cast(-2 as unsigned)) mod(5, 18446744073709551614) mod(5, -2) 5 5 1 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select pow(cast(-2 as unsigned), 5), pow(18446744073709551614, 5), pow(-2, 5); pow(cast(-2 as unsigned), 5) pow(18446744073709551614, 5) pow(-2, 5) 2.13598703592091e96 2.13598703592091e96 -32 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement CREATE TABLE t1 (a timestamp, b varchar(20), c bit(1)); INSERT INTO t1 VALUES('1998-09-23', 'str1', 1), ('2003-03-25', 'str2', 0); SELECT a DIV 900 y FROM t1 GROUP BY y; diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 6e0a0d84115..94353dc1833 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1027,7 +1027,7 @@ SELECT MAKETIME(CAST(-1 AS UNSIGNED), 0, 0); MAKETIME(CAST(-1 AS UNSIGNED), 0, 0) 838:59:59 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect time value: '18446744073709551615:00:00' SELECT EXTRACT(HOUR FROM '100000:02:03'); EXTRACT(HOUR FROM '100000:02:03') @@ -1047,8 +1047,8 @@ SELECT SEC_TO_TIME(CAST(-1 AS UNSIGNED)); SEC_TO_TIME(CAST(-1 AS UNSIGNED)) 838:59:59 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect time value: '18446744073709551615' SET NAMES latin1; SET character_set_results = NULL; diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 58cc47bdc18..b0938c8f131 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -1017,12 +1017,12 @@ DROP TABLE t1; # CREATE TABLE t1(col1 MULTIPOLYGON NOT NULL, SPATIAL INDEX USING BTREE (col1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USING BTREE (col1))' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE (col1))' at line 2 CREATE TABLE t2(col1 MULTIPOLYGON NOT NULL); CREATE SPATIAL INDEX USING BTREE ON t2(col); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USING BTREE ON t2(col)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE ON t2(col)' at line 1 ALTER TABLE t2 ADD SPATIAL INDEX USING BTREE (col1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USING BTREE (col1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE (col1)' at line 1 DROP TABLE t2; End of 5.0 tests create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime); diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result index b5e82794658..196f6601d48 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -247,7 +247,7 @@ drop user 'mysqltest_1b', 'mysqltest_2b', 'mysqltest_3b'; ERROR HY000: Operation DROP USER failed for 'mysqltest_2b'@'%' create user 'mysqltest_2' identified by 'Mysqltest-2'; drop user 'mysqltest_2' identified by 'Mysqltest-2'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'identified by 'Mysqltest-2'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'identified by 'Mysqltest-2'' at line 1 drop user 'mysqltest_2'; create user '%@b'@'b'; show grants for '%@b'@'b'; diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 4ac1a298ffe..141444886d8 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -1511,9 +1511,9 @@ EXPLAIN SELECT a FROM t1 USE INDEX (i2) USE INDEX (); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 index NULL i2 9 NULL 144 Using index EXPLAIN SELECT a FROM t1 FORCE INDEX (); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 EXPLAIN SELECT a FROM t1 IGNORE INDEX (); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 EXPLAIN SELECT a FROM t1 USE INDEX FOR JOIN (i2) USE INDEX FOR GROUP BY (i2) GROUP BY a; id select_type table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/r/having.result b/mysql-test/r/having.result index 1c9c8016ea6..e32cabf261f 100644 --- a/mysql-test/r/having.result +++ b/mysql-test/r/having.result @@ -237,7 +237,7 @@ count_col1 group_col2 20 hello 30 hello select sum(col1) as co12 from t1 group by col2 having col2 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '10' at line 1 select sum(col1) as co2, count(col2) as cc from t1 group by col1 having col1 =10; co2 cc 40 4 diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 170cc855e29..8443facbbd6 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -1090,7 +1090,7 @@ c int(11) YES NULL drop view v1; drop table t1; alter database information_schema; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 drop database information_schema; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' drop table information_schema.tables; @@ -1307,9 +1307,9 @@ delete from v1; drop view v1,v2; drop table t1,t2; alter database; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 alter database test; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 create database mysqltest; create table mysqltest.t1(a int, b int, c int); create trigger mysqltest.t1_ai after insert on mysqltest.t1 diff --git a/mysql-test/r/information_schema_parameters.result b/mysql-test/r/information_schema_parameters.result index 405fae0164b..93c7634a910 100644 --- a/mysql-test/r/information_schema_parameters.result +++ b/mysql-test/r/information_schema_parameters.result @@ -368,7 +368,7 @@ CREATE DATABASE i_s_parameters_test; USE i_s_parameters_test; CREATE FUNCTION test_func1 (s char(20) RETURNS CHAR(50) RETURN CONCAT('Hello', ,s,'!'); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RETURNS CHAR(50) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RETURNS CHAR(50) RETURN CONCAT('Hello', ,s,'!')' at line 1 SELECT * FROM INFORMATION_SCHEMA.PARAMETERS WHERE SPECIFIC_SCHEMA = 'i_s_parameters_test' AND SPECIFIC_NAME = 'test_func1'; diff --git a/mysql-test/r/information_schema_routines.result b/mysql-test/r/information_schema_routines.result index 8397020f6dd..36f8637faa9 100644 --- a/mysql-test/r/information_schema_routines.result +++ b/mysql-test/r/information_schema_routines.result @@ -698,7 +698,7 @@ CREATE DATABASE i_s_routines_test; USE i_s_routines_test; CREATE FUNCTION test_func1 (s char(20) RETURNS CHAR(50) RETURN CONCAT('Hello', ,s,'!'); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RETURNS CHAR(50) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RETURNS CHAR(50) RETURN CONCAT('Hello', ,s,'!')' at line 1 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA = 'i_s_routines_test' AND ROUTINE_NAME = 'test_func1'; diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index c7d78cff88c..cbf60d7184b 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -127,13 +127,13 @@ a 1 2 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a); -ERROR HY000: Too many tables; MySQL can only use XX tables in a join +ERROR HY000: Too many tables; MariaDB can only use XX tables in a join select a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a); a 1 2 select a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a); -ERROR HY000: Too many tables; MySQL can only use XX tables in a join +ERROR HY000: Too many tables; MariaDB can only use XX tables in a join drop table t1; CREATE TABLE t1 ( a int(11) NOT NULL, diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result index 41c7ecee220..a1feb3ad40d 100644 --- a/mysql-test/r/key_cache.result +++ b/mysql-test/r/key_cache.result @@ -41,7 +41,7 @@ SELECT @@medium.key_buffer_size; 0 SET @@global.key_buffer_size=@save_key_buffer_size; SELECT @@default.key_buffer_size; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default.key_buffer_size' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default.key_buffer_size' at line 1 SELECT @@skr.storage_engine="test"; ERROR HY000: Variable 'storage_engine' is not a variable component (can't be used as XXXX.variable_name) select @@keycache1.key_cache_block_size; diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index 36dd37611c4..e91db0c9036 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -24,7 +24,7 @@ SELECT 4; 4 4 KILL (SELECT COUNT(*) FROM mysql.user); -ERROR 42000: This version of MySQL doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' +ERROR 42000: This version of MariaDB doesn't yet support 'Usage of subqueries or stored function calls as part of this statement' SET DEBUG_SYNC= 'thread_end SIGNAL con1_end'; SET DEBUG_SYNC= 'before_do_command_net_read SIGNAL con1_read WAIT_FOR kill'; SET DEBUG_SYNC= 'now WAIT_FOR con1_read'; diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result index e9f6897da71..f438a3884eb 100644 --- a/mysql-test/r/log_state.result +++ b/mysql-test/r/log_state.result @@ -199,7 +199,7 @@ SELECT @@general_log, @@log; 1 1 SET GLOBAL log = 0; Warnings: -Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead +Warning 1287 The syntax '@@log' is deprecated and will be removed in MariaDB 7.0. Please use '@@general_log' instead SHOW VARIABLES LIKE 'general_log'; Variable_name Value general_log OFF @@ -230,7 +230,7 @@ SELECT @@slow_query_log, @@log_slow_queries; 0 0 SET GLOBAL log_slow_queries = 0; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SHOW VARIABLES LIKE 'slow_query_log'; Variable_name Value slow_query_log OFF @@ -283,16 +283,16 @@ SET GLOBAL slow_query_log_file = @old_slow_query_log_file; deprecated: SET GLOBAL log = 0; Warnings: -Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead +Warning 1287 The syntax '@@log' is deprecated and will be removed in MariaDB 7.0. Please use '@@general_log' instead SET GLOBAL log_slow_queries = 0; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SET GLOBAL log = DEFAULT; Warnings: -Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead +Warning 1287 The syntax '@@log' is deprecated and will be removed in MariaDB 7.0. Please use '@@general_log' instead SET GLOBAL log_slow_queries = DEFAULT; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead not deprecated: SELECT @@global.general_log_file INTO @my_glf; SELECT @@global.slow_query_log_file INTO @my_sqlf; diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index fb4e2dcb980..d87d8c0fe3b 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -194,7 +194,7 @@ n d unix_timestamp(t) 1 10 1038401397 2 20 1038401397 UPDATE t1,t2 SET 1=2 WHERE t1.n=t2.n; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '1=2 WHERE t1.n=t2.n' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '1=2 WHERE t1.n=t2.n' at line 1 drop table t1,t2; set timestamp=0; set sql_safe_updates=0; diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index c96f7bb4e51..e179d7ec207 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -1774,7 +1774,7 @@ create table t1 (c1 int) engine=myisam pack_keys=0; create table t2 (c1 int) engine=myisam pack_keys=1; create table t3 (c1 int) engine=myisam pack_keys=default; create table t4 (c1 int) engine=myisam pack_keys=2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2' at line 1 drop table t1, t2, t3; CREATE TABLE t1(a INT, b INT, KEY inx (a), UNIQUE KEY uinx (b)) ENGINE=MyISAM; INSERT INTO t1(a,b) VALUES (1,1),(2,2),(3,3),(4,4),(5,5); @@ -2051,9 +2051,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (a int not null, key key_block_size=1024 (a)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=1024 (a))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '=1024 (a))' at line 1 create table t1 (a int not null, key `a` key_block_size=1024 (a)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_block_size=1024 (a))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_block_size=1024 (a))' at line 1 CREATE TABLE t1 ( c1 INT, c2 VARCHAR(300), diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index d43d891da2f..3fb190bf963 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -135,7 +135,7 @@ c int(11) YES NULL drop table t1; 1 1 -ERROR 1064 (42000) at line 3: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 1064 (42000) at line 3: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 ERROR at line 1: USE must be followed by a database name 1 +1 2 @@ -164,7 +164,7 @@ count(*) drop table t17583; Test connect without db- or host-name => reconnect Test connect with dbname only => new dbname, old hostname -ERROR 1064 (42000) at line 1: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'connecttest' at line 1 +ERROR 1064 (42000) at line 1: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'connecttest' at line 1 Test connect with _invalid_ dbname only => new invalid dbname, old hostname ERROR 1049 (42000) at line 1: Unknown database 'invalid' ERROR 1049 (42000) at line 1: Unknown database 'invalid' diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result index 8bd84ea7049..5531a1d8a18 100644 --- a/mysql-test/r/mysqld--help-notwin.result +++ b/mysql-test/r/mysqld--help-notwin.result @@ -4,9 +4,6 @@ The following options may be given as the first argument: --defaults-file=# Only read default options from the given file #. --defaults-extra-file=# Read this file after the global files are read. - --abort-slave-event-count=# - Option used by mysql-test for debugging and testing of - replication. --allow-suspicious-udfs Allows use of UDFs consisting of only one symbol xxx() without corresponding xxx_init() or xxx_deinit(). That @@ -151,9 +148,6 @@ The following options may be given as the first argument: handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again - --disconnect-slave-event-count=# - Option used by mysql-test for debugging and testing of - replication. --div-precision-increment=# Precision of the result of '/' operator will be increased on that value @@ -165,7 +159,6 @@ The following options may be given as the first argument: Enable the event scheduler. Possible values are ON, OFF, and DISABLED (keep the event scheduler completely deactivated, it cannot be activated run-time) - -T, --exit-info[=#] Used for debugging. Use at your own risk. --expire-logs-days=# If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup @@ -195,7 +188,7 @@ The following options may be given as the first argument: Number of best matches to use for query expansion --ft-stopword-file=name Use stopwords from this file instead of built-in list - --gdb Set up signals usable for debugging. + --gdb Set up signals usable for debugging. Deprecated, use --general-log Log connections and queries to a table or log file. Defaults logging to a file 'hostname'.log or a table mysql.general_logif --log-output=TABLE is used @@ -359,9 +352,6 @@ The following options may be given as the first argument: Max packet length to send to or receive from the server --max-binlog-cache-size=# Sets the total size of the transactional cache - --max-binlog-dump-events=# - Option used by mysql-test for debugging and testing of - replication. --max-binlog-size=# Binary log will be rotated automatically when the size exceeds this value. Will also apply to relay logs if max_relay_log_size is 0 @@ -771,9 +761,6 @@ The following options may be given as the first argument: --sort-buffer-size=# Each thread that needs to do a sort allocates a buffer of this size - --sporadic-binlog-dump-fail - Option used by mysql-test for debugging and testing of - replication. --sql-mode=name Syntax: sql-mode=mode[,mode[,mode...]]. See the manual for the complete list of valid sql modes --stack-trace Print a symbolic stack trace on failure @@ -793,9 +780,6 @@ The following options may be given as the first argument: Synchronously flush relay log info to disk after every #th transaction. Use 0 (default) to disable synchronous flushing - --sync-sys Enable system sync calls. Disable only when running tests - or debugging! - (Defaults to on; use --skip-sync-sys to disable.) --sysdate-is-now Non-default option to alias SYSDATE() to NOW() to make it safe-replicable. Since 5.0, SYSDATE() returns a `dynamic' value different for different invocations, even within @@ -808,9 +792,6 @@ The following options may be given as the first argument: --tc-heuristic-recover=name Decision to use in heuristic recover process. Possible values are COMMIT or ROLLBACK. - --thread-alarm Enable system thread alarm calls. Disabling it may be - useful in debugging or testing, never do it in production - (Defaults to on; use --skip-thread-alarm to disable.) --thread-cache-size=# How many threads we should keep in a cache for reuse --thread-handling=name @@ -851,7 +832,6 @@ The following options may be given as the first argument: connection before closing it Variables (--variable-name=value) -abort-slave-event-count 0 allow-suspicious-udfs FALSE auto-increment-increment 1 auto-increment-offset 1 @@ -892,7 +872,6 @@ delay-key-write ON delayed-insert-limit 100 delayed-insert-timeout 300 delayed-queue-size 1000 -disconnect-slave-event-count 0 div-precision-increment 4 engine-condition-pushdown FALSE event-scheduler OFF @@ -958,7 +937,6 @@ master-retry-count 86400 master-verify-checksum FALSE max-allowed-packet 1048576 max-binlog-cache-size 18446744073709547520 -max-binlog-dump-events 0 max-binlog-size 1073741824 max-binlog-stmt-cache-size 18446744073709547520 max-connect-errors 10 @@ -1070,7 +1048,6 @@ slave-type-conversions slow-launch-time 2 slow-query-log FALSE sort-buffer-size 2097152 -sporadic-binlog-dump-fail FALSE sql-mode stack-trace TRUE symbolic-links FALSE @@ -1079,13 +1056,11 @@ sync-frm FALSE sync-master-info 0 sync-relay-log 0 sync-relay-log-info 0 -sync-sys TRUE sysdate-is-now FALSE table-cache 400 table-definition-cache 400 table-open-cache 400 tc-heuristic-recover COMMIT -thread-alarm TRUE thread-cache-size 0 thread-handling one-thread-per-connection thread-stack 294912 diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 2ffc5716348..4cb50b02533 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -1917,8 +1917,8 @@ drop table t1, t2, t3; # Bug#21288 mysqldump segmentation fault when using --where # create table t1 (a int); -mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064) -mysqldump: Got error: 1064: "You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1" when retrieving data from server +mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064) +mysqldump: Got error: 1064: "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1" when retrieving data from server /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index f91ea83da4b..2c9287d1646 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -29,40 +29,40 @@ select 0 as "after_successful_stmt_errno" ; after_successful_stmt_errno 0 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 ER_PARSE_ERROR select 1064 as "after_wrong_syntax_errno" ; after_wrong_syntax_errno 1064 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 ER_PARSE_ERROR select 1064 as "after_let_var_equal_value" ; after_let_var_equal_value 1064 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 set @my_var= 'abc' ; select 0 as "after_set_var_equal_value" ; after_set_var_equal_value 0 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 ER_PARSE_ERROR select 1064 as "after_disable_warnings_command" ; after_disable_warnings_command 1064 drop table if exists t1 ; garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 drop table if exists t1 ; select 0 as "after_disable_warnings" ; after_disable_warnings 0 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 select 3 from t1 ; ERROR 42S02: Table 'test.t1' doesn't exist ER_NO_SUCH_TABLE @@ -70,7 +70,7 @@ select 1146 as "after_minus_masked" ; after_minus_masked 1146 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 select 3 from t1 ; ERROR 42S02: Table 'test.t1' doesn't exist ER_NO_SUCH_TABLE @@ -78,12 +78,12 @@ select 1146 as "after_!_masked" ; after_!_masked 1146 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 select -1 as "after_let_errno_equal_value" ; after_let_errno_equal_value -1 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 prepare stmt from "select 3 from t1" ; ERROR 42S02: Table 'test.t1' doesn't exist ER_NO_SUCH_TABLE @@ -92,14 +92,14 @@ after_failing_prepare 1146 create table t1 ( f1 char(10)); garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 prepare stmt from "select 3 from t1" ; select 0 as "after_successful_prepare" ; after_successful_prepare 0 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 execute stmt; 3 @@ -108,7 +108,7 @@ after_successful_execute 0 drop table t1; garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 execute stmt; ERROR 42S02: Table 'test.t1' doesn't exist ER_NO_SUCH_TABLE @@ -116,7 +116,7 @@ select 1146 as "after_failing_execute" ; after_failing_execute 1146 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 execute __stmt_; ERROR HY000: Unknown prepared statement handler (__stmt_) given to EXECUTE ER_UNKNOWN_STMT_HANDLER @@ -124,14 +124,14 @@ select 1243 as "after_failing_execute" ; after_failing_execute 1243 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 deallocate prepare stmt; select 0 as "after_successful_deallocate" ; after_successful_deallocate 0 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 deallocate prepare __stmt_; ERROR HY000: Unknown prepared statement handler (__stmt_) given to DEALLOCATE PREPARE ER_UNKNOWN_STMT_HANDLER @@ -139,7 +139,7 @@ select 1243 as "after_failing_deallocate" ; after_failing_deallocate 1243 garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 ER_PARSE_ERROR select 1064 as "after_--disable_abort_on_error" ; after_--disable_abort_on_error @@ -156,12 +156,12 @@ after_!errno_masked_error 1146 select 3 from t1; mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146: 'Table 'test.t1' doesn't exist', instead of 1000... -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 is empty -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'nonsense' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'nonsense' at line 1 is empty garbage ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 ER_PARSE_ERROR select 1064 as "after_--enable_abort_on_error" ; after_--enable_abort_on_error @@ -171,7 +171,7 @@ ERROR 42S02: Table 'test.t1' doesn't exist select 3 from t1; mysqltest: At line 1: query 'select 3 from t1' failed with wrong errno 1146: 'Table 'test.t1' doesn't exist', instead of 1064... garbage; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 select 2; select 3; 3 @@ -364,7 +364,7 @@ insert into t1 values ('$dollar'); $dollar `select 42` drop table t1; -mysqltest: At line 1: query 'let $var2= `failing query`' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing query' at line 1 +mysqltest: At line 1: query 'let $var2= `failing query`' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'failing query' at line 1 mysqltest: At line 1: Missing required argument 'filename' to command 'source' mysqltest: At line 1: Could not open './non_existingFile' for reading, errno: 2 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": @@ -387,7 +387,7 @@ At line 1: Source directives are nesting too deep garbage ; mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": included from at line 1: -At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 +At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1 2 = outer loop variable after while here is the sourced script @@ -406,7 +406,7 @@ outer=2 ifval=0 outer=1 ifval=1 here is the sourced script ERROR 42S02: Table 'test.nowhere' doesn't exist -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'else' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'else' at line 1 In loop here is the sourced script @@ -524,7 +524,7 @@ mysqltest: At line 1: Missing '{' after while. Found "dec $i" mysqltest: At line 1: Stray '}' - end of block before beginning mysqltest: At line 1: Stray 'end' command - end of block before beginning {; -mysqltest: At line 1: query '{' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '{' at line 1 +mysqltest: At line 1: query '{' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '{' at line 1 mysqltest: At line 1: Missing '{' after while. Found "echo hej" mysqltest: At line 3: Missing end of block mysqltest: At line 3: Missing end of block @@ -585,9 +585,9 @@ Output from mysqltest-x.inc Output from mysqltest-x.inc mysqltest: Could not open './non_existing_file.inc' for reading, errno: 2 failing_statement; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing_statement' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'failing_statement' at line 1 failing_statement; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing_statement' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'failing_statement' at line 1 SELECT 1 as a; a 1 @@ -624,12 +624,12 @@ insertz 'error query'|||| mysqltest: At line 3: query 'create table t1 (a int primary key); insert into t1 values (1); select 'select-me'; -insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz 'error query'' at line 1 +insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insertz 'error query'' at line 1 drop table t1; mysqltest: At line 3: query 'create table t1 (a int primary key); insert into t1 values (1); select 'select-me'; -insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz 'error query'' at line 1 +insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insertz 'error query'' at line 1 drop table t1; Multi statement using expected error create table t1 (a int primary key); @@ -638,13 +638,13 @@ select 'select-me'; insertz error query|||| select-me select-me -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz error query' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insertz error query' at line 1 drop table t1; drop table t1; sleep; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sleep' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sleep' at line 1 sleep; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sleep' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sleep' at line 1 ; ERROR 42000: Query was empty select "b" as col1, "c" as col2; @@ -902,7 +902,7 @@ mysqltest: At line 1: Could not find column 'column_not_exists' in the result of mysqltest: At line 1: Query 'SET @A = 1' didn't return a result set mysqltest: At line 1: Could not find column '1 AS B' in the result of 'SELECT 1 AS A' value= No such row -mysqltest: At line 1: query 'let $value= query_get_value(SHOW COLNS FROM t1, Field, 1)' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'COLNS FROM t1' at line 1 +mysqltest: At line 1: query 'let $value= query_get_value(SHOW COLNS FROM t1, Field, 1)' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'COLNS FROM t1' at line 1 Field Type Null Key Default Extra a int(11) YES -><- NULL diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index 8fb6f787795..b10f175b63e 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -255,11 +255,11 @@ concat(':',product,':') sum(profit) avg(profit) :TV: 600 120.00000 NULL 7785 519.00000 select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube; -ERROR 42000: This version of MySQL doesn't yet support 'CUBE' +ERROR 42000: This version of MariaDB doesn't yet support 'CUBE' explain select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube; -ERROR 42000: This version of MySQL doesn't yet support 'CUBE' +ERROR 42000: This version of MariaDB doesn't yet support 'CUBE' select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube union all select product, country_id , year, sum(profit) from t1 group by product, country_id, year with rollup; -ERROR 42000: This version of MySQL doesn't yet support 'CUBE' +ERROR 42000: This version of MariaDB doesn't yet support 'CUBE' drop table t1,t2; CREATE TABLE t1 (i int); INSERT INTO t1 VALUES(100); diff --git a/mysql-test/r/outfile.result b/mysql-test/r/outfile.result index 84ef17857f4c7ca3b36a1085d04d8053de1dbd15..daea60c53eb0c8081514269141c6bdb6f09601c1 100644 GIT binary patch delta 19 acmca9a9dylBP&~CQD&lx(`HuI5M}^E%>~E+ delta 17 YcmcaDa8qCdBP&Z~aG=j-cGeJP05!V>4gdfE diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result index 1ea9e91df8a..10700d0ba73 100644 --- a/mysql-test/r/parser.result +++ b/mysql-test/r/parser.result @@ -5,47 +5,47 @@ drop table ADDDATE; create table ADDDATE (a int); drop table ADDDATE; create table BIT_AND(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_AND(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'BIT_AND(a int)' at line 1 create table BIT_AND (a int); drop table BIT_AND; create table BIT_OR(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_OR(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'BIT_OR(a int)' at line 1 create table BIT_OR (a int); drop table BIT_OR; create table BIT_XOR(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_XOR(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'BIT_XOR(a int)' at line 1 create table BIT_XOR (a int); drop table BIT_XOR; create table CAST(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CAST(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CAST(a int)' at line 1 create table CAST (a int); drop table CAST; create table COUNT(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'COUNT(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'COUNT(a int)' at line 1 create table COUNT (a int); drop table COUNT; create table CURDATE(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURDATE(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CURDATE(a int)' at line 1 create table CURDATE (a int); drop table CURDATE; create table CURTIME(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURTIME(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CURTIME(a int)' at line 1 create table CURTIME (a int); drop table CURTIME; create table DATE_ADD(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_ADD(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATE_ADD(a int)' at line 1 create table DATE_ADD (a int); drop table DATE_ADD; create table DATE_SUB(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_SUB(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATE_SUB(a int)' at line 1 create table DATE_SUB (a int); drop table DATE_SUB; create table EXTRACT(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTRACT(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'EXTRACT(a int)' at line 1 create table EXTRACT (a int); drop table EXTRACT; create table GROUP_CONCAT(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_CONCAT(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GROUP_CONCAT(a int)' at line 1 create table GROUP_CONCAT (a int); drop table GROUP_CONCAT; create table GROUP_UNIQUE_USERS(a int); @@ -53,23 +53,23 @@ drop table GROUP_UNIQUE_USERS; create table GROUP_UNIQUE_USERS (a int); drop table GROUP_UNIQUE_USERS; create table MAX(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MAX(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MAX(a int)' at line 1 create table MAX (a int); drop table MAX; create table MID(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MID(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MID(a int)' at line 1 create table MID (a int); drop table MID; create table MIN(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MIN(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MIN(a int)' at line 1 create table MIN (a int); drop table MIN; create table NOW(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NOW(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NOW(a int)' at line 1 create table NOW (a int); drop table NOW; create table POSITION(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'POSITION(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'POSITION(a int)' at line 1 create table POSITION (a int); drop table POSITION; create table SESSION_USER(a int); @@ -77,19 +77,19 @@ drop table SESSION_USER; create table SESSION_USER (a int); drop table SESSION_USER; create table STD(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STD(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STD(a int)' at line 1 create table STD (a int); drop table STD; create table STDDEV(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STDDEV(a int)' at line 1 create table STDDEV (a int); drop table STDDEV; create table STDDEV_POP(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_POP(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STDDEV_POP(a int)' at line 1 create table STDDEV_POP (a int); drop table STDDEV_POP; create table STDDEV_SAMP(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_SAMP(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STDDEV_SAMP(a int)' at line 1 create table STDDEV_SAMP (a int); drop table STDDEV_SAMP; create table SUBDATE(a int); @@ -97,19 +97,19 @@ drop table SUBDATE; create table SUBDATE (a int); drop table SUBDATE; create table SUBSTR(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTR(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SUBSTR(a int)' at line 1 create table SUBSTR (a int); drop table SUBSTR; create table SUBSTRING(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTRING(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SUBSTRING(a int)' at line 1 create table SUBSTRING (a int); drop table SUBSTRING; create table SUM(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUM(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SUM(a int)' at line 1 create table SUM (a int); drop table SUM; create table SYSDATE(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SYSDATE(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SYSDATE(a int)' at line 1 create table SYSDATE (a int); drop table SYSDATE; create table SYSTEM_USER(a int); @@ -117,7 +117,7 @@ drop table SYSTEM_USER; create table SYSTEM_USER (a int); drop table SYSTEM_USER; create table TRIM(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRIM(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TRIM(a int)' at line 1 create table TRIM (a int); drop table TRIM; create table UNIQUE_USERS(a int); @@ -125,15 +125,15 @@ drop table UNIQUE_USERS; create table UNIQUE_USERS (a int); drop table UNIQUE_USERS; create table VARIANCE(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VARIANCE(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VARIANCE(a int)' at line 1 create table VARIANCE (a int); drop table VARIANCE; create table VAR_POP(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_POP(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VAR_POP(a int)' at line 1 create table VAR_POP (a int); drop table VAR_POP; create table VAR_SAMP(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_SAMP(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VAR_SAMP(a int)' at line 1 create table VAR_SAMP (a int); drop table VAR_SAMP; set SQL_MODE='IGNORE_SPACE'; @@ -142,137 +142,137 @@ drop table ADDDATE; create table ADDDATE (a int); drop table ADDDATE; create table BIT_AND(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_AND(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'BIT_AND(a int)' at line 1 create table BIT_AND (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_AND (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'BIT_AND (a int)' at line 1 create table BIT_OR(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_OR(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'BIT_OR(a int)' at line 1 create table BIT_OR (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_OR (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'BIT_OR (a int)' at line 1 create table BIT_XOR(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_XOR(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'BIT_XOR(a int)' at line 1 create table BIT_XOR (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BIT_XOR (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'BIT_XOR (a int)' at line 1 create table CAST(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CAST(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CAST(a int)' at line 1 create table CAST (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CAST (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CAST (a int)' at line 1 create table COUNT(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'COUNT(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'COUNT(a int)' at line 1 create table COUNT (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'COUNT (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'COUNT (a int)' at line 1 create table CURDATE(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURDATE(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CURDATE(a int)' at line 1 create table CURDATE (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURDATE (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CURDATE (a int)' at line 1 create table CURTIME(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURTIME(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CURTIME(a int)' at line 1 create table CURTIME (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CURTIME (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CURTIME (a int)' at line 1 create table DATE_ADD(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_ADD(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATE_ADD(a int)' at line 1 create table DATE_ADD (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_ADD (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATE_ADD (a int)' at line 1 create table DATE_SUB(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_SUB(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATE_SUB(a int)' at line 1 create table DATE_SUB (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATE_SUB (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATE_SUB (a int)' at line 1 create table EXTRACT(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTRACT(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'EXTRACT(a int)' at line 1 create table EXTRACT (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTRACT (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'EXTRACT (a int)' at line 1 create table GROUP_CONCAT(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_CONCAT(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GROUP_CONCAT(a int)' at line 1 create table GROUP_CONCAT (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GROUP_CONCAT (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GROUP_CONCAT (a int)' at line 1 create table GROUP_UNIQUE_USERS(a int); drop table GROUP_UNIQUE_USERS; create table GROUP_UNIQUE_USERS (a int); drop table GROUP_UNIQUE_USERS; create table MAX(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MAX(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MAX(a int)' at line 1 create table MAX (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MAX (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MAX (a int)' at line 1 create table MID(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MID(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MID(a int)' at line 1 create table MID (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MID (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MID (a int)' at line 1 create table MIN(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MIN(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MIN(a int)' at line 1 create table MIN (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MIN (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MIN (a int)' at line 1 create table NOW(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NOW(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NOW(a int)' at line 1 create table NOW (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NOW (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NOW (a int)' at line 1 create table POSITION(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'POSITION(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'POSITION(a int)' at line 1 create table POSITION (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'POSITION (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'POSITION (a int)' at line 1 create table SESSION_USER(a int); drop table SESSION_USER; create table SESSION_USER (a int); drop table SESSION_USER; create table STD(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STD(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STD(a int)' at line 1 create table STD (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STD (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STD (a int)' at line 1 create table STDDEV(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STDDEV(a int)' at line 1 create table STDDEV (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STDDEV (a int)' at line 1 create table STDDEV_POP(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_POP(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STDDEV_POP(a int)' at line 1 create table STDDEV_POP (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_POP (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STDDEV_POP (a int)' at line 1 create table STDDEV_SAMP(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_SAMP(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STDDEV_SAMP(a int)' at line 1 create table STDDEV_SAMP (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STDDEV_SAMP (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'STDDEV_SAMP (a int)' at line 1 create table SUBDATE(a int); drop table SUBDATE; create table SUBDATE (a int); drop table SUBDATE; create table SUBSTR(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTR(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SUBSTR(a int)' at line 1 create table SUBSTR (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTR (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SUBSTR (a int)' at line 1 create table SUBSTRING(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTRING(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SUBSTRING(a int)' at line 1 create table SUBSTRING (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUBSTRING (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SUBSTRING (a int)' at line 1 create table SUM(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUM(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SUM(a int)' at line 1 create table SUM (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SUM (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SUM (a int)' at line 1 create table SYSDATE(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SYSDATE(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SYSDATE(a int)' at line 1 create table SYSDATE (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SYSDATE (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SYSDATE (a int)' at line 1 create table SYSTEM_USER(a int); drop table SYSTEM_USER; create table SYSTEM_USER (a int); drop table SYSTEM_USER; create table TRIM(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRIM(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TRIM(a int)' at line 1 create table TRIM (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRIM (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TRIM (a int)' at line 1 create table UNIQUE_USERS(a int); drop table UNIQUE_USERS; create table UNIQUE_USERS (a int); drop table UNIQUE_USERS; create table VARIANCE(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VARIANCE(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VARIANCE(a int)' at line 1 create table VARIANCE (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VARIANCE (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VARIANCE (a int)' at line 1 create table VAR_POP(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_POP(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VAR_POP(a int)' at line 1 create table VAR_POP (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_POP (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VAR_POP (a int)' at line 1 create table VAR_SAMP(a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_SAMP(a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VAR_SAMP(a int)' at line 1 create table VAR_SAMP (a int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VAR_SAMP (a int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VAR_SAMP (a int)' at line 1 DROP TABLE IF EXISTS table_25930_a; DROP TABLE IF EXISTS table_25930_b; SET SQL_MODE = 'ANSI_QUOTES'; diff --git a/mysql-test/r/parser_not_embedded.result b/mysql-test/r/parser_not_embedded.result index 5a5ae9f8178..fd545605c02 100644 --- a/mysql-test/r/parser_not_embedded.result +++ b/mysql-test/r/parser_not_embedded.result @@ -50,44 +50,44 @@ # Bug#46527 "COMMIT AND CHAIN RELEASE does not make sense" # COMMIT AND CHAIN RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RELEASE' at line 1 COMMIT AND NO CHAIN RELEASE; COMMIT RELEASE; COMMIT CHAIN RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHAIN RELEASE' at line 1 COMMIT NO CHAIN RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHAIN RELEASE' at line 1 COMMIT AND NO RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RELEASE' at line 1 COMMIT AND RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RELEASE' at line 1 COMMIT NO RELEASE; COMMIT CHAIN NO RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1 COMMIT NO CHAIN NO RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1 COMMIT AND RELEASE CHAIN; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE CHAIN' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RELEASE CHAIN' at line 1 COMMIT AND NO CHAIN NO RELEASE; ROLLBACK AND CHAIN RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RELEASE' at line 1 ROLLBACK AND NO CHAIN RELEASE; ROLLBACK RELEASE; ROLLBACK CHAIN RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHAIN RELEASE' at line 1 ROLLBACK NO CHAIN RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHAIN RELEASE' at line 1 ROLLBACK AND NO RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RELEASE' at line 1 ROLLBACK AND RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RELEASE' at line 1 ROLLBACK NO RELEASE; ROLLBACK CHAIN NO RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1 ROLLBACK NO CHAIN NO RELEASE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1 ROLLBACK AND RELEASE CHAIN; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE CHAIN' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RELEASE CHAIN' at line 1 ROLLBACK AND NO CHAIN NO RELEASE; # # End of 5.5 tests diff --git a/mysql-test/r/parser_precedence.result b/mysql-test/r/parser_precedence.result index 979084d0346..4330c8a2045 100644 --- a/mysql-test/r/parser_precedence.result +++ b/mysql-test/r/parser_precedence.result @@ -398,17 +398,17 @@ select (NOT TRUE) IS NOT NULL, NOT (TRUE IS NOT NULL), NOT TRUE IS NOT NULL; 1 0 0 Testing that IS [NOT] TRUE/FALSE/UNKNOWN predicates are not associative select TRUE IS TRUE IS TRUE IS TRUE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IS TRUE IS TRUE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IS TRUE IS TRUE' at line 1 select FALSE IS NOT TRUE IS NOT TRUE IS NOT TRUE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IS NOT TRUE IS NOT TRUE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IS NOT TRUE IS NOT TRUE' at line 1 select NULL IS FALSE IS FALSE IS FALSE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IS FALSE IS FALSE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IS FALSE IS FALSE' at line 1 select TRUE IS NOT FALSE IS NOT FALSE IS NOT FALSE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IS NOT FALSE IS NOT FALSE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IS NOT FALSE IS NOT FALSE' at line 1 select FALSE IS UNKNOWN IS UNKNOWN IS UNKNOWN; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IS UNKNOWN IS UNKNOWN' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IS UNKNOWN IS UNKNOWN' at line 1 select TRUE IS NOT UNKNOWN IS NOT UNKNOWN IS NOT UNKNOWN; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IS NOT UNKNOWN IS NOT UNKNOWN' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IS NOT UNKNOWN IS NOT UNKNOWN' at line 1 Testing that IS [NOT] NULL predicates are associative select FALSE IS NULL IS NULL IS NULL; FALSE IS NULL IS NULL IS NULL diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index 7a342f095df..2e90bf8e27b 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -662,7 +662,7 @@ ERROR 42000: Only integers allowed as number here near '0.2+e1' at line 3 create table t1 (a int) partition by key(a) partitions -1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 3 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1' at line 3 create table t1 (a int) partition by key(a) partitions 1.5; @@ -1216,11 +1216,11 @@ alter table t1 engine=heap partition by key (a) (partition p0 engine=heap, partition p1 engine=myisam); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB alter table t1 partition by key (a) (partition p0 engine=heap, partition p1 engine=myisam); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB drop table t1; CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1333,7 +1333,7 @@ create table t1 (a int) partition by list (a) (partition p0 values in (1)); alter table t1 rebuild partition; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 drop table t1; create table t1 (a int) partition by list (a) @@ -1434,7 +1434,7 @@ create table t1 (a int) partition by list (a) (partition p0 values in (1)); alter table t1 rebuild partition; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 drop table t1; create table t2 (s1 int not null auto_increment, primary key (s1)) partition by list (s1) (partition p1 values in (1),partition p2 values in (2),partition p3 values in (3),partition p4 values in (4)); insert into t2 values (null),(null),(null); @@ -1999,9 +1999,9 @@ PARTITION p1 VALUES LESS THAN (10), PARTITION p2 VALUES LESS THAN (20) ); ALTER TABLE t1 OPTIMIZE PARTITION p1 EXTENDED; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTENDED' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'EXTENDED' at line 1 ALTER TABLE t1 ANALYZE PARTITION p1 EXTENDED; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTENDED' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'EXTENDED' at line 1 ALTER TABLE t1 ANALYZE PARTITION p1; Table Op Msg_type Msg_text test.t1 analyze status OK diff --git a/mysql-test/r/partition_disabled.result b/mysql-test/r/partition_disabled.result index 507c6ebe9e9..2978a3b6d2e 100644 --- a/mysql-test/r/partition_disabled.result +++ b/mysql-test/r/partition_disabled.result @@ -1,47 +1,47 @@ DROP TABLE IF EXISTS t1; FLUSH TABLES; SELECT * FROM t1; -ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement TRUNCATE TABLE t1; ERROR 42S02: Table 'test.t1' doesn't exist ANALYZE TABLE t1; Table Op Msg_type Msg_text -test.t1 analyze Error The MySQL server is running with the --skip-partition option so it cannot execute this statement +test.t1 analyze Error The MariaDB server is running with the --skip-partition option so it cannot execute this statement test.t1 analyze error Corrupt CHECK TABLE t1; Table Op Msg_type Msg_text -test.t1 check Error The MySQL server is running with the --skip-partition option so it cannot execute this statement +test.t1 check Error The MariaDB server is running with the --skip-partition option so it cannot execute this statement test.t1 check error Corrupt OPTIMIZE TABLE t1; Table Op Msg_type Msg_text -test.t1 optimize Error The MySQL server is running with the --skip-partition option so it cannot execute this statement +test.t1 optimize Error The MariaDB server is running with the --skip-partition option so it cannot execute this statement test.t1 optimize error Corrupt REPAIR TABLE t1; Table Op Msg_type Msg_text -test.t1 repair Error The MySQL server is running with the --skip-partition option so it cannot execute this statement +test.t1 repair Error The MariaDB server is running with the --skip-partition option so it cannot execute this statement test.t1 repair error Corrupt ALTER TABLE t1 REPAIR PARTITION ALL; Table Op Msg_type Msg_text -test.t1 repair Error The MySQL server is running with the --skip-partition option so it cannot execute this statement +test.t1 repair Error The MariaDB server is running with the --skip-partition option so it cannot execute this statement test.t1 repair error Corrupt ALTER TABLE t1 CHECK PARTITION ALL; Table Op Msg_type Msg_text -test.t1 check Error The MySQL server is running with the --skip-partition option so it cannot execute this statement +test.t1 check Error The MariaDB server is running with the --skip-partition option so it cannot execute this statement test.t1 check error Corrupt ALTER TABLE t1 OPTIMIZE PARTITION ALL; Table Op Msg_type Msg_text -test.t1 optimize Error The MySQL server is running with the --skip-partition option so it cannot execute this statement +test.t1 optimize Error The MariaDB server is running with the --skip-partition option so it cannot execute this statement test.t1 optimize error Corrupt ALTER TABLE t1 ANALYZE PARTITION ALL; Table Op Msg_type Msg_text -test.t1 analyze Error The MySQL server is running with the --skip-partition option so it cannot execute this statement +test.t1 analyze Error The MariaDB server is running with the --skip-partition option so it cannot execute this statement test.t1 analyze error Corrupt ALTER TABLE t1 REBUILD PARTITION ALL; -ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement ALTER TABLE t1 ENGINE Memory; -ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement ALTER TABLE t1 ADD (new INT); -ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement DROP TABLE t1; CREATE TABLE t1 ( firstname VARCHAR(25) NOT NULL, @@ -52,9 +52,9 @@ joined DATE NOT NULL ) PARTITION BY KEY(joined) PARTITIONS 6; -ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement ALTER TABLE t1 PARTITION BY KEY(joined) PARTITIONS 2; -ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement drop table t1; ERROR 42S02: Unknown table 't1' CREATE TABLE t1 ( @@ -71,7 +71,7 @@ PARTITION p2 VALUES LESS THAN (1980), PARTITION p3 VALUES LESS THAN (1990), PARTITION p4 VALUES LESS THAN MAXVALUE ); -ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement drop table t1; ERROR 42S02: Unknown table 't1' CREATE TABLE t1 (id INT, purchased DATE) @@ -82,7 +82,7 @@ PARTITION p0 VALUES LESS THAN (1990), PARTITION p1 VALUES LESS THAN (2000), PARTITION p2 VALUES LESS THAN MAXVALUE ); -ERROR HY000: The MySQL server is running with the --skip-partition option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement drop table t1; ERROR 42S02: Unknown table 't1' create table t1 (a varchar(10) charset latin1 collate latin1_bin); diff --git a/mysql-test/r/partition_error.result b/mysql-test/r/partition_error.result index 342c81013a7..5cba49645b4 100644 --- a/mysql-test/r/partition_error.result +++ b/mysql-test/r/partition_error.result @@ -845,7 +845,7 @@ partitions 3 (partition x1 tablespace ts1, partition x2 tablespace ts2, partition x3 tablespace ts3); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '+2) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '+2) partitions 3 (partition x1 tablespace ts1, partition x2 tablespace ts2, @@ -860,7 +860,7 @@ partitions 3 (partition tablespace ts1, partition x2 tablespace ts2, partition x3 tablespace ts3); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ts1, +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ts1, partition x2 tablespace ts2, partition x3 tablespace ts3)' at line 8 CREATE TABLE t1 ( @@ -1076,7 +1076,7 @@ partition by range (a) subpartition by key (a+b) (partition x1 values less than (1) (subpartition x11, subpartition x12), partition x2 values less than (2) (subpartition x21, subpartition x22)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '+b) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '+b) (partition x1 values less than (1) (subpartition x11, subpartition x12), par' at line 7 CREATE TABLE t1 ( @@ -1280,7 +1280,7 @@ partition x2 ( subpartition x21 engine myisam, subpartition x22 engine myisam) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'list (a+b) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'list (a+b) ( partition x1 ( subpartition x11 engine myisam, subpartition x12 eng' at line 7 @@ -1298,7 +1298,7 @@ partition x2 ( subpartition x21 engine myisam values in (0), subpartition x22 engine myisam values in (1)) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'list (a+b) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'list (a+b) ( partition x1 ( subpartition x11 engine myisam values in (0), subpar' at line 7 @@ -1388,7 +1388,7 @@ partition by list (a) partitions 2 (partition x1 values in 4, partition x2 values in (5)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '4, +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '4, partition x2 values in (5))' at line 8 CREATE TABLE t1 (a int) PARTITION BY RANGE (a) diff --git a/mysql-test/r/partition_key_cache.result b/mysql-test/r/partition_key_cache.result index 7dd74837511..653d2f29d54 100644 --- a/mysql-test/r/partition_key_cache.result +++ b/mysql-test/r/partition_key_cache.result @@ -231,10 +231,10 @@ CACHE INDEX t1 PARTITION (p0) KEY (`inx_b`) IN cold_cache; Table Op Msg_type Msg_text test.t1 assign_to_keycache status OK CACHE INDEX t1 PARTITIONS (p0) KEY (`inx_b`) IN cold_cache; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'PARTITIONS (p0) KEY (`inx_b`) IN cold_cache' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'PARTITIONS (p0) KEY (`inx_b`) IN cold_cache' at line 1 # only one table at a time if specifying partitions CACHE INDEX t1,t2 PARTITION (p0) KEY (`inx_b`) IN cold_cache; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'PARTITION (p0) KEY (`inx_b`) IN cold_cache' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'PARTITION (p0) KEY (`inx_b`) IN cold_cache' at line 1 CACHE INDEX t1 PARTITION (`p0`,p1) INDEX (`PRIMARY`) IN warm_cache; Table Op Msg_type Msg_text test.t1 assign_to_keycache status OK @@ -276,7 +276,7 @@ test.t2 preload_keys error Indexes use different block sizes test.t2 preload_keys status Operation failed # Must have INDEX or KEY before the index list LOAD INDEX INTO CACHE t2 (`PRIMARY`); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(`PRIMARY`)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(`PRIMARY`)' at line 1 # Test of IGNORE LEAVES LOAD INDEX INTO CACHE t2 INDEX (`PRIMARY`); Table Op Msg_type Msg_text @@ -333,7 +333,7 @@ test.t1 preload_keys status OK test.t2 preload_keys status OK # only one table at a time if specifying partitions LOAD INDEX INTO CACHE t1 PARTITION (p0), t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ' t2' at line 1 LOAD INDEX INTO CACHE t1 IGNORE LEAVES; Table Op Msg_type Msg_text test.t1 preload_keys error Indexes use different block sizes @@ -372,7 +372,7 @@ LOAD INDEX INTO CACHE t1 PARTITION (ALL); Table Op Msg_type Msg_text test.t1 preload_keys status OK LOAD INDEX INTO CACHE t1 PARTITIONS ALL; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'PARTITIONS ALL' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'PARTITIONS ALL' at line 1 LOAD INDEX INTO CACHE t1 PARTITION (p1,`p0`) IGNORE LEAVES; Table Op Msg_type Msg_text test.t1 preload_keys error Indexes use different block sizes diff --git a/mysql-test/r/partition_myisam.result b/mysql-test/r/partition_myisam.result index 97bcc11495c..f0844c0b407 100644 --- a/mysql-test/r/partition_myisam.result +++ b/mysql-test/r/partition_myisam.result @@ -83,7 +83,7 @@ CREATE TABLE t1 (a INT) PARTITION BY HASH (a) ( PARTITION p0 ENGINE=MyISAM, PARTITION p1); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 (a INT) PARTITION BY LIST (a) SUBPARTITION BY HASH (a) @@ -91,7 +91,7 @@ SUBPARTITION BY HASH (a) ( SUBPARTITION s0, SUBPARTITION s1 ENGINE=MyISAM, SUBPARTITION s2), PARTITION p1 VALUES IN (1) ( SUBPARTITION s3 ENGINE=MyISAM, SUBPARTITION s4, SUBPARTITION s5 ENGINE=MyISAM)); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB # # Bug#49161: Out of memory; restart server and try again (needed 2 bytes) # diff --git a/mysql-test/r/plugin_auth.result b/mysql-test/r/plugin_auth.result index 40e974f90eb..de523b78625 100644 --- a/mysql-test/r/plugin_auth.result +++ b/mysql-test/r/plugin_auth.result @@ -89,13 +89,13 @@ GRANT ALL PRIVILEGES ON test_grant_db.* TO plug_dest IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'; REVOKE SELECT on test_grant_db.* FROM joro INDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'' at line 2 REVOKE SELECT on test_grant_db.* FROM joro INDENTIFIED BY 'plug_dest_passwd'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INDENTIFIED BY 'plug_dest_passwd'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INDENTIFIED BY 'plug_dest_passwd'' at line 2 REVOKE SELECT on test_grant_db.* FROM joro INDENTIFIED BY PASSWORD 'plug_dest_passwd'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INDENTIFIED BY PASSWORD 'plug_dest_passwd'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INDENTIFIED BY PASSWORD 'plug_dest_passwd'' at line 2 DROP DATABASE test_grant_db; ## GRANT PROXY tests CREATE USER grant_plug IDENTIFIED WITH 'test_plugin_server' @@ -106,10 +106,10 @@ CREATE USER grant_plug_dest2 IDENTIFIED BY 'grant_plug_dest_passwd2'; GRANT ALL PRIVILEGES ON *.* TO grant_plug; ERROR 28000: Access denied for user 'grant_plug'@'localhost' (using password: YES) GRANT ALL PRIVILEGES,PROXY ON grant_plug_dest TO grant_plug; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'PROXY ON grant_plug_dest TO grant_plug' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'PROXY ON grant_plug_dest TO grant_plug' at line 1 this should fail : can't combine PROXY GRANT ALL SELECT,PROXY ON grant_plug_dest TO grant_plug; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT,PROXY ON grant_plug_dest TO grant_plug' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT,PROXY ON grant_plug_dest TO grant_plug' at line 1 # this should fail : no such grant REVOKE PROXY ON grant_plug_dest FROM grant_plug; ERROR 42000: There is no such grant defined for user 'grant_plug' on host '%' diff --git a/mysql-test/r/plugin_auth_qa.result b/mysql-test/r/plugin_auth_qa.result index 2bca2e74726..72d21994792 100644 --- a/mysql-test/r/plugin_auth_qa.result +++ b/mysql-test/r/plugin_auth_qa.result @@ -36,65 +36,65 @@ plug test_plugin_server REVOKE ALL PRIVILEGES ON test_user_db.* FROM plug; DROP USER plug; CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH 'test_plugin_server' AS; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 CREATE USER plug IDENTIFIED WITH test_plugin_server AS plug_dest; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'plug_dest' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'plug_dest' at line 1 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH test_plugin_server AS plug_dest; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'plug_dest' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'plug_dest' at line 1 ========== test 1.1 syntax errors ======================================== CREATE USER plug IDENTIFIED WITH AS plug_dest; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS plug_dest' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS plug_dest' at line 1 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH AS plug_dest; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS plug_dest' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS plug_dest' at line 1 CREATE USER plug IDENTIFIED WITH; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 CREATE USER plug IDENTIFIED AS ''; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS ''' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS ''' at line 1 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED AS ''; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS ''' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS ''' at line 1 CREATE USER plug IDENTIFIED WITH 'test_plugin_server' IDENTIFIED WITH 'test_plugin_server'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IDENTIFIED WITH 'test_plugin_server'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IDENTIFIED WITH 'test_plugin_server'' at line 1 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH 'test_plugin_server' IDENTIFIED WITH 'test_plugin_server'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IDENTIFIED WITH 'test_plugin_server'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IDENTIFIED WITH 'test_plugin_server'' at line 2 CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS '' AS 'plug_dest'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS 'plug_dest'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS 'plug_dest'' at line 1 GRANT ALL PRIVILEGES ON test_user_db.* TO plug AS '' AS 'plug_dest'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS '' AS 'plug_dest'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS '' AS 'plug_dest'' at line 1 CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS '' IDENTIFIED WITH test_plugin_server AS 'plug_dest'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IDENTIFIED WITH test_plugin_server AS 'plug_dest'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IDENTIFIED WITH test_plugin_server AS 'plug_dest'' at line 2 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH 'test_plugin_server' AS '' IDENTIFIED WITH test_plugin_server AS 'plug_dest'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IDENTIFIED WITH test_plugin_server AS 'plug_dest'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IDENTIFIED WITH test_plugin_server AS 'plug_dest'' at line 2 CREATE USER plug_dest IDENTIFIED BY 'plug_dest_passwd' IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'' at line 2 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED BY 'plug_dest_passwd' IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'' at line 2 CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest' USER plug_dest IDENTIFIED by 'plug_dest_pwd'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USER plug_dest IDENTIFIED by 'plug_dest_pwd'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USER plug_dest IDENTIFIED by 'plug_dest_pwd'' at line 2 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest' USER plug_dest IDENTIFIED by 'plug_dest_pwd'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USER plug_dest IDENTIFIED by 'plug_dest_pwd'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USER plug_dest IDENTIFIED by 'plug_dest_pwd'' at line 2 CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest' plug_dest IDENTIFIED by 'plug_dest_pwd'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'plug_dest IDENTIFIED by 'plug_dest_pwd'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'plug_dest IDENTIFIED by 'plug_dest_pwd'' at line 2 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest' plug_dest IDENTIFIED by 'plug_dest_pwd'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'plug_dest IDENTIFIED by 'plug_dest_pwd'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'plug_dest IDENTIFIED by 'plug_dest_pwd'' at line 2 CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest' IDENTIFIED by 'plug_dest_pwd'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IDENTIFIED by 'plug_dest_pwd'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IDENTIFIED by 'plug_dest_pwd'' at line 2 GRANT ALL PRIVILEGES ON test_user_db.* TO plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest' IDENTIFIED by 'plug_dest_pwd'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IDENTIFIED by 'plug_dest_pwd'' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IDENTIFIED by 'plug_dest_pwd'' at line 2 ========== test 1.1 combinations ========================== CREATE USER plug IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest'; ========== test 1.1.1.6/1.1.2.5 ============================ @@ -261,10 +261,10 @@ DROP USER plüg_dest; ========== test 1.1.1.2/1.1.2.2============================= SET @auth_name= 'test_plugin_server'; CREATE USER plug IDENTIFIED WITH @auth_name AS 'plug_dest'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@auth_name AS 'plug_dest'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@auth_name AS 'plug_dest'' at line 1 SET @auth_string= 'plug_dest'; CREATE USER plug IDENTIFIED WITH test_plugin_server AS @auth_string; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@auth_string' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@auth_string' at line 1 ========== test 1.1.1.3/1.1.2.3============================= CREATE USER plug IDENTIFIED WITH 'hh''s_test_plugin_server' AS 'plug_dest'; ERROR HY000: Plugin 'hh's_test_plugin_server' is not loaded @@ -280,7 +280,7 @@ hh's_plug_dest DROP USER 'hh''s_plug_dest'; ========== test 1.1.1.4 ==================================== CREATE USER plug IDENTIFIED WITH hh''s_test_plugin_server AS 'plug_dest'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '''s_test_plugin_server AS 'plug_dest'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '''s_test_plugin_server AS 'plug_dest'' at line 1 ========== test 1.1.3.1 ==================================== GRANT INSERT ON test_user_db.* TO grant_user IDENTIFIED WITH test_plugin_server AS 'plug_dest'; SELECT user,plugin,authentication_string FROM mysql.user WHERE user != 'root'; diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index aed3274e732..4747511bdb5 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -85,11 +85,11 @@ NULL NULL NULL prepare stmt6 from 'select 1; select2'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select2' at line 1 prepare stmt6 from 'insert into t1 values (5,"five"); select2'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select2' at line 1 explain prepare stmt6 from 'insert into t1 values (5,"five"); select2'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from 'insert into t1 values (5,"five"); select2'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from 'insert into t1 values (5,"five"); select2'' at line 1 create table t2 ( a int @@ -100,13 +100,13 @@ prepare stmt1 from 'select 1 FROM t2 where a=?' ; execute stmt1 using @arg00 ; 1 prepare stmt1 from @nosuchvar; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NULL' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NULL' at line 1 set @ivar= 1234; prepare stmt1 from @ivar; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '1234' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '1234' at line 1 set @fvar= 123.4567; prepare stmt1 from @fvar; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '123.4567' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '123.4567' at line 1 drop table t1,t2; deallocate prepare stmt3; deallocate prepare stmt4; @@ -669,19 +669,19 @@ execute stmt using @a, @b; deallocate prepare stmt; create table t1 (a int); prepare stmt from "select ??"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '?' at line 1 prepare stmt from "select ?FROM t1"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?FROM t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '?FROM t1' at line 1 prepare stmt from "select FROM t1 WHERE?=1"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FROM t1 WHERE?=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'FROM t1 WHERE?=1' at line 1 prepare stmt from "update t1 set a=a+?WHERE 1"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?WHERE 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '?WHERE 1' at line 1 select ?; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '?' at line 1 select ??; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '??' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '??' at line 1 select ? from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? from t1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t1' at line 1 drop table t1; prepare stmt from "select @@time_zone"; execute stmt; @@ -1258,7 +1258,7 @@ a 1 2 prepare stmt from "select * from t1 where a in (select a from t1 limit ?)"; -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' prepare stmt from "select * from t1 union all select * from t1 limit ?, ?"; set @offset=9; set @limit=2; diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index a32f048977c..d2f740a06f4 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -63,23 +63,23 @@ DEALLOCATE PREPARE stmt ; prepare stmt1 from ' select 1 as my_col ' ; prepare stmt1 from ' select ? as my_col ' ; prepare ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 prepare stmt1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 prepare stmt1 from ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 prepare_garbage stmt1 from ' select 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'prepare_garbage stmt1 from ' select 1 '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'prepare_garbage stmt1 from ' select 1 '' at line 1 prepare stmt1 from_garbage ' select 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from_garbage ' select 1 '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from_garbage ' select 1 '' at line 1 prepare stmt1 from ' select_garbage 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select_garbage 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select_garbage 1' at line 1 prepare from ' select 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from ' select 1 '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from ' select 1 '' at line 1 prepare stmt1 ' select 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' select 1 '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' select 1 '' at line 1 prepare ? from ' select ? as my_col ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? from ' select ? as my_col '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from ' select ? as my_col '' at line 1 set @arg00='select 1 as my_col'; prepare stmt1 from @arg00; set @arg00=''; @@ -87,7 +87,7 @@ prepare stmt1 from @arg00; ERROR 42000: Query was empty set @arg00=NULL; prepare stmt1 from @arg01; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NULL' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NULL' at line 1 prepare stmt1 from ' select * from t1 where a <= 2 ' ; prepare stmt1 from ' select * from t1 where x <= 2 ' ; ERROR 42S22: Unknown column 'x' in 'where clause' @@ -99,10 +99,10 @@ drop table if exists not_exist ; prepare stmt1 from ' select * from not_exist where a <= 2 ' ; ERROR 42S02: Table 'test.not_exist' doesn't exist prepare stmt1 from ' insert into t1 values(? ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 prepare stmt1 from ' select a, b from t1 where a=? and where ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where' at line 2 execute never_prepared ; ERROR HY000: Unknown prepared statement handler (never_prepared) given to EXECUTE prepare stmt1 from ' select * from t1 where a <= 2 ' ; diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result index 2d280886b72..f679e0a9f3d 100644 --- a/mysql-test/r/ps_2myisam.result +++ b/mysql-test/r/ps_2myisam.result @@ -86,9 +86,9 @@ c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c 9 9 9 9 9 9 9 9 9 9 9.0000 9.0000 2004-02-29 2004-02-29 11:11:11 2004-02-29 11:11:11 11:11:11 2004 1 0 a 123456789a 123456789a123456789b123456789c tinyblob tinytext blob text mediumblob mediumtext longblob longtext two tuesday set @arg00='SELECT' ; @arg00 a from t1 where a=1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 prepare stmt1 from ' ? a from t1 where a=1 '; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a from t1 where a=1' at line 1 set @arg00=1 ; select @arg00, b from t1 where a=1 ; @arg00 b @@ -263,19 +263,19 @@ session_id drop table t5 ; set @arg00='FROM' ; select a @arg00 t1 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 prepare stmt1 from ' select a ? t1 where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? t1 where a=1' at line 1 set @arg00='t1' ; select a from @arg00 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 where a=1' at line 1 prepare stmt1 from ' select a from ? where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? where a=1' at line 1 set @arg00='WHERE' ; select a from t1 @arg00 a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a=1' at line 1 prepare stmt1 from ' select a from t1 ? a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a=1' at line 1 set @arg00=1 ; select a FROM t1 where a=@arg00 ; a @@ -366,9 +366,9 @@ NULL delete from t9 where c1= 0 ; set @arg00='>' ; select a FROM t1 where a @arg00 1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 1' at line 1 prepare stmt1 from ' select a FROM t1 where a ? 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? 1' at line 1 set @arg00=1 ; select a,b FROM t1 where a is not NULL AND b is not NULL group by a - @arg00 ; @@ -2089,7 +2089,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select ? := c1 from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 test_sequence ------ select column, .. into @parm,.. ------ select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, @@ -2265,7 +2265,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select c1 into ? from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1 test_sequence -- insert into numeric columns -- insert into t9 diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result index 4b91ab8186a..74853f46ae5 100644 --- a/mysql-test/r/ps_3innodb.result +++ b/mysql-test/r/ps_3innodb.result @@ -86,9 +86,9 @@ c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c 9 9 9 9 9 9 9 9 9 9 9.0000 9.0000 2004-02-29 2004-02-29 11:11:11 2004-02-29 11:11:11 11:11:11 2004 1 0 a 123456789a 123456789a123456789b123456789c tinyblob tinytext blob text mediumblob mediumtext longblob longtext two tuesday set @arg00='SELECT' ; @arg00 a from t1 where a=1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 prepare stmt1 from ' ? a from t1 where a=1 '; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a from t1 where a=1' at line 1 set @arg00=1 ; select @arg00, b from t1 where a=1 ; @arg00 b @@ -263,19 +263,19 @@ session_id drop table t5 ; set @arg00='FROM' ; select a @arg00 t1 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 prepare stmt1 from ' select a ? t1 where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? t1 where a=1' at line 1 set @arg00='t1' ; select a from @arg00 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 where a=1' at line 1 prepare stmt1 from ' select a from ? where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? where a=1' at line 1 set @arg00='WHERE' ; select a from t1 @arg00 a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a=1' at line 1 prepare stmt1 from ' select a from t1 ? a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a=1' at line 1 set @arg00=1 ; select a FROM t1 where a=@arg00 ; a @@ -366,9 +366,9 @@ NULL delete from t9 where c1= 0 ; set @arg00='>' ; select a FROM t1 where a @arg00 1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 1' at line 1 prepare stmt1 from ' select a FROM t1 where a ? 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? 1' at line 1 set @arg00=1 ; select a,b FROM t1 where a is not NULL AND b is not NULL group by a - @arg00 ; @@ -2072,7 +2072,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select ? := c1 from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 test_sequence ------ select column, .. into @parm,.. ------ select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, @@ -2248,7 +2248,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select c1 into ? from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1 test_sequence -- insert into numeric columns -- insert into t9 diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result index 92d5ed1aadb..500ff119ba2 100644 --- a/mysql-test/r/ps_4heap.result +++ b/mysql-test/r/ps_4heap.result @@ -87,9 +87,9 @@ c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c 9 9 9 9 9 9 9 9 9 9 9.0000 9.0000 2004-02-29 2004-02-29 11:11:11 2004-02-29 11:11:11 11:11:11 2004 1 0 a 123456789a 123456789a123456789b123456789c tinyblob tinytext blob text mediumblob mediumtext longblob longtext two tuesday set @arg00='SELECT' ; @arg00 a from t1 where a=1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 prepare stmt1 from ' ? a from t1 where a=1 '; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a from t1 where a=1' at line 1 set @arg00=1 ; select @arg00, b from t1 where a=1 ; @arg00 b @@ -264,19 +264,19 @@ session_id drop table t5 ; set @arg00='FROM' ; select a @arg00 t1 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 prepare stmt1 from ' select a ? t1 where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? t1 where a=1' at line 1 set @arg00='t1' ; select a from @arg00 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 where a=1' at line 1 prepare stmt1 from ' select a from ? where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? where a=1' at line 1 set @arg00='WHERE' ; select a from t1 @arg00 a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a=1' at line 1 prepare stmt1 from ' select a from t1 ? a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a=1' at line 1 set @arg00=1 ; select a FROM t1 where a=@arg00 ; a @@ -367,9 +367,9 @@ NULL delete from t9 where c1= 0 ; set @arg00='>' ; select a FROM t1 where a @arg00 1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 1' at line 1 prepare stmt1 from ' select a FROM t1 where a ? 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? 1' at line 1 set @arg00=1 ; select a,b FROM t1 where a is not NULL AND b is not NULL group by a - @arg00 ; @@ -2073,7 +2073,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select ? := c1 from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 test_sequence ------ select column, .. into @parm,.. ------ select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, @@ -2249,7 +2249,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select c1 into ? from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1 test_sequence -- insert into numeric columns -- insert into t9 diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result index 4a4c46a1907..e7dea3d51ba 100644 --- a/mysql-test/r/ps_5merge.result +++ b/mysql-test/r/ps_5merge.result @@ -129,9 +129,9 @@ c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c 9 9 9 9 9 9 9 9 9 9 9.0000 9.0000 2004-02-29 2004-02-29 11:11:11 2004-02-29 11:11:11 11:11:11 2004 1 0 a 123456789a 123456789a123456789b123456789c tinyblob tinytext blob text mediumblob mediumtext longblob longtext two tuesday set @arg00='SELECT' ; @arg00 a from t1 where a=1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 prepare stmt1 from ' ? a from t1 where a=1 '; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a from t1 where a=1' at line 1 set @arg00=1 ; select @arg00, b from t1 where a=1 ; @arg00 b @@ -306,19 +306,19 @@ session_id drop table t5 ; set @arg00='FROM' ; select a @arg00 t1 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 prepare stmt1 from ' select a ? t1 where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? t1 where a=1' at line 1 set @arg00='t1' ; select a from @arg00 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 where a=1' at line 1 prepare stmt1 from ' select a from ? where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? where a=1' at line 1 set @arg00='WHERE' ; select a from t1 @arg00 a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a=1' at line 1 prepare stmt1 from ' select a from t1 ? a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a=1' at line 1 set @arg00=1 ; select a FROM t1 where a=@arg00 ; a @@ -409,9 +409,9 @@ NULL delete from t9 where c1= 0 ; set @arg00='>' ; select a FROM t1 where a @arg00 1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 1' at line 1 prepare stmt1 from ' select a FROM t1 where a ? 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? 1' at line 1 set @arg00=1 ; select a,b FROM t1 where a is not NULL AND b is not NULL group by a - @arg00 ; @@ -2009,7 +2009,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select ? := c1 from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 test_sequence ------ select column, .. into @parm,.. ------ select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, @@ -2185,7 +2185,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select c1 into ? from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1 test_sequence -- insert into numeric columns -- insert into t9 @@ -3483,9 +3483,9 @@ c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c 9 9 9 9 9 9 9 9 9 9 9.0000 9.0000 2004-02-29 2004-02-29 11:11:11 2004-02-29 11:11:11 11:11:11 2004 1 0 a 123456789a 123456789a123456789b123456789c tinyblob tinytext blob text mediumblob mediumtext longblob longtext two tuesday set @arg00='SELECT' ; @arg00 a from t1 where a=1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 prepare stmt1 from ' ? a from t1 where a=1 '; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a from t1 where a=1' at line 1 set @arg00=1 ; select @arg00, b from t1 where a=1 ; @arg00 b @@ -3660,19 +3660,19 @@ session_id drop table t5 ; set @arg00='FROM' ; select a @arg00 t1 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 prepare stmt1 from ' select a ? t1 where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? t1 where a=1' at line 1 set @arg00='t1' ; select a from @arg00 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 where a=1' at line 1 prepare stmt1 from ' select a from ? where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? where a=1' at line 1 set @arg00='WHERE' ; select a from t1 @arg00 a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a=1' at line 1 prepare stmt1 from ' select a from t1 ? a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a=1' at line 1 set @arg00=1 ; select a FROM t1 where a=@arg00 ; a @@ -3763,9 +3763,9 @@ NULL delete from t9 where c1= 0 ; set @arg00='>' ; select a FROM t1 where a @arg00 1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 1' at line 1 prepare stmt1 from ' select a FROM t1 where a ? 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? 1' at line 1 set @arg00=1 ; select a,b FROM t1 where a is not NULL AND b is not NULL group by a - @arg00 ; @@ -5363,7 +5363,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select ? := c1 from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 test_sequence ------ select column, .. into @parm,.. ------ select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, @@ -5539,7 +5539,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select c1 into ? from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1 test_sequence -- insert into numeric columns -- insert into t9 diff --git a/mysql-test/r/ps_ddl.result b/mysql-test/r/ps_ddl.result index 1b908e1046d..5f156c170a4 100644 --- a/mysql-test/r/ps_ddl.result +++ b/mysql-test/r/ps_ddl.result @@ -2130,13 +2130,13 @@ deallocate prepare stmt; drop table if exists t1; create table t1 (a int); prepare stmt from "show engine all status where (1) in (select * from t1)"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where (1) in (select * from t1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where (1) in (select * from t1)' at line 1 prepare stmt from "show engine all logs where (1) in (select * from t1)"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where (1) in (select * from t1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where (1) in (select * from t1)' at line 1 prepare stmt from "show engine all mutex where (1) in (select * from t1)"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where (1) in (select * from t1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where (1) in (select * from t1)' at line 1 prepare stmt from "show processlist where (1) in (select * from t1)"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where (1) in (select * from t1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where (1) in (select * from t1)' at line 1 drop table t1; # # SQLCOM_SHOW_CHARSETS diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 3b5b7731cf3..e23dbaa9903 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -1770,9 +1770,9 @@ DROP TABLE t1; SET GLOBAL query_cache_size= default; CREATE TABLE t1( a INT ); SET @v = ( SELECT SQL_CACHE 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '1 )' at line 1 SET @v = ( SELECT SQL_NO_CACHE 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '1 )' at line 1 SELECT a FROM t1 WHERE a IN ( SELECT SQL_CACHE a FROM t1 ); ERROR 42S22: Unknown column 'SQL_CACHE' in 'field list' SELECT a FROM t1 WHERE a IN ( SELECT SQL_NO_CACHE a FROM t1 ); diff --git a/mysql-test/r/read_only.result b/mysql-test/r/read_only.result index 7b28da5a577..fead8c2b82b 100644 --- a/mysql-test/r/read_only.result +++ b/mysql-test/r/read_only.result @@ -17,25 +17,25 @@ select @@global.read_only; @@global.read_only 1 create table t3 (a int); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement insert into t1 values(1); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement update t1 set a=1 where 1=0; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement update t1,t2 set t1.a=t2.a+1 where t1.a=t2.a; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement delete t1,t2 from t1,t2 where t1.a=t2.a; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement create temporary table t3 (a int); create temporary table t4 (a int) select * from t3; insert into t3 values(1); insert into t4 select * from t3; update t1,t3 set t1.a=t3.a+1 where t1.a=t3.a; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement update t1,t3 set t3.a=t1.a+1 where t1.a=t3.a; update t4,t3 set t4.a=t3.a+1 where t4.a=t3.a; delete t1 from t1,t3 where t1.a=t3.a; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement delete t3 from t1,t3 where t1.a=t3.a; delete t4 from t3,t4 where t4.a=t3.a; create temporary table t1 (a int); @@ -44,7 +44,7 @@ update t1,t3 set t1.a=t3.a+1 where t1.a=t3.a; delete t1 from t1,t3 where t1.a=t3.a; drop table t1; insert into t1 values(1); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement connection default; set global read_only=0; lock table t1 write; @@ -145,11 +145,11 @@ flush privileges; connect (con_bug27440,127.0.0.1,mysqltest_u1,,test,MASTER_MYPORT,); connection con_bug27440; create database mysqltest_db2; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement show databases like '%mysqltest_db2%'; Database (%mysqltest_db2%) drop database mysqltest_db1; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement disconnect con_bug27440; connection default; delete from mysql.user where User like 'mysqltest_%'; diff --git a/mysql-test/r/read_only_innodb.result b/mysql-test/r/read_only_innodb.result index 13e5980f900..45005b41da8 100644 --- a/mysql-test/r/read_only_innodb.result +++ b/mysql-test/r/read_only_innodb.result @@ -12,7 +12,7 @@ select * from table_11733 ; a 11733 COMMIT; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement set global read_only=0; drop table table_11733 ; drop user test@localhost; @@ -90,7 +90,7 @@ a 1 CREATE TEMPORARY TABLE temp (a INT) ENGINE=INNODB; INSERT INTO t1 VALUES (1); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement INSERT INTO temp VALUES (1); SELECT * FROM t2; a @@ -110,7 +110,7 @@ a SELECT * FROM temp; a INSERT INTO t1 VALUES (1); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement INSERT INTO temp VALUES (1); DROP TABLE temp; UNLOCK TABLES; diff --git a/mysql-test/r/renamedb.result b/mysql-test/r/renamedb.result index e77aca0d0b7..f774c3d1ab6 100644 --- a/mysql-test/r/renamedb.result +++ b/mysql-test/r/renamedb.result @@ -1,5 +1,5 @@ rename database testdb1 to testdb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'database testdb1 to testdb2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'database testdb1 to testdb2' at line 1 ALTER DATABASE wrong UPGRADE DATA DIRECTORY NAME; ERROR HY000: Incorrect usage of ALTER DATABASE UPGRADE DATA DIRECTORY NAME and name ALTER DATABASE `#mysql41#not-supported` UPGRADE DATA DIRECTORY NAME; diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 71c1fafe4c0..4ae9197823a 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -2094,7 +2094,7 @@ drop table t4, t3, t2, t1; DO 1; DO benchmark(100,1+1),1,1; do default; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 do foobar; ERROR 42S22: Unknown column 'foobar' in 'field list' CREATE TABLE t1 ( @@ -3401,7 +3401,7 @@ f1 f2 f2 NULL a NULL drop table t1,t2; select * from (select * left join t on f1=f2) tt; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on f1=f2) tt' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on f1=f2) tt' at line 1 CREATE TABLE t1 (sku int PRIMARY KEY, pr int); CREATE TABLE t2 (sku int PRIMARY KEY, sppr int, name varchar(255)); INSERT INTO t1 VALUES @@ -3651,7 +3651,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1(a int); INSERT into t1 values (1), (2), (3); SELECT * FROM t1 LIMIT 2, -1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1' at line 1 DROP TABLE t1; CREATE TABLE t1 ( ID_with_null int NULL, diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result index 22ad32c23f2..4a9dc92433f 100644 --- a/mysql-test/r/select_jcl6.result +++ b/mysql-test/r/select_jcl6.result @@ -2103,7 +2103,7 @@ drop table t4, t3, t2, t1; DO 1; DO benchmark(100,1+1),1,1; do default; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 do foobar; ERROR 42S22: Unknown column 'foobar' in 'field list' CREATE TABLE t1 ( @@ -3410,7 +3410,7 @@ f1 f2 f2 NULL a NULL drop table t1,t2; select * from (select * left join t on f1=f2) tt; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on f1=f2) tt' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on f1=f2) tt' at line 1 CREATE TABLE t1 (sku int PRIMARY KEY, pr int); CREATE TABLE t2 (sku int PRIMARY KEY, sppr int, name varchar(255)); INSERT INTO t1 VALUES @@ -3660,7 +3660,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1(a int); INSERT into t1 values (1), (2), (3); SELECT * FROM t1 LIMIT 2, -1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1' at line 1 DROP TABLE t1; CREATE TABLE t1 ( ID_with_null int NULL, diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/r/select_pkeycache.result index 71c1fafe4c0..4ae9197823a 100644 --- a/mysql-test/r/select_pkeycache.result +++ b/mysql-test/r/select_pkeycache.result @@ -2094,7 +2094,7 @@ drop table t4, t3, t2, t1; DO 1; DO benchmark(100,1+1),1,1; do default; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 do foobar; ERROR 42S22: Unknown column 'foobar' in 'field list' CREATE TABLE t1 ( @@ -3401,7 +3401,7 @@ f1 f2 f2 NULL a NULL drop table t1,t2; select * from (select * left join t on f1=f2) tt; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on f1=f2) tt' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on f1=f2) tt' at line 1 CREATE TABLE t1 (sku int PRIMARY KEY, pr int); CREATE TABLE t2 (sku int PRIMARY KEY, sppr int, name varchar(255)); INSERT INTO t1 VALUES @@ -3651,7 +3651,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1(a int); INSERT into t1 values (1), (2), (3); SELECT * FROM t1 LIMIT 2, -1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1' at line 1 DROP TABLE t1; CREATE TABLE t1 ( ID_with_null int NULL, diff --git a/mysql-test/r/signal.result b/mysql-test/r/signal.result index 92f1df62dc2..062b866475d 100644 --- a/mysql-test/r/signal.result +++ b/mysql-test/r/signal.result @@ -66,11 +66,11 @@ transaction_active int drop table diag_stmt_non_reserved; drop table if exists test_reserved; create table test_reserved (signal int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'signal int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'signal int)' at line 1 create table test_reserved (resignal int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'resignal int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'resignal int)' at line 1 create table test_reserved (condition int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition int)' at line 1 # # Test the SIGNAL syntax # @@ -81,7 +81,7 @@ create procedure test_invalid() begin SIGNAL; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '; end' at line 3 create procedure test_invalid() begin @@ -239,109 +239,109 @@ create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET bla_bla = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bla_bla = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bla_bla = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET CONDITION_IDENTIFIER = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CONDITION_IDENTIFIER = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CONDITION_IDENTIFIER = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET CONDITION_NUMBER = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CONDITION_NUMBER = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CONDITION_NUMBER = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET CONNECTION_NAME = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CONNECTION_NAME = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CONNECTION_NAME = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET MESSAGE_LENGTH = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MESSAGE_LENGTH = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MESSAGE_LENGTH = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET MESSAGE_OCTET_LENGTH = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'MESSAGE_OCTET_LENGTH = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MESSAGE_OCTET_LENGTH = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET PARAMETER_MODE = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'PARAMETER_MODE = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'PARAMETER_MODE = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET PARAMETER_NAME = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'PARAMETER_NAME = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'PARAMETER_NAME = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET PARAMETER_ORDINAL_POSITION = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'PARAMETER_ORDINAL_POSITION = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'PARAMETER_ORDINAL_POSITION = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET RETURNED_SQLSTATE = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RETURNED_SQLSTATE = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RETURNED_SQLSTATE = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET ROUTINE_CATALOG = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ROUTINE_CATALOG = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ROUTINE_CATALOG = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET ROUTINE_NAME = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ROUTINE_NAME = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ROUTINE_NAME = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET ROUTINE_SCHEMA = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ROUTINE_SCHEMA = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ROUTINE_SCHEMA = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET SERVER_NAME = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SERVER_NAME = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SERVER_NAME = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET SPECIFIC_NAME = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SPECIFIC_NAME = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SPECIFIC_NAME = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET TRIGGER_CATALOG = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRIGGER_CATALOG = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TRIGGER_CATALOG = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET TRIGGER_NAME = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRIGGER_NAME = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TRIGGER_NAME = 'foo'; end' at line 3 create procedure test_invalid() begin SIGNAL SQLSTATE '12345' SET TRIGGER_SCHEMA = 'foo'; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TRIGGER_SCHEMA = 'foo'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TRIGGER_SCHEMA = 'foo'; end' at line 3 # # Test the RESIGNAL syntax @@ -596,7 +596,7 @@ ERROR 42000: Variable 'MYSQL_ERRNO' can't be set to the value of '4294967295' SIGNAL SQLSTATE 'HY000' SET MYSQL_ERRNO = 0; ERROR 42000: Variable 'MYSQL_ERRNO' can't be set to the value of '0' SIGNAL SQLSTATE 'HY000' SET MYSQL_ERRNO = -1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1' at line 1 SIGNAL SQLSTATE 'HY000' SET MYSQL_ERRNO = 65535; ERROR 42000: Variable 'MYSQL_ERRNO' can't be set to the value of '65535' SIGNAL SQLSTATE 'HY000' SET MYSQL_ERRNO = 65534; @@ -1063,7 +1063,7 @@ SIGNAL something SET MESSAGE_TEXT = @message_text := 'illegal', MYSQL_ERRNO = @sqlcode := 1234; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ' MYSQL_ERRNO = @sqlcode := 1234; end' at line 5 create procedure test_signal() @@ -2363,21 +2363,21 @@ begin DECLARE céèçà foo CONDITION FOR SQLSTATE '12345'; SIGNAL céèçà SET MYSQL_ERRNO = 1000; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '©Ã¨Ã§Ã  foo CONDITION FOR SQLSTATE '12345'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '©Ã¨Ã§Ã  foo CONDITION FOR SQLSTATE '12345'; SIGNAL céèçà SET ' at line 3 create procedure test_signal() begin DECLARE "céèçà" CONDITION FOR SQLSTATE '12345'; SIGNAL "céèçà" SET MYSQL_ERRNO = 1000; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"céèçà" CONDITION FOR SQLSTATE '12345'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"céèçà" CONDITION FOR SQLSTATE '12345'; SIGNAL "céèçà" S' at line 3 create procedure test_signal() begin DECLARE 'céèçà' CONDITION FOR SQLSTATE '12345'; SIGNAL 'céèçà' SET MYSQL_ERRNO = 1000; end $$ -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''céèçà' CONDITION FOR SQLSTATE '12345'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''céèçà' CONDITION FOR SQLSTATE '12345'; SIGNAL 'céèçà' S' at line 3 create procedure test_signal() begin diff --git a/mysql-test/r/skip_grants.result b/mysql-test/r/skip_grants.result index b523f2edc9f..cd691d882fa 100644 --- a/mysql-test/r/skip_grants.result +++ b/mysql-test/r/skip_grants.result @@ -59,7 +59,7 @@ DROP FUNCTION f1; DROP FUNCTION f2; DROP FUNCTION f3; set global event_scheduler=1; -ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED or --skip-grant-tables option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --event-scheduler=DISABLED or --skip-grant-tables option so it cannot execute this statement select count(*) from information_schema.COLUMN_PRIVILEGES; count(*) 0 diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index 0da4ed34e89..24cbb945fd2 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -2,11 +2,11 @@ drop table if exists t1, t2; SELECT * FROM mysql.proc INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/proc.txt'; delete from mysql.proc; create procedure syntaxerror(t int)| -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 create procedure syntaxerror(t int)| -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 create procedure syntaxerror(t int)| -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 drop table if exists t3| create table t3 ( x int )| insert into t3 values (2), (3)| @@ -143,7 +143,7 @@ declare c cursor for insert into test.t1 values ("foo", 42); open c; close c; end| -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insert into test.t1 values ("foo", 42); +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insert into test.t1 values ("foo", 42); open c; close c; end' at line 3 @@ -887,7 +887,7 @@ select password; end| ERROR 42000: Variable 'password' must be quoted with `...`, or renamed set names='foo2'| -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 create procedure bug13510_2() begin declare names varchar(10); @@ -1212,18 +1212,18 @@ ERROR 42S02: Unknown table 'c' in field list drop procedure bug15091; drop function if exists bug16896; create aggregate function bug16896() returns int return 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '() returns int return 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '() returns int return 1' at line 1 DROP PROCEDURE IF EXISTS bug14702; CREATE IF NOT EXISTS PROCEDURE bug14702() BEGIN END; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IF NOT EXISTS PROCEDURE bug14702() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IF NOT EXISTS PROCEDURE bug14702() BEGIN END' at line 1 CREATE PROCEDURE IF NOT EXISTS bug14702() BEGIN END; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IF NOT EXISTS bug14702() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'IF NOT EXISTS bug14702() BEGIN END' at line 1 DROP TABLE IF EXISTS t1; @@ -1415,7 +1415,7 @@ end| ERROR 0A000: Not allowed to return a result set from a function drop function if exists bug20701; create function bug20701() returns varchar(25) binary return "test"; -ERROR 42000: This version of MySQL doesn't yet support 'return value collation' +ERROR 42000: This version of MariaDB doesn't yet support 'return value collation' create function bug20701() returns varchar(25) return "test"; drop function bug20701; create procedure proc_26503_error_1() @@ -1493,7 +1493,7 @@ FETCH cur1 INTO c; select c; CLOSE cur1; END| -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SHOW TABLES; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SHOW TABLES; OPEN cur1; FETCH cur1 INTO c; select c; @@ -1508,9 +1508,9 @@ ERROR 42000: FUNCTION inexistent does not exist SELECT inexistent(); ERROR 42000: FUNCTION inexistent does not exist SELECT .inexistent(); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '()' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '()' at line 1 SELECT ..inexistent(); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.inexistent()' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.inexistent()' at line 1 USE test; create function f1() returns int begin diff --git a/mysql-test/r/sp-ucs2.result b/mysql-test/r/sp-ucs2.result index aa87e8865ed..605fe4ed151 100644 --- a/mysql-test/r/sp-ucs2.result +++ b/mysql-test/r/sp-ucs2.result @@ -106,20 +106,20 @@ RETURNS VARCHAR(64) CHARACTER SET ucs2 BEGIN RETURN 'str'; END| -ERROR 42000: This version of MySQL doesn't yet support 'COLLATE with no CHARACTER SET in SP parameters, RETURNS, DECLARE' +ERROR 42000: This version of MariaDB doesn't yet support 'COLLATE with no CHARACTER SET in SP parameters, RETURNS, DECLARE' CREATE FUNCTION f(f1 VARCHAR(64) CHARACTER SET ucs2) RETURNS VARCHAR(64) COLLATE ucs2_unicode_ci BEGIN RETURN 'str'; END| -ERROR 42000: This version of MySQL doesn't yet support 'COLLATE with no CHARACTER SET in SP parameters, RETURNS, DECLARE' +ERROR 42000: This version of MariaDB doesn't yet support 'COLLATE with no CHARACTER SET in SP parameters, RETURNS, DECLARE' CREATE FUNCTION f(f1 VARCHAR(64) CHARACTER SET ucs2) RETURNS VARCHAR(64) CHARACTER SET ucs2 BEGIN DECLARE f2 VARCHAR(64) COLLATE ucs2_unicode_ci; RETURN 'str'; END| -ERROR 42000: This version of MySQL doesn't yet support 'COLLATE with no CHARACTER SET in SP parameters, RETURNS, DECLARE' +ERROR 42000: This version of MariaDB doesn't yet support 'COLLATE with no CHARACTER SET in SP parameters, RETURNS, DECLARE' SET NAMES utf8; DROP FUNCTION IF EXISTS bug48766; CREATE FUNCTION bug48766 () diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 142c154bdac..fffb1ddceef 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -3621,7 +3621,7 @@ begin set f1= concat( 'hello', f1 ); return f1; end| -ERROR 42000: This version of MySQL doesn't yet support 'return value collation' +ERROR 42000: This version of MariaDB doesn't yet support 'return value collation' drop procedure if exists bug12849_1| create procedure bug12849_1(inout x char) select x into x| set @var='a'| diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 6acea0d1680..6b6db4f5f2c 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -1049,9 +1049,9 @@ a drop table t1, t2; create table t1 (a float); select 10.5 IN (SELECT * from t1 LIMIT 1); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' select 10.5 IN (SELECT * from t1 LIMIT 1 UNION SELECT 1.5); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' drop table t1; create table t1 (a int, b int, c varchar(10)); create table t2 (a int); @@ -1103,7 +1103,7 @@ select ROW(1, 1, 'a') IN (select b,a,c from t1 where c='b' or c='a'); ROW(1, 1, 'a') IN (select b,a,c from t1 where c='b' or c='a') 1 select ROW(1, 1, 'a') IN (select b,a,c from t1 limit 2); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' drop table t1; create table t1 (a int); insert into t1 values (1); @@ -1124,7 +1124,7 @@ ERROR 42S02: Table 'test.t1' doesn't exist CREATE TABLE t1 (a int, KEY(a)); HANDLER t1 OPEN; HANDLER t1 READ a=((SELECT 1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT 1))' at line 1 HANDLER t1 CLOSE; drop table t1; create table t1 (a int); @@ -1925,7 +1925,7 @@ create table t1(id int); create table t2(id int); create table t3(flag int); select (select * from t3 where id not null) from t1, t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null) from t1, t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null) from t1, t2' at line 1 drop table t1,t2,t3; CREATE TABLE t1 (id INT); CREATE TABLE t2 (id INT); @@ -3714,10 +3714,10 @@ SELECT sql_no_cache * FROM t1 WHERE NOT EXISTS i SELECT * FROM t1 WHERE NOT EXISTS (((SELECT i FROM t1) UNION (SELECT i FROM t1))); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION (SELECT i FROM t1)))' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION (SELECT i FROM t1)))' at line 2 explain select ((select t11.i from t1 t11) union (select t12.i from t1 t12)) from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'union (select t12.i from t1 t12)) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'union (select t12.i from t1 t12)) from t1' at line 1 explain select * from t1 where not exists ((select t11.i from t1 t11) union (select t12.i from t1 t12)); @@ -4992,33 +4992,33 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2( a INT, b INT ); SELECT * FROM (SELECT a INTO @var FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM (SELECT a INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM (SELECT a INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO @var FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO OUTFILE 'file' FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO DUMPFILE 'file' FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM (SELECT a FROM t1 WHERE a = 2) t1a; a @@ -5041,7 +5041,7 @@ a 1 2 SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; a 1 @@ -5049,23 +5049,23 @@ SELECT * FROM (SELECT 1 UNION SELECT 1) t1a; 1 1 SELECT * FROM ((SELECT 1 a INTO @a)) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)) t1a' at line 1 SELECT * FROM ((SELECT 1 a INTO OUTFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 SELECT * FROM ((SELECT 1 a INTO DUMPFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO @a)) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO DUMPFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO OUTFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO @a))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a))) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO DUMPFILE 'file' ))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' ))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' ))) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO OUTFILE 'file' ))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' ))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' ))) t1a' at line 1 SELECT * FROM (SELECT 1 a ORDER BY a) t1a; a 1 @@ -5083,15 +5083,15 @@ a 1 1 1 2 1 SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')) ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ON 1' at line 1 SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a) t1a ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a ON 1' at line 1 SELECT * FROM t1 JOIN ((t1 t1a)) t1a ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a) ON 1; a a 1 1 @@ -5129,7 +5129,7 @@ a a 1 1 2 1 SELECT * FROM (t1 JOIN (SELECT 1) t1a1 ON 1) t1a2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a2' at line 1 SELECT * FROM t1 WHERE a = ALL ( SELECT 1 ); a 1 @@ -5140,11 +5140,11 @@ SELECT * FROM t1 WHERE a = ANY ( SELECT 3 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 ); a 1 @@ -5152,29 +5152,29 @@ SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT ( SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT ( SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT a FROM t1 WHERE a = 1 ), a FROM t1; ( SELECT a FROM t1 WHERE a = 1 ) a 1 1 @@ -5186,13 +5186,13 @@ SELECT ( SELECT a FROM t1 WHERE a = 1 UNION SELECT 1 ), a FROM t1; SELECT * FROM t2 WHERE (a, b) IN (SELECT a, b FROM t2); a b SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1' at line 1 SELECT ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1' at line 1 SELECT ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) 1 @@ -5200,28 +5200,28 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); ((SELECT 1 UNION SELECT 1 UNION SELECT 1)) 1 SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; 1 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ALL ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ALL ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ANY ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a IN ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); a 1 @@ -5235,18 +5235,18 @@ SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE EXISTS ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT EXISTS(SELECT 1+1); EXISTS(SELECT 1+1) 1 SELECT EXISTS(SELECT 1+1 INTO @test); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @test)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @test)' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT * FROM t1 WHERE EXISTS ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 DROP TABLE t1, t2; CREATE TABLE t1 (a ENUM('rainbow')); INSERT INTO t1 VALUES (),(),(),(),(); diff --git a/mysql-test/r/subselect3.result b/mysql-test/r/subselect3.result index 41f1a842a90..1a87c268d29 100644 --- a/mysql-test/r/subselect3.result +++ b/mysql-test/r/subselect3.result @@ -1483,7 +1483,7 @@ WHERE ( SELECT b , a FROM t3 ); -ERROR 42000: This version of MySQL doesn't yet support 'SUBQUERY in ROW in left expression of IN/ALL/ANY' +ERROR 42000: This version of MariaDB doesn't yet support 'SUBQUERY in ROW in left expression of IN/ALL/ANY' set optimizer_switch=@optimizer_switch_save; drop table t1,t2,t3; End of 5.3 tests diff --git a/mysql-test/r/subselect3_jcl6.result b/mysql-test/r/subselect3_jcl6.result index 7cf3e2c5e9e..791040c8502 100644 --- a/mysql-test/r/subselect3_jcl6.result +++ b/mysql-test/r/subselect3_jcl6.result @@ -1492,7 +1492,7 @@ WHERE ( SELECT b , a FROM t3 ); -ERROR 42000: This version of MySQL doesn't yet support 'SUBQUERY in ROW in left expression of IN/ALL/ANY' +ERROR 42000: This version of MariaDB doesn't yet support 'SUBQUERY in ROW in left expression of IN/ALL/ANY' set optimizer_switch=@optimizer_switch_save; drop table t1,t2,t3; End of 5.3 tests diff --git a/mysql-test/r/subselect4.result b/mysql-test/r/subselect4.result index 24ed46a9068..de9cdd729f7 100644 --- a/mysql-test/r/subselect4.result +++ b/mysql-test/r/subselect4.result @@ -271,7 +271,7 @@ set @old_optimizer_switch = @@session.optimizer_switch, SET SESSION OPTIMIZER_SWITCH = 'materialization=off,semijoin=off,loosescan=off,firstmatch=off,mrr=on'; SET SESSION engine_condition_pushdown = 1; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT `time_nokey` G1 FROM t1 WHERE ( `varchar_nokey` , `varchar_key` ) IN ( SELECT `varchar_nokey` , `varchar_nokey` ) AND `varchar_key` >= 'c' HAVING G1 ORDER BY `pk` ; @@ -279,7 +279,7 @@ G1 set @@session.optimizer_switch = @old_optimizer_switch, @@session.engine_condition_pushdown = @old_engine_condition_pushdown; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead DROP TABLE t1; # # During work with BUG#45863 I had problems with a query that was @@ -466,7 +466,7 @@ SELECT @old_icp:=@@engine_condition_pushdown; # SET SESSION engine_condition_pushdown = 'ON'; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT pk FROM t2 @@ -481,7 +481,7 @@ pk # Restore old value for Index condition pushdown SET SESSION engine_condition_pushdown=@old_icp; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead DROP TABLE t1,t2; # # End of 5.3 tests. diff --git a/mysql-test/r/subselect_mat.result b/mysql-test/r/subselect_mat.result index 499963710e1..9a0a40e0ccc 100644 --- a/mysql-test/r/subselect_mat.result +++ b/mysql-test/r/subselect_mat.result @@ -182,7 +182,7 @@ a1 a2 1 - 01 2 - 01 1 - 02 2 - 02 select * from t1 where (a1, a2) in (select b1, min(b2) from t2i limit 1,1); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' set @save_optimizer_switch=@@optimizer_switch; set @@optimizer_switch=@optimizer_switch_local_default; set @@optimizer_switch='semijoin=off'; diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result index 4b3dce76f0a..b9705205999 100644 --- a/mysql-test/r/subselect_no_mat.result +++ b/mysql-test/r/subselect_no_mat.result @@ -1054,9 +1054,9 @@ a drop table t1, t2; create table t1 (a float); select 10.5 IN (SELECT * from t1 LIMIT 1); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' select 10.5 IN (SELECT * from t1 LIMIT 1 UNION SELECT 1.5); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' drop table t1; create table t1 (a int, b int, c varchar(10)); create table t2 (a int); @@ -1108,7 +1108,7 @@ select ROW(1, 1, 'a') IN (select b,a,c from t1 where c='b' or c='a'); ROW(1, 1, 'a') IN (select b,a,c from t1 where c='b' or c='a') 1 select ROW(1, 1, 'a') IN (select b,a,c from t1 limit 2); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' drop table t1; create table t1 (a int); insert into t1 values (1); @@ -1129,7 +1129,7 @@ ERROR 42S02: Table 'test.t1' doesn't exist CREATE TABLE t1 (a int, KEY(a)); HANDLER t1 OPEN; HANDLER t1 READ a=((SELECT 1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT 1))' at line 1 HANDLER t1 CLOSE; drop table t1; create table t1 (a int); @@ -1930,7 +1930,7 @@ create table t1(id int); create table t2(id int); create table t3(flag int); select (select * from t3 where id not null) from t1, t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null) from t1, t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null) from t1, t2' at line 1 drop table t1,t2,t3; CREATE TABLE t1 (id INT); CREATE TABLE t2 (id INT); @@ -3716,10 +3716,10 @@ SELECT sql_no_cache * FROM t1 WHERE NOT EXISTS i SELECT * FROM t1 WHERE NOT EXISTS (((SELECT i FROM t1) UNION (SELECT i FROM t1))); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION (SELECT i FROM t1)))' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION (SELECT i FROM t1)))' at line 2 explain select ((select t11.i from t1 t11) union (select t12.i from t1 t12)) from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'union (select t12.i from t1 t12)) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'union (select t12.i from t1 t12)) from t1' at line 1 explain select * from t1 where not exists ((select t11.i from t1 t11) union (select t12.i from t1 t12)); @@ -4992,33 +4992,33 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2( a INT, b INT ); SELECT * FROM (SELECT a INTO @var FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM (SELECT a INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM (SELECT a INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO @var FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO OUTFILE 'file' FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO DUMPFILE 'file' FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM (SELECT a FROM t1 WHERE a = 2) t1a; a @@ -5041,7 +5041,7 @@ a 1 2 SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; a 1 @@ -5049,23 +5049,23 @@ SELECT * FROM (SELECT 1 UNION SELECT 1) t1a; 1 1 SELECT * FROM ((SELECT 1 a INTO @a)) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)) t1a' at line 1 SELECT * FROM ((SELECT 1 a INTO OUTFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 SELECT * FROM ((SELECT 1 a INTO DUMPFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO @a)) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO DUMPFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO OUTFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO @a))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a))) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO DUMPFILE 'file' ))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' ))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' ))) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO OUTFILE 'file' ))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' ))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' ))) t1a' at line 1 SELECT * FROM (SELECT 1 a ORDER BY a) t1a; a 1 @@ -5083,15 +5083,15 @@ a 1 1 1 2 1 SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')) ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ON 1' at line 1 SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a) t1a ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a ON 1' at line 1 SELECT * FROM t1 JOIN ((t1 t1a)) t1a ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a) ON 1; a a 1 1 @@ -5129,7 +5129,7 @@ a a 1 1 2 1 SELECT * FROM (t1 JOIN (SELECT 1) t1a1 ON 1) t1a2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a2' at line 1 SELECT * FROM t1 WHERE a = ALL ( SELECT 1 ); a 1 @@ -5140,11 +5140,11 @@ SELECT * FROM t1 WHERE a = ANY ( SELECT 3 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 ); a 1 @@ -5152,29 +5152,29 @@ SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT ( SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT ( SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT a FROM t1 WHERE a = 1 ), a FROM t1; ( SELECT a FROM t1 WHERE a = 1 ) a 1 1 @@ -5186,13 +5186,13 @@ SELECT ( SELECT a FROM t1 WHERE a = 1 UNION SELECT 1 ), a FROM t1; SELECT * FROM t2 WHERE (a, b) IN (SELECT a, b FROM t2); a b SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1' at line 1 SELECT ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1' at line 1 SELECT ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) 1 @@ -5200,28 +5200,28 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); ((SELECT 1 UNION SELECT 1 UNION SELECT 1)) 1 SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; 1 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ALL ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ALL ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ANY ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a IN ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); a 1 @@ -5235,18 +5235,18 @@ SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE EXISTS ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT EXISTS(SELECT 1+1); EXISTS(SELECT 1+1) 1 SELECT EXISTS(SELECT 1+1 INTO @test); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @test)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @test)' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT * FROM t1 WHERE EXISTS ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 DROP TABLE t1, t2; CREATE TABLE t1 (a ENUM('rainbow')); INSERT INTO t1 VALUES (),(),(),(),(); diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result index 37166b3a537..91878c5dec5 100644 --- a/mysql-test/r/subselect_no_opts.result +++ b/mysql-test/r/subselect_no_opts.result @@ -1050,9 +1050,9 @@ a drop table t1, t2; create table t1 (a float); select 10.5 IN (SELECT * from t1 LIMIT 1); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' select 10.5 IN (SELECT * from t1 LIMIT 1 UNION SELECT 1.5); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' drop table t1; create table t1 (a int, b int, c varchar(10)); create table t2 (a int); @@ -1104,7 +1104,7 @@ select ROW(1, 1, 'a') IN (select b,a,c from t1 where c='b' or c='a'); ROW(1, 1, 'a') IN (select b,a,c from t1 where c='b' or c='a') 1 select ROW(1, 1, 'a') IN (select b,a,c from t1 limit 2); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' drop table t1; create table t1 (a int); insert into t1 values (1); @@ -1125,7 +1125,7 @@ ERROR 42S02: Table 'test.t1' doesn't exist CREATE TABLE t1 (a int, KEY(a)); HANDLER t1 OPEN; HANDLER t1 READ a=((SELECT 1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT 1))' at line 1 HANDLER t1 CLOSE; drop table t1; create table t1 (a int); @@ -1926,7 +1926,7 @@ create table t1(id int); create table t2(id int); create table t3(flag int); select (select * from t3 where id not null) from t1, t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null) from t1, t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null) from t1, t2' at line 1 drop table t1,t2,t3; CREATE TABLE t1 (id INT); CREATE TABLE t2 (id INT); @@ -3712,10 +3712,10 @@ SELECT sql_no_cache * FROM t1 WHERE NOT EXISTS i SELECT * FROM t1 WHERE NOT EXISTS (((SELECT i FROM t1) UNION (SELECT i FROM t1))); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION (SELECT i FROM t1)))' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION (SELECT i FROM t1)))' at line 2 explain select ((select t11.i from t1 t11) union (select t12.i from t1 t12)) from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'union (select t12.i from t1 t12)) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'union (select t12.i from t1 t12)) from t1' at line 1 explain select * from t1 where not exists ((select t11.i from t1 t11) union (select t12.i from t1 t12)); @@ -4988,33 +4988,33 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2( a INT, b INT ); SELECT * FROM (SELECT a INTO @var FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM (SELECT a INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM (SELECT a INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO @var FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO OUTFILE 'file' FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO DUMPFILE 'file' FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM (SELECT a FROM t1 WHERE a = 2) t1a; a @@ -5037,7 +5037,7 @@ a 1 2 SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; a 1 @@ -5045,23 +5045,23 @@ SELECT * FROM (SELECT 1 UNION SELECT 1) t1a; 1 1 SELECT * FROM ((SELECT 1 a INTO @a)) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)) t1a' at line 1 SELECT * FROM ((SELECT 1 a INTO OUTFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 SELECT * FROM ((SELECT 1 a INTO DUMPFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO @a)) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO DUMPFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO OUTFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO @a))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a))) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO DUMPFILE 'file' ))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' ))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' ))) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO OUTFILE 'file' ))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' ))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' ))) t1a' at line 1 SELECT * FROM (SELECT 1 a ORDER BY a) t1a; a 1 @@ -5079,15 +5079,15 @@ a 1 1 1 2 1 SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')) ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ON 1' at line 1 SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a) t1a ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a ON 1' at line 1 SELECT * FROM t1 JOIN ((t1 t1a)) t1a ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a) ON 1; a a 1 1 @@ -5125,7 +5125,7 @@ a a 1 1 2 1 SELECT * FROM (t1 JOIN (SELECT 1) t1a1 ON 1) t1a2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a2' at line 1 SELECT * FROM t1 WHERE a = ALL ( SELECT 1 ); a 1 @@ -5136,11 +5136,11 @@ SELECT * FROM t1 WHERE a = ANY ( SELECT 3 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 ); a 1 @@ -5148,29 +5148,29 @@ SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT ( SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT ( SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT a FROM t1 WHERE a = 1 ), a FROM t1; ( SELECT a FROM t1 WHERE a = 1 ) a 1 1 @@ -5182,13 +5182,13 @@ SELECT ( SELECT a FROM t1 WHERE a = 1 UNION SELECT 1 ), a FROM t1; SELECT * FROM t2 WHERE (a, b) IN (SELECT a, b FROM t2); a b SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1' at line 1 SELECT ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1' at line 1 SELECT ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) 1 @@ -5196,28 +5196,28 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); ((SELECT 1 UNION SELECT 1 UNION SELECT 1)) 1 SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; 1 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ALL ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ALL ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ANY ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a IN ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); a 1 @@ -5231,18 +5231,18 @@ SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE EXISTS ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT EXISTS(SELECT 1+1); EXISTS(SELECT 1+1) 1 SELECT EXISTS(SELECT 1+1 INTO @test); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @test)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @test)' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT * FROM t1 WHERE EXISTS ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 DROP TABLE t1, t2; CREATE TABLE t1 (a ENUM('rainbow')); INSERT INTO t1 VALUES (),(),(),(),(); diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result index dd5a4623419..fb04fa2e7bc 100644 --- a/mysql-test/r/subselect_no_scache.result +++ b/mysql-test/r/subselect_no_scache.result @@ -1053,9 +1053,9 @@ a drop table t1, t2; create table t1 (a float); select 10.5 IN (SELECT * from t1 LIMIT 1); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' select 10.5 IN (SELECT * from t1 LIMIT 1 UNION SELECT 1.5); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' drop table t1; create table t1 (a int, b int, c varchar(10)); create table t2 (a int); @@ -1107,7 +1107,7 @@ select ROW(1, 1, 'a') IN (select b,a,c from t1 where c='b' or c='a'); ROW(1, 1, 'a') IN (select b,a,c from t1 where c='b' or c='a') 1 select ROW(1, 1, 'a') IN (select b,a,c from t1 limit 2); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' drop table t1; create table t1 (a int); insert into t1 values (1); @@ -1128,7 +1128,7 @@ ERROR 42S02: Table 'test.t1' doesn't exist CREATE TABLE t1 (a int, KEY(a)); HANDLER t1 OPEN; HANDLER t1 READ a=((SELECT 1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT 1))' at line 1 HANDLER t1 CLOSE; drop table t1; create table t1 (a int); @@ -1929,7 +1929,7 @@ create table t1(id int); create table t2(id int); create table t3(flag int); select (select * from t3 where id not null) from t1, t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null) from t1, t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null) from t1, t2' at line 1 drop table t1,t2,t3; CREATE TABLE t1 (id INT); CREATE TABLE t2 (id INT); @@ -3718,10 +3718,10 @@ SELECT sql_no_cache * FROM t1 WHERE NOT EXISTS i SELECT * FROM t1 WHERE NOT EXISTS (((SELECT i FROM t1) UNION (SELECT i FROM t1))); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION (SELECT i FROM t1)))' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION (SELECT i FROM t1)))' at line 2 explain select ((select t11.i from t1 t11) union (select t12.i from t1 t12)) from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'union (select t12.i from t1 t12)) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'union (select t12.i from t1 t12)) from t1' at line 1 explain select * from t1 where not exists ((select t11.i from t1 t11) union (select t12.i from t1 t12)); @@ -4996,33 +4996,33 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2( a INT, b INT ); SELECT * FROM (SELECT a INTO @var FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM (SELECT a INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM (SELECT a INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO @var FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO OUTFILE 'file' FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO DUMPFILE 'file' FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM (SELECT a FROM t1 WHERE a = 2) t1a; a @@ -5045,7 +5045,7 @@ a 1 2 SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; a 1 @@ -5053,23 +5053,23 @@ SELECT * FROM (SELECT 1 UNION SELECT 1) t1a; 1 1 SELECT * FROM ((SELECT 1 a INTO @a)) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)) t1a' at line 1 SELECT * FROM ((SELECT 1 a INTO OUTFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 SELECT * FROM ((SELECT 1 a INTO DUMPFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO @a)) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO DUMPFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO OUTFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO @a))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a))) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO DUMPFILE 'file' ))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' ))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' ))) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO OUTFILE 'file' ))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' ))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' ))) t1a' at line 1 SELECT * FROM (SELECT 1 a ORDER BY a) t1a; a 1 @@ -5087,15 +5087,15 @@ a 1 1 1 2 1 SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')) ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ON 1' at line 1 SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a) t1a ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a ON 1' at line 1 SELECT * FROM t1 JOIN ((t1 t1a)) t1a ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a) ON 1; a a 1 1 @@ -5133,7 +5133,7 @@ a a 1 1 2 1 SELECT * FROM (t1 JOIN (SELECT 1) t1a1 ON 1) t1a2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a2' at line 1 SELECT * FROM t1 WHERE a = ALL ( SELECT 1 ); a 1 @@ -5144,11 +5144,11 @@ SELECT * FROM t1 WHERE a = ANY ( SELECT 3 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 ); a 1 @@ -5156,29 +5156,29 @@ SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT ( SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT ( SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT a FROM t1 WHERE a = 1 ), a FROM t1; ( SELECT a FROM t1 WHERE a = 1 ) a 1 1 @@ -5190,13 +5190,13 @@ SELECT ( SELECT a FROM t1 WHERE a = 1 UNION SELECT 1 ), a FROM t1; SELECT * FROM t2 WHERE (a, b) IN (SELECT a, b FROM t2); a b SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1' at line 1 SELECT ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1' at line 1 SELECT ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) 1 @@ -5204,28 +5204,28 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); ((SELECT 1 UNION SELECT 1 UNION SELECT 1)) 1 SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; 1 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ALL ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ALL ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ANY ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a IN ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); a 1 @@ -5239,18 +5239,18 @@ SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE EXISTS ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT EXISTS(SELECT 1+1); EXISTS(SELECT 1+1) 1 SELECT EXISTS(SELECT 1+1 INTO @test); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @test)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @test)' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT * FROM t1 WHERE EXISTS ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 DROP TABLE t1, t2; CREATE TABLE t1 (a ENUM('rainbow')); INSERT INTO t1 VALUES (),(),(),(),(); diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result index dda350592b7..071c58eb6e4 100644 --- a/mysql-test/r/subselect_no_semijoin.result +++ b/mysql-test/r/subselect_no_semijoin.result @@ -1050,9 +1050,9 @@ a drop table t1, t2; create table t1 (a float); select 10.5 IN (SELECT * from t1 LIMIT 1); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' select 10.5 IN (SELECT * from t1 LIMIT 1 UNION SELECT 1.5); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' drop table t1; create table t1 (a int, b int, c varchar(10)); create table t2 (a int); @@ -1104,7 +1104,7 @@ select ROW(1, 1, 'a') IN (select b,a,c from t1 where c='b' or c='a'); ROW(1, 1, 'a') IN (select b,a,c from t1 where c='b' or c='a') 1 select ROW(1, 1, 'a') IN (select b,a,c from t1 limit 2); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' drop table t1; create table t1 (a int); insert into t1 values (1); @@ -1125,7 +1125,7 @@ ERROR 42S02: Table 'test.t1' doesn't exist CREATE TABLE t1 (a int, KEY(a)); HANDLER t1 OPEN; HANDLER t1 READ a=((SELECT 1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT 1))' at line 1 HANDLER t1 CLOSE; drop table t1; create table t1 (a int); @@ -1926,7 +1926,7 @@ create table t1(id int); create table t2(id int); create table t3(flag int); select (select * from t3 where id not null) from t1, t2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null) from t1, t2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null) from t1, t2' at line 1 drop table t1,t2,t3; CREATE TABLE t1 (id INT); CREATE TABLE t2 (id INT); @@ -3712,10 +3712,10 @@ SELECT sql_no_cache * FROM t1 WHERE NOT EXISTS i SELECT * FROM t1 WHERE NOT EXISTS (((SELECT i FROM t1) UNION (SELECT i FROM t1))); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION (SELECT i FROM t1)))' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION (SELECT i FROM t1)))' at line 2 explain select ((select t11.i from t1 t11) union (select t12.i from t1 t12)) from t1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'union (select t12.i from t1 t12)) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'union (select t12.i from t1 t12)) from t1' at line 1 explain select * from t1 where not exists ((select t11.i from t1 t11) union (select t12.i from t1 t12)); @@ -4988,33 +4988,33 @@ INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2( a INT, b INT ); SELECT * FROM (SELECT a INTO @var FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM (SELECT a INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM (SELECT a INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2) t1a' at line 2 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO @var FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @var FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO OUTFILE 'file' FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM ( SELECT 1 a UNION SELECT a INTO DUMPFILE 'file' FROM t1 WHERE a = 2 ) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' FROM t1 WHERE a = 2 ) t1a' at line 4 SELECT * FROM (SELECT a FROM t1 WHERE a = 2) t1a; a @@ -5037,7 +5037,7 @@ a 1 2 SELECT * FROM ((SELECT 1 a) UNION SELECT 1 a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a)) alias; a 1 @@ -5045,23 +5045,23 @@ SELECT * FROM (SELECT 1 UNION SELECT 1) t1a; 1 1 SELECT * FROM ((SELECT 1 a INTO @a)) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)) t1a' at line 1 SELECT * FROM ((SELECT 1 a INTO OUTFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 SELECT * FROM ((SELECT 1 a INTO DUMPFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO @a)) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO DUMPFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION (SELECT 1 a INTO OUTFILE 'file' )) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO @a))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a))) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO DUMPFILE 'file' ))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' ))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' ))) t1a' at line 1 SELECT * FROM (SELECT 1 a UNION ((SELECT 1 a INTO OUTFILE 'file' ))) t1a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' ))) t1a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' ))) t1a' at line 1 SELECT * FROM (SELECT 1 a ORDER BY a) t1a; a 1 @@ -5079,15 +5079,15 @@ a 1 1 1 2 1 SELECT * FROM t1 JOIN ((SELECT 1 UNION SELECT 1)) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')) ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')) ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a UNION SELECT 1) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ON 1' at line 1 SELECT * FROM t1 JOIN ((t1 t1a UNION SELECT 1)) ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a) t1a ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a ON 1' at line 1 SELECT * FROM t1 JOIN ((t1 t1a)) t1a ON 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a ON 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a ON 1' at line 1 SELECT * FROM t1 JOIN (t1 t1a) ON 1; a a 1 1 @@ -5125,7 +5125,7 @@ a a 1 1 2 1 SELECT * FROM (t1 JOIN (SELECT 1) t1a1 ON 1) t1a2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1a2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 't1a2' at line 1 SELECT * FROM t1 WHERE a = ALL ( SELECT 1 ); a 1 @@ -5136,11 +5136,11 @@ SELECT * FROM t1 WHERE a = ANY ( SELECT 3 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 ); a 1 @@ -5148,29 +5148,29 @@ SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO @a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @a)' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT ( SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT ( SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO OUTFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO OUTFILE 'file' )' at line 1 SELECT ( SELECT 1 UNION SELECT 1 INTO DUMPFILE 'file' ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO DUMPFILE 'file' )' at line 1 SELECT ( SELECT a FROM t1 WHERE a = 1 ), a FROM t1; ( SELECT a FROM t1 WHERE a = 1 ) a 1 1 @@ -5182,13 +5182,13 @@ SELECT ( SELECT a FROM t1 WHERE a = 1 UNION SELECT 1 ), a FROM t1; SELECT * FROM t2 WHERE (a, b) IN (SELECT a, b FROM t2); a b SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1' at line 1 SELECT ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1' at line 1 SELECT ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) 1 @@ -5196,28 +5196,28 @@ SELECT ((SELECT 1 UNION SELECT 1 UNION SELECT 1)); ((SELECT 1 UNION SELECT 1 UNION SELECT 1)) 1 SELECT * FROM ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ') UNION SELECT 1 )' at line 1 SELECT * FROM ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ) a; 1 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ALL ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ANY ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION ( SELECT 1 UNION SELECT 1 ) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) )' at line 1 SELECT * FROM t1 WHERE a = ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ALL ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ANY ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 ) UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a IN ( ( SELECT 1 UNION SELECT 1 ) UNION SELECT 1 ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'UNION SELECT 1 )' at line 1 SELECT * FROM t1 WHERE a = ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); a 1 @@ -5231,18 +5231,18 @@ SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION SELECT 1 UNION SELECT 1 ); a 1 SELECT * FROM t1 WHERE EXISTS ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT EXISTS(SELECT 1+1); EXISTS(SELECT 1+1) 1 SELECT EXISTS(SELECT 1+1 INTO @test); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @test)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @test)' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 UNION SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT * FROM t1 WHERE EXISTS ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 SELECT * FROM t1 WHERE a IN ( SELECT 1 INTO @v ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @v )' at line 1 DROP TABLE t1, t2; CREATE TABLE t1 (a ENUM('rainbow')); INSERT INTO t1 VALUES (),(),(),(),(); diff --git a/mysql-test/r/subselect_notembedded.result b/mysql-test/r/subselect_notembedded.result index cbe5a44bbf8..9153706fc27 100644 --- a/mysql-test/r/subselect_notembedded.result +++ b/mysql-test/r/subselect_notembedded.result @@ -1,5 +1,5 @@ purge master logs before (select adddate(current_timestamp(), interval -4 day)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select adddate(current_timestamp(), interval -4 day))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select adddate(current_timestamp(), interval -4 day))' at line 1 purge master logs before adddate(current_timestamp(), interval -4 day); drop table if exists t1; create table t1(a int,b int,key(a),key(b)); diff --git a/mysql-test/r/subselect_sj_mat.result b/mysql-test/r/subselect_sj_mat.result index 350d3fe62d7..fe34b4e2851 100644 --- a/mysql-test/r/subselect_sj_mat.result +++ b/mysql-test/r/subselect_sj_mat.result @@ -192,7 +192,7 @@ a1 a2 1 - 01 2 - 01 1 - 02 2 - 02 select * from t1 where (a1, a2) in (select b1, min(b2) from t2i limit 1,1); -ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +ERROR 42000: This version of MariaDB doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' set @save_optimizer_switch=@@optimizer_switch; set @@optimizer_switch=@optimizer_switch_local_default; set @@optimizer_switch='semijoin=off'; diff --git a/mysql-test/r/trigger-compat.result b/mysql-test/r/trigger-compat.result index 284731d8dfc..8caba961624 100644 --- a/mysql-test/r/trigger-compat.result +++ b/mysql-test/r/trigger-compat.result @@ -67,29 +67,29 @@ FLUSH TABLE t2; # has broken triggers. The parse error refers to the first broken # trigger. CREATE TRIGGER tr16 AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t1 VALUES (1); -ERROR 42000: Trigger 'tr13' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'a USING t1 a' at line 1' +ERROR 42000: Trigger 'tr13' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'a USING t1 a' at line 1' CREATE TRIGGER tr22 BEFORE INSERT ON t2 FOR EACH ROW DELETE FROM non_existing_table; -ERROR 42000: Unknown trigger has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'Not allowed syntax here, and trigger name cant be extracted either.' at line 1' +ERROR 42000: Unknown trigger has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'Not allowed syntax here, and trigger name cant be extracted either.' at line 1' SHOW TRIGGERS; Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation tr11 INSERT t1 DELETE FROM t3 BEFORE NULL root@localhost latin1 latin1_swedish_ci latin1_swedish_ci tr12 INSERT t1 DELETE FROM t3 AFTER NULL root@localhost latin1 latin1_swedish_ci latin1_swedish_ci tr14 DELETE t1 DELETE FROM non_existing_table AFTER NULL root@localhost latin1 latin1_swedish_ci latin1_swedish_ci INSERT INTO t1 VALUES (1); -ERROR 42000: Trigger 'tr13' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'a USING t1 a' at line 1' +ERROR 42000: Trigger 'tr13' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'a USING t1 a' at line 1' INSERT INTO t2 VALUES (1); -ERROR 42000: Unknown trigger has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'Not allowed syntax here, and trigger name cant be extracted either.' at line 1' +ERROR 42000: Unknown trigger has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'Not allowed syntax here, and trigger name cant be extracted either.' at line 1' DELETE FROM t1; -ERROR 42000: Trigger 'tr13' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'a USING t1 a' at line 1' +ERROR 42000: Trigger 'tr13' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'a USING t1 a' at line 1' UPDATE t1 SET a = 1 WHERE a = 1; -ERROR 42000: Trigger 'tr13' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'a USING t1 a' at line 1' +ERROR 42000: Trigger 'tr13' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'a USING t1 a' at line 1' SELECT * FROM t1; a 1 2 3 RENAME TABLE t1 TO t1_2; -ERROR 42000: Trigger 'tr13' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'a USING t1 a' at line 1' +ERROR 42000: Trigger 'tr13' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'a USING t1 a' at line 1' SHOW TRIGGERS; Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation tr11 INSERT t1 DELETE FROM t3 BEFORE NULL root@localhost latin1 latin1_swedish_ci latin1_swedish_ci diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index daddbe5ceca..22f1546d322 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -295,7 +295,7 @@ create trigger trg before insert on t1 for each row set @a:=1; create trigger trg after insert on t1 for each row set @a:=1; ERROR HY000: Trigger already exists create trigger trg2 before insert on t1 for each row set @a:=1; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' create trigger trg before insert on t3 for each row set @a:=1; ERROR HY000: Trigger already exists create trigger trg2 before insert on t3 for each row set @a:=1; @@ -1955,7 +1955,7 @@ drop table if exists t1; create table t1 (i int, j int); create trigger t1_bi before insert on t1 for each row begin end; create trigger t1_bi before insert on t1 for each row begin end; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' drop trigger t1_bi; drop trigger t1_bi; ERROR HY000: Trigger does not exist @@ -2091,7 +2091,7 @@ CREATE TRIGGER trg1 BEFORE INSERT ON t2 FOR EACH ROW INSERT/*!INTO*/t1 VALUES (1 SHOW TRIGGERS IN db1; Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation INSERT INTO t2 VALUES (1); -ERROR 42000: Trigger 'trg1' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VALUES (1)' at line 1' +ERROR 42000: Trigger 'trg1' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VALUES (1)' at line 1' SELECT * FROM t1; b # Work around Bug#45235 diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result index eb2d69ec0df..fc2e0854620 100644 --- a/mysql-test/r/type_blob.result +++ b/mysql-test/r/type_blob.result @@ -825,7 +825,7 @@ drop table if exists b15776; create table b15776 (data blob(2147483647)); drop table b15776; create table b15776 (data blob(-1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1))' at line 1 create table b15776 (data blob(2147483648)); drop table b15776; create table b15776 (data blob(4294967294)); @@ -862,13 +862,13 @@ NULL 654 DROP TABLE b15776; CREATE TABLE b15776 (a int(-1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1))' at line 1 CREATE TABLE b15776 (a int(255)); DROP TABLE b15776; CREATE TABLE b15776 (a int(256)); ERROR 42000: Display width out of range for 'a' (max = 255) CREATE TABLE b15776 (data blob(-1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1))' at line 1 CREATE TABLE b15776 (a char(2147483647)); ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead CREATE TABLE b15776 (a char(2147483648)); @@ -888,7 +888,7 @@ ERROR 42000: Display width out of range for 'a' (max = 4294967295) CREATE TABLE b15776 (a year(0)); DROP TABLE b15776; CREATE TABLE b15776 (a year(-2)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2))' at line 1 CREATE TABLE b15776 (a timestamp(4294967294)); ERROR 42000: Too big precision 4294967294 specified for 'a'. Maximum is 6. CREATE TABLE b15776 (a timestamp(4294967295)); @@ -896,9 +896,9 @@ ERROR 42000: Too big precision 4294967295 specified for 'a'. Maximum is 6. CREATE TABLE b15776 (a timestamp(4294967296)); ERROR 42000: Display width out of range for 'a' (max = 4294967295) CREATE TABLE b15776 (a timestamp(-1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1))' at line 1 CREATE TABLE b15776 (a timestamp(-2)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2))' at line 1 CREATE TABLE b15776 (a int(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999)); ERROR 42000: Display width out of range for 'a' (max = 4294967295) CREATE TABLE b15776 (a char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999)); @@ -936,7 +936,7 @@ ERROR 42000: Display width out of range for '1' (max = 4294967295) explain select cast(1 as binary(4294967296)); ERROR 42000: Display width out of range for '1' (max = 4294967295) explain select cast(1 as decimal(-1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1))' at line 1 explain select cast(1 as decimal(64, 30)); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result index 8a72afa9b8c..fa36e9b5567 100644 --- a/mysql-test/r/type_decimal.result +++ b/mysql-test/r/type_decimal.result @@ -470,11 +470,11 @@ a 9999999999 drop table t1; CREATE TABLE t1 (a_dec DECIMAL(-1,0)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1,0))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1,0))' at line 1 CREATE TABLE t1 (a_dec DECIMAL(-2,1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2,1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2,1))' at line 1 CREATE TABLE t1 (a_dec DECIMAL(-1,1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1,1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1,1))' at line 1 CREATE TABLE t1 (a_dec DECIMAL(0,11)); ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 'a_dec'). create table t1(a decimal(7,3)); diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index bf5cb5fdf13..bcfc9941db9 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -93,10 +93,10 @@ FR DROP TABLE bug19904; CREATE DEFINER=CURRENT_USER() FUNCTION should_not_parse RETURNS STRING SONAME "should_not_parse.so"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RETURNS STRING SONAME "should_not_parse.so"' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RETURNS STRING SONAME "should_not_parse.so"' at line 2 CREATE DEFINER=someone@somewhere FUNCTION should_not_parse RETURNS STRING SONAME "should_not_parse.so"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RETURNS STRING SONAME "should_not_parse.so"' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RETURNS STRING SONAME "should_not_parse.so"' at line 2 create table t1(f1 int); insert into t1 values(1),(2); explain select myfunc_int(f1) from t1 order by 1; @@ -134,7 +134,7 @@ ERROR 42000: Incorrect parameters in the call to stored function 'fn' SELECT myfunc_int(fn(MIN(b) xx)) as c FROM t1 GROUP BY a; ERROR 42000: Incorrect parameters in the call to stored function 'fn' SELECT myfunc_int(test.fn(MIN(b) xx)) as c FROM t1 GROUP BY a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xx)) as c FROM t1 GROUP BY a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xx)) as c FROM t1 GROUP BY a' at line 1 SELECT myfunc_int(fn(MIN(b)) xx) as c FROM t1 GROUP BY a; c 1 diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index ae637467ad8..93e84c731fe 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -341,7 +341,7 @@ select found_rows(); found_rows() 4 (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION all SELECT * FROM t2 LIMIT 2; a 1 diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index 589186184c3..3bf8a6a7126 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -191,7 +191,7 @@ select coercibility(@v1),coercibility(@v2),coercibility(@v3),coercibility(@v4); coercibility(@v1) coercibility(@v2) coercibility(@v3) coercibility(@v4) 2 2 2 2 set session @honk=99; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@honk=99' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@honk=99' at line 1 select @@local.max_allowed_packet; @@local.max_allowed_packet # @@ -308,7 +308,7 @@ select @var; 3 drop table t1,t2; insert into city 'blah'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''blah'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''blah'' at line 1 SHOW COUNT(*) WARNINGS; @@session.warning_count 1 diff --git a/mysql-test/r/varbinary.result b/mysql-test/r/varbinary.result index 545044fc520..065abbb9c00 100644 --- a/mysql-test/r/varbinary.result +++ b/mysql-test/r/varbinary.result @@ -18,7 +18,7 @@ Warnings: Note 1003 select 00000001 AS `ID`,004084688022709641610 AS `UNIQ` from `test`.`t1` where 1 drop table t1; select x'hello'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'x'hello'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'x'hello'' at line 1 select 0xfg; ERROR 42S22: Unknown column '0xfg' in 'field list' create table t1 select 1 as x, 2 as xx; diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 8cc51cc86ac..36f96d8e8f8 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -538,7 +538,7 @@ Warning 1292 Truncated incorrect read_buffer_size value: '100' set read_rnd_buffer_size=100; set global rpl_recovery_rank=100; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. set global server_id=100; set global slow_launch_time=100; set sort_buffer_size=100; @@ -675,15 +675,15 @@ select @a, @b; @a @b 2 1 set @@global.global.key_buffer_size= 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_buffer_size= 1' at line 1 set GLOBAL global.key_buffer_size= 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_buffer_size= 1' at line 1 SELECT @@global.global.key_buffer_size; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_buffer_size' at line 1 SELECT @@global.session.key_buffer_size; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_buffer_size' at line 1 SELECT @@global.local.key_buffer_size; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_buffer_size' at line 1 set @tstlw = @@log_warnings; show global variables like 'log_warnings'; Variable_name Value @@ -1000,11 +1000,11 @@ select * from information_schema.session_variables where variable_name like 'log VARIABLE_NAME VARIABLE_VALUE LOG_QUERIES_NOT_USING_INDEXES OFF select @@""; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '""' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '""' at line 1 select @@&; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '&' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '&' at line 1 select @@@; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@' at line 1 select @@hostname; @@hostname # @@ -1060,7 +1060,7 @@ set global net_write_timeout =@my_net_write_timeout; set global net_read_timeout =@my_net_read_timeout; set global rpl_recovery_rank =@my_rpl_recovery_rank; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. set global server_id =@my_server_id; set global slow_launch_time =@my_slow_launch_time; set global default_storage_engine =@my_storage_engine; diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 8c37c866dc0..e033b358b6b 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -21,13 +21,13 @@ show errors; Level Code Message Error 1115 Unknown character set: 'qwerty' create table t (i); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 show count(*) errors; @@session.error_count 1 show errors; Level Code Message -Error 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +Error 1064 You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 insert into t1 values (1); insert into t1 values ("hej"); Warnings: diff --git a/mysql-test/r/xa.result b/mysql-test/r/xa.result index 3ec169016eb..cc40b96c43f 100644 --- a/mysql-test/r/xa.result +++ b/mysql-test/r/xa.result @@ -50,7 +50,7 @@ xa commit 'testb',0x2030405060,11; ERROR XAE04: XAER_NOTA: Unknown XID xa rollback 'testa','testb'; xa start 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 select * from t1; a 20 diff --git a/mysql-test/suite/binlog/r/binlog_base64_flag.result b/mysql-test/suite/binlog/r/binlog_base64_flag.result index 9a9f328f2b5..33feb5c7591 100644 --- a/mysql-test/suite/binlog/r/binlog_base64_flag.result +++ b/mysql-test/suite/binlog/r/binlog_base64_flag.result @@ -60,7 +60,7 @@ BINLOG ' Dl1YRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE= Dl1YRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+BQAAAA== '; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use select * from t1; a 1 @@ -99,9 +99,9 @@ call mtr.add_suppression("Slave SQL.*Column 1 of table .test.char128_utf8. canno # mysql_client_binlog_statement # BINLOG ''; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use BINLOG '123'; BINLOG '-2079193929'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use BINLOG 'xç↓%~∙Dâ•’Æ’â•¡'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result index 29a2a2aa861..dd376154100 100644 --- a/mysql-test/suite/funcs_1/r/innodb_func_view.result +++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result @@ -2463,7 +2463,7 @@ NULL NULL 1 130000 13:00:00 4 100000 10:00:00 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2477,7 +2477,7 @@ NULL NULL 1 130000 13:00:00 4 100000 10:00:00 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2572,9 +2572,9 @@ NULL NULL 1 18446744073709551615 -1 5 Warnings: Warning 1292 Truncated incorrect INTEGER value: '-1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect INTEGER value: '1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as unsigned) AS `CAST(my_double AS UNSIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2589,9 +2589,9 @@ NULL NULL 1 18446744073709551615 -1 5 Warnings: Warning 1292 Truncated incorrect INTEGER value: '-1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect INTEGER value: '1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2641,8 +2641,8 @@ NULL NULL 1 0 0 4 18446744073709551615 -1 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2656,8 +2656,8 @@ NULL NULL 1 0 0 4 18446744073709551615 -1 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2676,7 +2676,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2693,7 +2693,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2713,7 +2713,7 @@ Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' Warning 1292 Truncated incorrect INTEGER value: '-1' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2731,7 +2731,7 @@ Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' Warning 1292 Truncated incorrect INTEGER value: '-1' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2750,7 +2750,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2767,7 +2767,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2786,7 +2786,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2803,7 +2803,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result index 2bc9a75a13e..126d6c2080a 100644 --- a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result @@ -489,7 +489,7 @@ DECLARE condname1 CONDITION CHECK SQLSTATE '23000'; END; DECLARE CONTINUE HANDLER FOR condname1 SET x1 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHECK SQLSTATE '23000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHECK SQLSTATE '23000'; END; DECLARE CONTINUE HANDLER FOR condname1 SET x1 = 1; ' at line 5 @@ -523,7 +523,7 @@ declare undo handler for sqlexception select '1'; select * from tqq; SELECT 'end of 1'; end;// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'undo handler for sqlexception select '1'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo handler for sqlexception select '1'; select * from tqq; SELECT 'end of 1'; ' at line 3 diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result index 11cc098f2ec..0dfc1f51b76 100644 --- a/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result +++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result @@ -341,7 +341,7 @@ ALTER PROCEDURE sp_1 SQL SECURITY INVOKER; ALTER PROCEDURE sp_1 COMMENT 'new comment, SP changed to INVOKER'; ALTER PROCEDURE sp_2 SQL SECURITY DEFINER; ALTER PROCEDURE sp_2 DROP COMMENT; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DROP COMMENT' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DROP COMMENT' at line 1 ALTER PROCEDURE sp_2 COMMENT 'SP changed to DEFINER'; ALTER PROCEDURE sp_2 READS SQL DATA; ALTER FUNCTION fn_1 SQL SECURITY INVOKER; diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result index 5ca24acf0bf..330a9a315ee 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result @@ -136,21 +136,21 @@ Testcase: 3.5.1.2: ------------------ Create trigger trg_1 after insert on tb3 for each statement set @x= 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'statement set @x= 1' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'statement set @x= 1' at line 2 drop trigger trg_1; Testcase 3.5.1.3: ----------------- CREATE TRIGGER trg3_1 on tb3 BEFORE INSERT for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on tb3 BEFORE INSERT for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on tb3 BEFORE INSERT for each row set new.f120 = 't'' at line 1 CREATE trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'' at line 1 CREATE TRIGGER trg3_3 Before DELETE on tb3 set @ret1 = 'test' for each row; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set @ret1 = 'test' for each row' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set @ret1 = 'test' for each row' at line 1 CREATE TRIGGER trg3_4 DELETE AFTER on tb3 set @ret1 = 'test' for each row; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DELETE AFTER on tb3 set @ret1 = 'test' for each row' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DELETE AFTER on tb3 set @ret1 = 'test' for each row' at line 1 CREATE for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'' at line 1 drop trigger trg3_1; drop trigger trg3_2; drop trigger trg3_3; @@ -160,17 +160,17 @@ drop trigger trg3_5; Testcase: 3.5.1.5: ------------------ CREATE TRIGGER trg4_1 AFTER on tb3 for each row set new.f120 = 'e'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on tb3 for each row set new.f120 = 'e'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on tb3 for each row set new.f120 = 'e'' at line 1 CREATE TRIGGER trg4_2 INSERT on tb3 for each set row new.f120 = 'f'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INSERT on tb3 for each set row new.f120 = 'f'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INSERT on tb3 for each set row new.f120 = 'f'' at line 1 CREATE TRIGGER trg4_3 BEFORE INSERT tb3 for each row set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tb3 for each row set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tb3 for each row set new.f120 = 'g'' at line 1 CREATE TRIGGER trg4_4 AFTER UPDATE on tb3 for each set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set new.f120 = 'g'' at line 1 CREATE trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'' at line 1 CREATE TRIGGER trg4_6 BEFORE DELETE for each row set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for each row set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for each row set new.f120 = 'g'' at line 1 drop trigger trg4_1; drop trigger trg4_2; drop trigger trg4_3; @@ -217,15 +217,15 @@ drop table t1; Testcase 3.5.1.8: ----------------- CREATE TRIGGER trg12* before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '* before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '* before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER trigger before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trigger before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trigger before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER 100 before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '100 before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '100 before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER @@view before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@@view before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@@view before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER @name before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@name before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@name before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER tb3.trg6_1 BEFORE INSERT on test.tb3 for each row set new.f120 ='X'; ERROR HY000: Trigger in wrong schema diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result index 9dabfcbef49..5dfc734cf5c 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result @@ -1612,7 +1612,7 @@ NULL ##### trigger privilege on column level? ####### ------------------------------------------------ grant TRIGGER(f1) on priv_db.t1 to test_yesprivs@localhost; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(f1) on priv_db.t1 to test_yesprivs@localhost' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(f1) on priv_db.t1 to test_yesprivs@localhost' at line 1 select current_user; current_user root@localhost diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result index 8597f252e54..7f01975db16 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result @@ -123,9 +123,9 @@ create table t1_433a (f1a char (5)) engine = ; CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row set new.f1 = 'Trigger 3.5.4.3'; Drop trigger t1.433.trg3; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.trg3' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.trg3' at line 1 Drop trigger db_drop3.t1.433.trg3; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.433.trg3' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.433.trg3' at line 1 Drop trigger mysql.trg3; ERROR HY000: Trigger does not exist Drop trigger tbx.trg3; @@ -268,9 +268,9 @@ Testcase 3.5.6.2 (see Testcase 3.5.1.1) Testcase 3.5.6.3: ----------------- Create trigger trg3_1 DURING UPDATE on tb3 for each row set new.f132=25; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DURING UPDATE on tb3 for each row set new.f132=25' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DURING UPDATE on tb3 for each row set new.f132=25' at line 1 Create trigger trg3_2 TIME INSERT on tb3 for each row set new.f132=15; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TIME INSERT on tb3 for each row set new.f132=15' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TIME INSERT on tb3 for each row set new.f132=15' at line 1 drop trigger tb3.trg3_1; drop trigger tb3.trg3_2; @@ -292,9 +292,9 @@ Testcase 3.5.7.3 (see Testcase 3.5.1.1) Testcase 3.5.7.4: ----------------- Create trigger trg4_1 BEFORE SELECT on tb3 for each row set new.f132=5; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT on tb3 for each row set new.f132=5' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT on tb3 for each row set new.f132=5' at line 1 Create trigger trg4_2 AFTER VALUE on tb3 for each row set new.f132=1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VALUE on tb3 for each row set new.f132=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VALUE on tb3 for each row set new.f132=1' at line 1 drop trigger tb3.trg4_1; drop trigger tb3.trg4_2; @@ -304,7 +304,7 @@ Create trigger trg5_1 BEFORE INSERT on tb3 for each row set new.f122='Trigger1 3.5.7.5/6'; Create trigger trg5_2 BEFORE INSERT on tb3 for each row set new.f122='Trigger2 3.5.7.5'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' Insert into tb3 (f121,f122) values ('Test 3.5.7.5/6','Insert 3.5.7.5'); Select f121,f122 from tb3 where f121='Test 3.5.7.5/6'; f121 f122 @@ -324,7 +324,7 @@ Create trigger trg6_1 AFTER INSERT on tb3 for each row set @test_var='Trigger1 3.5.7.7/8'; Create trigger trg6_2 AFTER INSERT on tb3 for each row set @test_var='Trigger2 3.5.7.7'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' select @test_var; @test_var Before trig 3.5.7.7 @@ -352,7 +352,7 @@ Create trigger trg7_1 BEFORE UPDATE on tb3 for each row set new.f122='Trigger1 3.5.7.9/10'; Create trigger trg7_2 BEFORE UPDATE on tb3 for each row set new.f122='Trigger2 3.5.7.9'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' Insert into tb3 (f121,f122) values ('Test 3.5.7.9/10','Insert 3.5.7.9'); Select f121,f122 from tb3 where f121='Test 3.5.7.9/10'; f121 f122 @@ -372,7 +372,7 @@ Create trigger trg8_1 AFTER UPDATE on tb3 for each row set @test_var='Trigger 3.5.7.11/12'; Create trigger trg8_2 AFTER UPDATE on tb3 for each row set @test_var='Trigger2 3.5.7.11'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' select @test_var; @test_var Before trig 3.5.7.11 @@ -402,7 +402,7 @@ Create trigger trg9_1 BEFORE DELETE on tb3 for each row set @test_var=@test_var+1; Create trigger trg9_2 BEFORE DELETE on tb3 for each row set @test_var=@test_var+10; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' select @test_var; @test_var 1 @@ -434,7 +434,7 @@ Create trigger trg_3_406010_1 AFTER DELETE on tb3 for each row set @test_var=@test_var+5; Create trigger trg_3_406010_2 AFTER DELETE on tb3 for each row set @test_var=@test_var+50; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' Create trigger trg_3_406010_1 AFTER INSERT on tb3 for each row set @test_var=@test_var+1; ERROR HY000: Trigger already exists diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_08.result b/mysql-test/suite/funcs_1/r/innodb_trig_08.result index a25147a1480..f9454edce4b 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result @@ -280,7 +280,7 @@ BEGIN ELSEIF new.f120='2' then END IF; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ELSEIF new.f120='2' then +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ELSEIF new.f120='2' then END IF; END' at line 3 drop trigger trg3// @@ -291,7 +291,7 @@ set @test_var2='2nd if', new.f120='d'; ELSE set @test_var2='2nd else', new.f120='D'; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 7 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 7 drop trigger trg4; drop trigger trg2; delete from tb3 where f121='Test 3.5.8.5-if'; @@ -385,7 +385,7 @@ BEGIN CASE when new.f136<100 then set new.f120='p'; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 5 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 5 drop trigger trg3a; drop trigger trg3; delete from tb3 where f121='Test 3.5.8.5-case'; @@ -426,7 +426,7 @@ Label1: loop set @counter=@counter+1; END; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '; END' at line 5 drop trigger trg4_2; drop trigger trg4; @@ -454,7 +454,7 @@ BEGIN REPEAT SET @counter2 = @counter2 + 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END' at line 5 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'END' at line 5 drop trigger trg6; delete from tb3 where f122='Test 3.5.8.5-repeat'; @@ -478,7 +478,7 @@ BEGIN WHILE @counter1 < new.f136 SET @counter1 = @counter1 + 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; END' at line 4 delete from tb3 where f122='Test 3.5.8.5-while'; drop trigger trg7; diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result index 86a61773a31..e2bcd1f5047 100644 --- a/mysql-test/suite/funcs_1/r/innodb_views.result +++ b/mysql-test/suite/funcs_1/r/innodb_views.result @@ -3519,11 +3519,11 @@ CREATE TRIGGER tr1 BEFORE INSERT ON v1 FOR EACH ROW SET @a:=1 ; ERROR HY000: 'test.v1' is not BASE TABLE RENAME TABLE v1 TO v2; RENAME VIEW v2 TO v1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW v2 TO v1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VIEW v2 TO v1' at line 1 ALTER TABLE v2 RENAME AS v1; ERROR HY000: 'test.v2' is not BASE TABLE ALTER VIEW v1 RENAME AS v2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RENAME AS v2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RENAME AS v2' at line 1 DROP TABLE IF EXISTS t1, t2 ; DROP VIEW IF EXISTS v1 ; DROP VIEW IF EXISTS v2 ; @@ -3533,7 +3533,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f1); ALTER TABLE v1 ADD PRIMARY KEY(f1); ERROR HY000: 'test.v1' is not BASE TABLE ALTER VIEW v1 ADD PRIMARY KEY(f1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ADD PRIMARY KEY(f1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ADD PRIMARY KEY(f1)' at line 1 CREATE INDEX t1_idx ON t1(f3); CREATE INDEX v1_idx ON v1(f3); ERROR HY000: 'test.v1' is not BASE TABLE @@ -3544,81 +3544,81 @@ Testcase 3.3.1.3 + 3.1.1.4 -------------------------------------------------------------------------------- DROP VIEW IF EXISTS v1 ; CREATE VIEW v1 or REPLACE AS Select * from tb2 my_table; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'or REPLACE AS Select * from tb2 my_table' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'or REPLACE AS Select * from tb2 my_table' at line 1 CREATE VIEW v1 WITH CASCADED CHECK OPTION AS Select * from tb2 my_table limit 50; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CASCADED CHECK OPTION AS Select * +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CASCADED CHECK OPTION AS Select * from tb2 my_table limit 50' at line 1 CREATE VIEW v1 WITH LOCAL CHECK OPTION AS Select * from tb2 my_table limit 50; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'LOCAL CHECK OPTION AS Select * +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'LOCAL CHECK OPTION AS Select * from tb2 my_table limit 50' at line 1 SELECT * FROM tb2 my_table CREATE VIEW As v1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CREATE VIEW As v1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CREATE VIEW As v1' at line 1 CREATE or REPLACE VIEW v1 Select f59, f60 from test.tb2 my_table where f59 = 250 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'Select f59, f60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'Select f59, f60 from test.tb2 my_table where f59 = 250' at line 1 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION; DROP VIEW v1; REPLACE OR CREATE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OR CREATE VIEW v1 AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OR CREATE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK ' at line 1 CREATE OR REPLACE VIEW v1 SELECT AS F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT AS F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT AS F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION' at line 1 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table CASCADED WITH CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CASCADED WITH CHECK OPTION' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CASCADED WITH CHECK OPTION' at line 2 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED OPTION CHECK; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OPTION CHECK' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OPTION CHECK' at line 2 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table CHECK OPTION WITH CASCADED; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHECK OPTION WITH CASCADED' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHECK OPTION WITH CASCADED' at line 2 CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION AS SELECT F59, F60 FROM test.tb2 my_table; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CASCADED CHECK OPTION +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CASCADED CHECK OPTION AS SELECT F59, F60 FROM test.tb2 my_table' at line 1 CREATE OR REPLACE AS SELECT F59, F60 FROM test.tb2 my_table VIEW v1 WITH CASCADED CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS SELECT F59, F60 FROM test.tb2 my_table VIEW v1 WITH CASCADED CHECK OPTION' at line 1 CREATE OR REPLACE AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION VIEW v1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION VIEW v1' at line 1 REPLACE OR CREATE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OR CREATE VIEW v1 AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OR CREATE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPT' at line 1 CREATE OR REPLACE VIEW v1 SELECT AS F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT AS F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT AS F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPTION' at line 1 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table LOCAL WITH CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'LOCAL WITH CHECK OPTION' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'LOCAL WITH CHECK OPTION' at line 2 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH LOCAL OPTION CHECK; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OPTION CHECK' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OPTION CHECK' at line 2 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table CHECK OPTION WITH LOCAL; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHECK OPTION WITH LOCAL' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHECK OPTION WITH LOCAL' at line 2 CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION AS SELECT F59, F60 FROM test.tb2 my_table; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CASCADED CHECK OPTION +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CASCADED CHECK OPTION AS SELECT F59, F60 FROM test.tb2 my_table' at line 1 CREATE OR REPLACE AS SELECT F59, F60 FROM test.tb2 my_table VIEW v1 WITH LOCAL CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS SELECT F59, F60 FROM test.tb2 my_table VIEW v1 WITH LOCAL CHECK OPTION' at line 1 CREATE OR REPLACE AS SELECT F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPTION VIEW v1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS SELECT F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPTION VIEW v1' at line 1 Drop table if exists t1 ; CREATE table t1 (f1 int ,f2 int) ; @@ -3626,36 +3626,36 @@ INSERT INTO t1 values (235, 22); INSERT INTO t1 values (554, 11); CREATE or REPLACE view v1 as (Select from f59 tb2) Union ALL (Select from f1 t1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from f59 tb2) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from f59 tb2) Union ALL (Select from f1 t1)' at line 1 CREATE or REPLACE view v1 as Select f59, f60 from tb2 by order f59; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by order f59' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'by order f59' at line 2 CREATE or REPLACE view v1 as Select f59, f60 from tb2 by group f59 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by group f59' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'by group f59' at line 2 Testcase 3.3.1.5 -------------------------------------------------------------------------------- DROP VIEW IF EXISTS v1 ; CREATE VIEW v1 SELECT * FROM tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT * FROM tb2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT * FROM tb2' at line 1 CREATE v1 AS SELECT * FROM tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'v1 AS SELECT * FROM tb2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'v1 AS SELECT * FROM tb2' at line 1 VIEW v1 AS SELECT * FROM tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW v1 AS SELECT * FROM tb2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VIEW v1 AS SELECT * FROM tb2' at line 1 CREATE VIEW v1 AS SELECT 1; DROP VIEW v1; VIEW v1 AS SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW v1 AS SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VIEW v1 AS SELECT 1' at line 1 CREATE v1 AS SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'v1 AS SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'v1 AS SELECT 1' at line 1 CREATE VIEW AS SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS SELECT 1' at line 1 CREATE VIEW v1 SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT 1' at line 1 CREATE VIEW v1 AS ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 Testcase 3.3.1.6 -------------------------------------------------------------------------------- @@ -3672,31 +3672,31 @@ CREATE or REPLACE ALGORITHM = TEMPTABLE VIEW v1 as SELECT * from tb2; CREATE or REPLACE = TEMPTABLE VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '= TEMPTABLE VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '= TEMPTABLE VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE ALGORITHM TEMPTABLE VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TEMPTABLE VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TEMPTABLE VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE ALGORITHM = VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE TEMPTABLE = ALGORITHM VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TEMPTABLE = ALGORITHM VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TEMPTABLE = ALGORITHM VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE TEMPTABLE - ALGORITHM VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TEMPTABLE - ALGORITHM VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TEMPTABLE - ALGORITHM VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE GARBAGE = TEMPTABLE VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE = TEMPTABLE VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GARBAGE = TEMPTABLE VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE ALGORITHM = GARBAGE VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GARBAGE VIEW v1 as SELECT * from tb2' at line 1 Drop view if exists v1 ; CREATE or REPLACE VIEW v1 @@ -3709,16 +3709,16 @@ CREATE or REPLACE VIEW v1 AS SELECT * from tb2 where f59 < 1 WITH LOCAL CHECK OPTION; CREATE or REPLACE VIEW v1 AS SELECT * from tb2 where f59 < 1 WITH NO CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NO CHECK OPTION' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NO CHECK OPTION' at line 2 CREATE or REPLACE VIEW v1 AS SELECT * from tb2 where f59 < 1 CASCADED CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CASCADED CHECK OPTION' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CASCADED CHECK OPTION' at line 2 CREATE or REPLACE VIEW v1 AS SELECT * from tb2 where f59 < 1 WITH CASCADED OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OPTION' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OPTION' at line 2 CREATE or REPLACE VIEW v1 AS SELECT * from tb2 where f59 < 1 WITH CASCADED CHECK ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 2 Testcase 3.3.1.7 -------------------------------------------------------------------------------- @@ -3749,17 +3749,17 @@ DROP VIEW IF EXISTS V1 ; Testcase 3.3.1.8 -------------------------------------------------------------------------------- Create view select AS Select * from test.tb2 limit 100; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select AS Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select AS Select * from test.tb2 limit 100' at line 1 Create view as AS Select * from test.tb2 limit 100; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as AS Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as AS Select * from test.tb2 limit 100' at line 1 Create view where AS Select * from test.tb2 limit 100; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where AS Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where AS Select * from test.tb2 limit 100' at line 1 Create view from AS Select * from test.tb2 limit 100; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from AS Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from AS Select * from test.tb2 limit 100' at line 1 Create view while AS Select * from test.tb2 limit 100; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'while AS Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'while AS Select * from test.tb2 limit 100' at line 1 Create view asdkj*(&*&&^ as Select * from test.tb2 limit 100 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '*(&*&&^ as Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '*(&*&&^ as Select * from test.tb2 limit 100' at line 1 Drop view if exists test.procedure ; Create view test.procedure as Select * from test.tb2 limit 100 ; Drop view if exists test.procedure ; @@ -7571,11 +7571,11 @@ Testcase 3.3.1.42 Drop VIEW if exists test.v1 ; CREATE TEMPORARY VIEW test.v1 AS SELECT * FROM test.tb2 limit 2 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW test.v1 AS +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VIEW test.v1 AS SELECT * FROM test.tb2 limit 2' at line 1 CREATE OR REPLACE TEMPORARY VIEW test.v1 AS SELECT * FROM test.tb2 limit 2 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TEMPORARY VIEW test.v1 AS +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TEMPORARY VIEW test.v1 AS SELECT * FROM test.tb2 limit 2' at line 1 Drop view if exists test.v1 ; Use test; diff --git a/mysql-test/suite/funcs_1/r/is_statistics.result b/mysql-test/suite/funcs_1/r/is_statistics.result index de84590e2f7..8543b207728 100644 --- a/mysql-test/suite/funcs_1/r/is_statistics.result +++ b/mysql-test/suite/funcs_1/r/is_statistics.result @@ -316,7 +316,7 @@ CREATE INDEX f3_f1 ON test.t1_1 (f3,f1); CREATE UNIQUE INDEX f4x_uni ON test.t1_1 (f4x); CREATE INDEX f2_hash USING HASH ON test.t1_2 (f2); CREATE INDEX f1_idx ON test.t1_2 (f1) COMMENT = 'COMMENT'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '= 'COMMENT'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '= 'COMMENT'' at line 1 CREATE INDEX not_null ON test.t1_1 (f3x); CREATE INDEX f2_prefix ON test.t1_1 (f2(20)); SELECT * FROM information_schema.statistics diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result index d8f26c81e58..03e4c647d6d 100644 --- a/mysql-test/suite/funcs_1/r/memory_func_view.result +++ b/mysql-test/suite/funcs_1/r/memory_func_view.result @@ -2464,7 +2464,7 @@ NULL NULL 1 130000 13:00:00 4 100000 10:00:00 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2478,7 +2478,7 @@ NULL NULL 1 130000 13:00:00 4 100000 10:00:00 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2573,9 +2573,9 @@ NULL NULL 1 18446744073709551615 -1 5 Warnings: Warning 1292 Truncated incorrect INTEGER value: '-1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect INTEGER value: '1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as unsigned) AS `CAST(my_double AS UNSIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2590,9 +2590,9 @@ NULL NULL 1 18446744073709551615 -1 5 Warnings: Warning 1292 Truncated incorrect INTEGER value: '-1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect INTEGER value: '1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2642,8 +2642,8 @@ NULL NULL 1 0 0 4 18446744073709551615 -1 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2657,8 +2657,8 @@ NULL NULL 1 0 0 4 18446744073709551615 -1 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2677,7 +2677,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2694,7 +2694,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2714,7 +2714,7 @@ Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' Warning 1292 Truncated incorrect INTEGER value: '-1' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2732,7 +2732,7 @@ Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' Warning 1292 Truncated incorrect INTEGER value: '-1' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2751,7 +2751,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2768,7 +2768,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2787,7 +2787,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2804,7 +2804,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result index f18678e3896..03c16d06595 100644 --- a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result @@ -490,7 +490,7 @@ DECLARE condname1 CONDITION CHECK SQLSTATE '23000'; END; DECLARE CONTINUE HANDLER FOR condname1 SET x1 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHECK SQLSTATE '23000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHECK SQLSTATE '23000'; END; DECLARE CONTINUE HANDLER FOR condname1 SET x1 = 1; ' at line 5 @@ -524,7 +524,7 @@ declare undo handler for sqlexception select '1'; select * from tqq; SELECT 'end of 1'; end;// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'undo handler for sqlexception select '1'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo handler for sqlexception select '1'; select * from tqq; SELECT 'end of 1'; ' at line 3 diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_08.result b/mysql-test/suite/funcs_1/r/memory_storedproc_08.result index 43953ff1507..1188eedf6c6 100644 --- a/mysql-test/suite/funcs_1/r/memory_storedproc_08.result +++ b/mysql-test/suite/funcs_1/r/memory_storedproc_08.result @@ -342,7 +342,7 @@ ALTER PROCEDURE sp_1 SQL SECURITY INVOKER; ALTER PROCEDURE sp_1 COMMENT 'new comment, SP changed to INVOKER'; ALTER PROCEDURE sp_2 SQL SECURITY DEFINER; ALTER PROCEDURE sp_2 DROP COMMENT; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DROP COMMENT' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DROP COMMENT' at line 1 ALTER PROCEDURE sp_2 COMMENT 'SP changed to DEFINER'; ALTER PROCEDURE sp_2 READS SQL DATA; ALTER FUNCTION fn_1 SQL SECURITY INVOKER; diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0102.result b/mysql-test/suite/funcs_1/r/memory_trig_0102.result index c39370dde69..b08eeb6754f 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_0102.result +++ b/mysql-test/suite/funcs_1/r/memory_trig_0102.result @@ -137,21 +137,21 @@ Testcase: 3.5.1.2: ------------------ Create trigger trg_1 after insert on tb3 for each statement set @x= 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'statement set @x= 1' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'statement set @x= 1' at line 2 drop trigger trg_1; Testcase 3.5.1.3: ----------------- CREATE TRIGGER trg3_1 on tb3 BEFORE INSERT for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on tb3 BEFORE INSERT for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on tb3 BEFORE INSERT for each row set new.f120 = 't'' at line 1 CREATE trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'' at line 1 CREATE TRIGGER trg3_3 Before DELETE on tb3 set @ret1 = 'test' for each row; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set @ret1 = 'test' for each row' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set @ret1 = 'test' for each row' at line 1 CREATE TRIGGER trg3_4 DELETE AFTER on tb3 set @ret1 = 'test' for each row; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DELETE AFTER on tb3 set @ret1 = 'test' for each row' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DELETE AFTER on tb3 set @ret1 = 'test' for each row' at line 1 CREATE for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'' at line 1 drop trigger trg3_1; drop trigger trg3_2; drop trigger trg3_3; @@ -161,17 +161,17 @@ drop trigger trg3_5; Testcase: 3.5.1.5: ------------------ CREATE TRIGGER trg4_1 AFTER on tb3 for each row set new.f120 = 'e'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on tb3 for each row set new.f120 = 'e'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on tb3 for each row set new.f120 = 'e'' at line 1 CREATE TRIGGER trg4_2 INSERT on tb3 for each set row new.f120 = 'f'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INSERT on tb3 for each set row new.f120 = 'f'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INSERT on tb3 for each set row new.f120 = 'f'' at line 1 CREATE TRIGGER trg4_3 BEFORE INSERT tb3 for each row set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tb3 for each row set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tb3 for each row set new.f120 = 'g'' at line 1 CREATE TRIGGER trg4_4 AFTER UPDATE on tb3 for each set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set new.f120 = 'g'' at line 1 CREATE trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'' at line 1 CREATE TRIGGER trg4_6 BEFORE DELETE for each row set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for each row set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for each row set new.f120 = 'g'' at line 1 drop trigger trg4_1; drop trigger trg4_2; drop trigger trg4_3; @@ -218,15 +218,15 @@ drop table t1; Testcase 3.5.1.8: ----------------- CREATE TRIGGER trg12* before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '* before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '* before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER trigger before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trigger before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trigger before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER 100 before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '100 before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '100 before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER @@view before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@@view before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@@view before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER @name before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@name before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@name before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER tb3.trg6_1 BEFORE INSERT on test.tb3 for each row set new.f120 ='X'; ERROR HY000: Trigger in wrong schema diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03e.result b/mysql-test/suite/funcs_1/r/memory_trig_03e.result index 9b2e9e27b4a..32252c93890 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_03e.result +++ b/mysql-test/suite/funcs_1/r/memory_trig_03e.result @@ -1557,7 +1557,7 @@ NULL ##### trigger privilege on column level? ####### ------------------------------------------------ grant TRIGGER(f1) on priv_db.t1 to test_yesprivs@localhost; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(f1) on priv_db.t1 to test_yesprivs@localhost' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(f1) on priv_db.t1 to test_yesprivs@localhost' at line 1 select current_user; current_user root@localhost diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0407.result b/mysql-test/suite/funcs_1/r/memory_trig_0407.result index b8d15b5403b..2146c74b72e 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_0407.result +++ b/mysql-test/suite/funcs_1/r/memory_trig_0407.result @@ -124,9 +124,9 @@ create table t1_433a (f1a char (5)) engine = ; CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row set new.f1 = 'Trigger 3.5.4.3'; Drop trigger t1.433.trg3; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.trg3' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.trg3' at line 1 Drop trigger db_drop3.t1.433.trg3; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.433.trg3' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.433.trg3' at line 1 Drop trigger mysql.trg3; ERROR HY000: Trigger does not exist Drop trigger tbx.trg3; @@ -269,9 +269,9 @@ Testcase 3.5.6.2 (see Testcase 3.5.1.1) Testcase 3.5.6.3: ----------------- Create trigger trg3_1 DURING UPDATE on tb3 for each row set new.f132=25; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DURING UPDATE on tb3 for each row set new.f132=25' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DURING UPDATE on tb3 for each row set new.f132=25' at line 1 Create trigger trg3_2 TIME INSERT on tb3 for each row set new.f132=15; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TIME INSERT on tb3 for each row set new.f132=15' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TIME INSERT on tb3 for each row set new.f132=15' at line 1 drop trigger tb3.trg3_1; drop trigger tb3.trg3_2; @@ -293,9 +293,9 @@ Testcase 3.5.7.3 (see Testcase 3.5.1.1) Testcase 3.5.7.4: ----------------- Create trigger trg4_1 BEFORE SELECT on tb3 for each row set new.f132=5; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT on tb3 for each row set new.f132=5' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT on tb3 for each row set new.f132=5' at line 1 Create trigger trg4_2 AFTER VALUE on tb3 for each row set new.f132=1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VALUE on tb3 for each row set new.f132=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VALUE on tb3 for each row set new.f132=1' at line 1 drop trigger tb3.trg4_1; drop trigger tb3.trg4_2; @@ -305,7 +305,7 @@ Create trigger trg5_1 BEFORE INSERT on tb3 for each row set new.f122='Trigger1 3.5.7.5/6'; Create trigger trg5_2 BEFORE INSERT on tb3 for each row set new.f122='Trigger2 3.5.7.5'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' Insert into tb3 (f121,f122) values ('Test 3.5.7.5/6','Insert 3.5.7.5'); Select f121,f122 from tb3 where f121='Test 3.5.7.5/6'; f121 f122 @@ -325,7 +325,7 @@ Create trigger trg6_1 AFTER INSERT on tb3 for each row set @test_var='Trigger1 3.5.7.7/8'; Create trigger trg6_2 AFTER INSERT on tb3 for each row set @test_var='Trigger2 3.5.7.7'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' select @test_var; @test_var Before trig 3.5.7.7 @@ -353,7 +353,7 @@ Create trigger trg7_1 BEFORE UPDATE on tb3 for each row set new.f122='Trigger1 3.5.7.9/10'; Create trigger trg7_2 BEFORE UPDATE on tb3 for each row set new.f122='Trigger2 3.5.7.9'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' Insert into tb3 (f121,f122) values ('Test 3.5.7.9/10','Insert 3.5.7.9'); Select f121,f122 from tb3 where f121='Test 3.5.7.9/10'; f121 f122 @@ -373,7 +373,7 @@ Create trigger trg8_1 AFTER UPDATE on tb3 for each row set @test_var='Trigger 3.5.7.11/12'; Create trigger trg8_2 AFTER UPDATE on tb3 for each row set @test_var='Trigger2 3.5.7.11'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' select @test_var; @test_var Before trig 3.5.7.11 @@ -403,7 +403,7 @@ Create trigger trg9_1 BEFORE DELETE on tb3 for each row set @test_var=@test_var+1; Create trigger trg9_2 BEFORE DELETE on tb3 for each row set @test_var=@test_var+10; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' select @test_var; @test_var 1 @@ -435,7 +435,7 @@ Create trigger trg_3_406010_1 AFTER DELETE on tb3 for each row set @test_var=@test_var+5; Create trigger trg_3_406010_2 AFTER DELETE on tb3 for each row set @test_var=@test_var+50; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' Create trigger trg_3_406010_1 AFTER INSERT on tb3 for each row set @test_var=@test_var+1; ERROR HY000: Trigger already exists diff --git a/mysql-test/suite/funcs_1/r/memory_trig_08.result b/mysql-test/suite/funcs_1/r/memory_trig_08.result index 3f303ef607f..d19507e5f4d 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_08.result +++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result @@ -281,7 +281,7 @@ BEGIN ELSEIF new.f120='2' then END IF; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ELSEIF new.f120='2' then +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ELSEIF new.f120='2' then END IF; END' at line 3 drop trigger trg3// @@ -292,7 +292,7 @@ set @test_var2='2nd if', new.f120='d'; ELSE set @test_var2='2nd else', new.f120='D'; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 7 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 7 drop trigger trg4; drop trigger trg2; delete from tb3 where f121='Test 3.5.8.5-if'; @@ -386,7 +386,7 @@ BEGIN CASE when new.f136<100 then set new.f120='p'; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 5 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 5 drop trigger trg3a; drop trigger trg3; delete from tb3 where f121='Test 3.5.8.5-case'; @@ -427,7 +427,7 @@ Label1: loop set @counter=@counter+1; END; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '; END' at line 5 drop trigger trg4_2; drop trigger trg4; @@ -455,7 +455,7 @@ BEGIN REPEAT SET @counter2 = @counter2 + 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END' at line 5 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'END' at line 5 drop trigger trg6; delete from tb3 where f122='Test 3.5.8.5-repeat'; @@ -479,7 +479,7 @@ BEGIN WHILE @counter1 < new.f136 SET @counter1 = @counter1 + 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; END' at line 4 delete from tb3 where f122='Test 3.5.8.5-while'; drop trigger trg7; diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result index 7ed23c3a5c1..c93febe8cdf 100644 --- a/mysql-test/suite/funcs_1/r/memory_views.result +++ b/mysql-test/suite/funcs_1/r/memory_views.result @@ -3520,11 +3520,11 @@ CREATE TRIGGER tr1 BEFORE INSERT ON v1 FOR EACH ROW SET @a:=1 ; ERROR HY000: 'test.v1' is not BASE TABLE RENAME TABLE v1 TO v2; RENAME VIEW v2 TO v1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW v2 TO v1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VIEW v2 TO v1' at line 1 ALTER TABLE v2 RENAME AS v1; ERROR HY000: 'test.v2' is not BASE TABLE ALTER VIEW v1 RENAME AS v2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RENAME AS v2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RENAME AS v2' at line 1 DROP TABLE IF EXISTS t1, t2 ; DROP VIEW IF EXISTS v1 ; DROP VIEW IF EXISTS v2 ; @@ -3534,7 +3534,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f1); ALTER TABLE v1 ADD PRIMARY KEY(f1); ERROR HY000: 'test.v1' is not BASE TABLE ALTER VIEW v1 ADD PRIMARY KEY(f1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ADD PRIMARY KEY(f1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ADD PRIMARY KEY(f1)' at line 1 CREATE INDEX t1_idx ON t1(f3); CREATE INDEX v1_idx ON v1(f3); ERROR HY000: 'test.v1' is not BASE TABLE @@ -3545,81 +3545,81 @@ Testcase 3.3.1.3 + 3.1.1.4 -------------------------------------------------------------------------------- DROP VIEW IF EXISTS v1 ; CREATE VIEW v1 or REPLACE AS Select * from tb2 my_table; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'or REPLACE AS Select * from tb2 my_table' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'or REPLACE AS Select * from tb2 my_table' at line 1 CREATE VIEW v1 WITH CASCADED CHECK OPTION AS Select * from tb2 my_table limit 50; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CASCADED CHECK OPTION AS Select * +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CASCADED CHECK OPTION AS Select * from tb2 my_table limit 50' at line 1 CREATE VIEW v1 WITH LOCAL CHECK OPTION AS Select * from tb2 my_table limit 50; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'LOCAL CHECK OPTION AS Select * +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'LOCAL CHECK OPTION AS Select * from tb2 my_table limit 50' at line 1 SELECT * FROM tb2 my_table CREATE VIEW As v1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CREATE VIEW As v1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CREATE VIEW As v1' at line 1 CREATE or REPLACE VIEW v1 Select f59, f60 from test.tb2 my_table where f59 = 250 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'Select f59, f60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'Select f59, f60 from test.tb2 my_table where f59 = 250' at line 1 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION; DROP VIEW v1; REPLACE OR CREATE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OR CREATE VIEW v1 AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OR CREATE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK ' at line 1 CREATE OR REPLACE VIEW v1 SELECT AS F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT AS F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT AS F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION' at line 1 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table CASCADED WITH CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CASCADED WITH CHECK OPTION' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CASCADED WITH CHECK OPTION' at line 2 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED OPTION CHECK; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OPTION CHECK' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OPTION CHECK' at line 2 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table CHECK OPTION WITH CASCADED; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHECK OPTION WITH CASCADED' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHECK OPTION WITH CASCADED' at line 2 CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION AS SELECT F59, F60 FROM test.tb2 my_table; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CASCADED CHECK OPTION +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CASCADED CHECK OPTION AS SELECT F59, F60 FROM test.tb2 my_table' at line 1 CREATE OR REPLACE AS SELECT F59, F60 FROM test.tb2 my_table VIEW v1 WITH CASCADED CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS SELECT F59, F60 FROM test.tb2 my_table VIEW v1 WITH CASCADED CHECK OPTION' at line 1 CREATE OR REPLACE AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION VIEW v1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS SELECT F59, F60 FROM test.tb2 my_table WITH CASCADED CHECK OPTION VIEW v1' at line 1 REPLACE OR CREATE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OR CREATE VIEW v1 AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OR CREATE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPT' at line 1 CREATE OR REPLACE VIEW v1 SELECT AS F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT AS F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT AS F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPTION' at line 1 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table LOCAL WITH CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'LOCAL WITH CHECK OPTION' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'LOCAL WITH CHECK OPTION' at line 2 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table WITH LOCAL OPTION CHECK; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OPTION CHECK' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OPTION CHECK' at line 2 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60 FROM test.tb2 my_table CHECK OPTION WITH LOCAL; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHECK OPTION WITH LOCAL' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHECK OPTION WITH LOCAL' at line 2 CREATE OR REPLACE VIEW v1 WITH CASCADED CHECK OPTION AS SELECT F59, F60 FROM test.tb2 my_table; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CASCADED CHECK OPTION +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CASCADED CHECK OPTION AS SELECT F59, F60 FROM test.tb2 my_table' at line 1 CREATE OR REPLACE AS SELECT F59, F60 FROM test.tb2 my_table VIEW v1 WITH LOCAL CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS SELECT F59, F60 FROM test.tb2 my_table VIEW v1 WITH LOCAL CHECK OPTION' at line 1 CREATE OR REPLACE AS SELECT F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPTION VIEW v1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS SELECT F59, F60 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS SELECT F59, F60 FROM test.tb2 my_table WITH LOCAL CHECK OPTION VIEW v1' at line 1 Drop table if exists t1 ; CREATE table t1 (f1 int ,f2 int) ; @@ -3627,36 +3627,36 @@ INSERT INTO t1 values (235, 22); INSERT INTO t1 values (554, 11); CREATE or REPLACE view v1 as (Select from f59 tb2) Union ALL (Select from f1 t1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from f59 tb2) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from f59 tb2) Union ALL (Select from f1 t1)' at line 1 CREATE or REPLACE view v1 as Select f59, f60 from tb2 by order f59; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by order f59' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'by order f59' at line 2 CREATE or REPLACE view v1 as Select f59, f60 from tb2 by group f59 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by group f59' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'by group f59' at line 2 Testcase 3.3.1.5 -------------------------------------------------------------------------------- DROP VIEW IF EXISTS v1 ; CREATE VIEW v1 SELECT * FROM tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT * FROM tb2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT * FROM tb2' at line 1 CREATE v1 AS SELECT * FROM tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'v1 AS SELECT * FROM tb2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'v1 AS SELECT * FROM tb2' at line 1 VIEW v1 AS SELECT * FROM tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW v1 AS SELECT * FROM tb2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VIEW v1 AS SELECT * FROM tb2' at line 1 CREATE VIEW v1 AS SELECT 1; DROP VIEW v1; VIEW v1 AS SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW v1 AS SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VIEW v1 AS SELECT 1' at line 1 CREATE v1 AS SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'v1 AS SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'v1 AS SELECT 1' at line 1 CREATE VIEW AS SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AS SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AS SELECT 1' at line 1 CREATE VIEW v1 SELECT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT 1' at line 1 CREATE VIEW v1 AS ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 Testcase 3.3.1.6 -------------------------------------------------------------------------------- @@ -3673,31 +3673,31 @@ CREATE or REPLACE ALGORITHM = TEMPTABLE VIEW v1 as SELECT * from tb2; CREATE or REPLACE = TEMPTABLE VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '= TEMPTABLE VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '= TEMPTABLE VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE ALGORITHM TEMPTABLE VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TEMPTABLE VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TEMPTABLE VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE ALGORITHM = VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE TEMPTABLE = ALGORITHM VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TEMPTABLE = ALGORITHM VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TEMPTABLE = ALGORITHM VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE TEMPTABLE - ALGORITHM VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TEMPTABLE - ALGORITHM VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TEMPTABLE - ALGORITHM VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE GARBAGE = TEMPTABLE VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE = TEMPTABLE VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GARBAGE = TEMPTABLE VIEW v1 as SELECT * from tb2' at line 1 CREATE or REPLACE ALGORITHM = GARBAGE VIEW v1 as SELECT * from tb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE VIEW v1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GARBAGE VIEW v1 as SELECT * from tb2' at line 1 Drop view if exists v1 ; CREATE or REPLACE VIEW v1 @@ -3710,16 +3710,16 @@ CREATE or REPLACE VIEW v1 AS SELECT * from tb2 where f59 < 1 WITH LOCAL CHECK OPTION; CREATE or REPLACE VIEW v1 AS SELECT * from tb2 where f59 < 1 WITH NO CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NO CHECK OPTION' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NO CHECK OPTION' at line 2 CREATE or REPLACE VIEW v1 AS SELECT * from tb2 where f59 < 1 CASCADED CHECK OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CASCADED CHECK OPTION' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CASCADED CHECK OPTION' at line 2 CREATE or REPLACE VIEW v1 AS SELECT * from tb2 where f59 < 1 WITH CASCADED OPTION; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OPTION' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OPTION' at line 2 CREATE or REPLACE VIEW v1 AS SELECT * from tb2 where f59 < 1 WITH CASCADED CHECK ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 2 Testcase 3.3.1.7 -------------------------------------------------------------------------------- @@ -3750,17 +3750,17 @@ DROP VIEW IF EXISTS V1 ; Testcase 3.3.1.8 -------------------------------------------------------------------------------- Create view select AS Select * from test.tb2 limit 100; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select AS Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select AS Select * from test.tb2 limit 100' at line 1 Create view as AS Select * from test.tb2 limit 100; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as AS Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as AS Select * from test.tb2 limit 100' at line 1 Create view where AS Select * from test.tb2 limit 100; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where AS Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where AS Select * from test.tb2 limit 100' at line 1 Create view from AS Select * from test.tb2 limit 100; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from AS Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from AS Select * from test.tb2 limit 100' at line 1 Create view while AS Select * from test.tb2 limit 100; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'while AS Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'while AS Select * from test.tb2 limit 100' at line 1 Create view asdkj*(&*&&^ as Select * from test.tb2 limit 100 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '*(&*&&^ as Select * from test.tb2 limit 100' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '*(&*&&^ as Select * from test.tb2 limit 100' at line 1 Drop view if exists test.procedure ; Create view test.procedure as Select * from test.tb2 limit 100 ; Drop view if exists test.procedure ; @@ -7572,11 +7572,11 @@ Testcase 3.3.1.42 Drop VIEW if exists test.v1 ; CREATE TEMPORARY VIEW test.v1 AS SELECT * FROM test.tb2 limit 2 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VIEW test.v1 AS +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VIEW test.v1 AS SELECT * FROM test.tb2 limit 2' at line 1 CREATE OR REPLACE TEMPORARY VIEW test.v1 AS SELECT * FROM test.tb2 limit 2 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TEMPORARY VIEW test.v1 AS +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TEMPORARY VIEW test.v1 AS SELECT * FROM test.tb2 limit 2' at line 1 Drop view if exists test.v1 ; Use test; diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result index d8f26c81e58..03e4c647d6d 100644 --- a/mysql-test/suite/funcs_1/r/myisam_func_view.result +++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result @@ -2464,7 +2464,7 @@ NULL NULL 1 130000 13:00:00 4 100000 10:00:00 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2478,7 +2478,7 @@ NULL NULL 1 130000 13:00:00 4 100000 10:00:00 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2573,9 +2573,9 @@ NULL NULL 1 18446744073709551615 -1 5 Warnings: Warning 1292 Truncated incorrect INTEGER value: '-1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect INTEGER value: '1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as unsigned) AS `CAST(my_double AS UNSIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2590,9 +2590,9 @@ NULL NULL 1 18446744073709551615 -1 5 Warnings: Warning 1292 Truncated incorrect INTEGER value: '-1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect INTEGER value: '1.7976931348623e308' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2642,8 +2642,8 @@ NULL NULL 1 0 0 4 18446744073709551615 -1 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2657,8 +2657,8 @@ NULL NULL 1 0 0 4 18446744073709551615 -1 5 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2677,7 +2677,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2694,7 +2694,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2714,7 +2714,7 @@ Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' Warning 1292 Truncated incorrect INTEGER value: '-1' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2732,7 +2732,7 @@ Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' Warning 1292 Truncated incorrect INTEGER value: '-1' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2751,7 +2751,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2768,7 +2768,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; @@ -2787,7 +2787,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement SHOW CREATE VIEW v1; View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci @@ -2804,7 +2804,7 @@ Warnings: Warning 1292 Truncated incorrect INTEGER value: '' Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement DROP VIEW v1; diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result index f18678e3896..03c16d06595 100644 --- a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result +++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result @@ -490,7 +490,7 @@ DECLARE condname1 CONDITION CHECK SQLSTATE '23000'; END; DECLARE CONTINUE HANDLER FOR condname1 SET x1 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHECK SQLSTATE '23000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'CHECK SQLSTATE '23000'; END; DECLARE CONTINUE HANDLER FOR condname1 SET x1 = 1; ' at line 5 @@ -524,7 +524,7 @@ declare undo handler for sqlexception select '1'; select * from tqq; SELECT 'end of 1'; end;// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'undo handler for sqlexception select '1'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo handler for sqlexception select '1'; select * from tqq; SELECT 'end of 1'; ' at line 3 diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result index 43953ff1507..1188eedf6c6 100644 --- a/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result +++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result @@ -342,7 +342,7 @@ ALTER PROCEDURE sp_1 SQL SECURITY INVOKER; ALTER PROCEDURE sp_1 COMMENT 'new comment, SP changed to INVOKER'; ALTER PROCEDURE sp_2 SQL SECURITY DEFINER; ALTER PROCEDURE sp_2 DROP COMMENT; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DROP COMMENT' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DROP COMMENT' at line 1 ALTER PROCEDURE sp_2 COMMENT 'SP changed to DEFINER'; ALTER PROCEDURE sp_2 READS SQL DATA; ALTER FUNCTION fn_1 SQL SECURITY INVOKER; diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result index c39370dde69..b08eeb6754f 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result @@ -137,21 +137,21 @@ Testcase: 3.5.1.2: ------------------ Create trigger trg_1 after insert on tb3 for each statement set @x= 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'statement set @x= 1' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'statement set @x= 1' at line 2 drop trigger trg_1; Testcase 3.5.1.3: ----------------- CREATE TRIGGER trg3_1 on tb3 BEFORE INSERT for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on tb3 BEFORE INSERT for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on tb3 BEFORE INSERT for each row set new.f120 = 't'' at line 1 CREATE trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trg3_2 TRIGGER AFTER INSERT on tb3 for each row set new.f120 = 's'' at line 1 CREATE TRIGGER trg3_3 Before DELETE on tb3 set @ret1 = 'test' for each row; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set @ret1 = 'test' for each row' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set @ret1 = 'test' for each row' at line 1 CREATE TRIGGER trg3_4 DELETE AFTER on tb3 set @ret1 = 'test' for each row; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DELETE AFTER on tb3 set @ret1 = 'test' for each row' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DELETE AFTER on tb3 set @ret1 = 'test' for each row' at line 1 CREATE for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for each row TRIGGER trg3_5 AFTER UPDATE on tb3 set @ret1 = 'test'' at line 1 drop trigger trg3_1; drop trigger trg3_2; drop trigger trg3_3; @@ -161,17 +161,17 @@ drop trigger trg3_5; Testcase: 3.5.1.5: ------------------ CREATE TRIGGER trg4_1 AFTER on tb3 for each row set new.f120 = 'e'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on tb3 for each row set new.f120 = 'e'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on tb3 for each row set new.f120 = 'e'' at line 1 CREATE TRIGGER trg4_2 INSERT on tb3 for each set row new.f120 = 'f'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INSERT on tb3 for each set row new.f120 = 'f'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INSERT on tb3 for each set row new.f120 = 'f'' at line 1 CREATE TRIGGER trg4_3 BEFORE INSERT tb3 for each row set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tb3 for each row set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tb3 for each row set new.f120 = 'g'' at line 1 CREATE TRIGGER trg4_4 AFTER UPDATE on tb3 for each set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set new.f120 = 'g'' at line 1 CREATE trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trg4_5 AFTER DELETE on tb3 for each set new.f120 = 'g'' at line 1 CREATE TRIGGER trg4_6 BEFORE DELETE for each row set new.f120 = 'g'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for each row set new.f120 = 'g'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for each row set new.f120 = 'g'' at line 1 drop trigger trg4_1; drop trigger trg4_2; drop trigger trg4_3; @@ -218,15 +218,15 @@ drop table t1; Testcase 3.5.1.8: ----------------- CREATE TRIGGER trg12* before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '* before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '* before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER trigger before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trigger before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trigger before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER 100 before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '100 before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '100 before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER @@view before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@@view before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@@view before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER @name before insert on tb3 for each row set new.f120 = 't'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@name before insert on tb3 for each row set new.f120 = 't'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@name before insert on tb3 for each row set new.f120 = 't'' at line 1 CREATE TRIGGER tb3.trg6_1 BEFORE INSERT on test.tb3 for each row set new.f120 ='X'; ERROR HY000: Trigger in wrong schema diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result index ea421e85b86..1b3342ea581 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result @@ -1557,7 +1557,7 @@ NULL ##### trigger privilege on column level? ####### ------------------------------------------------ grant TRIGGER(f1) on priv_db.t1 to test_yesprivs@localhost; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(f1) on priv_db.t1 to test_yesprivs@localhost' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(f1) on priv_db.t1 to test_yesprivs@localhost' at line 1 select current_user; current_user root@localhost diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result index b8d15b5403b..2146c74b72e 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result @@ -124,9 +124,9 @@ create table t1_433a (f1a char (5)) engine = ; CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row set new.f1 = 'Trigger 3.5.4.3'; Drop trigger t1.433.trg3; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.trg3' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.trg3' at line 1 Drop trigger db_drop3.t1.433.trg3; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.433.trg3' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.433.trg3' at line 1 Drop trigger mysql.trg3; ERROR HY000: Trigger does not exist Drop trigger tbx.trg3; @@ -269,9 +269,9 @@ Testcase 3.5.6.2 (see Testcase 3.5.1.1) Testcase 3.5.6.3: ----------------- Create trigger trg3_1 DURING UPDATE on tb3 for each row set new.f132=25; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DURING UPDATE on tb3 for each row set new.f132=25' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DURING UPDATE on tb3 for each row set new.f132=25' at line 1 Create trigger trg3_2 TIME INSERT on tb3 for each row set new.f132=15; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'TIME INSERT on tb3 for each row set new.f132=15' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'TIME INSERT on tb3 for each row set new.f132=15' at line 1 drop trigger tb3.trg3_1; drop trigger tb3.trg3_2; @@ -293,9 +293,9 @@ Testcase 3.5.7.3 (see Testcase 3.5.1.1) Testcase 3.5.7.4: ----------------- Create trigger trg4_1 BEFORE SELECT on tb3 for each row set new.f132=5; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT on tb3 for each row set new.f132=5' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT on tb3 for each row set new.f132=5' at line 1 Create trigger trg4_2 AFTER VALUE on tb3 for each row set new.f132=1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VALUE on tb3 for each row set new.f132=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VALUE on tb3 for each row set new.f132=1' at line 1 drop trigger tb3.trg4_1; drop trigger tb3.trg4_2; @@ -305,7 +305,7 @@ Create trigger trg5_1 BEFORE INSERT on tb3 for each row set new.f122='Trigger1 3.5.7.5/6'; Create trigger trg5_2 BEFORE INSERT on tb3 for each row set new.f122='Trigger2 3.5.7.5'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' Insert into tb3 (f121,f122) values ('Test 3.5.7.5/6','Insert 3.5.7.5'); Select f121,f122 from tb3 where f121='Test 3.5.7.5/6'; f121 f122 @@ -325,7 +325,7 @@ Create trigger trg6_1 AFTER INSERT on tb3 for each row set @test_var='Trigger1 3.5.7.7/8'; Create trigger trg6_2 AFTER INSERT on tb3 for each row set @test_var='Trigger2 3.5.7.7'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' select @test_var; @test_var Before trig 3.5.7.7 @@ -353,7 +353,7 @@ Create trigger trg7_1 BEFORE UPDATE on tb3 for each row set new.f122='Trigger1 3.5.7.9/10'; Create trigger trg7_2 BEFORE UPDATE on tb3 for each row set new.f122='Trigger2 3.5.7.9'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' Insert into tb3 (f121,f122) values ('Test 3.5.7.9/10','Insert 3.5.7.9'); Select f121,f122 from tb3 where f121='Test 3.5.7.9/10'; f121 f122 @@ -373,7 +373,7 @@ Create trigger trg8_1 AFTER UPDATE on tb3 for each row set @test_var='Trigger 3.5.7.11/12'; Create trigger trg8_2 AFTER UPDATE on tb3 for each row set @test_var='Trigger2 3.5.7.11'; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' select @test_var; @test_var Before trig 3.5.7.11 @@ -403,7 +403,7 @@ Create trigger trg9_1 BEFORE DELETE on tb3 for each row set @test_var=@test_var+1; Create trigger trg9_2 BEFORE DELETE on tb3 for each row set @test_var=@test_var+10; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' select @test_var; @test_var 1 @@ -435,7 +435,7 @@ Create trigger trg_3_406010_1 AFTER DELETE on tb3 for each row set @test_var=@test_var+5; Create trigger trg_3_406010_2 AFTER DELETE on tb3 for each row set @test_var=@test_var+50; -ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table' +ERROR 42000: This version of MariaDB doesn't yet support 'multiple triggers with the same action time and event for one table' Create trigger trg_3_406010_1 AFTER INSERT on tb3 for each row set @test_var=@test_var+1; ERROR HY000: Trigger already exists diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_08.result b/mysql-test/suite/funcs_1/r/myisam_trig_08.result index 3f303ef607f..d19507e5f4d 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result @@ -281,7 +281,7 @@ BEGIN ELSEIF new.f120='2' then END IF; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ELSEIF new.f120='2' then +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ELSEIF new.f120='2' then END IF; END' at line 3 drop trigger trg3// @@ -292,7 +292,7 @@ set @test_var2='2nd if', new.f120='d'; ELSE set @test_var2='2nd else', new.f120='D'; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 7 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 7 drop trigger trg4; drop trigger trg2; delete from tb3 where f121='Test 3.5.8.5-if'; @@ -386,7 +386,7 @@ BEGIN CASE when new.f136<100 then set new.f120='p'; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 5 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 5 drop trigger trg3a; drop trigger trg3; delete from tb3 where f121='Test 3.5.8.5-case'; @@ -427,7 +427,7 @@ Label1: loop set @counter=@counter+1; END; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '; END' at line 5 drop trigger trg4_2; drop trigger trg4; @@ -455,7 +455,7 @@ BEGIN REPEAT SET @counter2 = @counter2 + 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END' at line 5 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'END' at line 5 drop trigger trg6; delete from tb3 where f122='Test 3.5.8.5-repeat'; @@ -479,7 +479,7 @@ BEGIN WHILE @counter1 < new.f136 SET @counter1 = @counter1 + 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; END' at line 4 delete from tb3 where f122='Test 3.5.8.5-while'; drop trigger trg7; diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result index a8b0300d240..2112da6761e 100644 --- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result +++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result @@ -85,7 +85,7 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_ DROP DATABASE information_schema; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' RENAME DATABASE information_schema TO info_schema; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1 ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' #################################################################################### @@ -154,7 +154,7 @@ ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'in DROP DATABASE information_schema; ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema' RENAME DATABASE information_schema TO info_schema; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATABASE information_schema TO info_schema' at line 1 ALTER DATABASE information_schema UPGRADE DATA DIRECTORY NAME; ERROR 42000: Access denied for user 'ddicttestuser1'@'localhost' to database 'information_schema' #################################################################################### diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result index 1f412e0a5d1..7b45ec4c9e1 100644 --- a/mysql-test/suite/funcs_1/r/storedproc.result +++ b/mysql-test/suite/funcs_1/r/storedproc.result @@ -1932,893 +1932,893 @@ DROP PROCEDURE sp1; ERROR HY000: Can't drop or alter a PROCEDURE from within another stored routine CREATE PROCEDURE !_sp1( f1 char(20) ) SELECT * from t1 where f2 = f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '!_sp1( f1 char(20) ) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '!_sp1( f1 char(20) ) SELECT * from t1 where f2 = f1' at line 1 CREATE PROCEDURE function() SELECT * from t1 where f2=f1; DROP PROCEDURE function; CREATE PROCEDURE accessible() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'accessible() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'accessible() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE add() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'add() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'add() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE all() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'all() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'all() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE alter() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'alter() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'alter() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE analyze() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'analyze() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'analyze() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE and() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'and() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'and() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE as() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE asc() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'asc() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asc() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE asensitive() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'asensitive() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asensitive() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE before() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'before() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'before() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE between() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'between() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'between() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE bigint() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE binary() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binary() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binary() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE blob() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'blob() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'blob() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE both() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'both() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'both() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE by() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'by() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE call() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'call() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'call() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE cascade() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cascade() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cascade() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE case() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'case() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'case() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE change() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'change() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'change() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE char() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE character() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'character() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE check() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'check() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'check() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE collate() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'collate() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'collate() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE column() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'column() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'column() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE condition() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE constraint() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'constraint() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'constraint() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE continue() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'continue() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'continue() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE convert() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'convert() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'convert() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE create() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'create() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'create() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE cross() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cross() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cross() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE current_date() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_date() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_date() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE current_time() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_time() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_time() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE current_timestamp() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_timestamp() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_timestamp() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE current_user() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_user() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_user() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE cursor() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cursor() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cursor() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE database() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'database() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'database() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE databases() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'databases() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'databases() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE day_hour() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_hour() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_hour() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE day_microsecond() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_microsecond() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_microsecond() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE day_minute() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_minute() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_minute() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE day_second() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_second() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_second() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE dec() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'dec() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dec() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE decimal() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE declare() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'declare() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'declare() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE default() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE delayed() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE delete() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delete() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delete() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE desc() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'desc() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'desc() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE describe() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'describe() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'describe() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE deterministic() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'deterministic() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'deterministic() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE distinct() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinct() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'distinct() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE distinctrow() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinctrow() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'distinctrow() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE div() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'div() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'div() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE double() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'double() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'double() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE drop() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'drop() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'drop() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE dual() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'dual() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dual() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE each() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'each() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'each() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE else() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'else() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'else() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE elseif() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'elseif() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'elseif() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE enclosed() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'enclosed() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'enclosed() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE escaped() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'escaped() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'escaped() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE exists() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'exists() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'exists() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE exit() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'exit() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'exit() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE explain() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'explain() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'explain() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE false() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'false() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'false() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE fetch() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'fetch() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fetch() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE fields() SELECT * from t1 where f2=f1; DROP PROCEDURE fields; CREATE PROCEDURE float() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE for() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE force() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'force() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'force() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE foreign() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'foreign() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'foreign() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE from() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE fulltext() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'fulltext() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fulltext() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE grant() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'grant() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'grant() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE group() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'group() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE having() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'having() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'having() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE high_priority() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'high_priority() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'high_priority() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE hour_microsecond() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_microsecond() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_microsecond() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE hour_minute() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_minute() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_minute() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE hour_second() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_second() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_second() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE if() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'if() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'if() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE ignore() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ignore() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ignore() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE in() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'in() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'in() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE index() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'index() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'index() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE infile() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'infile() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'infile() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE inner() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'inner() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'inner() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE inout() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'inout() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'inout() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE insensitive() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insensitive() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insensitive() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE insert() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insert() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insert() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE int() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE int1() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int1() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int1() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE int2() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int2() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int2() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE int3() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int3() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int3() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE int4() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int4() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int4() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE int8() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int8() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int8() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE integer() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'integer() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'integer() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE interval() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'interval() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'interval() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE into() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'into() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'into() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE is() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'is() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'is() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE iterate() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'iterate() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'iterate() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE join() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'join() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'join() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE key() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE keys() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'keys() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'keys() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE kill() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'kill() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'kill() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE leading() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'leading() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'leading() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE leave() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'leave() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'leave() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE left() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'left() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'left() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE like() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'like() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'like() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE limit() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'limit() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'limit() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE linear() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'linear() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'linear() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE lines() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'lines() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'lines() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE load() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'load() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'load() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE localtime() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'localtime() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'localtime() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE localtimestamp() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'localtimestamp() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'localtimestamp() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE lock() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'lock() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'lock() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE long() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'long() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'long() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE longblob() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longblob() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longblob() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE longtext() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longtext() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longtext() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE loop() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'loop() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'loop() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE low_priority() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'low_priority() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'low_priority() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE master_ssl_verify_server_cert() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'master_ssl_verify_server_cert() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'master_ssl_verify_server_cert() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE match() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE mediumblob() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumblob() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumblob() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE mediumint() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE mediumtext() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumtext() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumtext() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE middleint() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'middleint() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'middleint() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE minute_microsecond() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'minute_microsecond() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'minute_microsecond() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE minute_second() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'minute_second() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'minute_second() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE mod() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mod() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mod() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE modifies() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'modifies() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'modifies() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE natural() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'natural() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'natural() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE not() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE no_write_to_binlog() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'no_write_to_binlog() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'no_write_to_binlog() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE null() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE numeric() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE on() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE optimize() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'optimize() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'optimize() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE option() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'option() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'option() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE optionally() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'optionally() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'optionally() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE or() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'or() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'or() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE order() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'order() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'order() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE out() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'out() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'out() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE outer() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'outer() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'outer() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE outfile() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'outfile() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'outfile() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE precision() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'precision() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'precision() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE primary() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'primary() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE procedure() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'procedure() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'procedure() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE purge() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'purge() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'purge() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE range() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'range() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'range() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE read() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE reads() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'reads() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'reads() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE real() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE references() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'references() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'references() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE regexp() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'regexp() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'regexp() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE release() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'release() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'release() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE rename() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'rename() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'rename() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE repeat() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'repeat() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'repeat() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE replace() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'replace() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'replace() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE require() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'require() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'require() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE restrict() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'restrict() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'restrict() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE return() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'return() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'return() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE revoke() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'revoke() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'revoke() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE right() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'right() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'right() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE rlike() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'rlike() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'rlike() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE schema() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'schema() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'schema() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE schemas() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'schemas() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'schemas() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE second_microsecond() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'second_microsecond() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'second_microsecond() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE select() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE sensitive() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sensitive() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sensitive() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE separator() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'separator() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'separator() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE set() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE show() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'show() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'show() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE smallint() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE spatial() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'spatial() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'spatial() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE specific() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'specific() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'specific() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE sql() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE sqlexception() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlexception() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlexception() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE sqlstate() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlstate() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlstate() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE sqlwarning() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlwarning() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlwarning() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE sql_big_result() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_big_result() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_big_result() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE sql_calc_found_rows() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_calc_found_rows() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_calc_found_rows() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE sql_small_result() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_small_result() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_small_result() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE ssl() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ssl() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ssl() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE starting() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starting() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'starting() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE straight_join() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'straight_join() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'straight_join() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE table() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'table() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'table() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE terminated() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'terminated() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'terminated() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE then() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'then() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'then() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE tinyblob() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyblob() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyblob() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE tinyint() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE tinytext() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinytext() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinytext() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE to() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'to() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'to() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE trailing() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trailing() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trailing() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE trigger() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trigger() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trigger() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE true() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'true() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'true() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE undo() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'undo() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE union() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'union() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'union() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE unique() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unique() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unique() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE unlock() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unlock() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unlock() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE unsigned() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unsigned() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unsigned() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE update() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'update() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'update() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE usage() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'usage() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'usage() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE use() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'use() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'use() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE using() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'using() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'using() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE utc_date() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_date() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_date() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE utc_time() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_time() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_time() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE utc_timestamp() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_timestamp() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_timestamp() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE values() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'values() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'values() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE varbinary() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varbinary() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varbinary() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE varchar() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varchar() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varchar() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE varcharacter() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varcharacter() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varcharacter() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE varying() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varying() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varying() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE when() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'when() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'when() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE where() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE while() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'while() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'while() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE with() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE write() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'write() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'write() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE xor() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xor() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xor() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE year_month() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'year_month() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'year_month() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE zerofill() SELECT * from t1 where f2=f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'zerofill() +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'zerofill() SELECT * from t1 where f2=f1' at line 1 Testcase 4.1.15: @@ -2828,259 +2828,259 @@ error message is returned when the name is rejected -------------------------------------------------------------------------------- CREATE FUNCTION !_fn1(f1 char) returns char return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '!_fn1(f1 char) returns char +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '!_fn1(f1 char) returns char return f1' at line 1 CREATE FUNCTION char(f1 char) returns char return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char(f1 char) returns char +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char(f1 char) returns char return f1' at line 1 CREATE FUNCTION char binary(f1 char binary) returns char binary return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char binary(f1 char binary) returns char binary +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char binary(f1 char binary) returns char binary return f1' at line 1 CREATE FUNCTION char ascii(f1 char ascii) returns char ascii return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char ascii(f1 char ascii) returns char ascii +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char ascii(f1 char ascii) returns char ascii return f1' at line 1 CREATE FUNCTION char not null(f1 char not null) returns char not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char not null(f1 char not null) returns char not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char not null(f1 char not null) returns char not null return f1' at line 1 CREATE FUNCTION char binary not null(f1 char binary not null) returns char binary not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char binary not null(f1 char binary not null) returns char binary not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char binary not null(f1 char binary not null) returns char binary not null retur' at line 1 CREATE FUNCTION char ascii not null(f1 char ascii not null) returns char ascii not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char ascii not null(f1 char ascii not null) returns char ascii not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char ascii not null(f1 char ascii not null) returns char ascii not null return f' at line 1 CREATE FUNCTION tinytext(f1 tinytext) returns tinytext return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinytext(f1 tinytext) returns tinytext +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinytext(f1 tinytext) returns tinytext return f1' at line 1 CREATE FUNCTION text(f1 text) returns text return f1; DROP FUNCTION text; CREATE FUNCTION mediumtext(f1 mediumtext) returns mediumtext return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumtext(f1 mediumtext) returns mediumtext +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumtext(f1 mediumtext) returns mediumtext return f1' at line 1 CREATE FUNCTION longtext(f1 longtext) returns longtext return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longtext(f1 longtext) returns longtext +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longtext(f1 longtext) returns longtext return f1' at line 1 CREATE FUNCTION tinytext not null(f1 tinytext not null) returns tinytext not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinytext not null(f1 tinytext not null) returns tinytext not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinytext not null(f1 tinytext not null) returns tinytext not null return f1' at line 1 CREATE FUNCTION text not null(f1 text not null) returns text not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null(f1 text not null) returns text not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null(f1 text not null) returns text not null return f1' at line 1 CREATE FUNCTION mediumtext not null(f1 mediumtext not null) returns mediumtext not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumtext not null(f1 mediumtext not null) returns mediumtext not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumtext not null(f1 mediumtext not null) returns mediumtext not null return f' at line 1 CREATE FUNCTION longtext not null(f1 longtext not null) returns longtext not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longtext not null(f1 longtext not null) returns longtext not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longtext not null(f1 longtext not null) returns longtext not null return f1' at line 1 CREATE FUNCTION tinyblob(f1 tinyblob) returns tinyblob return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyblob(f1 tinyblob) returns tinyblob +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyblob(f1 tinyblob) returns tinyblob return f1' at line 1 CREATE FUNCTION blob(f1 blob) returns blob return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'blob(f1 blob) returns blob +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'blob(f1 blob) returns blob return f1' at line 1 CREATE FUNCTION mediumblob(f1 mediumblob) returns mediumblob return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumblob(f1 mediumblob) returns mediumblob +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumblob(f1 mediumblob) returns mediumblob return f1' at line 1 CREATE FUNCTION longblob(f1 longblob) returns longblob return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longblob(f1 longblob) returns longblob +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longblob(f1 longblob) returns longblob return f1' at line 1 CREATE FUNCTION tinyblob not null(f1 tinyblob not null) returns tinyblob not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyblob not null(f1 tinyblob not null) returns tinyblob not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyblob not null(f1 tinyblob not null) returns tinyblob not null return f1' at line 1 CREATE FUNCTION blob not null(f1 blob not null) returns blob not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'blob not null(f1 blob not null) returns blob not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'blob not null(f1 blob not null) returns blob not null return f1' at line 1 CREATE FUNCTION mediumblob not null(f1 mediumblob not null) returns mediumblob not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumblob not null(f1 mediumblob not null) returns mediumblob not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumblob not null(f1 mediumblob not null) returns mediumblob not null return f' at line 1 CREATE FUNCTION longblob not null(f1 longblob not null) returns longblob not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longblob not null(f1 longblob not null) returns longblob not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longblob not null(f1 longblob not null) returns longblob not null return f1' at line 1 CREATE FUNCTION binary(f1 binary) returns binary return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binary(f1 binary) returns binary +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binary(f1 binary) returns binary return f1' at line 1 CREATE FUNCTION binary not null(f1 binary not null) returns binary not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binary not null(f1 binary not null) returns binary not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binary not null(f1 binary not null) returns binary not null return f1' at line 1 CREATE FUNCTION tinyint(f1 tinyint) returns tinyint return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint(f1 tinyint) returns tinyint +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint(f1 tinyint) returns tinyint return f1' at line 1 CREATE FUNCTION tinyint unsigned(f1 tinyint unsigned) returns tinyint unsigned return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint unsigned(f1 tinyint unsigned) returns tinyint unsigned +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint unsigned(f1 tinyint unsigned) returns tinyint unsigned return f1' at line 1 CREATE FUNCTION tinyint zerofill(f1 tinyint zerofill) returns tinyint zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint zerofill(f1 tinyint zerofill) returns tinyint zerofill +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint zerofill(f1 tinyint zerofill) returns tinyint zerofill return f1' at line 1 CREATE FUNCTION tinyint unsigned zerofill(f1 tinyint unsigned zerofill) returns tinyint unsigned zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint unsigned zerofill(f1 tinyint unsigned zerofill) returns tinyint unsigned' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint unsigned zerofill(f1 tinyint unsigned zerofill) returns tinyint unsigned' at line 1 CREATE FUNCTION smallint(f1 smallint) returns smallint return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint(f1 smallint) returns smallint +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint(f1 smallint) returns smallint return f1' at line 1 CREATE FUNCTION smallint unsigned(f1 smallint unsigned) returns smallint unsigned return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint unsigned(f1 smallint unsigned) returns smallint unsigned +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint unsigned(f1 smallint unsigned) returns smallint unsigned return f1' at line 1 CREATE FUNCTION smallint zerofill(f1 smallint zerofill) returns smallint zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint zerofill(f1 smallint zerofill) returns smallint zerofill +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint zerofill(f1 smallint zerofill) returns smallint zerofill return f1' at line 1 CREATE FUNCTION smallint unsigned zerofill(f1 smallint unsigned zerofill) returns smallint unsigned zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint unsigned zerofill(f1 smallint unsigned zerofill) returns smallint unsig' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint unsigned zerofill(f1 smallint unsigned zerofill) returns smallint unsig' at line 1 CREATE FUNCTION mediumint(f1 mediumint) returns mediumint return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint(f1 mediumint) returns mediumint +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint(f1 mediumint) returns mediumint return f1' at line 1 CREATE FUNCTION mediumint unsigned(f1 mediumint unsigned) returns mediumint unsigned return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint unsigned(f1 mediumint unsigned) returns mediumint unsigned +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint unsigned(f1 mediumint unsigned) returns mediumint unsigned return f1' at line 1 CREATE FUNCTION mediumint zerofill(f1 mediumint zerofill) returns mediumint zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint zerofill(f1 mediumint zerofill) returns mediumint zerofill +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint zerofill(f1 mediumint zerofill) returns mediumint zerofill return f1' at line 1 CREATE FUNCTION mediumint unsigned zerofill(f1 mediumint unsigned zerofill) returns mediumint unsigned zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint unsigned zerofill(f1 mediumint unsigned zerofill) returns mediumint un' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint unsigned zerofill(f1 mediumint unsigned zerofill) returns mediumint un' at line 1 CREATE FUNCTION int(f1 int) returns int return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int(f1 int) returns int +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int(f1 int) returns int return f1' at line 1 CREATE FUNCTION int1(f1 int1) returns int1 return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int1(f1 int1) returns int1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int1(f1 int1) returns int1 return f1' at line 1 CREATE FUNCTION int2(f1 int2) returns int2 return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int2(f1 int2) returns int2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int2(f1 int2) returns int2 return f1' at line 1 CREATE FUNCTION int3(f1 int3) returns int3 return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int3(f1 int3) returns int3 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int3(f1 int3) returns int3 return f1' at line 1 CREATE FUNCTION int4(f1 int4) returns int4 return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int4(f1 int4) returns int4 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int4(f1 int4) returns int4 return f1' at line 1 CREATE FUNCTION int8(f1 int8) returns int8 return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int8(f1 int8) returns int8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int8(f1 int8) returns int8 return f1' at line 1 CREATE FUNCTION int unsigned(f1 int unsigned) returns int unsigned return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int unsigned(f1 int unsigned) returns int unsigned +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int unsigned(f1 int unsigned) returns int unsigned return f1' at line 1 CREATE FUNCTION int zerofill(f1 int zerofill) returns int zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int zerofill(f1 int zerofill) returns int zerofill +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int zerofill(f1 int zerofill) returns int zerofill return f1' at line 1 CREATE FUNCTION int unsigned zerofill(f1 int unsigned zerofill) returns int unsigned zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int unsigned zerofill(f1 int unsigned zerofill) returns int unsigned zerofill +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int unsigned zerofill(f1 int unsigned zerofill) returns int unsigned zerofill re' at line 1 CREATE FUNCTION bigint(f1 bigint) returns bigint return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint(f1 bigint) returns bigint +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint(f1 bigint) returns bigint return f1' at line 1 CREATE FUNCTION bigint unsigned(f1 bigint unsigned) returns bigint unsigned return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint unsigned(f1 bigint unsigned) returns bigint unsigned +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint unsigned(f1 bigint unsigned) returns bigint unsigned return f1' at line 1 CREATE FUNCTION bigint zerofill(f1 bigint zerofill) returns bigint zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint zerofill(f1 bigint zerofill) returns bigint zerofill +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint zerofill(f1 bigint zerofill) returns bigint zerofill return f1' at line 1 CREATE FUNCTION bigint unsigned zerofill(f1 bigint unsigned zerofill) returns bigint unsigned zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint unsigned zerofill(f1 bigint unsigned zerofill) returns bigint unsigned ze' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint unsigned zerofill(f1 bigint unsigned zerofill) returns bigint unsigned ze' at line 1 CREATE FUNCTION decimal(f1 decimal) returns decimal return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal(f1 decimal) returns decimal +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal(f1 decimal) returns decimal return f1' at line 1 CREATE FUNCTION decimal unsigned(f1 decimal unsigned) returns decimal unsigned return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal unsigned(f1 decimal unsigned) returns decimal unsigned +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal unsigned(f1 decimal unsigned) returns decimal unsigned return f1' at line 1 CREATE FUNCTION decimal zerofill(f1 decimal zerofill) returns decimal zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal zerofill(f1 decimal zerofill) returns decimal zerofill +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal zerofill(f1 decimal zerofill) returns decimal zerofill return f1' at line 1 CREATE FUNCTION decimal unsigned zerofill(f1 decimal unsigned zerofill) returns decimal unsigned zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal unsigned zerofill(f1 decimal unsigned zerofill) returns decimal unsigned' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal unsigned zerofill(f1 decimal unsigned zerofill) returns decimal unsigned' at line 1 CREATE FUNCTION numeric(f1 numeric) returns numeric return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric(f1 numeric) returns numeric +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric(f1 numeric) returns numeric return f1' at line 1 CREATE FUNCTION numeric unsigned(f1 numeric unsigned) returns numeric unsigned return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric unsigned(f1 numeric unsigned) returns numeric unsigned +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric unsigned(f1 numeric unsigned) returns numeric unsigned return f1' at line 1 CREATE FUNCTION numeric zerofill(f1 numeric zerofill) returns numeric zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric zerofill(f1 numeric zerofill) returns numeric zerofill +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric zerofill(f1 numeric zerofill) returns numeric zerofill return f1' at line 1 CREATE FUNCTION numeric unsigned zerofill(f1 numeric unsigned zerofill) returns numeric unsigned zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric unsigned zerofill(f1 numeric unsigned zerofill) returns numeric unsigned' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric unsigned zerofill(f1 numeric unsigned zerofill) returns numeric unsigned' at line 1 CREATE FUNCTION real(f1 real) returns real return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real(f1 real) returns real +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real(f1 real) returns real return f1' at line 1 CREATE FUNCTION real unsigned(f1 real unsigned) returns real unsigned return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real unsigned(f1 real unsigned) returns real unsigned +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real unsigned(f1 real unsigned) returns real unsigned return f1' at line 1 CREATE FUNCTION real zerofill(f1 real zerofill) returns real zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real zerofill(f1 real zerofill) returns real zerofill +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real zerofill(f1 real zerofill) returns real zerofill return f1' at line 1 CREATE FUNCTION real unsigned zerofill(f1 real unsigned zerofill) returns real unsigned zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real unsigned zerofill(f1 real unsigned zerofill) returns real unsigned zerofill' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real unsigned zerofill(f1 real unsigned zerofill) returns real unsigned zerofill' at line 1 CREATE FUNCTION float(f1 float) returns float return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(f1 float) returns float +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(f1 float) returns float return f1' at line 1 CREATE FUNCTION float unsigned(f1 float unsigned) returns float unsigned return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float unsigned(f1 float unsigned) returns float unsigned +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float unsigned(f1 float unsigned) returns float unsigned return f1' at line 1 CREATE FUNCTION float zerofill(f1 float zerofill) returns float zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float zerofill(f1 float zerofill) returns float zerofill +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float zerofill(f1 float zerofill) returns float zerofill return f1' at line 1 CREATE FUNCTION float unsigned zerofill(f1 float unsigned zerofill) returns float unsigned zerofill return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float unsigned zerofill(f1 float unsigned zerofill) returns float unsigned zerof' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float unsigned zerofill(f1 float unsigned zerofill) returns float unsigned zerof' at line 1 CREATE FUNCTION date(f1 date) returns date return f1; DROP FUNCTION date; @@ -3098,19 +3098,19 @@ return f1; DROP FUNCTION year; CREATE FUNCTION year(3)(f1 year(3)) returns year(3) return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '3)(f1 year(3)) returns year(3) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '3)(f1 year(3)) returns year(3) return f1' at line 1 CREATE FUNCTION year(4)(f1 year(4)) returns year(4) return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '4)(f1 year(4)) returns year(4) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '4)(f1 year(4)) returns year(4) return f1' at line 1 CREATE FUNCTION enum("1enum", "2enum")(f1 enum("1enum", "2enum")) returns enum("1enum", "2enum") return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"1enum", "2enum")(f1 enum("1enum", "2enum")) returns enum("1enum", "2enum") +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"1enum", "2enum")(f1 enum("1enum", "2enum")) returns enum("1enum", "2enum") retu' at line 1 CREATE FUNCTION set("1set", "2set")(f1 set("1set", "2set")) returns set("1set", "2set") return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set("1set", "2set")(f1 set("1set", "2set")) returns set("1set", "2set") +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set("1set", "2set")(f1 set("1set", "2set")) returns set("1set", "2set") return f' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: @@ -3120,7 +3120,7 @@ return f1; DROP FUNCTION IF EXISTS fn1; CREATE FUNCTION fn1(f1 char binary ) returns char binary return f1; -ERROR 42000: This version of MySQL doesn't yet support 'return value collation' +ERROR 42000: This version of MariaDB doesn't yet support 'return value collation' DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist @@ -3129,21 +3129,21 @@ return f1; DROP FUNCTION IF EXISTS fn1; CREATE FUNCTION fn1(f1 char not null ) returns char not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns char not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns char not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 char binary not null ) returns char binary not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns char binary not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns char binary not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 char ascii not null ) returns char ascii not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns char ascii not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns char ascii not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: @@ -3162,28 +3162,28 @@ return f1; DROP FUNCTION IF EXISTS fn1; CREATE FUNCTION fn1(f1 tinytext not null ) returns tinytext not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns tinytext not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns tinytext not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 text not null ) returns text not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns text not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns text not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 mediumtext not null ) returns mediumtext not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns mediumtext not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns mediumtext not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 longtext not null ) returns longtext not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns longtext not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns longtext not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: @@ -3202,28 +3202,28 @@ return f1; DROP FUNCTION IF EXISTS fn1; CREATE FUNCTION fn1(f1 tinyblob not null ) returns tinyblob not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns tinyblob not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns tinyblob not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 blob not null ) returns blob not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns blob not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns blob not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 mediumblob not null ) returns mediumblob not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns mediumblob not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns mediumblob not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 longblob not null ) returns longblob not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns longblob not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns longblob not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: @@ -3233,7 +3233,7 @@ return f1; DROP FUNCTION IF EXISTS fn1; CREATE FUNCTION fn1(f1 binary not null ) returns binary not null return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns binary not null +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null ) returns binary not null return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: @@ -3378,28 +3378,28 @@ return f1; DROP FUNCTION IF EXISTS fn1; CREATE FUNCTION fn1(f1 year(f1 3) ) returns year(3) return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'f1 3) ) returns year(3) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'f1 3) ) returns year(3) return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 year(f1 4) ) returns year(4) return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'f1 4) ) returns year(4) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'f1 4) ) returns year(4) return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 enum(f1 "1enum", "2enum") ) returns enum("1enum", "2enum") return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'f1 "1enum", "2enum") ) returns enum("1enum", "2enum") +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'f1 "1enum", "2enum") ) returns enum("1enum", "2enum") return f1' at line 1 DROP FUNCTION IF EXISTS fn1; Warnings: Note 1305 FUNCTION db_storedproc.fn1 does not exist CREATE FUNCTION fn1(f1 set(f1 "1set", "2set") ) returns set("1set", "2set") return f1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'f1 "1set", "2set") ) returns set("1set", "2set") +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'f1 "1set", "2set") ) returns set("1set", "2set") return f1' at line 1 Testcase 4.1.16: @@ -3796,7 +3796,7 @@ BEGIN SELECT * from t1 where f2 = f1; return 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '!_fn1( f1 char(20) ) returns int +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '!_fn1( f1 char(20) ) returns int BEGIN SELECT * from t1 where f2 = f1; return 1;' at line 1 @@ -3805,7 +3805,7 @@ BEGIN SELECT * from t1 where f2 = f1; return 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'return int +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'return int BEGIN SELECT * from t1 where f2 = f1; return 1; @@ -3814,16 +3814,16 @@ CREATE FUNCTION fn1() returns int return 'a'; CREATE FUNCTION procedure() returns int return 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'procedure() returns int +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'procedure() returns int return 1' at line 1 CREATE FUNCTION fn1(a char) returns int lang sql return 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql return 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql return 1' at line 1 CREATE FUNCTION fn1(a char) returns int deterministic( return 1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'return 1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'return 1)' at line 1 CREATE FUNCTION fn1(a char) returns int non deterministic return 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'deterministic return 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'deterministic return 1' at line 1 CREATE FUNCTION fn1(a char) returns int not deterministic comment 'abc' language sql sql security refiner return 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'refiner return 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'refiner return 1' at line 1 DROP FUNCTION IF EXISTS fn1; Testcase 4.1.1: @@ -3873,7 +3873,7 @@ SELECT count(*) into cnt from t2; set @count = cnt; SELECT @count; BEGIN// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'END SELECT count(*) into cnt from t2; set @count = cnt; SELECT @count; @@ -3891,7 +3891,7 @@ END; set @count = cnt; SELECT @count; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 10 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 10 Testcase 4.2.4: --------------- @@ -3915,7 +3915,7 @@ CREATE PROCEDURE sp1() accessible:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'accessible:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'accessible:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -3923,7 +3923,7 @@ CREATE PROCEDURE sp1() add:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'add:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'add:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -3931,7 +3931,7 @@ CREATE PROCEDURE sp1() all:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'all:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'all:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -3939,7 +3939,7 @@ CREATE PROCEDURE sp1() alter:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -3947,7 +3947,7 @@ CREATE PROCEDURE sp1() analyze:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -3955,7 +3955,7 @@ CREATE PROCEDURE sp1() and:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'and:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'and:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -3963,7 +3963,7 @@ CREATE PROCEDURE sp1() as:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -3971,7 +3971,7 @@ CREATE PROCEDURE sp1() asc:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'asc:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asc:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -3979,7 +3979,7 @@ CREATE PROCEDURE sp1() asensitive:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'asensitive:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asensitive:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -3987,7 +3987,7 @@ CREATE PROCEDURE sp1() before:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'before:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'before:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -3995,7 +3995,7 @@ CREATE PROCEDURE sp1() between:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'between:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'between:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4003,7 +4003,7 @@ CREATE PROCEDURE sp1() bigint:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4011,7 +4011,7 @@ CREATE PROCEDURE sp1() binary:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binary:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binary:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4019,7 +4019,7 @@ CREATE PROCEDURE sp1() blob:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'blob:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'blob:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4027,7 +4027,7 @@ CREATE PROCEDURE sp1() both:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'both:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'both:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4035,7 +4035,7 @@ CREATE PROCEDURE sp1() by:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'by:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4043,7 +4043,7 @@ CREATE PROCEDURE sp1() call:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4051,7 +4051,7 @@ CREATE PROCEDURE sp1() cascade:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cascade:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cascade:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4059,7 +4059,7 @@ CREATE PROCEDURE sp1() case:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4067,7 +4067,7 @@ CREATE PROCEDURE sp1() change:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4075,7 +4075,7 @@ CREATE PROCEDURE sp1() char:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4083,7 +4083,7 @@ CREATE PROCEDURE sp1() character:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'character:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4091,7 +4091,7 @@ CREATE PROCEDURE sp1() check:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4099,7 +4099,7 @@ CREATE PROCEDURE sp1() collate:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'collate:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'collate:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4107,7 +4107,7 @@ CREATE PROCEDURE sp1() column:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'column:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'column:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4115,7 +4115,7 @@ CREATE PROCEDURE sp1() condition:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4123,7 +4123,7 @@ CREATE PROCEDURE sp1() constraint:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'constraint:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'constraint:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4131,7 +4131,7 @@ CREATE PROCEDURE sp1() continue:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'continue:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'continue:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4139,7 +4139,7 @@ CREATE PROCEDURE sp1() convert:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'convert:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'convert:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4147,7 +4147,7 @@ CREATE PROCEDURE sp1() create:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4155,7 +4155,7 @@ CREATE PROCEDURE sp1() cross:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cross:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cross:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4163,7 +4163,7 @@ CREATE PROCEDURE sp1() current_date:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_date:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_date:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4171,7 +4171,7 @@ CREATE PROCEDURE sp1() current_time:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_time:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_time:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4179,7 +4179,7 @@ CREATE PROCEDURE sp1() current_timestamp:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_timestamp:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_timestamp:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4187,7 +4187,7 @@ CREATE PROCEDURE sp1() current_user:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_user:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_user:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4195,7 +4195,7 @@ CREATE PROCEDURE sp1() cursor:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cursor:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cursor:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4203,7 +4203,7 @@ CREATE PROCEDURE sp1() database:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'database:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'database:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4211,7 +4211,7 @@ CREATE PROCEDURE sp1() databases:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'databases:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'databases:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4219,7 +4219,7 @@ CREATE PROCEDURE sp1() day_hour:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_hour:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_hour:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4227,7 +4227,7 @@ CREATE PROCEDURE sp1() day_microsecond:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_microsecond:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_microsecond:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4235,7 +4235,7 @@ CREATE PROCEDURE sp1() day_minute:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_minute:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_minute:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4243,7 +4243,7 @@ CREATE PROCEDURE sp1() day_second:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_second:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_second:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4251,7 +4251,7 @@ CREATE PROCEDURE sp1() dec:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'dec:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dec:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4259,7 +4259,7 @@ CREATE PROCEDURE sp1() decimal:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4267,7 +4267,7 @@ CREATE PROCEDURE sp1() declare:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'declare:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'declare:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4275,7 +4275,7 @@ CREATE PROCEDURE sp1() default:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4283,7 +4283,7 @@ CREATE PROCEDURE sp1() delayed:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4291,7 +4291,7 @@ CREATE PROCEDURE sp1() delete:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4299,7 +4299,7 @@ CREATE PROCEDURE sp1() desc:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4307,7 +4307,7 @@ CREATE PROCEDURE sp1() describe:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4315,7 +4315,7 @@ CREATE PROCEDURE sp1() deterministic:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4323,7 +4323,7 @@ CREATE PROCEDURE sp1() distinct:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinct:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'distinct:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4331,7 +4331,7 @@ CREATE PROCEDURE sp1() distinctrow:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinctrow:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'distinctrow:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4339,7 +4339,7 @@ CREATE PROCEDURE sp1() div:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'div:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'div:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4347,7 +4347,7 @@ CREATE PROCEDURE sp1() double:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'double:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'double:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4355,7 +4355,7 @@ CREATE PROCEDURE sp1() drop:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4363,7 +4363,7 @@ CREATE PROCEDURE sp1() dual:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'dual:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dual:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4371,7 +4371,7 @@ CREATE PROCEDURE sp1() each:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'each:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'each:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4379,7 +4379,7 @@ CREATE PROCEDURE sp1() else:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'else:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'else:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4387,7 +4387,7 @@ CREATE PROCEDURE sp1() elseif:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'elseif:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'elseif:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4395,7 +4395,7 @@ CREATE PROCEDURE sp1() enclosed:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'enclosed:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'enclosed:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4403,7 +4403,7 @@ CREATE PROCEDURE sp1() escaped:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'escaped:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'escaped:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4411,7 +4411,7 @@ CREATE PROCEDURE sp1() exists:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'exists:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'exists:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4419,7 +4419,7 @@ CREATE PROCEDURE sp1() exit:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'exit:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'exit:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4427,7 +4427,7 @@ CREATE PROCEDURE sp1() explain:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4435,7 +4435,7 @@ CREATE PROCEDURE sp1() false:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'false:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'false:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4443,7 +4443,7 @@ CREATE PROCEDURE sp1() fetch:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4451,7 +4451,7 @@ CREATE PROCEDURE sp1() float:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4459,7 +4459,7 @@ CREATE PROCEDURE sp1() float4:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float4:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float4:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4467,7 +4467,7 @@ CREATE PROCEDURE sp1() float8:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float8:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float8:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4475,7 +4475,7 @@ CREATE PROCEDURE sp1() for:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4483,7 +4483,7 @@ CREATE PROCEDURE sp1() force:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'force:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'force:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4491,7 +4491,7 @@ CREATE PROCEDURE sp1() foreign:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'foreign:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'foreign:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4499,7 +4499,7 @@ CREATE PROCEDURE sp1() from:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4507,7 +4507,7 @@ CREATE PROCEDURE sp1() fulltext:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'fulltext:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fulltext:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4515,7 +4515,7 @@ CREATE PROCEDURE sp1() grant:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4523,7 +4523,7 @@ CREATE PROCEDURE sp1() group:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'group:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4531,7 +4531,7 @@ CREATE PROCEDURE sp1() having:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'having:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'having:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4539,7 +4539,7 @@ CREATE PROCEDURE sp1() high_priority:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'high_priority:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'high_priority:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4547,7 +4547,7 @@ CREATE PROCEDURE sp1() hour_microsecond:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_microsecond:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_microsecond:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4555,7 +4555,7 @@ CREATE PROCEDURE sp1() hour_minute:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_minute:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_minute:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4563,7 +4563,7 @@ CREATE PROCEDURE sp1() hour_second:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_second:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_second:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4571,7 +4571,7 @@ CREATE PROCEDURE sp1() if:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4579,7 +4579,7 @@ CREATE PROCEDURE sp1() ignore:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ignore:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ignore:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4587,7 +4587,7 @@ CREATE PROCEDURE sp1() in:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'in:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'in:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4595,7 +4595,7 @@ CREATE PROCEDURE sp1() index:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'index:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'index:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4603,7 +4603,7 @@ CREATE PROCEDURE sp1() infile:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'infile:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'infile:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4611,7 +4611,7 @@ CREATE PROCEDURE sp1() inner:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'inner:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'inner:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4619,7 +4619,7 @@ CREATE PROCEDURE sp1() inout:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'inout:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'inout:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4627,7 +4627,7 @@ CREATE PROCEDURE sp1() insensitive:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insensitive:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insensitive:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4635,7 +4635,7 @@ CREATE PROCEDURE sp1() insert:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4643,7 +4643,7 @@ CREATE PROCEDURE sp1() int:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4651,7 +4651,7 @@ CREATE PROCEDURE sp1() int1:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int1:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int1:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4659,7 +4659,7 @@ CREATE PROCEDURE sp1() int2:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int2:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int2:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4667,7 +4667,7 @@ CREATE PROCEDURE sp1() int3:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int3:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int3:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4675,7 +4675,7 @@ CREATE PROCEDURE sp1() int4:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int4:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int4:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4683,7 +4683,7 @@ CREATE PROCEDURE sp1() int8:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int8:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int8:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4691,7 +4691,7 @@ CREATE PROCEDURE sp1() integer:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'integer:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'integer:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4699,7 +4699,7 @@ CREATE PROCEDURE sp1() interval:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'interval:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'interval:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4707,7 +4707,7 @@ CREATE PROCEDURE sp1() into:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'into:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'into:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4715,7 +4715,7 @@ CREATE PROCEDURE sp1() is:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'is:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'is:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4723,7 +4723,7 @@ CREATE PROCEDURE sp1() iterate:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4731,7 +4731,7 @@ CREATE PROCEDURE sp1() join:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'join:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'join:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4739,7 +4739,7 @@ CREATE PROCEDURE sp1() key:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4747,7 +4747,7 @@ CREATE PROCEDURE sp1() keys:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'keys:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'keys:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4755,7 +4755,7 @@ CREATE PROCEDURE sp1() kill:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4763,7 +4763,7 @@ CREATE PROCEDURE sp1() leading:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'leading:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'leading:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4771,7 +4771,7 @@ CREATE PROCEDURE sp1() leave:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4779,7 +4779,7 @@ CREATE PROCEDURE sp1() left:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'left:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'left:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4787,7 +4787,7 @@ CREATE PROCEDURE sp1() like:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'like:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'like:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4795,7 +4795,7 @@ CREATE PROCEDURE sp1() limit:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'limit:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'limit:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4803,7 +4803,7 @@ CREATE PROCEDURE sp1() linear:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'linear:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'linear:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4811,7 +4811,7 @@ CREATE PROCEDURE sp1() lines:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'lines:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'lines:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4819,7 +4819,7 @@ CREATE PROCEDURE sp1() load:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4827,7 +4827,7 @@ CREATE PROCEDURE sp1() localtime:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'localtime:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'localtime:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4835,7 +4835,7 @@ CREATE PROCEDURE sp1() localtimestamp:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'localtimestamp:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'localtimestamp:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4843,7 +4843,7 @@ CREATE PROCEDURE sp1() lock:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4851,7 +4851,7 @@ CREATE PROCEDURE sp1() long:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'long:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'long:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4859,7 +4859,7 @@ CREATE PROCEDURE sp1() longblob:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longblob:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longblob:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4867,7 +4867,7 @@ CREATE PROCEDURE sp1() longtext:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longtext:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longtext:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4875,7 +4875,7 @@ CREATE PROCEDURE sp1() loop:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4883,7 +4883,7 @@ CREATE PROCEDURE sp1() low_priority:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'low_priority:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'low_priority:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4891,7 +4891,7 @@ CREATE PROCEDURE sp1() master_ssl_verify_server_cert:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'master_ssl_verify_server_cert:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'master_ssl_verify_server_cert:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4899,7 +4899,7 @@ CREATE PROCEDURE sp1() match:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4907,7 +4907,7 @@ CREATE PROCEDURE sp1() mediumblob:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumblob:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumblob:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4915,7 +4915,7 @@ CREATE PROCEDURE sp1() mediumint:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4923,7 +4923,7 @@ CREATE PROCEDURE sp1() mediumtext:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumtext:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumtext:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4931,7 +4931,7 @@ CREATE PROCEDURE sp1() middleint:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'middleint:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'middleint:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4939,7 +4939,7 @@ CREATE PROCEDURE sp1() minute_microsecond:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'minute_microsecond:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'minute_microsecond:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4947,7 +4947,7 @@ CREATE PROCEDURE sp1() minute_second:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'minute_second:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'minute_second:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4955,7 +4955,7 @@ CREATE PROCEDURE sp1() mod:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mod:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mod:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4963,7 +4963,7 @@ CREATE PROCEDURE sp1() modifies:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4971,7 +4971,7 @@ CREATE PROCEDURE sp1() natural:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'natural:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'natural:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4979,7 +4979,7 @@ CREATE PROCEDURE sp1() not:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4987,7 +4987,7 @@ CREATE PROCEDURE sp1() no_write_to_binlog:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'no_write_to_binlog:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'no_write_to_binlog:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -4995,7 +4995,7 @@ CREATE PROCEDURE sp1() null:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5003,7 +5003,7 @@ CREATE PROCEDURE sp1() numeric:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5011,7 +5011,7 @@ CREATE PROCEDURE sp1() on:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5019,7 +5019,7 @@ CREATE PROCEDURE sp1() optimize:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5027,7 +5027,7 @@ CREATE PROCEDURE sp1() option:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'option:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'option:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5035,7 +5035,7 @@ CREATE PROCEDURE sp1() optionally:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'optionally:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'optionally:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5043,7 +5043,7 @@ CREATE PROCEDURE sp1() or:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'or:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'or:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5051,7 +5051,7 @@ CREATE PROCEDURE sp1() order:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'order:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'order:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5059,7 +5059,7 @@ CREATE PROCEDURE sp1() out:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'out:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'out:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5067,7 +5067,7 @@ CREATE PROCEDURE sp1() outer:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'outer:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'outer:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5075,7 +5075,7 @@ CREATE PROCEDURE sp1() outfile:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'outfile:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'outfile:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5083,7 +5083,7 @@ CREATE PROCEDURE sp1() precision:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'precision:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'precision:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5091,7 +5091,7 @@ CREATE PROCEDURE sp1() primary:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'primary:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5099,7 +5099,7 @@ CREATE PROCEDURE sp1() procedure:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'procedure:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'procedure:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5107,7 +5107,7 @@ CREATE PROCEDURE sp1() purge:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5115,7 +5115,7 @@ CREATE PROCEDURE sp1() range:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'range:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'range:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5123,7 +5123,7 @@ CREATE PROCEDURE sp1() read:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5131,7 +5131,7 @@ CREATE PROCEDURE sp1() reads:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5140,7 +5140,7 @@ CREATE PROCEDURE sp1() read_write:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read_write:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read_write:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5148,7 +5148,7 @@ CREATE PROCEDURE sp1() real:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5156,7 +5156,7 @@ CREATE PROCEDURE sp1() references:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'references:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'references:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5164,7 +5164,7 @@ CREATE PROCEDURE sp1() regexp:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'regexp:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'regexp:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5172,7 +5172,7 @@ CREATE PROCEDURE sp1() release:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5180,7 +5180,7 @@ CREATE PROCEDURE sp1() rename:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5188,7 +5188,7 @@ CREATE PROCEDURE sp1() repeat:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5196,7 +5196,7 @@ CREATE PROCEDURE sp1() replace:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5204,7 +5204,7 @@ CREATE PROCEDURE sp1() require:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'require:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'require:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5212,7 +5212,7 @@ CREATE PROCEDURE sp1() restrict:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'restrict:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'restrict:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5220,7 +5220,7 @@ CREATE PROCEDURE sp1() return:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5228,7 +5228,7 @@ CREATE PROCEDURE sp1() revoke:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5236,7 +5236,7 @@ CREATE PROCEDURE sp1() right:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'right:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'right:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5244,7 +5244,7 @@ CREATE PROCEDURE sp1() rlike:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'rlike:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'rlike:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5252,7 +5252,7 @@ CREATE PROCEDURE sp1() schema:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'schema:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'schema:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5260,7 +5260,7 @@ CREATE PROCEDURE sp1() schemas:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'schemas:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'schemas:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5268,7 +5268,7 @@ CREATE PROCEDURE sp1() second_microsecond:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'second_microsecond:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'second_microsecond:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5276,7 +5276,7 @@ CREATE PROCEDURE sp1() select:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5284,7 +5284,7 @@ CREATE PROCEDURE sp1() sensitive:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sensitive:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sensitive:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5292,7 +5292,7 @@ CREATE PROCEDURE sp1() separator:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'separator:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'separator:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5300,7 +5300,7 @@ CREATE PROCEDURE sp1() set:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5308,7 +5308,7 @@ CREATE PROCEDURE sp1() show:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5316,7 +5316,7 @@ CREATE PROCEDURE sp1() smallint:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5324,7 +5324,7 @@ CREATE PROCEDURE sp1() spatial:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'spatial:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'spatial:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5332,7 +5332,7 @@ CREATE PROCEDURE sp1() specific:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'specific:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'specific:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5340,7 +5340,7 @@ CREATE PROCEDURE sp1() sql:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5348,7 +5348,7 @@ CREATE PROCEDURE sp1() sqlexception:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlexception:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlexception:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5356,7 +5356,7 @@ CREATE PROCEDURE sp1() sqlstate:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlstate:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlstate:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5364,7 +5364,7 @@ CREATE PROCEDURE sp1() sqlwarning:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlwarning:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlwarning:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5372,7 +5372,7 @@ CREATE PROCEDURE sp1() sql_big_result:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_big_result:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_big_result:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5380,7 +5380,7 @@ CREATE PROCEDURE sp1() sql_calc_found_rows:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_calc_found_rows:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_calc_found_rows:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5388,7 +5388,7 @@ CREATE PROCEDURE sp1() sql_small_result:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_small_result:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_small_result:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5396,7 +5396,7 @@ CREATE PROCEDURE sp1() ssl:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ssl:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ssl:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5404,7 +5404,7 @@ CREATE PROCEDURE sp1() starting:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starting:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'starting:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5412,7 +5412,7 @@ CREATE PROCEDURE sp1() straight_join:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'straight_join:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'straight_join:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5420,7 +5420,7 @@ CREATE PROCEDURE sp1() table:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'table:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'table:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5428,7 +5428,7 @@ CREATE PROCEDURE sp1() terminated:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'terminated:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'terminated:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5436,7 +5436,7 @@ CREATE PROCEDURE sp1() then:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'then:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'then:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5444,7 +5444,7 @@ CREATE PROCEDURE sp1() tinyblob:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyblob:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyblob:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5452,7 +5452,7 @@ CREATE PROCEDURE sp1() tinyint:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5460,7 +5460,7 @@ CREATE PROCEDURE sp1() tinytext:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinytext:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinytext:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5468,7 +5468,7 @@ CREATE PROCEDURE sp1() to:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'to:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'to:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5476,7 +5476,7 @@ CREATE PROCEDURE sp1() trailing:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trailing:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trailing:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5484,7 +5484,7 @@ CREATE PROCEDURE sp1() trigger:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trigger:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trigger:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5492,7 +5492,7 @@ CREATE PROCEDURE sp1() true:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'true:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'true:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5500,7 +5500,7 @@ CREATE PROCEDURE sp1() undo:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'undo:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5508,7 +5508,7 @@ CREATE PROCEDURE sp1() union:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'union:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'union:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5516,7 +5516,7 @@ CREATE PROCEDURE sp1() unique:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unique:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unique:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5530,7 +5530,7 @@ CREATE PROCEDURE sp1() unsigned:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unsigned:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unsigned:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5538,7 +5538,7 @@ CREATE PROCEDURE sp1() update:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5546,7 +5546,7 @@ CREATE PROCEDURE sp1() usage:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'usage:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'usage:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5554,7 +5554,7 @@ CREATE PROCEDURE sp1() use:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5562,7 +5562,7 @@ CREATE PROCEDURE sp1() using:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'using:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'using:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5570,7 +5570,7 @@ CREATE PROCEDURE sp1() utc_date:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_date:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_date:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5578,7 +5578,7 @@ CREATE PROCEDURE sp1() utc_time:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_time:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_time:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5586,7 +5586,7 @@ CREATE PROCEDURE sp1() utc_timestamp:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_timestamp:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_timestamp:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5594,7 +5594,7 @@ CREATE PROCEDURE sp1() values:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'values:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'values:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5602,7 +5602,7 @@ CREATE PROCEDURE sp1() varbinary:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varbinary:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varbinary:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5610,7 +5610,7 @@ CREATE PROCEDURE sp1() varchar:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varchar:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varchar:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5618,7 +5618,7 @@ CREATE PROCEDURE sp1() varcharacter:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varcharacter:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varcharacter:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5626,7 +5626,7 @@ CREATE PROCEDURE sp1() varying:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varying:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varying:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5634,7 +5634,7 @@ CREATE PROCEDURE sp1() when:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'when:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'when:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5642,7 +5642,7 @@ CREATE PROCEDURE sp1() where:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5650,7 +5650,7 @@ CREATE PROCEDURE sp1() while:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5658,7 +5658,7 @@ CREATE PROCEDURE sp1() with:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5666,7 +5666,7 @@ CREATE PROCEDURE sp1() write:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'write:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'write:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5674,7 +5674,7 @@ CREATE PROCEDURE sp1() xor:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xor:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xor:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5682,7 +5682,7 @@ CREATE PROCEDURE sp1() year_month:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'year_month:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'year_month:BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -5690,7 +5690,7 @@ CREATE PROCEDURE sp1() zerofill:BEGIN SELECT @x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'zerofill:BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'zerofill:BEGIN SELECT @x; END' at line 2 @@ -5772,7 +5772,7 @@ declare x char; declare y char; SELECT f1, f2 into x, y from t2 limit 1; END begin_label// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'begin_label' at line 6 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'begin_label' at line 6 Testcase 4.2.10: ---------------- @@ -5785,7 +5785,7 @@ declare x char; declare y char; SELECT f1, f2 into x, y from t2 limit 1; END begin_label// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BEGIN +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'BEGIN declare x char; declare y char; SELECT f1, f2 into x, y from t2 limit 1; @@ -5862,7 +5862,7 @@ BEGIN declare x default '0' char; SELECT x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default '0' char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default '0' char; SELECT x; END' at line 3 DROP PROCEDURE IF EXISTS sp6; @@ -5871,7 +5871,7 @@ BEGIN declare x char, integer default '0'; SELECT x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ' integer default '0'; SELECT x; END' at line 3 DROP PROCEDURE IF EXISTS sp6; @@ -5880,7 +5880,7 @@ BEGIN declare x1, x2 char, integer default '0', 1; SELECT x; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0', 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ' integer default '0', 1; SELECT x; END' at line 3 DROP PROCEDURE IF EXISTS sp6; @@ -5890,7 +5890,7 @@ declare char x; declare char y; SELECT f1, f2 into x, y from t2 limit 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char x; declare char y; SELECT f1, f2 into x, y from t2 limit 1; END' at line 3 @@ -5901,7 +5901,7 @@ declare char x, y1 integer default 0; declare char y; SELECT f1, f2 into x, y from t2 limit 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char x, y1 integer default 0; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char x, y1 integer default 0; declare char y; SELECT f1, f2 into x, y from t2 li' at line 3 DROP PROCEDURE IF EXISTS sp6; @@ -5909,77 +5909,77 @@ CREATE PROCEDURE sp6( ) BEGIN declare x default 'a' char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default 'a' char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default 'a' char; END' at line 3 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6( ) BEGIN declare condition notable for sqlstate '42s22'; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition notable for sqlstate '42s22'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition notable for sqlstate '42s22'; END' at line 3 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6( ) BEGIN declare condition for notable sqlstate '42s22'; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition for notable sqlstate '42s22'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition for notable sqlstate '42s22'; END' at line 3 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6( ) BEGIN declare condition for sqlstate notable '42s22'; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition for sqlstate notable '42s22'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition for sqlstate notable '42s22'; END' at line 3 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6( ) BEGIN declare condition for sqlstate '42s22' notable; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition for sqlstate '42s22' notable; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition for sqlstate '42s22' notable; END' at line 3 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6( ) BEGIN declare cursor cur1 for SELECT f1 from db_storedproc.t2; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cursor cur1 for SELECT f1 from db_storedproc.t2; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cursor cur1 for SELECT f1 from db_storedproc.t2; END' at line 3 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6( ) BEGIN declare cursor for cur1 SELECT f1 from db_storedproc.t2; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cursor for cur1 SELECT f1 from db_storedproc.t2; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cursor for cur1 SELECT f1 from db_storedproc.t2; END' at line 3 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6( ) BEGIN declare cursor for SELECT cur1 f1 from db_storedproc.t2; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cursor for SELECT cur1 f1 from db_storedproc.t2; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cursor for SELECT cur1 f1 from db_storedproc.t2; END' at line 3 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6( ) BEGIN declare handler continue for sqlstate '02000' set @x2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'continue for sqlstate '02000' set @x2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'continue for sqlstate '02000' set @x2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6( ) BEGIN declare handler exit for sqlstate '02000' set @x2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'exit for sqlstate '02000' set @x2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'exit for sqlstate '02000' set @x2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6( ) BEGIN declare handler undo for sqlstate '02000' set @x2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'undo for sqlstate '02000' set @x2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo for sqlstate '02000' set @x2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -5987,7 +5987,7 @@ BEGIN declare char x; SELECT f1 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char x; SELECT f1 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -5996,7 +5996,7 @@ BEGIN declare char binary x; SELECT f2 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char binary x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char binary x; SELECT f2 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6005,7 +6005,7 @@ BEGIN declare char ascii x; SELECT f3 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char ascii x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char ascii x; SELECT f3 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6014,7 +6014,7 @@ BEGIN declare tinytext x; SELECT f4 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinytext x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinytext x; SELECT f4 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6023,7 +6023,7 @@ BEGIN declare x; SELECT f5 text into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '; SELECT f5 text into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6032,7 +6032,7 @@ BEGIN declare mediumtext x; SELECT f6 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumtext x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumtext x; SELECT f6 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6041,7 +6041,7 @@ BEGIN declare longtext x; SELECT f7 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longtext x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longtext x; SELECT f7 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6050,7 +6050,7 @@ BEGIN declare tinyblob x; SELECT f8 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyblob x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyblob x; SELECT f8 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6059,7 +6059,7 @@ BEGIN declare blob x; SELECT f9 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'blob x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'blob x; SELECT f9 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6068,7 +6068,7 @@ BEGIN declare mediumblob x; SELECT f10 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumblob x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumblob x; SELECT f10 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6077,7 +6077,7 @@ BEGIN declare longblob x; SELECT f11 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longblob x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longblob x; SELECT f11 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6086,7 +6086,7 @@ BEGIN declare binary x; SELECT f12 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binary x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binary x; SELECT f12 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6095,7 +6095,7 @@ BEGIN declare tinyint x; SELECT f13 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint x; SELECT f13 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6104,7 +6104,7 @@ BEGIN declare tinyint unsigned x; SELECT f14 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint unsigned x; SELECT f14 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6113,7 +6113,7 @@ BEGIN declare tinyint zerofill x; SELECT f15 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint zerofill x; SELECT f15 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6122,7 +6122,7 @@ BEGIN declare tinyint unsigned zerofill x; SELECT f16 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint unsigned zerofill x; SELECT f16 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6131,7 +6131,7 @@ BEGIN declare smallint x; SELECT f17 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint x; SELECT f17 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6140,7 +6140,7 @@ BEGIN declare smallint unsigned x; SELECT f18 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint unsigned x; SELECT f18 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6149,7 +6149,7 @@ BEGIN declare smallint zerofill x; SELECT f19 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint zerofill x; SELECT f19 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6158,7 +6158,7 @@ BEGIN declare smallint unsigned zerofill x; SELECT f20 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint unsigned zerofill x; SELECT f20 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6167,7 +6167,7 @@ BEGIN declare mediumint x; SELECT f21 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint x; SELECT f21 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6176,7 +6176,7 @@ BEGIN declare mediumint unsigned x; SELECT f22 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint unsigned x; SELECT f22 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6185,7 +6185,7 @@ BEGIN declare mediumint zerofill x; SELECT f23 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint zerofill x; SELECT f23 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6194,7 +6194,7 @@ BEGIN declare mediumint unsigned zerofill x; SELECT f24 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint unsigned zerofill x; SELECT f24 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6203,7 +6203,7 @@ BEGIN declare int x; SELECT f25 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int x; SELECT f25 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6212,7 +6212,7 @@ BEGIN declare int unsigned x; SELECT f26 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int unsigned x; SELECT f26 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6221,7 +6221,7 @@ BEGIN declare int zerofill x; SELECT f27 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int zerofill x; SELECT f27 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6230,7 +6230,7 @@ BEGIN declare int unsigned zerofill x; SELECT f28 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int unsigned zerofill x; SELECT f28 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6239,7 +6239,7 @@ BEGIN declare bigint x; SELECT f29 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint x; SELECT f29 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6248,7 +6248,7 @@ BEGIN declare bigint unsigned x; elect f30 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint unsigned x; elect f30 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6257,7 +6257,7 @@ BEGIN declare bigint zerofill x; SELECT f31 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint zerofill x; SELECT f31 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6266,7 +6266,7 @@ BEGIN declare bigint unsigned zerofill x; SELECT f32 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint unsigned zerofill x; SELECT f32 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6275,7 +6275,7 @@ BEGIN declare decimal x; SELECT f33 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal x; SELECT f33 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6284,7 +6284,7 @@ BEGIN declare decimal unsigned x; SELECT f34 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal unsigned x; SELECT f34 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6293,7 +6293,7 @@ BEGIN declare decimal zerofill x; SELECT f35 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal zerofill x; SELECT f35 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6302,7 +6302,7 @@ BEGIN declare decimal unsigned zerofill not null x; SELECT f36 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal unsigned zerofill not null x; SELECT f36 into x from tb1 limit 9998, 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6310,7 +6310,7 @@ BEGIN declare decimal (0) not null x; SELECT f37 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (0) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (0) not null x; SELECT f37 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6319,7 +6319,7 @@ BEGIN declare decimal (64) not null x; SELECT f38 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (64) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (64) not null x; SELECT f38 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6328,7 +6328,7 @@ BEGIN declare decimal (0) unsigned not null x; SELECT f39 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (0) unsigned not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (0) unsigned not null x; SELECT f39 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6337,7 +6337,7 @@ BEGIN declare decimal (64) unsigned not null x; SELECT f40 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (64) unsigned not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (64) unsigned not null x; SELECT f40 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6346,7 +6346,7 @@ BEGIN declare decimal (0) zerofill not null x; SELECT f41 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (0) zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (0) zerofill not null x; SELECT f41 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6355,7 +6355,7 @@ BEGIN declare decimal (64) zerofill not null x; SELECT f42 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (64) zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (64) zerofill not null x; SELECT f42 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6364,7 +6364,7 @@ BEGIN declare decimal (0) unsigned zerofill not null x; SELECT f43 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (0) unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (0) unsigned zerofill not null x; SELECT f43 into x from tb1 limit 9998' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6372,7 +6372,7 @@ BEGIN declare decimal (64) unsigned zerofill not null x; SELECT f44 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (64) unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (64) unsigned zerofill not null x; SELECT f44 into x from tb1 limit 999' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6380,7 +6380,7 @@ BEGIN declare decimal (00) not null x; SELECT f45 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (00) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (00) not null x; SELECT f45 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6389,7 +6389,7 @@ BEGIN declare decimal (63, 30) not null x; SELECT f46 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (63, 30) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (63, 30) not null x; SELECT f46 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6398,7 +6398,7 @@ BEGIN declare decimal (00) unsigned not null x; SELECT f47 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (00) unsigned not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (00) unsigned not null x; SELECT f47 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6407,7 +6407,7 @@ BEGIN declare decimal (63, 30) unsigned not null x; SELECT f48 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (63, 30) unsigned not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (63, 30) unsigned not null x; SELECT f48 into x from tb1 limit 9998, 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6415,7 +6415,7 @@ BEGIN declare decimal (00) zerofill not null x; SELECT f49 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (00) zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (00) zerofill not null x; SELECT f49 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6424,7 +6424,7 @@ BEGIN declare decimal (63, 30) zerofill not null x; SELECT f50 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (63, 30) zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (63, 30) zerofill not null x; SELECT f50 into x from tb1 limit 9998, 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6432,7 +6432,7 @@ BEGIN declare decimal (00) unsigned zerofill not null x; SELECT f51 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (00) unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (00) unsigned zerofill not null x; SELECT f51 into x from tb1 limit 999' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6440,7 +6440,7 @@ BEGIN declare decimal (63, 30) unsigned zerofill not null x; SELECT f52 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal (63, 30) unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal (63, 30) unsigned zerofill not null x; SELECT f52 into x from tb1 limit' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6448,7 +6448,7 @@ BEGIN declare numeric not null x; SELECT f53 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric not null x; SELECT f53 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6457,7 +6457,7 @@ BEGIN declare numeric unsigned not null x; SELECT f54 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric unsigned not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric unsigned not null x; SELECT f54 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6466,7 +6466,7 @@ BEGIN declare numeric zerofill not null x; SELECT f55 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric zerofill not null x; SELECT f55 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6475,7 +6475,7 @@ BEGIN declare numeric unsigned zerofill not null x; SELECT f56 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric unsigned zerofill not null x; SELECT f56 into x from tb1 limit 9998, 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6483,7 +6483,7 @@ BEGIN declare numeric (0) not null x; SELECT f57 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (0) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (0) not null x; SELECT f57 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6492,7 +6492,7 @@ BEGIN declare numeric (64) not nul x; SELECT f58 into x from tb1 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (64) not nul x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (64) not nul x; SELECT f58 into x from tb1 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6501,7 +6501,7 @@ BEGIN declare numeric (0) unsigned x; SELECT f59 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (0) unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (0) unsigned x; SELECT f59 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6510,7 +6510,7 @@ BEGIN declare numeric (64) unsigned x; SELECT f60 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (64) unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (64) unsigned x; SELECT f60 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6519,7 +6519,7 @@ BEGIN declare numeric (0) zerofill x; SELECT f61 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (0) zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (0) zerofill x; SELECT f61 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6528,7 +6528,7 @@ BEGIN declare numeric (64) zerofill x; SELECT f62 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (64) zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (64) zerofill x; SELECT f62 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6537,7 +6537,7 @@ BEGIN declare numeric (0) unsigned zerofill x; SELECT f63 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (0) unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (0) unsigned zerofill x; SELECT f63 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6546,7 +6546,7 @@ BEGIN declare numeric (64) unsigned zerofill x; SELECT f64 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (64) unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (64) unsigned zerofill x; SELECT f64 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6555,7 +6555,7 @@ BEGIN declare numeric (00) x; SELECT f65 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (00) x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (00) x; SELECT f65 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6564,7 +6564,7 @@ BEGIN declare numeric (63, 30) x; SELECT f66 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (63, 30) x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (63, 30) x; SELECT f66 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6573,7 +6573,7 @@ BEGIN declare numeric (00) unsigned x; SELECT f67 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (00) unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (00) unsigned x; SELECT f67 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6582,7 +6582,7 @@ BEGIN declare numeric (63, 30) unsigned x; SELECT f68 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (63, 30) unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (63, 30) unsigned x; SELECT f68 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6591,7 +6591,7 @@ BEGIN declare numeric (00) zerofill x; SELECT f69 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (00) zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (00) zerofill x; SELECT f69 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6600,7 +6600,7 @@ BEGIN declare numeric (63, 30) zerofill x; SELECT f70 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (63, 30) zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (63, 30) zerofill x; SELECT f70 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6609,7 +6609,7 @@ BEGIN declare numeric (00) unsigned zerofill x; SELECT f71 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (00) unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (00) unsigned zerofill x; SELECT f71 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6618,7 +6618,7 @@ BEGIN declare numeric (63, 30) unsigned zerofill x; SELECT f72 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric (63, 30) unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric (63, 30) unsigned zerofill x; SELECT f72 into x from tb2 limit 9998, 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6626,7 +6626,7 @@ BEGIN declare real x; SELECT f73 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real x; SELECT f73 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6635,7 +6635,7 @@ BEGIN declare real unsigned x; SELECT f74 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real unsigned x; SELECT f74 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6644,7 +6644,7 @@ BEGIN declare real zerofill x; SELECT f75 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real zerofill x; SELECT f75 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6653,7 +6653,7 @@ BEGIN declare real unsigned zerofill x; SELECT f76 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real unsigned zerofill x; SELECT f76 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6662,7 +6662,7 @@ BEGIN declare double x; SELECT f77 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'double x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'double x; SELECT f77 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6671,7 +6671,7 @@ BEGIN declare double unsigned x; SELECT f78 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'double unsigned x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'double unsigned x; SELECT f78 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6680,7 +6680,7 @@ BEGIN declare double zerofill x; SELECT f79 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'double zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'double zerofill x; SELECT f79 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6689,7 +6689,7 @@ BEGIN declare double unsigned zerofill x; SELECT f80 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'double unsigned zerofill x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'double unsigned zerofill x; SELECT f80 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6698,7 +6698,7 @@ BEGIN declare float not null x; SELECT f81 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float not null x; SELECT f81 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6707,7 +6707,7 @@ BEGIN declare float unsigned not null x; SELECT f82 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float unsigned not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float unsigned not null x; SELECT f82 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6716,7 +6716,7 @@ BEGIN declare float zerofill not null x; SELECT f83 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float zerofill not null x; SELECT f83 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6725,7 +6725,7 @@ BEGIN declare float unsigned zerofill not null x; SELECT f84 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float unsigned zerofill not null x; SELECT f84 into x from tb2 limit 9998, 1; E' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6734,7 +6734,7 @@ BEGIN declare float(0) not null x; SELECT f85 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(0) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(0) not null x; SELECT f85 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6743,7 +6743,7 @@ BEGIN declare float(23) not null x; SELECT f86 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(23) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(23) not null x; SELECT f86 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6752,7 +6752,7 @@ BEGIN declare float(0) unsigned not null x; SELECT f87 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(0) unsigned not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(0) unsigned not null x; SELECT f87 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6761,7 +6761,7 @@ BEGIN declare float(23) unsigned not null x; SELECT f88 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(23) unsigned not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(23) unsigned not null x; SELECT f88 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6770,7 +6770,7 @@ BEGIN declare float(0) zerofill not null x; SELECT f89 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(0) zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(0) zerofill not null x; SELECT f89 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6779,7 +6779,7 @@ BEGIN declare float(23) zerofill not null x; SELECT f90 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(23) zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(23) zerofill not null x; SELECT f90 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6788,7 +6788,7 @@ BEGIN declare float(0) unsigned zerofill not null x; SELECT f91 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(0) unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(0) unsigned zerofill not null x; SELECT f91 into x from tb2 limit 9998, 1' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6796,7 +6796,7 @@ BEGIN declare float(23) unsigned zerofill not null x; SELECT f92 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(23) unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(23) unsigned zerofill not null x; SELECT f92 into x from tb2 limit 9998, ' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6804,7 +6804,7 @@ BEGIN declare float(24) not null x; SELECT f93 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(24) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(24) not null x; SELECT f93 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6813,7 +6813,7 @@ BEGIN declare float(53) not null x; SELECT f94 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(53) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(53) not null x; SELECT f94 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6822,7 +6822,7 @@ BEGIN declare float(24) unsigned not null x; SELECT f95 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(24) unsigned not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(24) unsigned not null x; SELECT f95 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6831,7 +6831,7 @@ BEGIN declare float(53) unsigned not null x; SELECT f96 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(53) unsigned not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(53) unsigned not null x; SELECT f96 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6840,7 +6840,7 @@ BEGIN declare float(24) zerofill not null x; SELECT f97 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(24) zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(24) zerofill not null x; SELECT f97 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6849,7 +6849,7 @@ BEGIN declare float(53) zerofill not null x; SELECT f98 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(53) zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(53) zerofill not null x; SELECT f98 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6858,7 +6858,7 @@ BEGIN declare float(24) unsigned zerofill not null x; SELECT f99 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(24) unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(24) unsigned zerofill not null x; SELECT f99 into x from tb2 limit 9998, ' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6866,7 +6866,7 @@ BEGIN declare float(53) unsigned zerofill not null x; SELECT f100 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float(53) unsigned zerofill not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float(53) unsigned zerofill not null x; SELECT f100 into x from tb2 limit 9998,' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1( ) @@ -6874,7 +6874,7 @@ BEGIN declare date not null x; SELECT f101 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null x; SELECT f101 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6883,7 +6883,7 @@ BEGIN declare time not null x; SELECT f102 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null x; SELECT f102 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6892,7 +6892,7 @@ BEGIN declare datetime not null x; SELECT f103 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null x; SELECT f103 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6901,7 +6901,7 @@ BEGIN declare timestamp not null x; SELECT f104 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null x; SELECT f104 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6910,7 +6910,7 @@ BEGIN declare year not null x; SELECT f105 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null x; SELECT f105 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6919,7 +6919,7 @@ BEGIN declare year(3) not null x; SELECT f106 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(3) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(3) not null x; SELECT f106 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6928,7 +6928,7 @@ BEGIN declare year(4) not null x; SELECT f107 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(4) not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(4) not null x; SELECT f107 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6937,7 +6937,7 @@ BEGIN declare enum("1enum", "2enum") not null x; SELECT f108 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '("1enum", "2enum") not null x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '("1enum", "2enum") not null x; SELECT f108 into x from tb2 limit 9998, 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -6946,7 +6946,7 @@ BEGIN declare set("1set", "2set") not nul x; SELECT f109 into x from tb2 limit 9998, 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set("1set", "2set") not nul x; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set("1set", "2set") not nul x; SELECT f109 into x from tb2 limit 9998, 1; END' at line 3 @@ -7563,7 +7563,7 @@ BEGIN declare @x char; SELECT f2 into x from t2 limit 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@x char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@x char; SELECT f2 into x from t2 limit 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -7571,1071 +7571,1071 @@ CREATE PROCEDURE sp1() BEGIN declare accessible char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'accessible char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'accessible char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare add char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'add char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'add char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare all char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'all char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'all char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare alter char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'alter char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'alter char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare analyze char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'analyze char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'analyze char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare and char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'and char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'and char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare as char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare asc char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'asc char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asc char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare asensitive char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'asensitive char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asensitive char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare before char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'before char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'before char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare between char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'between char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'between char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare bigint char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare binary char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binary char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binary char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare blob char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'blob char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'blob char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare both char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'both char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'both char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare by char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'by char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare call char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'call char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'call char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare cascade char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cascade char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cascade char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare case char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'case char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'case char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare change char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'change char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'change char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare char char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare character char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'character char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare check char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'check char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'check char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare collate char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'collate char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'collate char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare column char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'column char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'column char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare condition char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare constraint char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'constraint char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'constraint char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare continue char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare convert char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'convert char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'convert char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare create char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'create char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'create char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare cross char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cross char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cross char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare current_date char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_date char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_date char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare current_time char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_time char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_time char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare current_timestamp char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_timestamp char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_timestamp char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare current_user char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_user char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_user char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare cursor char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cursor char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cursor char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare database char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'database char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'database char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare databases char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'databases char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'databases char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare day_hour char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_hour char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_hour char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare day_microsecond char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_microsecond char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_microsecond char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare day_minute char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_minute char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_minute char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare day_second char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_second char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_second char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare dec char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'dec char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dec char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare decimal char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare declare char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'declare char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'declare char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare default char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare delayed char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare delete char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delete char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delete char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare desc char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'desc char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'desc char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare describe char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'describe char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'describe char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare deterministic char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'deterministic char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'deterministic char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare distinct char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinct char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'distinct char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare distinctrow char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinctrow char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'distinctrow char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare div char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'div char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'div char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare double char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'double char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'double char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare drop char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'drop char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'drop char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare dual char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'dual char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dual char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare each char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'each char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'each char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare else char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'else char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'else char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare elseif char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'elseif char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'elseif char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare enclosed char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'enclosed char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'enclosed char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare escaped char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'escaped char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'escaped char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare exists char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'exists char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'exists char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare exit char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare explain char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'explain char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'explain char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare false char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'false char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'false char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare fetch char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'fetch char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fetch char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare float char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare float4 char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float4 char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float4 char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare float8 char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float8 char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float8 char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare for char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare force char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'force char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'force char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare foreign char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'foreign char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'foreign char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare from char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare fulltext char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'fulltext char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fulltext char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare grant char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'grant char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'grant char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare group char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'group char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare having char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'having char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'having char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare high_priority char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'high_priority char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'high_priority char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare hour_microsecond char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_microsecond char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_microsecond char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare hour_minute char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_minute char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_minute char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare hour_second char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_second char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_second char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare if char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'if char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'if char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare ignore char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ignore char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ignore char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare in char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'in char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'in char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare index char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'index char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'index char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare infile char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'infile char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'infile char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare inner char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'inner char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'inner char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare inout char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'inout char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'inout char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare insensitive char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insensitive char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insensitive char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare insert char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insert char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insert char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare int char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare int1 char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int1 char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int1 char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare int2 char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int2 char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int2 char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare int3 char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int3 char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int3 char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare int4 char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int4 char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int4 char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare int8 char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int8 char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int8 char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare integer char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'integer char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'integer char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare interval char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'interval char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'interval char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare into char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'into char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'into char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare is char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'is char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'is char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare iterate char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'iterate char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'iterate char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare join char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'join char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'join char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare key char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare keys char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'keys char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'keys char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare kill char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'kill char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'kill char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare leading char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'leading char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'leading char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare leave char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'leave char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'leave char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare left char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'left char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'left char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare like char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'like char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'like char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare limit char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'limit char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'limit char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare linear char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'linear char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'linear char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare lines char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'lines char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'lines char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare load char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'load char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'load char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare localtime char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'localtime char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'localtime char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare localtimestamp char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'localtimestamp char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'localtimestamp char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare lock char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'lock char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'lock char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare long char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'long char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'long char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare longblob char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longblob char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longblob char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare longtext char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longtext char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longtext char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare loop char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'loop char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'loop char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare low_priority char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'low_priority char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'low_priority char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare master_ssl_verify_server_cert char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'master_ssl_verify_server_cert char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'master_ssl_verify_server_cert char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare match char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare mediumblob char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumblob char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumblob char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare mediumint char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare mediumtext char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumtext char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumtext char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare middleint char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'middleint char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'middleint char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare minute_microsecond char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'minute_microsecond char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'minute_microsecond char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare minute_second char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'minute_second char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'minute_second char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare mod char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mod char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mod char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare modifies char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'modifies char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'modifies char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare natural char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'natural char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'natural char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare not char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare no_write_to_binlog char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'no_write_to_binlog char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'no_write_to_binlog char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare null char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare numeric char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare on char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare optimize char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'optimize char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'optimize char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare option char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'option char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'option char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare optionally char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'optionally char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'optionally char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare or char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'or char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'or char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare order char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'order char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'order char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare out char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'out char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'out char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare outer char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'outer char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'outer char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare outfile char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'outfile char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'outfile char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare precision char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'precision char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'precision char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare primary char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'primary char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare procedure char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'procedure char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'procedure char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare purge char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'purge char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'purge char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare range char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'range char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'range char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare read char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare reads char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'reads char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'reads char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() @@ -8647,56 +8647,56 @@ CREATE PROCEDURE sp1() BEGIN declare read_write char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read_write char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read_write char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare real char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare references char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'references char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'references char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare regexp char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'regexp char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'regexp char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare release char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'release char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'release char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare rename char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'rename char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'rename char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare repeat char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'repeat char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'repeat char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; CREATE PROCEDURE sp1() BEGIN declare replace char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'replace char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'replace char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8705,7 +8705,7 @@ CREATE PROCEDURE sp1() BEGIN declare require char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'require char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'require char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8714,7 +8714,7 @@ CREATE PROCEDURE sp1() BEGIN declare restrict char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'restrict char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'restrict char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8723,7 +8723,7 @@ CREATE PROCEDURE sp1() BEGIN declare return char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'return char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'return char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8732,7 +8732,7 @@ CREATE PROCEDURE sp1() BEGIN declare revoke char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'revoke char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'revoke char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8741,7 +8741,7 @@ CREATE PROCEDURE sp1() BEGIN declare right char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'right char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'right char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8750,7 +8750,7 @@ CREATE PROCEDURE sp1() BEGIN declare rlike char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'rlike char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'rlike char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8759,7 +8759,7 @@ CREATE PROCEDURE sp1() BEGIN declare schema char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'schema char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'schema char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8768,7 +8768,7 @@ CREATE PROCEDURE sp1() BEGIN declare schemas char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'schemas char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'schemas char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8777,7 +8777,7 @@ CREATE PROCEDURE sp1() BEGIN declare second_microsecond char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'second_microsecond char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'second_microsecond char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8786,7 +8786,7 @@ CREATE PROCEDURE sp1() BEGIN declare SELECT char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8795,7 +8795,7 @@ CREATE PROCEDURE sp1() BEGIN declare sensitive char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sensitive char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sensitive char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8804,7 +8804,7 @@ CREATE PROCEDURE sp1() BEGIN declare separator char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'separator char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'separator char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8813,7 +8813,7 @@ CREATE PROCEDURE sp1() BEGIN declare set char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8822,7 +8822,7 @@ CREATE PROCEDURE sp1() BEGIN declare show char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'show char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'show char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8831,7 +8831,7 @@ CREATE PROCEDURE sp1() BEGIN declare smallint char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8840,7 +8840,7 @@ CREATE PROCEDURE sp1() BEGIN declare spatial char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'spatial char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'spatial char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8849,7 +8849,7 @@ CREATE PROCEDURE sp1() BEGIN declare specific char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'specific char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'specific char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8858,7 +8858,7 @@ CREATE PROCEDURE sp1() BEGIN declare sql char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8867,7 +8867,7 @@ CREATE PROCEDURE sp1() BEGIN declare sqlexception char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlexception char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlexception char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8876,7 +8876,7 @@ CREATE PROCEDURE sp1() BEGIN declare sqlstate char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlstate char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlstate char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8885,7 +8885,7 @@ CREATE PROCEDURE sp1() BEGIN declare sqlwarning char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlwarning char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlwarning char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8894,7 +8894,7 @@ CREATE PROCEDURE sp1() BEGIN declare sql_big_result char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_big_result char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_big_result char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8903,7 +8903,7 @@ CREATE PROCEDURE sp1() BEGIN declare sql_calc_found_rows char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_calc_found_rows char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_calc_found_rows char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8912,7 +8912,7 @@ CREATE PROCEDURE sp1() BEGIN declare sql_small_result char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_small_result char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_small_result char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8921,7 +8921,7 @@ CREATE PROCEDURE sp1() BEGIN declare ssl char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ssl char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ssl char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8930,7 +8930,7 @@ CREATE PROCEDURE sp1() BEGIN declare starting char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starting char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'starting char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8939,7 +8939,7 @@ CREATE PROCEDURE sp1() BEGIN declare straight_join char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'straight_join char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'straight_join char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8948,7 +8948,7 @@ CREATE PROCEDURE sp1() BEGIN declare table char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'table char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'table char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8957,7 +8957,7 @@ CREATE PROCEDURE sp1() BEGIN declare terminated char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'terminated char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'terminated char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8966,7 +8966,7 @@ CREATE PROCEDURE sp1() BEGIN declare then char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'then char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'then char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8975,7 +8975,7 @@ CREATE PROCEDURE sp1() BEGIN declare tinyblob char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyblob char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyblob char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8984,7 +8984,7 @@ CREATE PROCEDURE sp1() BEGIN declare tinyint char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -8993,7 +8993,7 @@ CREATE PROCEDURE sp1() BEGIN declare tinytext char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinytext char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinytext char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9002,7 +9002,7 @@ CREATE PROCEDURE sp1() BEGIN declare to char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'to char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'to char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9011,7 +9011,7 @@ CREATE PROCEDURE sp1() BEGIN declare trailing char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trailing char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trailing char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9020,7 +9020,7 @@ CREATE PROCEDURE sp1() BEGIN declare trigger char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trigger char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trigger char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9029,7 +9029,7 @@ CREATE PROCEDURE sp1() BEGIN declare true char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'true char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'true char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9038,7 +9038,7 @@ CREATE PROCEDURE sp1() BEGIN declare undo char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'undo char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9047,7 +9047,7 @@ CREATE PROCEDURE sp1() BEGIN declare union char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'union char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'union char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9056,7 +9056,7 @@ CREATE PROCEDURE sp1() BEGIN declare unique char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unique char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unique char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9065,7 +9065,7 @@ CREATE PROCEDURE sp1() BEGIN declare unlock char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unlock char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unlock char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9074,7 +9074,7 @@ CREATE PROCEDURE sp1() BEGIN declare unsigned char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unsigned char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unsigned char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9083,7 +9083,7 @@ CREATE PROCEDURE sp1() BEGIN declare update char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'update char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'update char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9092,7 +9092,7 @@ CREATE PROCEDURE sp1() BEGIN declare usage char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'usage char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'usage char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9101,7 +9101,7 @@ CREATE PROCEDURE sp1() BEGIN declare use char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'use char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'use char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9110,7 +9110,7 @@ CREATE PROCEDURE sp1() BEGIN declare using char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'using char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'using char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9119,7 +9119,7 @@ CREATE PROCEDURE sp1() BEGIN declare utc_date char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_date char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_date char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9128,7 +9128,7 @@ CREATE PROCEDURE sp1() BEGIN declare utc_time char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_time char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_time char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9137,7 +9137,7 @@ CREATE PROCEDURE sp1() BEGIN declare utc_timestamp char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_timestamp char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_timestamp char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9146,7 +9146,7 @@ CREATE PROCEDURE sp1() BEGIN declare values char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'values char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'values char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9155,7 +9155,7 @@ CREATE PROCEDURE sp1() BEGIN declare varbinary char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varbinary char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varbinary char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9164,7 +9164,7 @@ CREATE PROCEDURE sp1() BEGIN declare varchar char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varchar char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varchar char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9173,7 +9173,7 @@ CREATE PROCEDURE sp1() BEGIN declare varcharacter char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varcharacter char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varcharacter char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9182,7 +9182,7 @@ CREATE PROCEDURE sp1() BEGIN declare varying char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varying char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varying char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9191,7 +9191,7 @@ CREATE PROCEDURE sp1() BEGIN declare when char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'when char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'when char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9200,7 +9200,7 @@ CREATE PROCEDURE sp1() BEGIN declare where char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9209,7 +9209,7 @@ CREATE PROCEDURE sp1() BEGIN declare while char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'while char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'while char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9218,7 +9218,7 @@ CREATE PROCEDURE sp1() BEGIN declare with char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9227,7 +9227,7 @@ CREATE PROCEDURE sp1() BEGIN declare write char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'write char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'write char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9236,7 +9236,7 @@ CREATE PROCEDURE sp1() BEGIN declare xor char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xor char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xor char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9245,7 +9245,7 @@ CREATE PROCEDURE sp1() BEGIN declare year_month char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'year_month char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'year_month char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9254,7 +9254,7 @@ CREATE PROCEDURE sp1() BEGIN declare zerofill char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'zerofill char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'zerofill char; END' at line 3 Testcase : @@ -9336,7 +9336,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare @x char; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@x char; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@x char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9345,7 +9345,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare x char1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9355,7 +9355,7 @@ BEGIN declare accessible condition for sqlstate '02000'; declare exit handler for add set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'accessible condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'accessible condition for sqlstate '02000'; declare exit handler for add set @var' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9365,7 +9365,7 @@ BEGIN declare add condition for sqlstate '02000'; declare exit handler for add set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'add condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'add condition for sqlstate '02000'; declare exit handler for add set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -9376,7 +9376,7 @@ BEGIN declare all condition for sqlstate '02000'; declare exit handler for all set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'all condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'all condition for sqlstate '02000'; declare exit handler for all set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -9387,7 +9387,7 @@ BEGIN declare alter condition for sqlstate '02000'; declare exit handler for alter set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'alter condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'alter condition for sqlstate '02000'; declare exit handler for alter set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9397,7 +9397,7 @@ BEGIN declare analyze condition for sqlstate '02000'; declare exit handler for analyze set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'analyze condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'analyze condition for sqlstate '02000'; declare exit handler for analyze set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9407,7 +9407,7 @@ BEGIN declare and condition for sqlstate '02000'; declare exit handler for and set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'and condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'and condition for sqlstate '02000'; declare exit handler for and set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -9418,7 +9418,7 @@ BEGIN declare as condition for sqlstate '02000'; declare exit handler for as set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as condition for sqlstate '02000'; declare exit handler for as set @var2 = 1; EN' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -9429,7 +9429,7 @@ BEGIN declare asc condition for sqlstate '02000'; declare exit handler for asc set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'asc condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asc condition for sqlstate '02000'; declare exit handler for asc set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -9440,7 +9440,7 @@ BEGIN declare asensitive condition for sqlstate '02000'; declare exit handler for asensitive set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'asensitive condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asensitive condition for sqlstate '02000'; declare exit handler for asensitive s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9450,7 +9450,7 @@ BEGIN declare before condition for sqlstate '02000'; declare exit handler for before set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'before condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'before condition for sqlstate '02000'; declare exit handler for before set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9460,7 +9460,7 @@ BEGIN declare between condition for sqlstate '02000'; declare exit handler for between set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'between condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'between condition for sqlstate '02000'; declare exit handler for between set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9470,7 +9470,7 @@ BEGIN declare bigint condition for sqlstate '02000'; declare exit handler for bigint set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint condition for sqlstate '02000'; declare exit handler for bigint set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9480,7 +9480,7 @@ BEGIN declare binary condition for sqlstate '02000'; declare exit handler for binary set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binary condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binary condition for sqlstate '02000'; declare exit handler for binary set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9490,7 +9490,7 @@ BEGIN declare blob condition for sqlstate '02000'; declare exit handler for blob set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'blob condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'blob condition for sqlstate '02000'; declare exit handler for blob set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9500,7 +9500,7 @@ BEGIN declare both condition for sqlstate '02000'; declare exit handler for both set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'both condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'both condition for sqlstate '02000'; declare exit handler for both set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9510,7 +9510,7 @@ BEGIN declare by condition for sqlstate '02000'; declare exit handler for by set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'by condition for sqlstate '02000'; declare exit handler for by set @var2 = 1; EN' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -9521,7 +9521,7 @@ BEGIN declare call condition for sqlstate '02000'; declare exit handler for CALL set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'call condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'call condition for sqlstate '02000'; declare exit handler for CALL set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9531,7 +9531,7 @@ BEGIN declare cascade condition for sqlstate '02000'; declare exit handler for cascade set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cascade condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cascade condition for sqlstate '02000'; declare exit handler for cascade set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9541,7 +9541,7 @@ BEGIN declare case condition for sqlstate '02000'; declare exit handler for case set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'case condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'case condition for sqlstate '02000'; declare exit handler for case set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9551,7 +9551,7 @@ BEGIN declare change condition for sqlstate '02000'; declare exit handler for change set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'change condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'change condition for sqlstate '02000'; declare exit handler for change set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9561,7 +9561,7 @@ BEGIN declare char condition for sqlstate '02000'; declare exit handler for char set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char condition for sqlstate '02000'; declare exit handler for char set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9571,7 +9571,7 @@ BEGIN declare character condition for sqlstate '02000'; declare exit handler for character set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'character condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character condition for sqlstate '02000'; declare exit handler for character set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9581,7 +9581,7 @@ BEGIN declare check condition for sqlstate '02000'; declare exit handler for check set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'check condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'check condition for sqlstate '02000'; declare exit handler for check set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9591,7 +9591,7 @@ BEGIN declare collate condition for sqlstate '02000'; declare exit handler for collate set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'collate condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'collate condition for sqlstate '02000'; declare exit handler for collate set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9601,7 +9601,7 @@ BEGIN declare column condition for sqlstate '02000'; declare exit handler for column set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'column condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'column condition for sqlstate '02000'; declare exit handler for column set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9611,7 +9611,7 @@ BEGIN declare condition condition for sqlstate '02000'; declare exit handler for condition set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition condition for sqlstate '02000'; declare exit handler for condition set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9627,7 +9627,7 @@ BEGIN declare constraint condition for sqlstate '02000'; declare exit handler for constraint set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'constraint condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'constraint condition for sqlstate '02000'; declare exit handler for constraint s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9637,7 +9637,7 @@ BEGIN declare continue condition for sqlstate '02000'; declare exit handler for continue set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition for sqlstate '02000'; declare exit handler for continue set @var2 = 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9647,7 +9647,7 @@ BEGIN declare convert condition for sqlstate '02000'; declare exit handler for convert set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'convert condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'convert condition for sqlstate '02000'; declare exit handler for convert set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9657,7 +9657,7 @@ BEGIN declare create condition for sqlstate '02000'; declare exit handler for create set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'create condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'create condition for sqlstate '02000'; declare exit handler for create set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9667,7 +9667,7 @@ BEGIN declare cross condition for sqlstate '02000'; declare exit handler for cross set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cross condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cross condition for sqlstate '02000'; declare exit handler for cross set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9677,7 +9677,7 @@ BEGIN declare current_date condition for sqlstate '02000'; declare exit handler for current_date set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_date condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_date condition for sqlstate '02000'; declare exit handler for current_da' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9687,7 +9687,7 @@ BEGIN declare current_time condition for sqlstate '02000'; declare exit handler for current_time set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_time condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_time condition for sqlstate '02000'; declare exit handler for current_ti' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9697,7 +9697,7 @@ BEGIN declare current_timestamp condition for sqlstate '02000'; declare exit handler for current_timestamp set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_timestamp condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_timestamp condition for sqlstate '02000'; declare exit handler for curre' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9707,7 +9707,7 @@ BEGIN declare current_user condition for sqlstate '02000'; declare exit handler for current_user set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_user condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_user condition for sqlstate '02000'; declare exit handler for current_us' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9717,7 +9717,7 @@ BEGIN declare cursor condition for sqlstate '02000'; declare exit handler for cursor set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cursor condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cursor condition for sqlstate '02000'; declare exit handler for cursor set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9727,7 +9727,7 @@ BEGIN declare database condition for sqlstate '02000'; declare exit handler for database set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'database condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'database condition for sqlstate '02000'; declare exit handler for database set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9737,7 +9737,7 @@ BEGIN declare databases condition for sqlstate '02000'; declare exit handler for databases set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'databases condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'databases condition for sqlstate '02000'; declare exit handler for databases set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9747,7 +9747,7 @@ BEGIN declare day_hour condition for sqlstate '02000'; declare exit handler for day_hour set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_hour condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_hour condition for sqlstate '02000'; declare exit handler for day_hour set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9757,7 +9757,7 @@ BEGIN declare day_microsecond condition for sqlstate '02000'; declare exit handler for day_microsecond set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_microsecond condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_microsecond condition for sqlstate '02000'; declare exit handler for day_mic' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9767,7 +9767,7 @@ BEGIN declare day_minute condition for sqlstate '02000'; declare exit handler for day_minute set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_minute condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_minute condition for sqlstate '02000'; declare exit handler for day_minute s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9777,7 +9777,7 @@ BEGIN declare day_second condition for sqlstate '02000'; declare exit handler for day_second set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_second condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_second condition for sqlstate '02000'; declare exit handler for day_second s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9787,7 +9787,7 @@ BEGIN declare dec condition for sqlstate '02000'; declare exit handler for dec set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'dec condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dec condition for sqlstate '02000'; declare exit handler for dec set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -9798,7 +9798,7 @@ BEGIN declare decimal condition for sqlstate '02000'; declare exit handler for decimal set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal condition for sqlstate '02000'; declare exit handler for decimal set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9808,7 +9808,7 @@ BEGIN declare declare condition for sqlstate '02000'; declare exit handler for declare set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'declare condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'declare condition for sqlstate '02000'; declare exit handler for declare set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9818,7 +9818,7 @@ BEGIN declare default condition for sqlstate '02000'; declare exit handler for default set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default condition for sqlstate '02000'; declare exit handler for default set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9828,7 +9828,7 @@ BEGIN declare delayed condition for sqlstate '02000'; declare exit handler for delayed set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed condition for sqlstate '02000'; declare exit handler for delayed set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9838,7 +9838,7 @@ BEGIN declare delete condition for sqlstate '02000'; declare exit handler for delete set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delete condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delete condition for sqlstate '02000'; declare exit handler for delete set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9848,7 +9848,7 @@ BEGIN declare desc condition for sqlstate '02000'; declare exit handler for desc set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'desc condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'desc condition for sqlstate '02000'; declare exit handler for desc set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9858,7 +9858,7 @@ BEGIN declare describe condition for sqlstate '02000'; declare exit handler for describe set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'describe condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'describe condition for sqlstate '02000'; declare exit handler for describe set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9868,7 +9868,7 @@ BEGIN declare deterministic condition for sqlstate '02000'; declare exit handler for deterministic set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'deterministic condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'deterministic condition for sqlstate '02000'; declare exit handler for determini' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9878,7 +9878,7 @@ BEGIN declare distinct condition for sqlstate '02000'; declare exit handler for distinct set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinct condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'distinct condition for sqlstate '02000'; declare exit handler for distinct set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9888,7 +9888,7 @@ BEGIN declare distinctrow condition for sqlstate '02000'; declare exit handler for distinctrow set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinctrow condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'distinctrow condition for sqlstate '02000'; declare exit handler for distinctrow' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9898,7 +9898,7 @@ BEGIN declare div condition for sqlstate '02000'; declare exit handler for div set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'div condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'div condition for sqlstate '02000'; declare exit handler for div set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -9909,7 +9909,7 @@ BEGIN declare double condition for sqlstate '02000'; declare exit handler for double set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'double condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'double condition for sqlstate '02000'; declare exit handler for double set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9919,7 +9919,7 @@ BEGIN declare drop condition for sqlstate '02000'; declare exit handler for drop set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'drop condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'drop condition for sqlstate '02000'; declare exit handler for drop set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9929,7 +9929,7 @@ BEGIN declare dual condition for sqlstate '02000'; declare exit handler for dual set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'dual condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dual condition for sqlstate '02000'; declare exit handler for dual set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9939,7 +9939,7 @@ BEGIN declare each condition for sqlstate '02000'; declare exit handler for each set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'each condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'each condition for sqlstate '02000'; declare exit handler for each set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9949,7 +9949,7 @@ BEGIN declare else condition for sqlstate '02000'; declare exit handler for else set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'else condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'else condition for sqlstate '02000'; declare exit handler for else set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9959,7 +9959,7 @@ BEGIN declare elseif condition for sqlstate '02000'; declare exit handler for elseif set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'elseif condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'elseif condition for sqlstate '02000'; declare exit handler for elseif set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9969,7 +9969,7 @@ BEGIN declare enclosed condition for sqlstate '02000'; declare exit handler for enclosed set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'enclosed condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'enclosed condition for sqlstate '02000'; declare exit handler for enclosed set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9979,7 +9979,7 @@ BEGIN declare escaped condition for sqlstate '02000'; declare exit handler for escaped set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'escaped condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'escaped condition for sqlstate '02000'; declare exit handler for escaped set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9989,7 +9989,7 @@ BEGIN declare exists condition for sqlstate '02000'; declare exit handler for exists set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'exists condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'exists condition for sqlstate '02000'; declare exit handler for exists set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -9999,7 +9999,7 @@ BEGIN declare exit condition for sqlstate '02000'; declare exit handler for exit set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition for sqlstate '02000'; declare exit handler for exit set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10010,7 +10010,7 @@ BEGIN declare explain condition for sqlstate '02000'; declare exit handler for explain set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'explain condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'explain condition for sqlstate '02000'; declare exit handler for explain set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10020,7 +10020,7 @@ BEGIN declare false condition for sqlstate '02000'; declare exit handler for false set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'false condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'false condition for sqlstate '02000'; declare exit handler for false set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10030,7 +10030,7 @@ BEGIN declare fetch condition for sqlstate '02000'; declare exit handler for fetch set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'fetch condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fetch condition for sqlstate '02000'; declare exit handler for fetch set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10040,7 +10040,7 @@ BEGIN declare float condition for sqlstate '02000'; declare exit handler for float set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float condition for sqlstate '02000'; declare exit handler for float set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10050,7 +10050,7 @@ BEGIN declare float4 condition for sqlstate '02000'; declare exit handler for add set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float4 condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float4 condition for sqlstate '02000'; declare exit handler for add set @var2 = ' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10060,7 +10060,7 @@ BEGIN declare float8 condition for sqlstate '02000'; declare exit handler for add set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float8 condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float8 condition for sqlstate '02000'; declare exit handler for add set @var2 = ' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10070,7 +10070,7 @@ BEGIN declare for condition for sqlstate '02000'; declare exit handler for for set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for condition for sqlstate '02000'; declare exit handler for for set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10081,7 +10081,7 @@ BEGIN declare force condition for sqlstate '02000'; declare exit handler for force set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'force condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'force condition for sqlstate '02000'; declare exit handler for force set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10091,7 +10091,7 @@ BEGIN declare foreign condition for sqlstate '02000'; declare exit handler for foreign set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'foreign condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'foreign condition for sqlstate '02000'; declare exit handler for foreign set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10101,7 +10101,7 @@ BEGIN declare from condition for sqlstate '02000'; declare exit handler for from set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from condition for sqlstate '02000'; declare exit handler for from set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10111,7 +10111,7 @@ BEGIN declare fulltext condition for sqlstate '02000'; declare exit handler for fulltext set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'fulltext condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fulltext condition for sqlstate '02000'; declare exit handler for fulltext set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10121,7 +10121,7 @@ BEGIN declare grant condition for sqlstate '02000'; declare exit handler for grant set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'grant condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'grant condition for sqlstate '02000'; declare exit handler for grant set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10131,7 +10131,7 @@ BEGIN declare group condition for sqlstate '02000'; declare exit handler for group set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'group condition for sqlstate '02000'; declare exit handler for group set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10141,7 +10141,7 @@ BEGIN declare having condition for sqlstate '02000'; declare exit handler for having set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'having condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'having condition for sqlstate '02000'; declare exit handler for having set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10151,7 +10151,7 @@ BEGIN declare high_priority condition for sqlstate '02000'; declare exit handler for high_priority set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'high_priority condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'high_priority condition for sqlstate '02000'; declare exit handler for high_prio' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10161,7 +10161,7 @@ BEGIN declare hour_microsecond condition for sqlstate '02000'; declare exit handler for hour_microsecond set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_microsecond condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_microsecond condition for sqlstate '02000'; declare exit handler for hour_m' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10171,7 +10171,7 @@ BEGIN declare hour_minute condition for sqlstate '02000'; declare exit handler for hour_minute set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_minute condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_minute condition for sqlstate '02000'; declare exit handler for hour_minute' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10181,7 +10181,7 @@ BEGIN declare hour_second condition for sqlstate '02000'; declare exit handler for hour_second set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_second condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_second condition for sqlstate '02000'; declare exit handler for hour_second' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10191,7 +10191,7 @@ BEGIN declare if condition for sqlstate '02000'; declare exit handler for if set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'if condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'if condition for sqlstate '02000'; declare exit handler for if set @var2 = 1; EN' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10202,7 +10202,7 @@ BEGIN declare ignore condition for sqlstate '02000'; declare exit handler for ignore set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ignore condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ignore condition for sqlstate '02000'; declare exit handler for ignore set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10212,7 +10212,7 @@ BEGIN declare in condition for sqlstate '02000'; declare exit handler for in set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'in condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'in condition for sqlstate '02000'; declare exit handler for in set @var2 = 1; EN' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10223,7 +10223,7 @@ BEGIN declare index condition for sqlstate '02000'; declare exit handler for index set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'index condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'index condition for sqlstate '02000'; declare exit handler for index set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10233,7 +10233,7 @@ BEGIN declare infile condition for sqlstate '02000'; declare exit handler for infile set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'infile condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'infile condition for sqlstate '02000'; declare exit handler for infile set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10243,7 +10243,7 @@ BEGIN declare inner condition for sqlstate '02000'; declare exit handler for inner set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'inner condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'inner condition for sqlstate '02000'; declare exit handler for inner set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10253,7 +10253,7 @@ BEGIN declare inout condition for sqlstate '02000'; declare exit handler for inout set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'inout condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'inout condition for sqlstate '02000'; declare exit handler for inout set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10263,7 +10263,7 @@ BEGIN declare insensitive condition for sqlstate '02000'; declare exit handler for insensitive set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insensitive condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insensitive condition for sqlstate '02000'; declare exit handler for insensitive' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10273,7 +10273,7 @@ BEGIN declare insert condition for sqlstate '02000'; declare exit handler for insert set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insert condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insert condition for sqlstate '02000'; declare exit handler for insert set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10283,7 +10283,7 @@ BEGIN declare int condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10294,7 +10294,7 @@ BEGIN declare int1 condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int1 condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int1 condition for sqlstate '02000'; declare exit handler for int set @var2 = 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10304,7 +10304,7 @@ BEGIN declare int2 condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int2 condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int2 condition for sqlstate '02000'; declare exit handler for int set @var2 = 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10314,7 +10314,7 @@ BEGIN declare int3 condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int3 condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int3 condition for sqlstate '02000'; declare exit handler for int set @var2 = 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10324,7 +10324,7 @@ BEGIN declare int4 condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int4 condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int4 condition for sqlstate '02000'; declare exit handler for int set @var2 = 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10334,7 +10334,7 @@ BEGIN declare int8 condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int8 condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int8 condition for sqlstate '02000'; declare exit handler for int set @var2 = 1;' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10344,7 +10344,7 @@ BEGIN declare integer condition for sqlstate '02000'; declare exit handler for integer set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'integer condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'integer condition for sqlstate '02000'; declare exit handler for integer set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10354,7 +10354,7 @@ BEGIN declare interval condition for sqlstate '02000'; declare exit handler for interval set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'interval condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'interval condition for sqlstate '02000'; declare exit handler for interval set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10364,7 +10364,7 @@ BEGIN declare into condition for sqlstate '02000'; declare exit handler for into set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'into condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'into condition for sqlstate '02000'; declare exit handler for into set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10374,7 +10374,7 @@ BEGIN declare is condition for sqlstate '02000'; declare exit handler for is set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'is condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'is condition for sqlstate '02000'; declare exit handler for is set @var2 = 1; EN' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10385,7 +10385,7 @@ BEGIN declare iterate condition for sqlstate '02000'; declare exit handler for iterate set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'iterate condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'iterate condition for sqlstate '02000'; declare exit handler for iterate set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10395,7 +10395,7 @@ BEGIN declare join condition for sqlstate '02000'; declare exit handler for join set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'join condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'join condition for sqlstate '02000'; declare exit handler for join set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10405,7 +10405,7 @@ BEGIN declare key condition for sqlstate '02000'; declare exit handler for key set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key condition for sqlstate '02000'; declare exit handler for key set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10416,7 +10416,7 @@ BEGIN declare keys condition for sqlstate '02000'; declare exit handler for keys set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'keys condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'keys condition for sqlstate '02000'; declare exit handler for keys set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10426,7 +10426,7 @@ BEGIN declare kill condition for sqlstate '02000'; declare exit handler for kill set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'kill condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'kill condition for sqlstate '02000'; declare exit handler for kill set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10436,7 +10436,7 @@ BEGIN declare leading condition for sqlstate '02000'; declare exit handler for leading set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'leading condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'leading condition for sqlstate '02000'; declare exit handler for leading set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10446,7 +10446,7 @@ BEGIN declare leave condition for sqlstate '02000'; declare exit handler for leave set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'leave condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'leave condition for sqlstate '02000'; declare exit handler for leave set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10456,7 +10456,7 @@ BEGIN declare left condition for sqlstate '02000'; declare exit handler for left set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'left condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'left condition for sqlstate '02000'; declare exit handler for left set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10466,7 +10466,7 @@ BEGIN declare like condition for sqlstate '02000'; declare exit handler for like set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'like condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'like condition for sqlstate '02000'; declare exit handler for like set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10476,7 +10476,7 @@ BEGIN declare limit condition for sqlstate '02000'; declare exit handler for limit set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'limit condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'limit condition for sqlstate '02000'; declare exit handler for limit set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10486,7 +10486,7 @@ BEGIN declare linear condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'linear condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'linear condition for sqlstate '02000'; declare exit handler for int set @var2 = ' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10496,7 +10496,7 @@ BEGIN declare lines condition for sqlstate '02000'; declare exit handler for lines set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'lines condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'lines condition for sqlstate '02000'; declare exit handler for lines set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10506,7 +10506,7 @@ BEGIN declare load condition for sqlstate '02000'; declare exit handler for load set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'load condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'load condition for sqlstate '02000'; declare exit handler for load set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10516,7 +10516,7 @@ BEGIN declare localtime condition for sqlstate '02000'; declare exit handler for localtime set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'localtime condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'localtime condition for sqlstate '02000'; declare exit handler for localtime set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10526,7 +10526,7 @@ BEGIN declare localtimestamp condition for sqlstate '02000'; declare exit handler for localtimestamp set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'localtimestamp condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'localtimestamp condition for sqlstate '02000'; declare exit handler for localtim' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10536,7 +10536,7 @@ BEGIN declare lock condition for sqlstate '02000'; declare exit handler for lock set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'lock condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'lock condition for sqlstate '02000'; declare exit handler for lock set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10546,7 +10546,7 @@ BEGIN declare long condition for sqlstate '02000'; declare exit handler for long set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'long condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'long condition for sqlstate '02000'; declare exit handler for long set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10556,7 +10556,7 @@ BEGIN declare longblob condition for sqlstate '02000'; declare exit handler for longblob set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longblob condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longblob condition for sqlstate '02000'; declare exit handler for longblob set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10566,7 +10566,7 @@ BEGIN declare longtext condition for sqlstate '02000'; declare exit handler for longtext set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longtext condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longtext condition for sqlstate '02000'; declare exit handler for longtext set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10576,7 +10576,7 @@ BEGIN declare loop condition for sqlstate '02000'; declare exit handler for loop set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'loop condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'loop condition for sqlstate '02000'; declare exit handler for loop set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10586,7 +10586,7 @@ BEGIN declare low_priority condition for sqlstate '02000'; declare exit handler for low_priority set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'low_priority condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'low_priority condition for sqlstate '02000'; declare exit handler for low_priori' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10596,7 +10596,7 @@ BEGIN declare master_ssl_verify_server_cert condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'master_ssl_verify_server_cert condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'master_ssl_verify_server_cert condition for sqlstate '02000'; declare exit handl' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10606,7 +10606,7 @@ BEGIN declare match condition for sqlstate '02000'; declare exit handler for match set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match condition for sqlstate '02000'; declare exit handler for match set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10616,7 +10616,7 @@ BEGIN declare mediumblob condition for sqlstate '02000'; declare exit handler for mediumblob set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumblob condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumblob condition for sqlstate '02000'; declare exit handler for mediumblob s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10626,7 +10626,7 @@ BEGIN declare mediumint condition for sqlstate '02000'; declare exit handler for mediumint set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint condition for sqlstate '02000'; declare exit handler for mediumint set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10636,7 +10636,7 @@ BEGIN declare mediumtext condition for sqlstate '02000'; declare exit handler for mediumtext set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumtext condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumtext condition for sqlstate '02000'; declare exit handler for mediumtext s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10646,7 +10646,7 @@ BEGIN declare middleint condition for sqlstate '02000'; declare exit handler for middleint set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'middleint condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'middleint condition for sqlstate '02000'; declare exit handler for middleint set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10656,7 +10656,7 @@ BEGIN declare minute_microsecond condition for sqlstate '02000'; declare exit handler for minute_microsecond set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'minute_microsecond condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'minute_microsecond condition for sqlstate '02000'; declare exit handler for minu' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10666,7 +10666,7 @@ BEGIN declare minute_second condition for sqlstate '02000'; declare exit handler for minute_second set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'minute_second condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'minute_second condition for sqlstate '02000'; declare exit handler for minute_se' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10676,7 +10676,7 @@ BEGIN declare mod condition for sqlstate '02000'; declare exit handler for mod set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mod condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mod condition for sqlstate '02000'; declare exit handler for mod set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10687,7 +10687,7 @@ BEGIN declare modifies condition for sqlstate '02000'; declare exit handler for modifies set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'modifies condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'modifies condition for sqlstate '02000'; declare exit handler for modifies set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10697,7 +10697,7 @@ BEGIN declare natural condition for sqlstate '02000'; declare exit handler for natural set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'natural condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'natural condition for sqlstate '02000'; declare exit handler for natural set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10707,7 +10707,7 @@ BEGIN declare not condition for sqlstate '02000'; declare exit handler for not set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not condition for sqlstate '02000'; declare exit handler for not set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10718,7 +10718,7 @@ BEGIN declare no_write_to_binlog condition for sqlstate '02000'; declare exit handler for no_write_to_binlog set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'no_write_to_binlog condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'no_write_to_binlog condition for sqlstate '02000'; declare exit handler for no_w' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10728,7 +10728,7 @@ BEGIN declare null condition for sqlstate '02000'; declare exit handler for null set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null condition for sqlstate '02000'; declare exit handler for null set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10738,7 +10738,7 @@ BEGIN declare numeric condition for sqlstate '02000'; declare exit handler for numeric set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric condition for sqlstate '02000'; declare exit handler for numeric set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10748,7 +10748,7 @@ BEGIN declare on condition for sqlstate '02000'; declare exit handler for on set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on condition for sqlstate '02000'; declare exit handler for on set @var2 = 1; EN' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10759,7 +10759,7 @@ BEGIN declare optimize condition for sqlstate '02000'; declare exit handler for optimize set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'optimize condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'optimize condition for sqlstate '02000'; declare exit handler for optimize set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10769,7 +10769,7 @@ BEGIN declare option condition for sqlstate '02000'; declare exit handler for option set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'option condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'option condition for sqlstate '02000'; declare exit handler for option set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10779,7 +10779,7 @@ BEGIN declare optionally condition for sqlstate '02000'; declare exit handler for optionally set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'optionally condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'optionally condition for sqlstate '02000'; declare exit handler for optionally s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10789,7 +10789,7 @@ BEGIN declare or condition for sqlstate '02000'; declare exit handler for or set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'or condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'or condition for sqlstate '02000'; declare exit handler for or set @var2 = 1; EN' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10800,7 +10800,7 @@ BEGIN declare order condition for sqlstate '02000'; declare exit handler for order set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'order condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'order condition for sqlstate '02000'; declare exit handler for order set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10810,7 +10810,7 @@ BEGIN declare out condition for sqlstate '02000'; declare exit handler for out set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'out condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'out condition for sqlstate '02000'; declare exit handler for out set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -10821,7 +10821,7 @@ BEGIN declare outer condition for sqlstate '02000'; declare exit handler for outer set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'outer condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'outer condition for sqlstate '02000'; declare exit handler for outer set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10831,7 +10831,7 @@ BEGIN declare outfile condition for sqlstate '02000'; declare exit handler for outfile set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'outfile condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'outfile condition for sqlstate '02000'; declare exit handler for outfile set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10841,7 +10841,7 @@ BEGIN declare precision condition for sqlstate '02000'; declare exit handler for precision set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'precision condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'precision condition for sqlstate '02000'; declare exit handler for precision set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10851,7 +10851,7 @@ BEGIN declare primary condition for sqlstate '02000'; declare exit handler for primary set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'primary condition for sqlstate '02000'; declare exit handler for primary set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10861,7 +10861,7 @@ BEGIN declare procedure condition for sqlstate '02000'; declare exit handler for procedure set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'procedure condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'procedure condition for sqlstate '02000'; declare exit handler for procedure set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10871,7 +10871,7 @@ BEGIN declare purge condition for sqlstate '02000'; declare exit handler for purge set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'purge condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'purge condition for sqlstate '02000'; declare exit handler for purge set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10881,7 +10881,7 @@ BEGIN declare range condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'range condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'range condition for sqlstate '02000'; declare exit handler for int set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10891,7 +10891,7 @@ BEGIN declare read condition for sqlstate '02000'; declare exit handler for read set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read condition for sqlstate '02000'; declare exit handler for read set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10901,7 +10901,7 @@ BEGIN declare reads condition for sqlstate '02000'; declare exit handler for reads set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'reads condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'reads condition for sqlstate '02000'; declare exit handler for reads set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10911,7 +10911,7 @@ BEGIN declare read_only condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int set @var2 = 1; END' at line 4 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10921,7 +10921,7 @@ BEGIN declare read_write condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read_write condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read_write condition for sqlstate '02000'; declare exit handler for int set @var' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10931,7 +10931,7 @@ BEGIN declare real condition for sqlstate '02000'; declare exit handler for real set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real condition for sqlstate '02000'; declare exit handler for real set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10941,7 +10941,7 @@ BEGIN declare references condition for sqlstate '02000'; declare exit handler for references set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'references condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'references condition for sqlstate '02000'; declare exit handler for references s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10951,7 +10951,7 @@ BEGIN declare regexp condition for sqlstate '02000'; declare exit handler for regexp set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'regexp condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'regexp condition for sqlstate '02000'; declare exit handler for regexp set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10961,7 +10961,7 @@ BEGIN declare release condition for sqlstate '02000'; declare exit handler for int set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'release condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'release condition for sqlstate '02000'; declare exit handler for int set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10971,7 +10971,7 @@ BEGIN declare rename condition for sqlstate '02000'; declare exit handler for rename set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'rename condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'rename condition for sqlstate '02000'; declare exit handler for rename set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10981,7 +10981,7 @@ BEGIN declare repeat condition for sqlstate '02000'; declare exit handler for repeat set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'repeat condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'repeat condition for sqlstate '02000'; declare exit handler for repeat set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -10991,7 +10991,7 @@ BEGIN declare replace condition for sqlstate '02000'; declare exit handler for replace set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'replace condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'replace condition for sqlstate '02000'; declare exit handler for replace set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11001,7 +11001,7 @@ BEGIN declare require condition for sqlstate '02000'; declare exit handler for require set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'require condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'require condition for sqlstate '02000'; declare exit handler for require set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11011,7 +11011,7 @@ BEGIN declare restrict condition for sqlstate '02000'; declare exit handler for restrict set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'restrict condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'restrict condition for sqlstate '02000'; declare exit handler for restrict set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11021,7 +11021,7 @@ BEGIN declare return condition for sqlstate '02000'; declare exit handler for return set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'return condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'return condition for sqlstate '02000'; declare exit handler for return set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11031,7 +11031,7 @@ BEGIN declare revoke condition for sqlstate '02000'; declare exit handler for revoke set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'revoke condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'revoke condition for sqlstate '02000'; declare exit handler for revoke set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11041,7 +11041,7 @@ BEGIN declare right condition for sqlstate '02000'; declare exit handler for right set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'right condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'right condition for sqlstate '02000'; declare exit handler for right set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11051,7 +11051,7 @@ BEGIN declare rlike condition for sqlstate '02000'; declare exit handler for rlike set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'rlike condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'rlike condition for sqlstate '02000'; declare exit handler for rlike set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11061,7 +11061,7 @@ BEGIN declare schema condition for sqlstate '02000'; declare exit handler for schema set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'schema condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'schema condition for sqlstate '02000'; declare exit handler for schema set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11071,7 +11071,7 @@ BEGIN declare schemas condition for sqlstate '02000'; declare exit handler for schemas set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'schemas condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'schemas condition for sqlstate '02000'; declare exit handler for schemas set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11081,7 +11081,7 @@ BEGIN declare second_microsecond condition for sqlstate '02000'; declare exit handler for second_microsecond set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'second_microsecond condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'second_microsecond condition for sqlstate '02000'; declare exit handler for seco' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11091,7 +11091,7 @@ BEGIN declare select condition for sqlstate '02000'; declare exit handler for SELECT set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select condition for sqlstate '02000'; declare exit handler for SELECT set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11101,7 +11101,7 @@ BEGIN declare sensitive condition for sqlstate '02000'; declare exit handler for sensitive set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sensitive condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sensitive condition for sqlstate '02000'; declare exit handler for sensitive set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11111,7 +11111,7 @@ BEGIN declare separator condition for sqlstate '02000'; declare exit handler for separator set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'separator condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'separator condition for sqlstate '02000'; declare exit handler for separator set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11121,7 +11121,7 @@ BEGIN declare set condition for sqlstate '02000'; declare exit handler for set set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set condition for sqlstate '02000'; declare exit handler for set set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -11132,7 +11132,7 @@ BEGIN declare show condition for sqlstate '02000'; declare exit handler for show set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'show condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'show condition for sqlstate '02000'; declare exit handler for show set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11142,7 +11142,7 @@ BEGIN declare smallint condition for sqlstate '02000'; declare exit handler for smallint set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint condition for sqlstate '02000'; declare exit handler for smallint set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11152,7 +11152,7 @@ BEGIN declare spatial condition for sqlstate '02000'; declare exit handler for spatial set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'spatial condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'spatial condition for sqlstate '02000'; declare exit handler for spatial set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11162,7 +11162,7 @@ BEGIN declare specific condition for sqlstate '02000'; declare exit handler for specific set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'specific condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'specific condition for sqlstate '02000'; declare exit handler for specific set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11172,7 +11172,7 @@ BEGIN declare sql condition for sqlstate '02000'; declare exit handler for sql set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql condition for sqlstate '02000'; declare exit handler for sql set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -11183,7 +11183,7 @@ BEGIN declare sqlexception condition for sqlstate '02000'; declare exit handler for sqlexception set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlexception condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlexception condition for sqlstate '02000'; declare exit handler for sqlexcepti' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11193,7 +11193,7 @@ BEGIN declare sqlstate condition for sqlstate '02000'; declare exit handler for sqlstate set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlstate condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlstate condition for sqlstate '02000'; declare exit handler for sqlstate set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11203,7 +11203,7 @@ BEGIN declare sqlwarning condition for sqlstate '02000'; declare exit handler for sqlwarning set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlwarning condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlwarning condition for sqlstate '02000'; declare exit handler for sqlwarning s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11213,7 +11213,7 @@ BEGIN declare sql_big_result condition for sqlstate '02000'; declare exit handler for sql_big_result set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_big_result condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_big_result condition for sqlstate '02000'; declare exit handler for sql_big_' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11223,7 +11223,7 @@ BEGIN declare sql_calc_found_rows condition for sqlstate '02000'; declare exit handler for sql_calc_found_rows set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_calc_found_rows condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_calc_found_rows condition for sqlstate '02000'; declare exit handler for sql' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11233,7 +11233,7 @@ BEGIN declare sql_small_result condition for sqlstate '02000'; declare exit handler for sql_small_result set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_small_result condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_small_result condition for sqlstate '02000'; declare exit handler for sql_sm' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11243,7 +11243,7 @@ BEGIN declare ssl condition for sqlstate '02000'; declare exit handler for ssl set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ssl condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ssl condition for sqlstate '02000'; declare exit handler for ssl set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -11254,7 +11254,7 @@ BEGIN declare starting condition for sqlstate '02000'; declare exit handler for starting set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starting condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'starting condition for sqlstate '02000'; declare exit handler for starting set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11264,7 +11264,7 @@ BEGIN declare straight_join condition for sqlstate '02000'; declare exit handler for straight_join set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'straight_join condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'straight_join condition for sqlstate '02000'; declare exit handler for straight_' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11274,7 +11274,7 @@ BEGIN declare table condition for sqlstate '02000'; declare exit handler for table set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'table condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'table condition for sqlstate '02000'; declare exit handler for table set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11284,7 +11284,7 @@ BEGIN declare terminated condition for sqlstate '02000'; declare exit handler for terminated set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'terminated condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'terminated condition for sqlstate '02000'; declare exit handler for terminated s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11294,7 +11294,7 @@ BEGIN declare then condition for sqlstate '02000'; declare exit handler for then set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'then condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'then condition for sqlstate '02000'; declare exit handler for then set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11304,7 +11304,7 @@ BEGIN declare tinyblob condition for sqlstate '02000'; declare exit handler for tinyblob set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyblob condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyblob condition for sqlstate '02000'; declare exit handler for tinyblob set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11314,7 +11314,7 @@ BEGIN declare tinyint condition for sqlstate '02000'; declare exit handler for tinyint set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint condition for sqlstate '02000'; declare exit handler for tinyint set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11324,7 +11324,7 @@ BEGIN declare tinytext condition for sqlstate '02000'; declare exit handler for tinytext set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinytext condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinytext condition for sqlstate '02000'; declare exit handler for tinytext set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11334,7 +11334,7 @@ BEGIN declare to condition for sqlstate '02000'; declare exit handler for to set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'to condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'to condition for sqlstate '02000'; declare exit handler for to set @var2 = 1; EN' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -11345,7 +11345,7 @@ BEGIN declare trailing condition for sqlstate '02000'; declare exit handler for trailing set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trailing condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trailing condition for sqlstate '02000'; declare exit handler for trailing set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11355,7 +11355,7 @@ BEGIN declare trigger condition for sqlstate '02000'; declare exit handler for trigger set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trigger condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trigger condition for sqlstate '02000'; declare exit handler for trigger set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11365,7 +11365,7 @@ BEGIN declare true condition for sqlstate '02000'; declare exit handler for true set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'true condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'true condition for sqlstate '02000'; declare exit handler for true set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11375,7 +11375,7 @@ BEGIN declare undo condition for sqlstate '02000'; declare exit handler for undo set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'undo condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo condition for sqlstate '02000'; declare exit handler for undo set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11385,7 +11385,7 @@ BEGIN declare union condition for sqlstate '02000'; declare exit handler for union set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'union condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'union condition for sqlstate '02000'; declare exit handler for union set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11395,7 +11395,7 @@ BEGIN declare unique condition for sqlstate '02000'; declare exit handler for unique set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unique condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unique condition for sqlstate '02000'; declare exit handler for unique set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11405,7 +11405,7 @@ BEGIN declare unlock condition for sqlstate '02000'; declare exit handler for unlock set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unlock condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unlock condition for sqlstate '02000'; declare exit handler for unlock set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11415,7 +11415,7 @@ BEGIN declare unsigned condition for sqlstate '02000'; declare exit handler for unsigned set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unsigned condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unsigned condition for sqlstate '02000'; declare exit handler for unsigned set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11425,7 +11425,7 @@ BEGIN declare update condition for sqlstate '02000'; declare exit handler for update set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'update condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'update condition for sqlstate '02000'; declare exit handler for update set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11435,7 +11435,7 @@ BEGIN declare usage condition for sqlstate '02000'; declare exit handler for usage set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'usage condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'usage condition for sqlstate '02000'; declare exit handler for usage set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11445,7 +11445,7 @@ BEGIN declare use condition for sqlstate '02000'; declare exit handler for USE set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'use condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'use condition for sqlstate '02000'; declare exit handler for USE set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -11456,7 +11456,7 @@ BEGIN declare using condition for sqlstate '02000'; declare exit handler for using set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'using condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'using condition for sqlstate '02000'; declare exit handler for using set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11466,7 +11466,7 @@ BEGIN declare utc_date condition for sqlstate '02000'; declare exit handler for utc_date set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_date condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_date condition for sqlstate '02000'; declare exit handler for utc_date set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11476,7 +11476,7 @@ BEGIN declare utc_time condition for sqlstate '02000'; declare exit handler for utc_time set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_time condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_time condition for sqlstate '02000'; declare exit handler for utc_time set @' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11486,7 +11486,7 @@ BEGIN declare utc_timestamp condition for sqlstate '02000'; declare exit handler for utc_timestamp set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_timestamp condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_timestamp condition for sqlstate '02000'; declare exit handler for utc_times' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11496,7 +11496,7 @@ BEGIN declare values condition for sqlstate '02000'; declare exit handler for values set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'values condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'values condition for sqlstate '02000'; declare exit handler for values set @var2' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11506,7 +11506,7 @@ BEGIN declare varbinary condition for sqlstate '02000'; declare exit handler for varbinary set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varbinary condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varbinary condition for sqlstate '02000'; declare exit handler for varbinary set' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11516,7 +11516,7 @@ BEGIN declare varchar condition for sqlstate '02000'; declare exit handler for varchar set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varchar condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varchar condition for sqlstate '02000'; declare exit handler for varchar set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11526,7 +11526,7 @@ BEGIN declare varcharacter condition for sqlstate '02000'; declare exit handler for varcharacter set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varcharacter condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varcharacter condition for sqlstate '02000'; declare exit handler for varcharact' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11536,7 +11536,7 @@ BEGIN declare varying condition for sqlstate '02000'; declare exit handler for varying set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varying condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varying condition for sqlstate '02000'; declare exit handler for varying set @va' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11546,7 +11546,7 @@ BEGIN declare when condition for sqlstate '02000'; declare exit handler for when set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'when condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'when condition for sqlstate '02000'; declare exit handler for when set @var2 = 1' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11556,7 +11556,7 @@ BEGIN declare where condition for sqlstate '02000'; declare exit handler for where set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where condition for sqlstate '02000'; declare exit handler for where set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11566,7 +11566,7 @@ BEGIN declare while condition for sqlstate '02000'; declare exit handler for while set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'while condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'while condition for sqlstate '02000'; declare exit handler for while set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11576,7 +11576,7 @@ BEGIN declare with condition for sqlstate '02000'; declare exit handler for with set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition for sqlstate '02000'; declare exit handler for with set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -11587,7 +11587,7 @@ BEGIN declare write condition for sqlstate '02000'; declare exit handler for write set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'write condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'write condition for sqlstate '02000'; declare exit handler for write set @var2 =' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11597,7 +11597,7 @@ BEGIN declare xor condition for sqlstate '02000'; declare exit handler for xor set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xor condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xor condition for sqlstate '02000'; declare exit handler for xor set @var2 = 1; ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -11608,7 +11608,7 @@ BEGIN declare year_month condition for sqlstate '02000'; declare exit handler for year_month set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'year_month condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'year_month condition for sqlstate '02000'; declare exit handler for year_month s' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11618,7 +11618,7 @@ BEGIN declare zerofill condition for sqlstate '02000'; declare exit handler for zerofill set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'zerofill condition for sqlstate '02000'; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'zerofill condition for sqlstate '02000'; declare exit handler for zerofill set @' at line 3 Testcase : @@ -11652,7 +11652,7 @@ set @x = 2; insert into t values (1); set @x = 3; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'undo handler for sqlstate '23000' set @x2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo handler for sqlstate '23000' set @x2 = 1; set @x = 1; insert into t values ' at line 3 DROP PROCEDURE IF EXISTS handler1; @@ -11667,7 +11667,7 @@ set @x = 2; insert into t values (1); set @x = 3; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'handler for sqlstate '2300' set @x2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'handler for sqlstate '2300' set @x2 = 1; set @x = 1; insert into t values (1); s' at line 3 @@ -11683,7 +11683,7 @@ set @x = 2; insert into t values (1); set @x = 3; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'handler for sqlstate '2300' set @x2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'handler for sqlstate '2300' set @x2 = 1; set @x = 1; insert into t values (1); s' at line 3 @@ -11699,7 +11699,7 @@ set @x = 2; insert into t values (1); set @x = 3; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'handler for sqlstate '2300' set @x2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'handler for sqlstate '2300' set @x2 = 1; set @x = 1; insert into t values (1); s' at line 3 @@ -11710,7 +11710,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare accessible handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'accessible handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'accessible handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11719,7 +11719,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare add handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'add handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'add handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11728,7 +11728,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare all handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'all handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'all handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11737,7 +11737,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare alter handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'alter handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'alter handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11746,7 +11746,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare analyze handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'analyze handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'analyze handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11755,7 +11755,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare and handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'and handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'and handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11764,7 +11764,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare as handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'as handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'as handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11773,7 +11773,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare asc handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'asc handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asc handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11782,7 +11782,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare asensitive handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'asensitive handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'asensitive handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11791,7 +11791,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare before handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'before handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'before handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11800,7 +11800,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare between handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'between handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'between handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11809,7 +11809,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare bigint handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bigint handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bigint handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11818,7 +11818,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare binary handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binary handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binary handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11827,7 +11827,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare blob handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'blob handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'blob handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11836,7 +11836,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare both handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'both handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'both handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11845,7 +11845,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare by handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'by handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11854,7 +11854,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare call handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'call handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'call handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11863,7 +11863,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare cascade handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cascade handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cascade handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11872,7 +11872,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare case handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'case handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'case handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11881,7 +11881,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare change handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'change handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'change handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11890,7 +11890,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare char handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'char handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11899,7 +11899,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare character handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'character handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11908,7 +11908,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare check handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'check handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'check handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11917,7 +11917,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare collate handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'collate handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'collate handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11926,7 +11926,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare column handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'column handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'column handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11935,7 +11935,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare condition handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'condition handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'condition handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11944,7 +11944,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare constraint handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'constraint handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'constraint handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11958,7 +11958,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare convert handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'convert handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'convert handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11967,7 +11967,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare create handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'create handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'create handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11976,7 +11976,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare cross handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cross handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cross handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11985,7 +11985,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare current_date handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_date handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_date handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11994,7 +11994,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare current_time handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_time handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_time handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12003,7 +12003,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare current_timestamp handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_timestamp handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_timestamp handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12012,7 +12012,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare current_user handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'current_user handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'current_user handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12021,7 +12021,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare cursor handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'cursor handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'cursor handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12030,7 +12030,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare database handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'database handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'database handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12039,7 +12039,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare databases handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'databases handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'databases handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12048,7 +12048,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare day_hour handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_hour handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_hour handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12057,7 +12057,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare day_microsecond handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_microsecond handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_microsecond handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12066,7 +12066,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare day_minute handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_minute handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_minute handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12075,7 +12075,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare day_second handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'day_second handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'day_second handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12084,7 +12084,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare dec handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'dec handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dec handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12093,7 +12093,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare decimal handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'decimal handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'decimal handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12102,7 +12102,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare declare handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'declare handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'declare handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12111,7 +12111,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare default handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12120,7 +12120,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare delayed handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12129,7 +12129,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare delete handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delete handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delete handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12138,7 +12138,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare desc handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'desc handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'desc handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12147,7 +12147,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare describe handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'describe handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'describe handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12156,7 +12156,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare deterministic handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'deterministic handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'deterministic handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12165,7 +12165,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare distinct handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinct handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'distinct handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12174,7 +12174,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare distinctrow handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinctrow handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'distinctrow handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12183,7 +12183,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare div handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'div handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'div handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12192,7 +12192,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare double handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'double handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'double handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12201,7 +12201,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare drop handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'drop handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'drop handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12210,7 +12210,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare dual handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'dual handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dual handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12219,7 +12219,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare each handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'each handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'each handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12228,7 +12228,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare else handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'else handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'else handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12237,7 +12237,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare elseif handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'elseif handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'elseif handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12246,7 +12246,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare enclosed handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'enclosed handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'enclosed handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12255,7 +12255,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare escaped handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'escaped handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'escaped handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12264,7 +12264,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare exists handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'exists handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'exists handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12278,7 +12278,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare explain handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'explain handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'explain handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12287,7 +12287,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare false handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'false handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'false handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12296,7 +12296,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare fetch handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'fetch handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fetch handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12305,7 +12305,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare float handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12314,7 +12314,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare float4 handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float4 handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float4 handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12323,7 +12323,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare float8 handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float8 handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'float8 handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12332,7 +12332,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare for handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'for handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12341,7 +12341,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare force handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'force handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'force handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12350,7 +12350,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare foreign handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'foreign handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'foreign handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12359,7 +12359,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare from handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12368,7 +12368,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare fulltext handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'fulltext handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fulltext handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12377,7 +12377,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare grant handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'grant handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'grant handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12386,7 +12386,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare group handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'group handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'group handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12395,7 +12395,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare having handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'having handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'having handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12404,7 +12404,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare high_priority handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'high_priority handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'high_priority handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12413,7 +12413,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare hour_microsecond handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_microsecond handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_microsecond handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12422,7 +12422,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare hour_minute handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_minute handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_minute handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12431,7 +12431,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare hour_second handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'hour_second handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'hour_second handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12440,7 +12440,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare if handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'if handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'if handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12449,7 +12449,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare ignore handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ignore handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ignore handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12458,7 +12458,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare in handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'in handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'in handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12467,7 +12467,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare index handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'index handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'index handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12476,7 +12476,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare infile handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'infile handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'infile handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12485,7 +12485,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare inner handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'inner handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'inner handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12494,7 +12494,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare inout handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'inout handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'inout handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12503,7 +12503,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare insensitive handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insensitive handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insensitive handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12512,7 +12512,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare insert handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insert handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insert handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12521,7 +12521,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare int handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12530,7 +12530,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare int1 handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int1 handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int1 handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12539,7 +12539,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare int2 handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int2 handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int2 handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12548,7 +12548,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare int3 handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int3 handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int3 handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12557,7 +12557,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare int4 handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int4 handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int4 handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12566,7 +12566,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare int8 handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'int8 handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'int8 handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12575,7 +12575,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare integer handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'integer handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'integer handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12584,7 +12584,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare interval handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'interval handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'interval handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12593,7 +12593,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare into handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'into handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'into handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12602,7 +12602,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare is handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'is handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'is handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12611,7 +12611,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare iterate handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'iterate handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'iterate handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12620,7 +12620,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare join handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'join handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'join handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12629,7 +12629,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare key handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12638,7 +12638,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare keys handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'keys handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'keys handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12647,7 +12647,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare kill handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'kill handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'kill handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12656,7 +12656,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare leading handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'leading handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'leading handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12665,7 +12665,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare leave handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'leave handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'leave handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12674,7 +12674,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare left handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'left handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'left handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12683,7 +12683,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare like handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'like handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'like handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12692,7 +12692,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare limit handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'limit handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'limit handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12701,7 +12701,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare linear handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'linear handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'linear handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12710,7 +12710,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare lines handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'lines handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'lines handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12719,7 +12719,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare load handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'load handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'load handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12728,7 +12728,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare localtime handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'localtime handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'localtime handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12737,7 +12737,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare localtimestamp handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'localtimestamp handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'localtimestamp handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12746,7 +12746,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare lock handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'lock handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'lock handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12755,7 +12755,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare long handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'long handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'long handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12764,7 +12764,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare longblob handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longblob handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longblob handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12773,7 +12773,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare longtext handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'longtext handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'longtext handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12782,7 +12782,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare loop handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'loop handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'loop handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12791,7 +12791,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare low_priority handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'low_priority handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'low_priority handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12800,7 +12800,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare master_ssl_verify_server_cert handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'master_ssl_verify_server_cert handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'master_ssl_verify_server_cert handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12809,7 +12809,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare match handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'match handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12818,7 +12818,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare mediumblob handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumblob handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumblob handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12827,7 +12827,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare mediumint handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumint handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumint handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12836,7 +12836,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare mediumtext handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mediumtext handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mediumtext handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12845,7 +12845,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare middleint handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'middleint handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'middleint handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12854,7 +12854,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare minute_microsecond handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'minute_microsecond handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'minute_microsecond handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12863,7 +12863,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare minute_second handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'minute_second handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'minute_second handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12872,7 +12872,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare mod handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mod handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mod handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12881,7 +12881,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare modifies handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'modifies handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'modifies handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12890,7 +12890,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare natural handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'natural handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'natural handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12899,7 +12899,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare not handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12908,7 +12908,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare no_write_to_binlog handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'no_write_to_binlog handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'no_write_to_binlog handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12917,7 +12917,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare null handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12926,7 +12926,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare numeric handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'numeric handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'numeric handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12935,7 +12935,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare on handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12944,7 +12944,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare optimize handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'optimize handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'optimize handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12953,7 +12953,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare option handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'option handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'option handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12962,7 +12962,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare optionally handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'optionally handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'optionally handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12971,7 +12971,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare or handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'or handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'or handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12980,7 +12980,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare order handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'order handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'order handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12989,7 +12989,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare out handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'out handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'out handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -12998,7 +12998,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare outer handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'outer handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'outer handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13007,7 +13007,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare outfile handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'outfile handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'outfile handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13016,7 +13016,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare precision handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'precision handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'precision handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13025,7 +13025,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare primary handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'primary handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13034,7 +13034,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare privileges handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13043,7 +13043,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare procedure handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'procedure handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'procedure handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13052,7 +13052,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare purge handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'purge handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'purge handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13061,7 +13061,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare range handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'range handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'range handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13070,7 +13070,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare read handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13079,7 +13079,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare reads handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'reads handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'reads handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13088,7 +13088,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare read_only handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13097,7 +13097,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare read_write handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read_write handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read_write handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13106,7 +13106,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare real handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'real handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'real handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13115,7 +13115,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare references handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'references handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'references handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13124,7 +13124,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare regexp handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'regexp handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'regexp handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13133,7 +13133,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare release handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'release handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'release handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13142,7 +13142,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare rename handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'rename handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'rename handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13151,7 +13151,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare repeat handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'repeat handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'repeat handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13160,7 +13160,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare replace handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'replace handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'replace handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13169,7 +13169,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare require handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'require handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'require handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13178,7 +13178,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare restrict handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'restrict handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'restrict handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13187,7 +13187,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare return handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'return handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'return handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13196,7 +13196,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare revoke handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'revoke handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'revoke handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13205,7 +13205,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare right handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'right handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'right handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13214,7 +13214,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare rlike handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'rlike handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'rlike handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13223,7 +13223,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare schema handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'schema handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'schema handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13232,7 +13232,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare schemas handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'schemas handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'schemas handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13241,7 +13241,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare second_microsecond handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'second_microsecond handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'second_microsecond handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13250,7 +13250,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare select handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13259,7 +13259,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare sensitive handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sensitive handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sensitive handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13268,7 +13268,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare separator handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'separator handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'separator handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13277,7 +13277,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare set handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'set handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'set handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13286,7 +13286,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare show handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'show handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'show handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13295,7 +13295,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare smallint handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'smallint handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'smallint handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13304,7 +13304,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare spatial handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'spatial handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'spatial handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13313,7 +13313,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare specific handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'specific handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'specific handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13322,7 +13322,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare sql handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13331,7 +13331,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare sqlexception handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlexception handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlexception handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13340,7 +13340,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare sqlstate handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlstate handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlstate handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13349,7 +13349,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare sqlwarning handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sqlwarning handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sqlwarning handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13358,7 +13358,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare sql_big_result handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_big_result handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_big_result handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13367,7 +13367,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare sql_calc_found_rows handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_calc_found_rows handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_calc_found_rows handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13376,7 +13376,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare sql_small_result handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_small_result handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_small_result handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13385,7 +13385,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare ssl handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ssl handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ssl handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13394,7 +13394,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare starting handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starting handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'starting handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13403,7 +13403,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare straight_join handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'straight_join handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'straight_join handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13412,7 +13412,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare table handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'table handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'table handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13421,7 +13421,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare terminated handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'terminated handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'terminated handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13430,7 +13430,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare then handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'then handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'then handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13439,7 +13439,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare tinyblob handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyblob handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyblob handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13448,7 +13448,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare tinyint handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinyint handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinyint handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13457,7 +13457,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare tinytext handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tinytext handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tinytext handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13466,7 +13466,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare to handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'to handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'to handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13475,7 +13475,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare trailing handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trailing handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trailing handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13484,7 +13484,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare trigger handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'trigger handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'trigger handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13493,7 +13493,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare true handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'true handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'true handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13502,7 +13502,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare undo handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'undo handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'undo handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13511,7 +13511,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare union handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'union handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'union handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13520,7 +13520,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare unique handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unique handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unique handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13529,7 +13529,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare unlock handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unlock handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unlock handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13538,7 +13538,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare unsigned handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'unsigned handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'unsigned handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13547,7 +13547,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare update handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'update handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'update handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13556,7 +13556,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare usage handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'usage handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'usage handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13565,7 +13565,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare use handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'use handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'use handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13574,7 +13574,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare using handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'using handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'using handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13583,7 +13583,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare utc_date handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_date handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_date handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13592,7 +13592,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare utc_time handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_time handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_time handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13601,7 +13601,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare utc_timestamp handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'utc_timestamp handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'utc_timestamp handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13610,7 +13610,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare values handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'values handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'values handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13619,7 +13619,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare varbinary handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varbinary handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varbinary handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13628,7 +13628,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare varchar handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varchar handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varchar handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13637,7 +13637,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare varcharacter handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varcharacter handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varcharacter handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13646,7 +13646,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare varying handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'varying handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'varying handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13655,7 +13655,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare when handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'when handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'when handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13664,7 +13664,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare where handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13673,7 +13673,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare while handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'while handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'while handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13682,7 +13682,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare with handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13691,7 +13691,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare write handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'write handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'write handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13700,7 +13700,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare xor handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xor handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xor handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13709,7 +13709,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare year_month handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'year_month handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'year_month handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -13718,7 +13718,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare zerofill handler for sqlstate '02000' set @var2 = 1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'zerofill handler for sqlstate '02000' set @var2 = 1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'zerofill handler for sqlstate '02000' set @var2 = 1; END' at line 3 USE db_storedproc; @@ -14500,7 +14500,7 @@ declare cond1 condition for sqlstate 1234567890; declare continue handler for cond1 set @var2 = 1; insert into tnull values( 1); END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '1234567890; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '1234567890; declare continue handler for cond1 set @var2 = 1; insert into tnull ' at line 3 DROP PROCEDURE IF EXISTS sp1; @@ -14609,7 +14609,7 @@ Verify SP wasn't created CALL sp1(); ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist DROP PROCEDURE IF EXISTSsp1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXISTSsp1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'EXISTSsp1' at line 1 Testcase 4.2.52: -------------------------------------------------------------------------------- @@ -15353,7 +15353,7 @@ set @dummystring = 'temp value'; iterate label1; END case label1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'case +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'case when action = 'delete' then delete from res_t3_itisalongname_1381742_itsav' at line 3 DROP PROCEDURE IF EXISTS sp3; @@ -15369,7 +15369,7 @@ iterate label1; END case; END label1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'then +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'then delete from res_t3_itisalongname_1381742_itsaverylongname_1381742; else set' at line 5 @@ -15386,7 +15386,7 @@ set @dummystring = 'temp value'; iterate label1; END case; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'then action = 'truncate' when +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'then action = 'truncate' when truncate from res_t3_itisalongname_1381742_itsave' at line 6 DROP PROCEDURE IF EXISTS sp3; CREATE PROCEDURE sp3( action char(20) ) @@ -15403,7 +15403,7 @@ when 'delete' then delete from res_t3_itisalongname_1381742_itsaverylongname_1381742; END case; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'when 'delete' then +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'when 'delete' then delete from res_t3_itisalongname_1381742_itsaverylongname_13' at line 11 DROP PROCEDURE IF EXISTS sp3; CREATE PROCEDURE sp3( action char(20) ) @@ -15463,7 +15463,7 @@ END if; iterate label1; END loop label1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'elseif count > 20 then +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'elseif count > 20 then leave label1; END if; iterate label1; @@ -15483,7 +15483,7 @@ END if; iterate label1; END loop label1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'else +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'else set count = count + 1; if count > 20 then leave label1; @@ -15503,7 +15503,7 @@ END if; iterate label1; END loop label1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'elseif count > 20 then +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'elseif count > 20 then leave label1; else set count=count+1; @@ -15523,7 +15523,7 @@ set count=count+1; iterate label1; END loop label1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END if; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'END if; if count > 20 then leave label1; else @@ -15546,7 +15546,7 @@ set count=count+1; iterate label1; END loop label1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'declare count int; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'declare count int; set count = 1; label1: loop if count > 20 then @@ -15593,7 +15593,7 @@ when count = 1 then set count = count + 1; END case; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'else +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'else set count = 10; when count = 1 then set count = count + 1; @@ -15608,7 +15608,7 @@ when count = 2 then set count = count + 1; END case; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'when case count = 1 then +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'when case count = 1 then set count = 10; when count = 2 then set count = count' at line 3 @@ -15622,7 +15622,7 @@ when count = 2 then set count = count + 1; END case; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'case; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'case; when count = 1 then set count = 10; when count = 2 then @@ -15636,7 +15636,7 @@ case when count = 2 then set count = count + 1; END case; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'when count = 1 then +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'when count = 1 then set count = 10; case when count = 2 then set count = count' at line 3 @@ -15655,7 +15655,7 @@ if count1 > 5 then leave label1; END if; END repeat; until count1 > 5 END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END repeat; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'END repeat; until count1 > 5 END' at line 7 DROP PROCEDURE IF EXISTS sp6; @@ -15668,7 +15668,7 @@ set count1 = count1 + 1; if count1 > 5 then leave label1; END if; END repeat; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'until count1 > 5 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'until count1 > 5 repeat set count1 = count1 + 1; if count1 > 5 then leave label1' at line 4 @@ -15682,7 +15682,7 @@ if count1 > 5 then leave label1; END if; until count1 > 5 repeat; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END repeat +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'END repeat set count1 = count1 + 1; if count1 > 5 then leave label1; END if; unt' at line 4 @@ -15695,7 +15695,7 @@ set count1 = count1 + 1; if count1 > 5 then leave label1; END if; END repeat; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END repeat; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'END repeat; END' at line 7 DROP PROCEDURE IF EXISTS sp6; CREATE PROCEDURE sp6() @@ -15708,7 +15708,7 @@ until count1 > 10; SELECT count1; END repeat; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '; SELECT count1; END repeat; END' at line 7 @@ -15739,7 +15739,7 @@ END if; label1 iterate; END label1 loop; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'iterate; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'iterate; END label1 loop; END' at line 7 DROP PROCEDURE IF EXISTS sp7; @@ -15752,7 +15752,7 @@ END if; iterate label1; loop; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END loop; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'END loop; set @dummystring = 'temp value'; if count > 10 then leave label1; END ' at line 3 @@ -15766,7 +15766,7 @@ if count > 10 then leave label1; END if; END loop label1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'iterate label1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'iterate label1; loop set @dummystring = 'temp value'; if count > 10 then leave l' at line 3 @@ -15781,7 +15781,7 @@ do while v1 > 0 set v1 = v1 - 1; END while; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'while v1 > 0 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'while v1 > 0 set v1 = v1 - 1; END while; END' at line 4 @@ -15793,7 +15793,7 @@ do v1 > 0 while set v1 = v1 - 1; END while; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'while +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'while set v1 = v1 - 1; END while; END' at line 4 @@ -15805,7 +15805,7 @@ END while; set v1 = v1 - 1; while v1 > 0 do; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'while; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'while; set v1 = v1 - 1; while v1 > 0 do; END' at line 4 @@ -15894,7 +15894,7 @@ set count1 = count1 + 1; iterate lable1; END loop label1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'loop +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'loop if count1 > 2 then leave lable1; END if; insert into res_t3_itisalongname_1' at line 4 @@ -15995,7 +15995,7 @@ insert into res_t3_itisalongname_1381742_itsaverylongname_1381742 values( 'xyz' until count1 < 3 END repeat label1; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'label1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'label1; END' at line 8 Testcase 4.3.21: @@ -16037,7 +16037,7 @@ insert into res_t3_itisalongname_1381742_itsaverylongname_1381742 values( 'xyz' END while label1; END while; END// -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'label1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'label1; END while; END' at line 11 diff --git a/mysql-test/suite/handler/aria.result b/mysql-test/suite/handler/aria.result index 72d096132e6..95be170b5f8 100644 --- a/mysql-test/suite/handler/aria.result +++ b/mysql-test/suite/handler/aria.result @@ -1662,7 +1662,7 @@ CREATE TABLE t1(a INT); INSERT INTO t1 VALUES (1); HANDLER t1 OPEN; HANDLER t1 READ FIRST WHERE f1() = 1; -ERROR 42000: This version of MySQL doesn't yet support 'stored functions in HANDLER ... READ' +ERROR 42000: This version of MariaDB doesn't yet support 'stored functions in HANDLER ... READ' HANDLER t1 CLOSE; DROP FUNCTION f1; DROP TABLE t1; @@ -1677,7 +1677,7 @@ INSERT INTO t1 VALUES (1), (2); CREATE FUNCTION f1() RETURNS INT RETURN 1; HANDLER t1 OPEN; HANDLER t1 READ FIRST WHERE f1() = 1; -ERROR 42000: This version of MySQL doesn't yet support 'stored functions in HANDLER ... READ' +ERROR 42000: This version of MariaDB doesn't yet support 'stored functions in HANDLER ... READ' HANDLER t1 CLOSE; DROP FUNCTION f1; DROP TABLE t1; diff --git a/mysql-test/suite/handler/heap.result b/mysql-test/suite/handler/heap.result index 0d59440f88a..8b526335024 100644 --- a/mysql-test/suite/handler/heap.result +++ b/mysql-test/suite/handler/heap.result @@ -1662,7 +1662,7 @@ CREATE TABLE t1(a INT); INSERT INTO t1 VALUES (1); HANDLER t1 OPEN; HANDLER t1 READ FIRST WHERE f1() = 1; -ERROR 42000: This version of MySQL doesn't yet support 'stored functions in HANDLER ... READ' +ERROR 42000: This version of MariaDB doesn't yet support 'stored functions in HANDLER ... READ' HANDLER t1 CLOSE; DROP FUNCTION f1; DROP TABLE t1; @@ -1677,7 +1677,7 @@ INSERT INTO t1 VALUES (1), (2); CREATE FUNCTION f1() RETURNS INT RETURN 1; HANDLER t1 OPEN; HANDLER t1 READ FIRST WHERE f1() = 1; -ERROR 42000: This version of MySQL doesn't yet support 'stored functions in HANDLER ... READ' +ERROR 42000: This version of MariaDB doesn't yet support 'stored functions in HANDLER ... READ' HANDLER t1 CLOSE; DROP FUNCTION f1; DROP TABLE t1; diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result index ab7b8dc8848..db36640ea39 100644 --- a/mysql-test/suite/handler/innodb.result +++ b/mysql-test/suite/handler/innodb.result @@ -1666,7 +1666,7 @@ CREATE TABLE t1(a INT); INSERT INTO t1 VALUES (1); HANDLER t1 OPEN; HANDLER t1 READ FIRST WHERE f1() = 1; -ERROR 42000: This version of MySQL doesn't yet support 'stored functions in HANDLER ... READ' +ERROR 42000: This version of MariaDB doesn't yet support 'stored functions in HANDLER ... READ' HANDLER t1 CLOSE; DROP FUNCTION f1; DROP TABLE t1; @@ -1681,7 +1681,7 @@ INSERT INTO t1 VALUES (1), (2); CREATE FUNCTION f1() RETURNS INT RETURN 1; HANDLER t1 OPEN; HANDLER t1 READ FIRST WHERE f1() = 1; -ERROR 42000: This version of MySQL doesn't yet support 'stored functions in HANDLER ... READ' +ERROR 42000: This version of MariaDB doesn't yet support 'stored functions in HANDLER ... READ' HANDLER t1 CLOSE; DROP FUNCTION f1; DROP TABLE t1; diff --git a/mysql-test/suite/handler/interface.result b/mysql-test/suite/handler/interface.result index 923277914bd..96d21e7373a 100644 --- a/mysql-test/suite/handler/interface.result +++ b/mysql-test/suite/handler/interface.result @@ -9,20 +9,20 @@ insert into t1 values (20,"ggg"),(21,"hhh"),(22,"iii"),(23,"xxx"),(24,"xxx"),(25,"xxx"); handler t1 open; handler t1 read a=(SELECT 1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELECT 1)' at line 1 handler t1 read a=(1) FIRST; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FIRST' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'FIRST' at line 1 handler t1 read a=(1) NEXT; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NEXT' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NEXT' at line 1 handler t1 read last; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 handler t1 close; drop table t1; CREATE TABLE t1(a INT, PRIMARY KEY(a)); insert into t1 values(1),(2); handler t1 open; handler t1 read primary=(1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary=(1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'primary=(1)' at line 1 handler t1 read `primary`=(1); a 1 @@ -54,31 +54,31 @@ handler t1 open; ERROR 42000: Not unique table/alias: 't1' use test; handler test.t1 read first limit 9; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read first limit 9' at line 1 handler test_test.t1 read first limit 9; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read first limit 9' at line 1 handler t1 read first limit 9; table_id test_test.t1 handler test_test.t2 read first limit 9; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read first limit 9' at line 1 handler t2 read first limit 9; table_id test_test.t2 handler test_test.t1 close; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'close' at line 1 handler t1 close; drop table test_test.t1; handler test_test.t2 close; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'close' at line 1 handler t2 close; drop table test_test.t2; drop database test_test; use test; handler test.t1 close; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'close' at line 1 handler t1 close; ERROR 42S02: Unknown table 't1' in HANDLER drop table test.t1; @@ -113,7 +113,7 @@ handler t1 read first limit 9; c1 test_test.t1 handler test.t1 close; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'close' at line 1 handler test.t1 open h1; ERROR 42000: Not unique table/alias: 'h1' handler test_test.t1 open h1; @@ -136,7 +136,7 @@ handler h2 read first limit 9; c1 t1 handler test.h1 close; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'close' at line 1 handler t1 close; handler h1 close; handler h2 close; @@ -157,7 +157,7 @@ handler h3 read first limit 9; c1 test_test.t3 handler test.h3 read first limit 9; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read first limit 9' at line 1 handler h3 close; use test; drop table t3; diff --git a/mysql-test/suite/handler/myisam.result b/mysql-test/suite/handler/myisam.result index 96e67038db5..e8abe8047cd 100644 --- a/mysql-test/suite/handler/myisam.result +++ b/mysql-test/suite/handler/myisam.result @@ -1662,7 +1662,7 @@ CREATE TABLE t1(a INT); INSERT INTO t1 VALUES (1); HANDLER t1 OPEN; HANDLER t1 READ FIRST WHERE f1() = 1; -ERROR 42000: This version of MySQL doesn't yet support 'stored functions in HANDLER ... READ' +ERROR 42000: This version of MariaDB doesn't yet support 'stored functions in HANDLER ... READ' HANDLER t1 CLOSE; DROP FUNCTION f1; DROP TABLE t1; @@ -1677,7 +1677,7 @@ INSERT INTO t1 VALUES (1), (2); CREATE FUNCTION f1() RETURNS INT RETURN 1; HANDLER t1 OPEN; HANDLER t1 READ FIRST WHERE f1() = 1; -ERROR 42000: This version of MySQL doesn't yet support 'stored functions in HANDLER ... READ' +ERROR 42000: This version of MariaDB doesn't yet support 'stored functions in HANDLER ... READ' HANDLER t1 CLOSE; DROP FUNCTION f1; DROP TABLE t1; diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/r/maria.result index 36f7301ca0b..d01737ae7cd 100644 --- a/mysql-test/suite/maria/r/maria.result +++ b/mysql-test/suite/maria/r/maria.result @@ -1679,7 +1679,7 @@ create table t1 (c1 int) pack_keys=0; create table t2 (c1 int) pack_keys=1; create table t3 (c1 int) pack_keys=default; create table t4 (c1 int) pack_keys=2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2' at line 1 drop table t1, t2, t3; CREATE TABLE t1(a INT, b INT, KEY inx (a), UNIQUE KEY uinx (b)); INSERT INTO t1(a,b) VALUES (1,1),(2,2),(3,3),(4,4),(5,5); @@ -1928,9 +1928,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; create table t1 (a int not null, key key_block_size=1024 (a)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=1024 (a))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '=1024 (a))' at line 1 create table t1 (a int not null, key `a` key_block_size=1024 (a)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_block_size=1024 (a))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_block_size=1024 (a))' at line 1 CREATE TABLE t1 ( c1 INT, c2 VARCHAR(300), diff --git a/mysql-test/suite/maria/r/maria3.result b/mysql-test/suite/maria/r/maria3.result index 21de234dad6..c38eb6af191 100644 --- a/mysql-test/suite/maria/r/maria3.result +++ b/mysql-test/suite/maria/r/maria3.result @@ -34,9 +34,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0 drop table t1; create table t1 (a int not null, key key_block_size=1024 (a)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=1024 (a))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '=1024 (a))' at line 1 create table t1 (a int not null, key `a` key_block_size=1024 (a)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_block_size=1024 (a))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_block_size=1024 (a))' at line 1 CREATE TABLE t1 ( c1 INT, c2 VARCHAR(300), diff --git a/mysql-test/suite/maria/r/ps_maria.result b/mysql-test/suite/maria/r/ps_maria.result index d2e27268b5e..1f26f03f479 100644 --- a/mysql-test/suite/maria/r/ps_maria.result +++ b/mysql-test/suite/maria/r/ps_maria.result @@ -86,9 +86,9 @@ c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c 9 9 9 9 9 9 9 9 9 9 9.0000 9.0000 2004-02-29 2004-02-29 11:11:11 2004-02-29 11:11:11 11:11:11 2004 1 0 a 123456789a 123456789a123456789b123456789c tinyblob tinytext blob text mediumblob mediumtext longblob longtext two tuesday set @arg00='SELECT' ; @arg00 a from t1 where a=1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 prepare stmt1 from ' ? a from t1 where a=1 '; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a from t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a from t1 where a=1' at line 1 set @arg00=1 ; select @arg00, b from t1 where a=1 ; @arg00 b @@ -263,19 +263,19 @@ session_id drop table t5 ; set @arg00='FROM' ; select a @arg00 t1 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 t1 where a=1' at line 1 prepare stmt1 from ' select a ? t1 where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? t1 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? t1 where a=1' at line 1 set @arg00='t1' ; select a from @arg00 where a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 where a=1' at line 1 prepare stmt1 from ' select a from ? where a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? where a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? where a=1' at line 1 set @arg00='WHERE' ; select a from t1 @arg00 a=1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 a=1' at line 1 prepare stmt1 from ' select a from t1 ? a=1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a=1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? a=1' at line 1 set @arg00=1 ; select a FROM t1 where a=@arg00 ; a @@ -366,9 +366,9 @@ NULL delete from t9 where c1= 0 ; set @arg00='>' ; select a FROM t1 where a @arg00 1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@arg00 1' at line 1 prepare stmt1 from ' select a FROM t1 where a ? 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? 1' at line 1 set @arg00=1 ; select a,b FROM t1 where a is not NULL AND b is not NULL group by a - @arg00 ; @@ -2089,7 +2089,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select ? := c1 from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':= c1 from t9 where c1= 1' at line 1 test_sequence ------ select column, .. into @parm,.. ------ select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, @@ -2265,7 +2265,7 @@ def @arg32 250 16777215 0 Y 0 31 8 @arg01 @arg02 @arg03 @arg04 @arg05 @arg06 @arg07 @arg08 @arg09 @arg10 @arg11 @arg12 @arg13 @arg14 @arg15 @arg16 @arg17 @arg18 @arg19 @arg20 @arg21 @arg22 @arg23 @arg24 @arg25 @arg26 @arg27 @arg28 @arg29 @arg30 @arg31 @arg32 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1991-01-01 01:01:01 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL prepare stmt1 from "select c1 into ? from t9 where c1= 1" ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? from t9 where c1= 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from t9 where c1= 1' at line 1 test_sequence -- insert into numeric columns -- insert into t9 diff --git a/mysql-test/suite/parts/r/partition_alter3_innodb.result b/mysql-test/suite/parts/r/partition_alter3_innodb.result index 7825a2350b0..ed41ede378d 100644 --- a/mysql-test/suite/parts/r/partition_alter3_innodb.result +++ b/mysql-test/suite/parts/r/partition_alter3_innodb.result @@ -202,7 +202,7 @@ ALTER TABLE t1 DROP PARTITION part1; ERROR HY000: DROP PARTITION can only be used on RANGE/LIST partitions # 1.2.2 COALESCE PARTITION partitionname is not supported ALTER TABLE t1 COALESCE PARTITION part1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'part1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'part1' at line 1 # 1.2.3 Decrease by 0 is non sense --> must fail ALTER TABLE t1 COALESCE PARTITION 0; ERROR HY000: At least one partition must be coalesced diff --git a/mysql-test/suite/parts/r/partition_alter3_myisam.result b/mysql-test/suite/parts/r/partition_alter3_myisam.result index a5dec48e85c..297f2bf9210 100644 --- a/mysql-test/suite/parts/r/partition_alter3_myisam.result +++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result @@ -240,7 +240,7 @@ ALTER TABLE t1 DROP PARTITION part1; ERROR HY000: DROP PARTITION can only be used on RANGE/LIST partitions # 1.2.2 COALESCE PARTITION partitionname is not supported ALTER TABLE t1 COALESCE PARTITION part1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'part1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'part1' at line 1 # 1.2.3 Decrease by 0 is non sense --> must fail ALTER TABLE t1 COALESCE PARTITION 0; ERROR HY000: At least one partition must be coalesced diff --git a/mysql-test/suite/parts/r/partition_engine_innodb.result b/mysql-test/suite/parts/r/partition_engine_innodb.result index 22ce5d75952..c033ea36351 100644 --- a/mysql-test/suite/parts/r/partition_engine_innodb.result +++ b/mysql-test/suite/parts/r/partition_engine_innodb.result @@ -1432,7 +1432,7 @@ PARTITION BY HASH(f_int1) ( PARTITION part1 STORAGE ENGINE = 'InnoDB', PARTITION part2 ); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1444,7 +1444,7 @@ PARTITION BY HASH(f_int1) ( PARTITION part1 , PARTITION part2 STORAGE ENGINE = 'InnoDB' ); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1461,7 +1461,7 @@ PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 STORAGE ENGINE = 'InnoDB', SUBPARTITION subpart22 STORAGE ENGINE = 'InnoDB') ); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1478,7 +1478,7 @@ PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21, SUBPARTITION subpart22 ) ); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1962,7 +1962,7 @@ PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 STORAGE ENGINE = 'InnoDB', SUBPARTITION subpart22 STORAGE ENGINE = 'InnoDB') ); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, diff --git a/mysql-test/suite/parts/r/partition_engine_myisam.result b/mysql-test/suite/parts/r/partition_engine_myisam.result index 41be1ce9303..cfba8731b2f 100644 --- a/mysql-test/suite/parts/r/partition_engine_myisam.result +++ b/mysql-test/suite/parts/r/partition_engine_myisam.result @@ -1463,7 +1463,7 @@ PARTITION BY HASH(f_int1) ( PARTITION part1 STORAGE ENGINE = 'MyISAM', PARTITION part2 ); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1475,7 +1475,7 @@ PARTITION BY HASH(f_int1) ( PARTITION part1 , PARTITION part2 STORAGE ENGINE = 'MyISAM' ); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1492,7 +1492,7 @@ PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 STORAGE ENGINE = 'MyISAM', SUBPARTITION subpart22 STORAGE ENGINE = 'MyISAM') ); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1509,7 +1509,7 @@ PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21, SUBPARTITION subpart22 ) ); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -2006,7 +2006,7 @@ PARTITION part2 VALUES LESS THAN (2147483646) (SUBPARTITION subpart21 STORAGE ENGINE = 'MyISAM', SUBPARTITION subpart22 STORAGE ENGINE = 'MyISAM') ); -ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MySQL +ERROR HY000: The mix of handlers in the partitions is not allowed in this version of MariaDB CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, diff --git a/mysql-test/suite/parts/r/partition_syntax_innodb.result b/mysql-test/suite/parts/r/partition_syntax_innodb.result index 848a30a13df..f704d902429 100644 --- a/mysql-test/suite/parts/r/partition_syntax_innodb.result +++ b/mysql-test/suite/parts/r/partition_syntax_innodb.result @@ -973,7 +973,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS -1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -985,7 +985,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS -1 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (214' at line 9 CREATE TABLE t1 ( @@ -1041,7 +1041,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS -2.0; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2.0' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2.0' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1053,7 +1053,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS -2.0 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2.0 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2.0 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2' at line 9 CREATE TABLE t1 ( @@ -1202,7 +1202,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS -2.0E+0; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2.0E+0' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2.0E+0' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1214,7 +1214,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS -2.0E+0 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2.0E+0 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2.0E+0 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN' at line 9 CREATE TABLE t1 ( @@ -1318,7 +1318,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS '2'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1330,7 +1330,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS '2' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (21' at line 9 CREATE TABLE t1 ( @@ -1341,7 +1341,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS '2.0'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2.0'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2.0'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1353,7 +1353,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS '2.0' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2.0' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2.0' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (' at line 9 CREATE TABLE t1 ( @@ -1364,7 +1364,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS '0.2E+1'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''0.2E+1'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''0.2E+1'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1376,7 +1376,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS '0.2E+1' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''0.2E+1' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''0.2E+1' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THA' at line 9 CREATE TABLE t1 ( @@ -1387,7 +1387,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS '2A'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2A'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2A'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1399,7 +1399,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS '2A' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2A' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2A' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2' at line 9 CREATE TABLE t1 ( @@ -1410,7 +1410,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS 'A2'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''A2'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''A2'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1422,7 +1422,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 'A2' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''A2' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''A2' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2' at line 9 CREATE TABLE t1 ( @@ -1433,7 +1433,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS ''; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '''' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '''' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1445,7 +1445,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS '' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (214' at line 9 CREATE TABLE t1 ( @@ -1456,7 +1456,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS 'GARBAGE'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''GARBAGE'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''GARBAGE'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1468,7 +1468,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 'GARBAGE' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''GARBAGE' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''GARBAGE' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS TH' at line 9 # 4.2.5 partition/subpartition numbers other notations @@ -1480,7 +1480,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS 2A; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2A' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2A' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1492,7 +1492,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 2A (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2A +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2A (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (214' at line 9 CREATE TABLE t1 ( @@ -1503,7 +1503,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS A2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A2' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'A2' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1515,7 +1515,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS A2 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'A2 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (214' at line 9 CREATE TABLE t1 ( @@ -1526,7 +1526,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS GARBAGE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GARBAGE' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1538,7 +1538,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS GARBAGE (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GARBAGE (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN' at line 9 CREATE TABLE t1 ( @@ -1549,7 +1549,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS "2"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2"' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"2"' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1561,7 +1561,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS "2" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2" +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"2" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (21' at line 9 CREATE TABLE t1 ( @@ -1572,7 +1572,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS "2A"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2A"' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"2A"' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1584,7 +1584,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS "2A" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2A" +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"2A" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2' at line 9 CREATE TABLE t1 ( @@ -1595,7 +1595,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS "A2"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"A2"' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"A2"' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1607,7 +1607,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS "A2" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"A2" +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"A2" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2' at line 9 CREATE TABLE t1 ( @@ -1618,7 +1618,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS "GARBAGE"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"GARBAGE"' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"GARBAGE"' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1630,7 +1630,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS "GARBAGE" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"GARBAGE" +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"GARBAGE" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS TH' at line 9 # 4.2.6 (negative) partition/subpartition numbers per @variables @@ -1643,7 +1643,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS @aux; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@aux' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@aux' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1655,7 +1655,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS @aux = 5 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@aux = 5 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@aux = 5 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THA' at line 9 #------------------------------------------------------------------------ diff --git a/mysql-test/suite/parts/r/partition_syntax_myisam.result b/mysql-test/suite/parts/r/partition_syntax_myisam.result index f3b7f5b3025..556abf7ad39 100644 --- a/mysql-test/suite/parts/r/partition_syntax_myisam.result +++ b/mysql-test/suite/parts/r/partition_syntax_myisam.result @@ -1055,7 +1055,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS -1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1067,7 +1067,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS -1 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (214' at line 9 CREATE TABLE t1 ( @@ -1123,7 +1123,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS -2.0; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2.0' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2.0' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1135,7 +1135,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS -2.0 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2.0 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2.0 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2' at line 9 CREATE TABLE t1 ( @@ -1284,7 +1284,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS -2.0E+0; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2.0E+0' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2.0E+0' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1296,7 +1296,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS -2.0E+0 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2.0E+0 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2.0E+0 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN' at line 9 CREATE TABLE t1 ( @@ -1400,7 +1400,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS '2'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1412,7 +1412,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS '2' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (21' at line 9 CREATE TABLE t1 ( @@ -1423,7 +1423,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS '2.0'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2.0'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2.0'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1435,7 +1435,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS '2.0' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2.0' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2.0' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (' at line 9 CREATE TABLE t1 ( @@ -1446,7 +1446,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS '0.2E+1'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''0.2E+1'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''0.2E+1'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1458,7 +1458,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS '0.2E+1' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''0.2E+1' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''0.2E+1' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THA' at line 9 CREATE TABLE t1 ( @@ -1469,7 +1469,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS '2A'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2A'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2A'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1481,7 +1481,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS '2A' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2A' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''2A' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2' at line 9 CREATE TABLE t1 ( @@ -1492,7 +1492,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS 'A2'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''A2'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''A2'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1504,7 +1504,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 'A2' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''A2' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''A2' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2' at line 9 CREATE TABLE t1 ( @@ -1515,7 +1515,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS ''; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '''' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '''' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1527,7 +1527,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS '' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (214' at line 9 CREATE TABLE t1 ( @@ -1538,7 +1538,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS 'GARBAGE'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''GARBAGE'' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''GARBAGE'' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1550,7 +1550,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 'GARBAGE' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''GARBAGE' +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''GARBAGE' (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS TH' at line 9 # 4.2.5 partition/subpartition numbers other notations @@ -1562,7 +1562,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS 2A; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2A' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2A' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1574,7 +1574,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 2A (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2A +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2A (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (214' at line 9 CREATE TABLE t1 ( @@ -1585,7 +1585,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS A2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A2' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'A2' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1597,7 +1597,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS A2 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'A2 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (214' at line 9 CREATE TABLE t1 ( @@ -1608,7 +1608,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS GARBAGE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GARBAGE' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1620,7 +1620,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS GARBAGE (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'GARBAGE (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN' at line 9 CREATE TABLE t1 ( @@ -1631,7 +1631,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS "2"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2"' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"2"' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1643,7 +1643,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS "2" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2" +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"2" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (21' at line 9 CREATE TABLE t1 ( @@ -1654,7 +1654,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS "2A"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2A"' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"2A"' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1666,7 +1666,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS "2A" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2A" +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"2A" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2' at line 9 CREATE TABLE t1 ( @@ -1677,7 +1677,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS "A2"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"A2"' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"A2"' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1689,7 +1689,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS "A2" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"A2" +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"A2" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2' at line 9 CREATE TABLE t1 ( @@ -1700,7 +1700,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS "GARBAGE"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"GARBAGE"' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"GARBAGE"' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1712,7 +1712,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS "GARBAGE" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"GARBAGE" +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '"GARBAGE" (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS TH' at line 9 # 4.2.6 (negative) partition/subpartition numbers per @variables @@ -1725,7 +1725,7 @@ f_char2 CHAR(20), f_charbig VARCHAR(1000) ) PARTITION BY HASH(f_int1) PARTITIONS @aux; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@aux' at line 8 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@aux' at line 8 CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, @@ -1737,7 +1737,7 @@ PARTITION BY RANGE(f_int1) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS @aux = 5 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THAN (2147483646)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@aux = 5 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@aux = 5 (PARTITION part1 VALUES LESS THAN (10), PARTITION part2 VALUES LESS THA' at line 9 #------------------------------------------------------------------------ diff --git a/mysql-test/suite/pbxt/r/cast.result b/mysql-test/suite/pbxt/r/cast.result index 628cdd1f2c0..780f4baedf8 100644 --- a/mysql-test/suite/pbxt/r/cast.result +++ b/mysql-test/suite/pbxt/r/cast.result @@ -2,12 +2,12 @@ select CAST(1-2 AS UNSIGNED); CAST(1-2 AS UNSIGNED) 18446744073709551615 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER); CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER) -1 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select CAST('10 ' as unsigned integer); CAST('10 ' as unsigned integer) 10 @@ -17,14 +17,14 @@ select cast(-5 as unsigned) | 1, cast(-5 as unsigned) & -1; cast(-5 as unsigned) | 1 cast(-5 as unsigned) & -1 18446744073709551611 18446744073709551611 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select cast(-5 as unsigned) -1, cast(-5 as unsigned) + 1; cast(-5 as unsigned) -1 cast(-5 as unsigned) + 1 18446744073709551610 18446744073709551612 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select ~5, cast(~5 as signed); ~5 cast(~5 as signed) 18446744073709551610 -6 @@ -135,12 +135,12 @@ select cast('9223372036854775809' as signed); cast('9223372036854775809' as signed) -9223372036854775807 Warnings: -Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement select cast('-1' as unsigned); cast('-1' as unsigned) 18446744073709551615 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select cast('abc' as signed); cast('abc' as signed) 0 @@ -324,7 +324,7 @@ select cast('18446744073709551615' as signed); cast('18446744073709551615' as signed) -1 Warnings: -Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement select cast('9223372036854775807' as signed); cast('9223372036854775807' as signed) 9223372036854775807 @@ -335,7 +335,7 @@ select cast(concat('184467440','73709551615') as signed); cast(concat('184467440','73709551615') as signed) -1 Warnings: -Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement select cast(repeat('1',20) as unsigned); cast(repeat('1',20) as unsigned) 11111111111111111111 @@ -343,7 +343,7 @@ select cast(repeat('1',20) as signed); cast(repeat('1',20) as signed) -7335632962598440505 Warnings: -Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement select cast(1.0e+300 as signed int); cast(1.0e+300 as signed int) 9223372036854775807 diff --git a/mysql-test/suite/pbxt/r/create.result b/mysql-test/suite/pbxt/r/create.result index ae4e04dd562..e367c04b00f 100644 --- a/mysql-test/suite/pbxt/r/create.result +++ b/mysql-test/suite/pbxt/r/create.result @@ -303,11 +303,11 @@ ERROR 42000: Incorrect database name 'db1 ' create table t1(`a ` int); ERROR 42000: Incorrect column name 'a ' create table t1 (a int,); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 create table t1 (a int,,b int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'b int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'b int)' at line 1 create table t1 (,b int); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'b int)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'b int)' at line 1 create table t1 (a int, key(a)); create table t2 (b int, foreign key(b) references t1(a), key(b)); drop table if exists t2,t1; diff --git a/mysql-test/suite/pbxt/r/derived.result b/mysql-test/suite/pbxt/r/derived.result index 9294b658595..f2247504936 100644 --- a/mysql-test/suite/pbxt/r/derived.result +++ b/mysql-test/suite/pbxt/r/derived.result @@ -216,15 +216,15 @@ a 2 drop table t1; select mail_id, if(folder.f_description!='', folder.f_description, folder.f_name) as folder_name, date, address_id, phrase, address, subject from folder, (select mail.mail_id as mail_id, date_format(mail.h_date, '%b %e, %Y %h:%i') as date, mail.folder_id, sender.address_id as address_id, sender.phrase as phrase, sender.address as address, mail.h_subject as subject from mail left join mxa as mxa_sender on mail.mail_id=mxa_sender.mail_id and mxa_sender.type='from' left join address as sender on mxa_sender.address_id=sender.address_id mxa as mxa_recipient, address as recipient, where 1 and mail.mail_id=mxa_recipient.mail_id and mxa_recipient.address_id=recipient.address_id and mxa_recipient.type='to' and match(sender.phrase, sender.address, sender.comment) against ('jeremy' in boolean mode) and match(recipient.phrase, recipient.address, recipient.comment) against ('monty' in boolean mode) order by mail.h_date desc limit 0, 25 ) as query where query.folder_id=folder.folder_id; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mxa as mxa_recipient, address as recipient, where 1 and mail.mail_id=mxa_r' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'mxa as mxa_recipient, address as recipient, where 1 and mail.mail_id=mxa_r' at line 1 create table t1 (a int); insert into t1 values (1),(2),(3); update (select * from t1) as t1 set a = 5; ERROR HY000: The target table t1 of the UPDATE is not updatable delete from (select * from t1); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(select * from t1)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(select * from t1)' at line 1 insert into (select * from t1) values (5); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(select * from t1) values (5)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(select * from t1) values (5)' at line 1 drop table t1; create table t1 (E1 INTEGER UNSIGNED NOT NULL, E2 INTEGER UNSIGNED NOT NULL, E3 INTEGER UNSIGNED NOT NULL, PRIMARY KEY(E1) ); diff --git a/mysql-test/suite/pbxt/r/group_by.result b/mysql-test/suite/pbxt/r/group_by.result index d20df632ab1..683a862b21e 100644 --- a/mysql-test/suite/pbxt/r/group_by.result +++ b/mysql-test/suite/pbxt/r/group_by.result @@ -1139,9 +1139,9 @@ EXPLAIN SELECT a FROM t1 USE INDEX (i2) USE INDEX (); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 index NULL i2 9 NULL 144 Using index EXPLAIN SELECT a FROM t1 FORCE INDEX (); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 EXPLAIN SELECT a FROM t1 IGNORE INDEX (); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1 EXPLAIN SELECT a FROM t1 USE INDEX FOR JOIN (i2) USE INDEX FOR GROUP BY (i2) GROUP BY a; id select_type table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/suite/pbxt/r/having.result b/mysql-test/suite/pbxt/r/having.result index fede184f9f7..1d871d43b70 100644 --- a/mysql-test/suite/pbxt/r/having.result +++ b/mysql-test/suite/pbxt/r/having.result @@ -218,7 +218,7 @@ count_col1 group_col2 20 hello 30 hello select sum(col1) as co12 from t1 group by col2 having col2 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '10' at line 1 select sum(col1) as co2, count(col2) as cc from t1 group by col1 having col1 =10; co2 cc 40 4 diff --git a/mysql-test/suite/pbxt/r/join.result b/mysql-test/suite/pbxt/r/join.result index 291c78deb74..1a2b6e4fc80 100644 --- a/mysql-test/suite/pbxt/r/join.result +++ b/mysql-test/suite/pbxt/r/join.result @@ -126,13 +126,13 @@ a 1 2 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a); -ERROR HY000: Too many tables; MySQL can only use XX tables in a join +ERROR HY000: Too many tables; MariaDB can only use XX tables in a join select a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a); a 1 2 select a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a); -ERROR HY000: Too many tables; MySQL can only use XX tables in a join +ERROR HY000: Too many tables; MariaDB can only use XX tables in a join drop table t1; CREATE TABLE t1 ( a int(11) NOT NULL, diff --git a/mysql-test/suite/pbxt/r/multi_update.result b/mysql-test/suite/pbxt/r/multi_update.result index 3ccbb74a01a..0a2332dd186 100644 --- a/mysql-test/suite/pbxt/r/multi_update.result +++ b/mysql-test/suite/pbxt/r/multi_update.result @@ -194,7 +194,7 @@ n d unix_timestamp(t) 1 10 1038401397 2 20 1038401397 UPDATE t1,t2 SET 1=2 WHERE t1.n=t2.n; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '1=2 WHERE t1.n=t2.n' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '1=2 WHERE t1.n=t2.n' at line 1 drop table t1,t2; set timestamp=0; set sql_safe_updates=0; diff --git a/mysql-test/suite/pbxt/r/olap.result b/mysql-test/suite/pbxt/r/olap.result index 0959ebb135f..74b03e0fa36 100644 --- a/mysql-test/suite/pbxt/r/olap.result +++ b/mysql-test/suite/pbxt/r/olap.result @@ -255,11 +255,11 @@ concat(':',product,':') sum(profit) avg(profit) :TV: 600 120.00000 NULL 7785 519.00000 select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube; -ERROR 42000: This version of MySQL doesn't yet support 'CUBE' +ERROR 42000: This version of MariaDB doesn't yet support 'CUBE' explain select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube; -ERROR 42000: This version of MySQL doesn't yet support 'CUBE' +ERROR 42000: This version of MariaDB doesn't yet support 'CUBE' select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube union all select product, country_id , year, sum(profit) from t1 group by product, country_id, year with rollup; -ERROR 42000: This version of MySQL doesn't yet support 'CUBE' +ERROR 42000: This version of MariaDB doesn't yet support 'CUBE' drop table t1,t2; CREATE TABLE t1 (i int); INSERT INTO t1 VALUES(100); diff --git a/mysql-test/suite/pbxt/r/partition_error.result b/mysql-test/suite/pbxt/r/partition_error.result index 42a0587eb8c..a9a48c5027a 100644 --- a/mysql-test/suite/pbxt/r/partition_error.result +++ b/mysql-test/suite/pbxt/r/partition_error.result @@ -36,7 +36,7 @@ partitions 3 (partition x1 tablespace ts1, partition x2 tablespace ts2, partition x3 tablespace ts3); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '+2) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '+2) partitions 3 (partition x1 tablespace ts1, partition x2 tablespace ts2, @@ -51,7 +51,7 @@ partitions 3 (partition tablespace ts1, partition x2 tablespace ts2, partition x3 tablespace ts3); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ts1, +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'ts1, partition x2 tablespace ts2, partition x3 tablespace ts3)' at line 8 CREATE TABLE t1 ( @@ -267,7 +267,7 @@ partition by range (a) subpartition by key (a+b) (partition x1 values less than (1) (subpartition x11, subpartition x12), partition x2 values less than (2) (subpartition x21, subpartition x22)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '+b) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '+b) (partition x1 values less than (1) (subpartition x11, subpartition x12), par' at line 7 CREATE TABLE t1 ( @@ -471,7 +471,7 @@ partition x2 ( subpartition x21 engine myisam, subpartition x22 engine myisam) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'list (a+b) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'list (a+b) ( partition x1 ( subpartition x11 engine myisam, subpartition x12 eng' at line 7 @@ -489,7 +489,7 @@ partition x2 ( subpartition x21 engine myisam values in (0), subpartition x22 engine myisam values in (1)) ); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'list (a+b) +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'list (a+b) ( partition x1 ( subpartition x11 engine myisam values in (0), subpar' at line 7 @@ -579,7 +579,7 @@ partition by list (a) partitions 2 (partition x1 values in 4, partition x2 values in (5)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '4, +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '4, partition x2 values in (5))' at line 8 CREATE TABLE t1 (a int) PARTITION BY RANGE (a) diff --git a/mysql-test/suite/pbxt/r/ps_1general.result b/mysql-test/suite/pbxt/r/ps_1general.result index 52eb7529a1b..ce51d4a5bd9 100644 --- a/mysql-test/suite/pbxt/r/ps_1general.result +++ b/mysql-test/suite/pbxt/r/ps_1general.result @@ -63,23 +63,23 @@ DEALLOCATE PREPARE stmt ; prepare stmt1 from ' select 1 as my_col ' ; prepare stmt1 from ' select ? as my_col ' ; prepare ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 prepare stmt1 ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 prepare stmt1 from ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 prepare_garbage stmt1 from ' select 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'prepare_garbage stmt1 from ' select 1 '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'prepare_garbage stmt1 from ' select 1 '' at line 1 prepare stmt1 from_garbage ' select 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from_garbage ' select 1 '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from_garbage ' select 1 '' at line 1 prepare stmt1 from ' select_garbage 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select_garbage 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select_garbage 1' at line 1 prepare from ' select 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from ' select 1 '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from ' select 1 '' at line 1 prepare stmt1 ' select 1 ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' select 1 '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' select 1 '' at line 1 prepare ? from ' select ? as my_col ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? from ' select ? as my_col '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '? from ' select ? as my_col '' at line 1 set @arg00='select 1 as my_col'; prepare stmt1 from @arg00; set @arg00=''; @@ -87,7 +87,7 @@ prepare stmt1 from @arg00; ERROR 42000: Query was empty set @arg00=NULL; prepare stmt1 from @arg01; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NULL' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NULL' at line 1 prepare stmt1 from ' select * from t1 where a <= 2 ' ; prepare stmt1 from ' select * from t1 where x <= 2 ' ; ERROR 42S22: Unknown column 'x' in 'where clause' @@ -99,10 +99,10 @@ drop table if exists not_exist ; prepare stmt1 from ' select * from not_exist where a <= 2 ' ; ERROR 42S02: Table 'test.not_exist' doesn't exist prepare stmt1 from ' insert into t1 values(? ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 prepare stmt1 from ' select a, b from t1 where a=? and where ' ; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'where' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'where' at line 2 execute never_prepared ; ERROR HY000: Unknown prepared statement handler (never_prepared) given to EXECUTE prepare stmt1 from ' select * from t1 where a <= 2 ' ; diff --git a/mysql-test/suite/pbxt/r/read_only.result b/mysql-test/suite/pbxt/r/read_only.result index 2eecb0a891d..6e5e27ee3f8 100644 --- a/mysql-test/suite/pbxt/r/read_only.result +++ b/mysql-test/suite/pbxt/r/read_only.result @@ -11,25 +11,25 @@ select @@global.read_only; @@global.read_only 1 create table t3 (a int); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement insert into t1 values(1); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement update t1 set a=1 where 1=0; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement update t1,t2 set t1.a=t2.a+1 where t1.a=t2.a; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement delete t1,t2 from t1,t2 where t1.a=t2.a; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement create temporary table t3 (a int) engine=myisam; create temporary table t4 (a int) engine=myisam select * from t3; insert into t3 values(1); insert into t4 select * from t3; update t1,t3 set t1.a=t3.a+1 where t1.a=t3.a; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement update t1,t3 set t3.a=t1.a+1 where t1.a=t3.a; update t4,t3 set t4.a=t3.a+1 where t4.a=t3.a; delete t1 from t1,t3 where t1.a=t3.a; -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement delete t3 from t1,t3 where t1.a=t3.a; delete t4 from t3,t4 where t4.a=t3.a; create temporary table t1 (a int) engine=myisam; @@ -38,7 +38,7 @@ update t1,t3 set t1.a=t3.a+1 where t1.a=t3.a; delete t1 from t1,t3 where t1.a=t3.a; drop table t1; insert into t1 values(1); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement set global read_only=0; lock table t1 write; lock table t2 write; diff --git a/mysql-test/suite/pbxt/r/renamedb.result b/mysql-test/suite/pbxt/r/renamedb.result index e77aca0d0b7..f774c3d1ab6 100644 --- a/mysql-test/suite/pbxt/r/renamedb.result +++ b/mysql-test/suite/pbxt/r/renamedb.result @@ -1,5 +1,5 @@ rename database testdb1 to testdb2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'database testdb1 to testdb2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'database testdb1 to testdb2' at line 1 ALTER DATABASE wrong UPGRADE DATA DIRECTORY NAME; ERROR HY000: Incorrect usage of ALTER DATABASE UPGRADE DATA DIRECTORY NAME and name ALTER DATABASE `#mysql41#not-supported` UPGRADE DATA DIRECTORY NAME; diff --git a/mysql-test/suite/pbxt/r/select.result b/mysql-test/suite/pbxt/r/select.result index 7c8a0f83a27..77630e5173b 100644 --- a/mysql-test/suite/pbxt/r/select.result +++ b/mysql-test/suite/pbxt/r/select.result @@ -2100,7 +2100,7 @@ drop table t4, t3, t2, t1; DO 1; DO benchmark(100,1+1),1,1; do default; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 do foobar; ERROR 42S22: Unknown column 'foobar' in 'field list' CREATE TABLE t1 ( @@ -3400,7 +3400,7 @@ f1 f2 f2 NULL a NULL drop table t1,t2; select * from (select * left join t on f1=f2) tt; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on f1=f2) tt' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'on f1=f2) tt' at line 1 CREATE TABLE t1 (sku int PRIMARY KEY, pr int); CREATE TABLE t2 (sku int PRIMARY KEY, sppr int, name varchar(255)); INSERT INTO t1 VALUES @@ -3634,5 +3634,5 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1(a int); INSERT into t1 values (1), (2), (3); SELECT * FROM t1 LIMIT 2, -1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1' at line 1 DROP TABLE t1; diff --git a/mysql-test/suite/pbxt/r/select_safe.result b/mysql-test/suite/pbxt/r/select_safe.result index 801c8fa67a3..8698e1f5471 100644 --- a/mysql-test/suite/pbxt/r/select_safe.result +++ b/mysql-test/suite/pbxt/r/select_safe.result @@ -1,7 +1,7 @@ drop table if exists t1,t2; SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=4, SQL_MAX_JOIN_SIZE=9; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead create table t1 (a int auto_increment primary key, b char(20)); insert into t1 values(1,"test"); SELECT SQL_BUFFER_RESULT * from t1; @@ -99,4 +99,4 @@ ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your W drop table t1; SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, SQL_MAX_JOIN_SIZE=DEFAULT; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead diff --git a/mysql-test/suite/pbxt/r/subselect.result b/mysql-test/suite/pbxt/r/subselect.result index 46a974b5168..02e1ed6c16a 100644 --- a/mysql-test/suite/pbxt/r/subselect.result +++ b/mysql-test/suite/pbxt/r/subselect.result @@ -918,9 +918,9 @@ Note 1003 select `test`.`t1`.`a` AS `a`,<`test`.`t1`.`a`>(= D (column 'a_dec'). create table t1(a decimal(7,3)); diff --git a/mysql-test/suite/pbxt/r/udf.result b/mysql-test/suite/pbxt/r/udf.result index 4bd5272969a..5918273f20a 100644 --- a/mysql-test/suite/pbxt/r/udf.result +++ b/mysql-test/suite/pbxt/r/udf.result @@ -95,10 +95,10 @@ FR DROP TABLE bug19904; CREATE DEFINER=CURRENT_USER() FUNCTION should_not_parse RETURNS STRING SONAME "should_not_parse.so"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RETURNS STRING SONAME "should_not_parse.so"' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RETURNS STRING SONAME "should_not_parse.so"' at line 2 CREATE DEFINER=someone@somewhere FUNCTION should_not_parse RETURNS STRING SONAME "should_not_parse.so"; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RETURNS STRING SONAME "should_not_parse.so"' at line 2 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'RETURNS STRING SONAME "should_not_parse.so"' at line 2 create table t1(f1 int); insert into t1 values(1),(2); explain select myfunc_int(f1) from t1 order by 1; @@ -136,7 +136,7 @@ ERROR 42000: Incorrect parameters in the call to stored function 'fn' SELECT myfunc_int(fn(MIN(b) xx)) as c FROM t1 GROUP BY a; ERROR 42000: Incorrect parameters in the call to stored function 'fn' SELECT myfunc_int(test.fn(MIN(b) xx)) as c FROM t1 GROUP BY a; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xx)) as c FROM t1 GROUP BY a' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xx)) as c FROM t1 GROUP BY a' at line 1 SELECT myfunc_int(fn(MIN(b)) xx) as c FROM t1 GROUP BY a; c 1 diff --git a/mysql-test/suite/pbxt/r/union.result b/mysql-test/suite/pbxt/r/union.result index 344e9759e35..cea55f3f204 100644 --- a/mysql-test/suite/pbxt/r/union.result +++ b/mysql-test/suite/pbxt/r/union.result @@ -341,7 +341,7 @@ select found_rows(); found_rows() 4 (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION all SELECT * FROM t2 LIMIT 2; a 1 diff --git a/mysql-test/suite/pbxt/r/user_var.result b/mysql-test/suite/pbxt/r/user_var.result index b6ba2522719..1a2cca5e431 100644 --- a/mysql-test/suite/pbxt/r/user_var.result +++ b/mysql-test/suite/pbxt/r/user_var.result @@ -191,7 +191,7 @@ select coercibility(@v1),coercibility(@v2),coercibility(@v3),coercibility(@v4); coercibility(@v1) coercibility(@v2) coercibility(@v3) coercibility(@v4) 2 2 2 2 set session @honk=99; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@honk=99' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '@honk=99' at line 1 select @@local.max_allowed_packet; @@local.max_allowed_packet # @@ -308,7 +308,7 @@ select @var; 3 drop table t1,t2; insert into city 'blah'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''blah'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''blah'' at line 1 SHOW COUNT(*) WARNINGS; @@session.warning_count 1 diff --git a/mysql-test/suite/rpl/r/rpl_conditional_comments.result b/mysql-test/suite/rpl/r/rpl_conditional_comments.result index fca7d941718..5471f788561 100644 --- a/mysql-test/suite/rpl/r/rpl_conditional_comments.result +++ b/mysql-test/suite/rpl/r/rpl_conditional_comments.result @@ -59,6 +59,6 @@ include/diff_tables.inc [master:t1,slave:t1] # Verify it can restore the '!', if the it is an uncomplete conditional # comments SELECT c1 FROM /*!99999 t1 WHEREN; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '/*!99999 t1 WHEREN' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '/*!99999 t1 WHEREN' at line 1 DROP TABLE t1; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result b/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result index 93faf37053a..29b5b768b66 100644 --- a/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result +++ b/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result @@ -162,13 +162,13 @@ RESET SLAVE; *** Misc incorrect values *** CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD='-1'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''-1'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''-1'' at line 1 RESET SLAVE; CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD='123abc'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''123abc'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''123abc'' at line 1 RESET SLAVE; CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=''; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '''' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '''' at line 1 RESET SLAVE; *** Running slave *** diff --git a/mysql-test/suite/rpl/r/rpl_read_only.result b/mysql-test/suite/rpl/r/rpl_read_only.result index 2f1f8cc1efb..63e84e3258a 100644 --- a/mysql-test/suite/rpl/r/rpl_read_only.result +++ b/mysql-test/suite/rpl/r/rpl_read_only.result @@ -37,9 +37,9 @@ insert into t1 values(1002); insert into t2 values(2002); *** On regular USER connection *** insert into t1 values(1003); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement insert into t2 values(2003); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement *** SUPER USER COMMIT (must succeed) *** COMMIT; *** regular USER COMMIT (must succeed - nothing to commit) *** @@ -111,9 +111,9 @@ a 2004 2005 insert into t1 values(1006); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement insert into t2 values(2006); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement drop user test; drop table t1; drop table t2; diff --git a/mysql-test/suite/rpl/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result index d235331391b..4b830799dd1 100644 --- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result +++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result @@ -1,9 +1,9 @@ start slave; Got one of the listed errors start slave; -ERROR HY000: Could not initialize master info structure; more error messages can be found in the MySQL error log +ERROR HY000: Could not initialize master info structure; more error messages can be found in the MariaDB error log change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root'; -ERROR HY000: Could not initialize master info structure; more error messages can be found in the MySQL error log +ERROR HY000: Could not initialize master info structure; more error messages can be found in the MariaDB error log reset slave; change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root'; reset master; diff --git a/mysql-test/suite/rpl/t/rpl_000010-slave.opt b/mysql-test/suite/rpl/t/rpl_000010-slave.opt index 0dbfb311e33..cbd77ee2abd 100644 --- a/mysql-test/suite/rpl/t/rpl_000010-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_000010-slave.opt @@ -1 +1 @@ ---disconnect-slave-event-count=2 +--debug-disconnect-slave-event-count=2 diff --git a/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt b/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt index 6d5b66bed61..5f038b69bb7 100644 --- a/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt +++ b/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt @@ -1 +1 @@ ---sporadic-binlog-dump-fail --max-binlog-dump-events=2 +--debug-sporadic-binlog-dump-fail --debug-max-binlog-dump-events=2 diff --git a/mysql-test/suite/sys_vars/r/aria_checkpoint_interval_basic.result b/mysql-test/suite/sys_vars/r/aria_checkpoint_interval_basic.result index aa9fc3a974b..d5113b24938 100644 --- a/mysql-test/suite/sys_vars/r/aria_checkpoint_interval_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_checkpoint_interval_basic.result @@ -34,8 +34,8 @@ select @@global.aria_checkpoint_interval; 0 set global aria_checkpoint_interval=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect aria_checkpoint_interval value: '18446744073709551615' select @@global.aria_checkpoint_interval; @@global.aria_checkpoint_interval diff --git a/mysql-test/suite/sys_vars/r/aria_checkpoint_log_activity_basic.result b/mysql-test/suite/sys_vars/r/aria_checkpoint_log_activity_basic.result index 8a0247471ff..fb751fddb29 100644 --- a/mysql-test/suite/sys_vars/r/aria_checkpoint_log_activity_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_checkpoint_log_activity_basic.result @@ -34,8 +34,8 @@ select @@global.aria_checkpoint_log_activity; 0 set global aria_checkpoint_log_activity=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect aria_checkpoint_log_activity value: '18446744073709551615' select @@global.aria_checkpoint_log_activity; @@global.aria_checkpoint_log_activity diff --git a/mysql-test/suite/sys_vars/r/aria_group_commit_interval_basic.result b/mysql-test/suite/sys_vars/r/aria_group_commit_interval_basic.result index 6729d05be05..e0c2950d37d 100644 --- a/mysql-test/suite/sys_vars/r/aria_group_commit_interval_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_group_commit_interval_basic.result @@ -34,8 +34,8 @@ select @@global.aria_group_commit_interval; 0 set global aria_group_commit_interval=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect aria_group_commit_interval value: '18446744073709551615' select @@global.aria_group_commit_interval; @@global.aria_group_commit_interval diff --git a/mysql-test/suite/sys_vars/r/aria_log_file_size_basic.result b/mysql-test/suite/sys_vars/r/aria_log_file_size_basic.result index 8dc7173ccc9..353ec38b2c7 100644 --- a/mysql-test/suite/sys_vars/r/aria_log_file_size_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_log_file_size_basic.result @@ -46,8 +46,8 @@ select @@global.aria_log_file_size; 8396800 set global aria_log_file_size=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect aria_log_file_size value: '18446744073709551615' select @@global.aria_log_file_size; @@global.aria_log_file_size diff --git a/mysql-test/suite/sys_vars/r/aria_max_sort_file_size_basic.result b/mysql-test/suite/sys_vars/r/aria_max_sort_file_size_basic.result index 00b45d8e53b..cd56f42a7c7 100644 --- a/mysql-test/suite/sys_vars/r/aria_max_sort_file_size_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_max_sort_file_size_basic.result @@ -46,8 +46,8 @@ select @@global.aria_max_sort_file_size; 1048576 set global aria_max_sort_file_size=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect aria_max_sort_file_size value: '18446744073709551615' select @@global.aria_max_sort_file_size; @@global.aria_max_sort_file_size diff --git a/mysql-test/suite/sys_vars/r/aria_pagecache_age_threshold_basic.result b/mysql-test/suite/sys_vars/r/aria_pagecache_age_threshold_basic.result index 636351ca83d..5e609017585 100644 --- a/mysql-test/suite/sys_vars/r/aria_pagecache_age_threshold_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_pagecache_age_threshold_basic.result @@ -46,8 +46,8 @@ select @@global.aria_pagecache_age_threshold; 200 set global aria_pagecache_age_threshold=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect aria_pagecache_age_threshold value: '18446744073709551615' select @@global.aria_pagecache_age_threshold; @@global.aria_pagecache_age_threshold diff --git a/mysql-test/suite/sys_vars/r/aria_pagecache_division_limit_basic.result b/mysql-test/suite/sys_vars/r/aria_pagecache_division_limit_basic.result index 2233092fa41..c331b96a180 100644 --- a/mysql-test/suite/sys_vars/r/aria_pagecache_division_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_pagecache_division_limit_basic.result @@ -36,8 +36,8 @@ select @@global.aria_pagecache_division_limit; 1 set global aria_pagecache_division_limit=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect aria_pagecache_division_limit value: '18446744073709551615' select @@global.aria_pagecache_division_limit; @@global.aria_pagecache_division_limit diff --git a/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result b/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result index b9bd498a8cc..947dc182fc0 100644 --- a/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result @@ -39,8 +39,8 @@ select @@global.aria_repair_threads; 1 set session aria_repair_threads=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select @@session.aria_repair_threads; @@session.aria_repair_threads 18446744073709551615 diff --git a/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result index 3224fff5618..4d4fba9a543 100644 --- a/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result @@ -39,8 +39,8 @@ select @@global.aria_sort_buffer_size; 4 set session aria_sort_buffer_size=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select @@session.aria_sort_buffer_size; @@session.aria_sort_buffer_size 18446744073709551615 diff --git a/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result index e0a939758d5..98072169fc9 100644 --- a/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result +++ b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result @@ -85,11 +85,11 @@ SELECT @@automatic_sp_privileges = @@global.automatic_sp_privileges; SET automatic_sp_privileges = 1; ERROR HY000: Variable 'automatic_sp_privileges' is a GLOBAL variable and should be set with SET GLOBAL SET local.automatic_sp_privileges = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'automatic_sp_privileges = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'automatic_sp_privileges = 1' at line 1 SELECT local.automatic_sp_privileges; ERROR 42S02: Unknown table 'local' in field list SET global.automatic_sp_privileges = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'automatic_sp_privileges = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'automatic_sp_privileges = 1' at line 1 SELECT global.automatic_sp_privileges; ERROR 42S02: Unknown table 'global' in field list SELECT automatic_sp_privileges = @@session.automatic_sp_privileges; diff --git a/mysql-test/suite/sys_vars/r/big_tables_basic.result b/mysql-test/suite/sys_vars/r/big_tables_basic.result index fac9be20d8d..4ff5774812a 100644 --- a/mysql-test/suite/sys_vars/r/big_tables_basic.result +++ b/mysql-test/suite/sys_vars/r/big_tables_basic.result @@ -87,11 +87,11 @@ SELECT @@big_tables; @@big_tables 1 SET local.big_tables = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'big_tables = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'big_tables = 1' at line 1 SELECT local.big_tables; ERROR 42S02: Unknown table 'local' in field list SET session.big_tables = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'big_tables = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'big_tables = 1' at line 1 SELECT session.big_tables; ERROR 42S02: Unknown table 'session' in field list select big_tables; diff --git a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result index 95693c6a1ba..915a2383435 100644 --- a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result @@ -97,7 +97,7 @@ SELECT @@binlog_cache_size = @@global.binlog_cache_size; SET binlog_cache_size = 1; ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL SET global.binlog_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binlog_cache_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_cache_size = 1' at line 1 SELECT global.binlog_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT binlog_cache_size = @@session.binlog_cache_size; diff --git a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result index 7cb553e48ee..8f1e519dab4 100644 --- a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result @@ -97,7 +97,7 @@ SELECT @@binlog_stmt_cache_size = @@global.binlog_stmt_cache_size; SET binlog_stmt_cache_size = 1; ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL SET global.binlog_stmt_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binlog_stmt_cache_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_stmt_cache_size = 1' at line 1 SELECT global.binlog_stmt_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT binlog_stmt_cache_size = @@session.binlog_stmt_cache_size; diff --git a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result index e687a86c68d..b332d01f900 100644 --- a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result @@ -134,11 +134,11 @@ SELECT @@bulk_insert_buffer_size; @@bulk_insert_buffer_size 1 SET local.bulk_insert_buffer_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1 SELECT local.bulk_insert_buffer_size; ERROR 42S02: Unknown table 'local' in field list SET session.bulk_insert_buffer_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1 SELECT session.bulk_insert_buffer_size; ERROR 42S02: Unknown table 'session' in field list SELECT bulk_insert_buffer_size = @@session.bulk_insert_buffer_size; diff --git a/mysql-test/suite/sys_vars/r/character_set_client_basic.result b/mysql-test/suite/sys_vars/r/character_set_client_basic.result index ed3612627e6..b0b8d620a9e 100644 --- a/mysql-test/suite/sys_vars/r/character_set_client_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_client_basic.result @@ -22,7 +22,7 @@ SELECT @@session.character_set_client; @@session.character_set_client utf8 SET global.character_set_client=utf8; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'character_set_client=utf8' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character_set_client=utf8' at line 1 SET session character_set_client=utf8; SELECT session character_set_client; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/character_set_connection_basic.result b/mysql-test/suite/sys_vars/r/character_set_connection_basic.result index feb9073e175..4ed313c71c7 100644 --- a/mysql-test/suite/sys_vars/r/character_set_connection_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_connection_basic.result @@ -22,7 +22,7 @@ SELECT @@session.character_set_connection; @@session.character_set_connection utf8 SET global.character_set_connection=utf8; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'character_set_connection=utf8' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character_set_connection=utf8' at line 1 SET session character_set_connection=utf8; SELECT session character_set_connection; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/character_set_database_basic.result b/mysql-test/suite/sys_vars/r/character_set_database_basic.result index 669af6a610c..88f311adf87 100644 --- a/mysql-test/suite/sys_vars/r/character_set_database_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_database_basic.result @@ -22,7 +22,7 @@ SELECT @@session.character_set_database; @@session.character_set_database utf8 SET global.character_set_database=utf8; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'character_set_database=utf8' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character_set_database=utf8' at line 1 SET session character_set_database=utf8; SELECT session character_set_database; ERROR 42S22: Unknown column 'session' in 'field list' @@ -429,7 +429,7 @@ SELECT @total_charset; SET @@character_set_database = "grek"; ERROR 42000: Unknown character set: 'grek' SET @@character_set_database = utf 8; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '8' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '8' at line 1 SET @@character_set_database = 0; ERROR 42000: Unknown character set: '0' SET @@character_set_database = 1.1; diff --git a/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result b/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result index e8d41d99437..826dc98a832 100644 --- a/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result @@ -22,7 +22,7 @@ SELECT @@session.character_set_filesystem; @@session.character_set_filesystem utf8 SET global.character_set_filesystem=utf8; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'character_set_filesystem=utf8' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character_set_filesystem=utf8' at line 1 SET session character_set_filesystem=utf8; SELECT session character_set_filesystem; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/character_set_results_basic.result b/mysql-test/suite/sys_vars/r/character_set_results_basic.result index 6b50f128af83b2cc70d9705aba19eae1e4c7a523..3354dcb18383fc0a727902db5137a2aaf3dac462 100644 GIT binary patch delta 21 ccmccD!1$nnaYGn0TVhdWqKnh!C}tL009+OaL;wH) delta 19 acmaFRz<95LaYGn0OJ#7N&*m6r7Fz&Jhz5!P diff --git a/mysql-test/suite/sys_vars/r/character_set_server_basic.result b/mysql-test/suite/sys_vars/r/character_set_server_basic.result index 966489c6cbb..0a009cdebdb 100644 --- a/mysql-test/suite/sys_vars/r/character_set_server_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_server_basic.result @@ -22,7 +22,7 @@ SELECT @@session.character_set_server; @@session.character_set_server utf8 SET global.character_set_server=utf8; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'character_set_server=utf8' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character_set_server=utf8' at line 1 SET session character_set_server=utf8; SELECT session character_set_server; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/collation_connection_basic.result b/mysql-test/suite/sys_vars/r/collation_connection_basic.result index bc6074e2614..c8ce41cfe88 100644 --- a/mysql-test/suite/sys_vars/r/collation_connection_basic.result +++ b/mysql-test/suite/sys_vars/r/collation_connection_basic.result @@ -22,7 +22,7 @@ SELECT @@session.collation_connection; @@session.collation_connection utf8_unicode_ci SET global.collation_connection=utf8_unicode_ci; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'collation_connection=utf8_unicode_ci' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'collation_connection=utf8_unicode_ci' at line 1 SET session collation_connection=utf8_unicode_ci; SELECT session collation_connection; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/collation_database_basic.result b/mysql-test/suite/sys_vars/r/collation_database_basic.result index 50787b4bc7d..efe9638c5f6 100644 --- a/mysql-test/suite/sys_vars/r/collation_database_basic.result +++ b/mysql-test/suite/sys_vars/r/collation_database_basic.result @@ -22,7 +22,7 @@ SELECT @@session.collation_database; @@session.collation_database utf8_unicode_ci SET global.collation_database=utf8_unicode_ci; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'collation_database=utf8_unicode_ci' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'collation_database=utf8_unicode_ci' at line 1 SET session collation_database=utf8_unicode_ci; SELECT session collation_database; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/collation_server_basic.result b/mysql-test/suite/sys_vars/r/collation_server_basic.result index 5e36643a3c9..e60f3a3041a 100644 --- a/mysql-test/suite/sys_vars/r/collation_server_basic.result +++ b/mysql-test/suite/sys_vars/r/collation_server_basic.result @@ -22,7 +22,7 @@ SELECT @@session.collation_server; @@session.collation_server utf8_unicode_ci SET global.collation_server=utf8_unicode_ci; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'collation_server=utf8_unicode_ci' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'collation_server=utf8_unicode_ci' at line 1 SET session collation_server=utf8_unicode_ci; SELECT session collation_server; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/completion_type_basic.result b/mysql-test/suite/sys_vars/r/completion_type_basic.result index c0f307cf238..9470a7e6100 100644 --- a/mysql-test/suite/sys_vars/r/completion_type_basic.result +++ b/mysql-test/suite/sys_vars/r/completion_type_basic.result @@ -119,11 +119,11 @@ SELECT @@completion_type; @@completion_type CHAIN SET local.completion_type = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'completion_type = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'completion_type = 1' at line 1 SELECT local.completion_type; ERROR 42S02: Unknown table 'local' in field list SET session.completion_type = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'completion_type = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'completion_type = 1' at line 1 SELECT session.completion_type; ERROR 42S02: Unknown table 'session' in field list SELECT completion_type = @@session.completion_type; diff --git a/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result index 996a5e93717..af3d25ff58e 100644 --- a/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result +++ b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result @@ -102,7 +102,7 @@ SELECT @@concurrent_insert; @@concurrent_insert AUTO SET global.concurrent_insert = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'concurrent_insert = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'concurrent_insert = 1' at line 1 SELECT global.concurrent_insert; ERROR 42S02: Unknown table 'global' in field list SELECT concurrent_insert = @@session.concurrent_insert; diff --git a/mysql-test/suite/sys_vars/r/connect_timeout_basic.result b/mysql-test/suite/sys_vars/r/connect_timeout_basic.result index 7947332a68c..985ca925491 100644 --- a/mysql-test/suite/sys_vars/r/connect_timeout_basic.result +++ b/mysql-test/suite/sys_vars/r/connect_timeout_basic.result @@ -82,7 +82,7 @@ SELECT @@connect_timeout = @@global.connect_timeout; SET connect_timeout = 1; ERROR HY000: Variable 'connect_timeout' is a GLOBAL variable and should be set with SET GLOBAL SET global.connect_timeout = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'connect_timeout = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'connect_timeout = 1' at line 1 SELECT global.connect_timeout; ERROR 42S02: Unknown table 'global' in field list SELECT connect_timeout = @@session.connect_timeout; diff --git a/mysql-test/suite/sys_vars/r/deadlock_search_depth_long_basic.result b/mysql-test/suite/sys_vars/r/deadlock_search_depth_long_basic.result index caf37fd951a..db3f59ded12 100644 --- a/mysql-test/suite/sys_vars/r/deadlock_search_depth_long_basic.result +++ b/mysql-test/suite/sys_vars/r/deadlock_search_depth_long_basic.result @@ -37,7 +37,7 @@ select @@global.deadlock_search_depth_long; 0 set session deadlock_search_depth_long=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect deadlock_search_depth_long value: '18446744073709551615' select @@session.deadlock_search_depth_long; @@session.deadlock_search_depth_long diff --git a/mysql-test/suite/sys_vars/r/deadlock_search_depth_short_basic.result b/mysql-test/suite/sys_vars/r/deadlock_search_depth_short_basic.result index 7533b4a0dab..5b0bfbdbad4 100644 --- a/mysql-test/suite/sys_vars/r/deadlock_search_depth_short_basic.result +++ b/mysql-test/suite/sys_vars/r/deadlock_search_depth_short_basic.result @@ -37,7 +37,7 @@ select @@global.deadlock_search_depth_short; 0 set session deadlock_search_depth_short=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect deadlock_search_depth_short value: '18446744073709551615' select @@session.deadlock_search_depth_short; @@session.deadlock_search_depth_short diff --git a/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result b/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result index b227b70133f..91f0a30239a 100644 --- a/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result +++ b/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result @@ -37,7 +37,7 @@ select @@global.deadlock_timeout_long; 0 set session deadlock_timeout_long=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect deadlock_timeout_long value: '18446744073709551615' select @@session.deadlock_timeout_long; @@session.deadlock_timeout_long diff --git a/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result b/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result index 5b8449142f2..f5e7ab4d687 100644 --- a/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result +++ b/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result @@ -37,7 +37,7 @@ select @@global.deadlock_timeout_short; 0 set session deadlock_timeout_short=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect deadlock_timeout_short value: '18446744073709551615' select @@session.deadlock_timeout_short; @@session.deadlock_timeout_short diff --git a/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result b/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result index 25706a1a3f4..269b1e564a1 100644 --- a/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result +++ b/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result @@ -34,7 +34,7 @@ select @@global.debug_binlog_fsync_sleep; 0 set global debug_binlog_fsync_sleep=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect debug_binlog_fsync_sleep value: '18446744073709551615' select @@global.debug_binlog_fsync_sleep; @@global.debug_binlog_fsync_sleep diff --git a/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result b/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result index 79cf572ce2e..13f5a901f6d 100644 --- a/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result +++ b/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result @@ -34,7 +34,7 @@ select @@global.debug_crc_break; 0 set global debug_crc_break=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select @@global.debug_crc_break; @@global.debug_crc_break 18446744073709551615 diff --git a/mysql-test/suite/sys_vars/r/debug_no_thread_alarm_basic.result b/mysql-test/suite/sys_vars/r/debug_no_thread_alarm_basic.result new file mode 100644 index 00000000000..817c7880d5d --- /dev/null +++ b/mysql-test/suite/sys_vars/r/debug_no_thread_alarm_basic.result @@ -0,0 +1,21 @@ +select @@global.debug_no_thread_alarm; +@@global.debug_no_thread_alarm +0 +select @@session.debug_no_thread_alarm; +ERROR HY000: Variable 'debug_no_thread_alarm' is a GLOBAL variable +show global variables like 'debug_no_thread_alarm'; +Variable_name Value +debug_no_thread_alarm OFF +show session variables like 'debug_no_thread_alarm'; +Variable_name Value +debug_no_thread_alarm OFF +select * from information_schema.global_variables where variable_name='debug_no_thread_alarm'; +VARIABLE_NAME VARIABLE_VALUE +DEBUG_NO_THREAD_ALARM OFF +select * from information_schema.session_variables where variable_name='debug_no_thread_alarm'; +VARIABLE_NAME VARIABLE_VALUE +DEBUG_NO_THREAD_ALARM OFF +set global debug_no_thread_alarm=1; +ERROR HY000: Variable 'debug_no_thread_alarm' is a read only variable +set session debug_no_thread_alarm=1; +ERROR HY000: Variable 'debug_no_thread_alarm' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/default_week_format_basic.result b/mysql-test/suite/sys_vars/r/default_week_format_basic.result index 8e3bc407ba3..1ba931734e9 100644 --- a/mysql-test/suite/sys_vars/r/default_week_format_basic.result +++ b/mysql-test/suite/sys_vars/r/default_week_format_basic.result @@ -152,11 +152,11 @@ SELECT @@default_week_format; @@default_week_format 1 SET local.default_week_format = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default_week_format = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default_week_format = 1' at line 1 SELECT local.default_week_format; ERROR 42S02: Unknown table 'local' in field list SET session.default_week_format = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default_week_format = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default_week_format = 1' at line 1 SELECT session.default_week_format; ERROR 42S02: Unknown table 'session' in field list SELECT default_week_format = @@session.default_week_format; diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result index 3da10bc8416..6acc2398bbd 100644 --- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result @@ -96,11 +96,11 @@ SELECT @@delayed_insert_limit; @@delayed_insert_limit 1 SET local.delayed_insert_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1 SELECT local.delayed_insert_limit; ERROR 42S02: Unknown table 'local' in field list SET global.delayed_insert_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1 SELECT global.delayed_insert_limit; ERROR 42S02: Unknown table 'global' in field list SELECT delayed_insert_limit = @@session.delayed_insert_limit; diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result index ceb89ad6698..7b2f98e3682 100644 --- a/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result +++ b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result @@ -94,11 +94,11 @@ SELECT @@delayed_insert_timeout; @@delayed_insert_timeout 1 SET local.delayed_insert_timeout = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_insert_timeout = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_timeout = 1' at line 1 SELECT local.delayed_insert_timeout; ERROR 42S02: Unknown table 'local' in field list SET global.delayed_insert_timeout = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_insert_timeout = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_timeout = 1' at line 1 SELECT global.delayed_insert_timeout; ERROR 42S02: Unknown table 'global' in field list SELECT delayed_insert_timeout = @@session.delayed_insert_timeout; diff --git a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result index f4448b08b1f..04aad26f0e8 100644 --- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result @@ -94,11 +94,11 @@ SELECT @@delayed_queue_size; @@delayed_queue_size 1 SET local.delayed_queue_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_queue_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1 SELECT local.delayed_queue_size; ERROR 42S02: Unknown table 'local' in field list SET global.delayed_queue_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_queue_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1 SELECT global.delayed_queue_size; ERROR 42S02: Unknown table 'global' in field list SELECT delayed_queue_size = @@session.delayed_queue_size; diff --git a/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result b/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result index 982cca47f5f..21c00c65eab 100644 --- a/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result +++ b/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result @@ -170,11 +170,11 @@ SELECT @@div_precision_increment; @@div_precision_increment 1 SET local.div_precision_increment = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'div_precision_increment = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'div_precision_increment = 1' at line 1 SELECT local.div_precision_increment; ERROR 42S02: Unknown table 'local' in field list SET session.div_precision_increment = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'div_precision_increment = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'div_precision_increment = 1' at line 1 SELECT session.div_precision_increment; ERROR 42S02: Unknown table 'session' in field list SELECT div_precision_increment = @@session.div_precision_increment; diff --git a/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result b/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result index b09fac99711..28b57da381d 100644 --- a/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result +++ b/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result @@ -13,26 +13,26 @@ index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_inters '#--------------------FN_DYNVARS_028_01------------------------#' SET @@session.engine_condition_pushdown = 0; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SET @@session.engine_condition_pushdown = DEFAULT; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@session.engine_condition_pushdown; @@session.engine_condition_pushdown 0 SET @@global.engine_condition_pushdown = 0; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SET @@global.engine_condition_pushdown = DEFAULT; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@global.engine_condition_pushdown; @@global.engine_condition_pushdown 1 '#---------------------FN_DYNVARS_028_02-------------------------#' SET engine_condition_pushdown = 1; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@engine_condition_pushdown; @@engine_condition_pushdown 1 @@ -44,38 +44,38 @@ SELECT global.engine_condition_pushdown; ERROR 42S02: Unknown table 'global' in field list SET session engine_condition_pushdown = 0; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@session.engine_condition_pushdown; @@session.engine_condition_pushdown 0 SET global engine_condition_pushdown = 0; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@global.engine_condition_pushdown; @@global.engine_condition_pushdown 0 '#--------------------FN_DYNVARS_028_03------------------------#' SET @@session.engine_condition_pushdown = 0; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@session.engine_condition_pushdown; @@session.engine_condition_pushdown 0 SET @@session.engine_condition_pushdown = 1; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@session.engine_condition_pushdown; @@session.engine_condition_pushdown 1 SET @@global.engine_condition_pushdown = 0; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@global.engine_condition_pushdown; @@global.engine_condition_pushdown 0 SET @@global.engine_condition_pushdown = 1; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@global.engine_condition_pushdown; @@global.engine_condition_pushdown 1 @@ -115,16 +115,16 @@ ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of ' '#-------------------FN_DYNVARS_028_05----------------------------#' SET @@global.engine_condition_pushdown = 0; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SET @@session.engine_condition_pushdown = 1; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@global.engine_condition_pushdown AS res_is_0; res_is_0 0 SET @@global.engine_condition_pushdown = 0; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@session.engine_condition_pushdown AS res_is_1; res_is_1 1 @@ -159,50 +159,50 @@ ON '#---------------------FN_DYNVARS_028_08-------------------------#' SET @@session.engine_condition_pushdown = OFF; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@session.engine_condition_pushdown; @@session.engine_condition_pushdown 0 SET @@session.engine_condition_pushdown = ON; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@session.engine_condition_pushdown; @@session.engine_condition_pushdown 1 SET @@global.engine_condition_pushdown = OFF; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@global.engine_condition_pushdown; @@global.engine_condition_pushdown 0 SET @@global.engine_condition_pushdown = ON; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@global.engine_condition_pushdown; @@global.engine_condition_pushdown 1 '#---------------------FN_DYNVARS_028_09----------------------#' SET @@session.engine_condition_pushdown = TRUE; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@session.engine_condition_pushdown; @@session.engine_condition_pushdown 1 SET @@session.engine_condition_pushdown = FALSE; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@session.engine_condition_pushdown; @@session.engine_condition_pushdown 0 SET @@global.engine_condition_pushdown = TRUE; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@global.engine_condition_pushdown; @@global.engine_condition_pushdown 1 SET @@global.engine_condition_pushdown = FALSE; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@global.engine_condition_pushdown; @@global.engine_condition_pushdown 0 @@ -215,7 +215,7 @@ select @@session.engine_condition_pushdown, 0 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=off,derived_with_keys=off,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=off,derived_with_keys=off,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on set @@session.engine_condition_pushdown = TRUE; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead select @@session.engine_condition_pushdown, @@global.engine_condition_pushdown, @@session.optimizer_switch, @@global.optimizer_switch; @@ -223,7 +223,7 @@ select @@session.engine_condition_pushdown, 1 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=on,index_condition_pushdown=on,derived_merge=off,derived_with_keys=off,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=off,derived_with_keys=off,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on set @@session.engine_condition_pushdown = FALSE; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead select @@session.engine_condition_pushdown, @@global.engine_condition_pushdown, @@session.optimizer_switch, @@global.optimizer_switch; @@ -231,7 +231,7 @@ select @@session.engine_condition_pushdown, 0 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=off,derived_with_keys=off,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=off,derived_with_keys=off,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on set @@global.engine_condition_pushdown = TRUE; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead select @@session.engine_condition_pushdown, @@global.engine_condition_pushdown, @@session.optimizer_switch, @@global.optimizer_switch; @@ -239,7 +239,7 @@ select @@session.engine_condition_pushdown, 0 1 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=off,derived_with_keys=off,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=on,index_condition_pushdown=on,derived_merge=off,derived_with_keys=off,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on set @@global.engine_condition_pushdown = FALSE; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead select @@session.engine_condition_pushdown, @@global.engine_condition_pushdown, @@session.optimizer_switch, @@global.optimizer_switch; @@ -271,13 +271,13 @@ select @@session.engine_condition_pushdown, 0 0 index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=off,derived_with_keys=off,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=off,derived_with_keys=off,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on SET @@session.engine_condition_pushdown = @session_start_value; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@session.engine_condition_pushdown; @@session.engine_condition_pushdown 0 SET @@global.engine_condition_pushdown = @global_start_value; Warnings: -Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MySQL 7.0. Please use '@@optimizer_switch' instead +Warning 1287 The syntax '@@engine_condition_pushdown' is deprecated and will be removed in MariaDB 7.0. Please use '@@optimizer_switch' instead SELECT @@global.engine_condition_pushdown; @@global.engine_condition_pushdown 0 diff --git a/mysql-test/suite/sys_vars/r/event_scheduler_basic.result b/mysql-test/suite/sys_vars/r/event_scheduler_basic.result index 835321530eb..04d3f5e5888 100644 --- a/mysql-test/suite/sys_vars/r/event_scheduler_basic.result +++ b/mysql-test/suite/sys_vars/r/event_scheduler_basic.result @@ -84,11 +84,11 @@ SELECT @@event_scheduler = @@global.event_scheduler; SET event_scheduler = ON; ERROR HY000: Variable 'event_scheduler' is a GLOBAL variable and should be set with SET GLOBAL SET local.event_scheduler = OFF; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'event_scheduler = OFF' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'event_scheduler = OFF' at line 1 SELECT local.event_scheduler; ERROR 42S02: Unknown table 'local' in field list SET global.event_scheduler = ON; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'event_scheduler = ON' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'event_scheduler = ON' at line 1 SELECT global.event_scheduler; ERROR 42S02: Unknown table 'global' in field list SELECT event_scheduler = @@session.event_scheduler; diff --git a/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result b/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result index 59b2662d1ea..d55ad7a73b9 100644 --- a/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result +++ b/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result @@ -114,11 +114,11 @@ SELECT @@expire_logs_days; @@expire_logs_days 1 SET local.expire_logs_days = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'expire_logs_days = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'expire_logs_days = 1' at line 1 SELECT local.expire_logs_days; ERROR 42S02: Unknown table 'local' in field list SET global.expire_logs_days = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'expire_logs_days = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'expire_logs_days = 1' at line 1 SELECT global.expire_logs_days; ERROR 42S02: Unknown table 'global' in field list SELECT expire_logs_days = @@session.expire_logs_days; diff --git a/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result b/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result index 4b4f951bc69..cd8968e3c7d 100644 --- a/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result +++ b/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result @@ -36,7 +36,7 @@ select @@global.extra_max_connections; 1 set global extra_max_connections=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect extra_max_connections value: '18446744073709551615' select @@global.extra_max_connections; @@global.extra_max_connections diff --git a/mysql-test/suite/sys_vars/r/flush_basic.result b/mysql-test/suite/sys_vars/r/flush_basic.result index 9a080ee0313..fabbf476052 100644 --- a/mysql-test/suite/sys_vars/r/flush_basic.result +++ b/mysql-test/suite/sys_vars/r/flush_basic.result @@ -84,7 +84,7 @@ SELECT @@flush = @@global.flush; SET flush = 1; ERROR HY000: Variable 'flush' is a GLOBAL variable and should be set with SET GLOBAL SET global.flush = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'flush = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'flush = 1' at line 1 SELECT global.flush; ERROR 42S02: Unknown table 'global' in field list SELECT flush = @@session.flush; diff --git a/mysql-test/suite/sys_vars/r/flush_time_basic.result b/mysql-test/suite/sys_vars/r/flush_time_basic.result index 45d0f74aa65..ab34db72c3b 100644 --- a/mysql-test/suite/sys_vars/r/flush_time_basic.result +++ b/mysql-test/suite/sys_vars/r/flush_time_basic.result @@ -34,7 +34,7 @@ select @@global.flush_time; 0 set global flush_time=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect flush_time value: '18446744073709551615' select @@global.flush_time; @@global.flush_time diff --git a/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result index d889eb7bba7..fc83ea5cf92 100644 --- a/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result +++ b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result @@ -77,7 +77,7 @@ ERROR 42000: Variable 'ft_boolean_syntax' can't be set to the value of 'ON' SET @@global.ft_boolean_syntax = true; ERROR 42000: Incorrect argument type to variable 'ft_boolean_syntax' SET @@global.ft_boolean_syntax = + -><()~*:""&|; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '><()~*:""&|' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '><()~*:""&|' at line 1 SET @@global.ft_boolean_syntax = ENABLE; ERROR 42000: Variable 'ft_boolean_syntax' can't be set to the value of 'ENABLE' SET @@global.ft_boolean_syntax = 'IGNORE'; diff --git a/mysql-test/suite/sys_vars/r/general_log_basic.result b/mysql-test/suite/sys_vars/r/general_log_basic.result index df6ec9fb384..1d16bc7c4d5 100644 --- a/mysql-test/suite/sys_vars/r/general_log_basic.result +++ b/mysql-test/suite/sys_vars/r/general_log_basic.result @@ -79,11 +79,11 @@ SELECT @@general_log = @@global.general_log; SET general_log = ON; ERROR HY000: Variable 'general_log' is a GLOBAL variable and should be set with SET GLOBAL SET local.general_log = OFF; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'general_log = OFF' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'general_log = OFF' at line 1 SELECT local.general_log; ERROR 42S02: Unknown table 'local' in field list SET global.general_log = ON; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'general_log = ON' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'general_log = ON' at line 1 SELECT global.general_log; ERROR 42S02: Unknown table 'global' in field list SELECT general_log = @@session.general_log; diff --git a/mysql-test/suite/sys_vars/r/identity_basic.result b/mysql-test/suite/sys_vars/r/identity_basic.result index 063decf2eb1..40111ead253 100644 --- a/mysql-test/suite/sys_vars/r/identity_basic.result +++ b/mysql-test/suite/sys_vars/r/identity_basic.result @@ -109,11 +109,11 @@ SELECT @@identity; @@identity 1 SET local.identity = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'identity = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'identity = 1' at line 1 SELECT local.identity; ERROR 42S02: Unknown table 'local' in field list SET session.identity = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'identity = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'identity = 1' at line 1 SELECT session.identity; ERROR 42S02: Unknown table 'session' in field list SELECT identity = @@session.identity; diff --git a/mysql-test/suite/sys_vars/r/init_connect_basic.result b/mysql-test/suite/sys_vars/r/init_connect_basic.result index 333a230a4a169876ca75a3bc09c3a189d4922d41..0992fae67fe4d5713302863f33ca2692986bd29b 100644 GIT binary patch delta 19 acmbO&H&<>$GZR~4QD&lx)8=-jDLep0ZU(Oa delta 17 YcmbO$H(PE)GZRZ?aG=lTPNpe505~26^#A|> diff --git a/mysql-test/suite/sys_vars/r/init_slave_basic.result b/mysql-test/suite/sys_vars/r/init_slave_basic.result index 87272f1489b..5f9b0a50e26 100644 --- a/mysql-test/suite/sys_vars/r/init_slave_basic.result +++ b/mysql-test/suite/sys_vars/r/init_slave_basic.result @@ -16,7 +16,7 @@ SET global init_slave='SET autocomit=0'; SELECT global init_slave; ERROR 42S22: Unknown column 'global' in 'field list' SELECT @@global init_slave; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'init_slave' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'init_slave' at line 1 '#--------------------FN_DYNVARS_037_02-------------------------#' SET @@global.init_slave = 'SET join_buffer_size=8200'; SET @@global.init_slave = DEFAULT; diff --git a/mysql-test/suite/sys_vars/r/insert_id_basic.result b/mysql-test/suite/sys_vars/r/insert_id_basic.result index 191bdcc96df..318563f7e42 100644 --- a/mysql-test/suite/sys_vars/r/insert_id_basic.result +++ b/mysql-test/suite/sys_vars/r/insert_id_basic.result @@ -109,11 +109,11 @@ SELECT @@insert_id; @@insert_id 1 SET local.insert_id = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insert_id = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insert_id = 1' at line 1 SELECT local.insert_id; ERROR 42S02: Unknown table 'local' in field list SET session.insert_id = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insert_id = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'insert_id = 1' at line 1 SELECT session.insert_id; ERROR 42S02: Unknown table 'session' in field list SELECT insert_id = @@session.insert_id; diff --git a/mysql-test/suite/sys_vars/r/join_buffer_space_limit_basic.result b/mysql-test/suite/sys_vars/r/join_buffer_space_limit_basic.result index 7377528cfad..9a65367a56f 100644 --- a/mysql-test/suite/sys_vars/r/join_buffer_space_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/join_buffer_space_limit_basic.result @@ -49,7 +49,7 @@ select @@global.join_buffer_space_limit; 2048 set session join_buffer_space_limit=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect join_buffer_space_limit value: '18446744073709551615' select @@session.join_buffer_space_limit; @@session.join_buffer_space_limit diff --git a/mysql-test/suite/sys_vars/r/join_cache_level_basic.result b/mysql-test/suite/sys_vars/r/join_cache_level_basic.result index 491aeacb4c0..871a8a28c39 100644 --- a/mysql-test/suite/sys_vars/r/join_cache_level_basic.result +++ b/mysql-test/suite/sys_vars/r/join_cache_level_basic.result @@ -37,7 +37,7 @@ select @@global.join_cache_level; 0 set session join_cache_level=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect join_cache_level value: '18446744073709551615' select @@session.join_cache_level; @@session.join_cache_level diff --git a/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result index 89aef2a3703..4a63be5fd22 100644 --- a/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result +++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result @@ -63,11 +63,11 @@ SELECT @@key_buffer_size = @@global.key_buffer_size; SET key_buffer_size = 8 ; ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL SET local.key_buffer_size = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_buffer_size = 10' at line 1 SELECT local.key_buffer_size; ERROR 42S02: Unknown table 'local' in field list SET global.key_buffer_size = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_buffer_size = 10' at line 1 SELECT global.key_buffer_size; ERROR 42S02: Unknown table 'global' in field list SELECT key_buffer_size = @@session.key_buffer_size; diff --git a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result index 9df9f56bd1f..f2a59e419e4 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result +++ b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result @@ -116,11 +116,11 @@ SELECT @@key_cache_age_threshold; @@key_cache_age_threshold 100 SET local.key_cache_age_threshold = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1 SELECT local.key_cache_age_threshold; ERROR 42S02: Unknown table 'local' in field list SET global.key_cache_age_threshold = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1 SELECT global.key_cache_age_threshold; ERROR 42S02: Unknown table 'global' in field list SELECT key_cache_age_threshold = @@session.key_cache_age_threshold; diff --git a/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result b/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result index 00ba39558af..db8273ceed5 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result +++ b/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result @@ -126,11 +126,11 @@ SELECT @@key_cache_block_size; @@key_cache_block_size 1024 SET local.key_cache_block_size = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_cache_block_size = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_block_size = 10' at line 1 SELECT local.key_cache_block_size; ERROR 42S02: Unknown table 'local' in field list SET global.key_cache_block_size = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_cache_block_size = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_block_size = 10' at line 1 SELECT global.key_cache_block_size; ERROR 42S02: Unknown table 'global' in field list SELECT key_cache_block_size = @@session.key_cache_block_size; diff --git a/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result b/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result index 641779ac819..83dcea6d096 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result @@ -120,11 +120,11 @@ SELECT @@key_cache_division_limit; @@key_cache_division_limit 90 SET local.key_cache_division_limit = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_cache_division_limit = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_division_limit = 10' at line 1 SELECT local.key_cache_division_limit; ERROR 42S02: Unknown table 'local' in field list SET global.key_cache_division_limit = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_cache_division_limit = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_division_limit = 10' at line 1 SELECT global.key_cache_division_limit; ERROR 42S02: Unknown table 'global' in field list SELECT key_cache_division_limit = @@session.key_cache_division_limit; diff --git a/mysql-test/suite/sys_vars/r/key_cache_segments_basic.result b/mysql-test/suite/sys_vars/r/key_cache_segments_basic.result index a60e717970e..83d423b0771 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_segments_basic.result +++ b/mysql-test/suite/sys_vars/r/key_cache_segments_basic.result @@ -34,7 +34,7 @@ select @@global.key_cache_segments; 0 set global key_cache_segments=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect key_cache_segments value: '18446744073709551615' select @@global.key_cache_segments; @@global.key_cache_segments diff --git a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result index 3f19c7dda15..e61436c0e47 100644 --- a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result +++ b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result @@ -22,7 +22,7 @@ SELECT @@session.lc_time_names; @@session.lc_time_names ar_AE SET global.lc_time_names=ar_AE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'lc_time_names=ar_AE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'lc_time_names=ar_AE' at line 1 SET session lc_time_names=ar_AE; SELECT session lc_time_names; ERROR 42S22: Unknown column 'session' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/local_infile_basic.result b/mysql-test/suite/sys_vars/r/local_infile_basic.result index 7afb367fde9..f74a394cff9 100644 --- a/mysql-test/suite/sys_vars/r/local_infile_basic.result +++ b/mysql-test/suite/sys_vars/r/local_infile_basic.result @@ -88,7 +88,7 @@ SELECT @@local_infile; @@local_infile 1 SET global.local_infile = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'local_infile = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'local_infile = 1' at line 1 SELECT global.local_infile; ERROR 42S02: Unknown table 'global' in field list SELECT local_infile = @@session.local_infile; diff --git a/mysql-test/suite/sys_vars/r/local_infile_func.result b/mysql-test/suite/sys_vars/r/local_infile_func.result index 66a1e5544fb..4a9d0e20b88 100644 --- a/mysql-test/suite/sys_vars/r/local_infile_func.result +++ b/mysql-test/suite/sys_vars/r/local_infile_func.result @@ -28,7 +28,7 @@ DROP TABLE IF EXISTS t1; create table t1(a int); LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/std_data/numbers.txt' INTO TABLE test.t1; -ERROR 42000: The used command is not allowed with this MySQL version +ERROR 42000: The used command is not allowed with this MariaDB version SELECT count(*) from t1; count(*) 0 diff --git a/mysql-test/suite/sys_vars/r/log_basic.result b/mysql-test/suite/sys_vars/r/log_basic.result index 5574d49514d..949d8cc8eaa 100644 --- a/mysql-test/suite/sys_vars/r/log_basic.result +++ b/mysql-test/suite/sys_vars/r/log_basic.result @@ -8,10 +8,10 @@ INIT_VALUE 1 SET @@global.log = ON; Warnings: -Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead +Warning 1287 The syntax '@@log' is deprecated and will be removed in MariaDB 7.0. Please use '@@general_log' instead SET global log = 0; Warnings: -Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead +Warning 1287 The syntax '@@log' is deprecated and will be removed in MariaDB 7.0. Please use '@@general_log' instead '#--------------------FN_DYNVARS_062_02-------------------------#' SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -20,4 +20,4 @@ VARIABLE_VALUE OFF SET @@global.log= @start_log; Warnings: -Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead +Warning 1287 The syntax '@@log' is deprecated and will be removed in MariaDB 7.0. Please use '@@general_log' instead diff --git a/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result b/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result index f577122bacf..fcb5abbcf91 100644 --- a/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result +++ b/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result @@ -70,7 +70,7 @@ ERROR HY000: Variable 'log_queries_not_using_indexes' is a GLOBAL variable and s SET LOCAL log_queries_not_using_indexes= TRUE; ERROR HY000: Variable 'log_queries_not_using_indexes' is a GLOBAL variable and should be set with SET GLOBAL SET @@global log_queries_not_using_indexes= TRUE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'log_queries_not_using_indexes= TRUE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'log_queries_not_using_indexes= TRUE' at line 1 SET @@SESSION log_queries_not_using_indexes= TRUE; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'log_queries_not_using_indexes= TRUE' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'log_queries_not_using_indexes= TRUE' at line 1 SET @@global.log_queries_not_using_indexes= @start_value; diff --git a/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result b/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result index 1748406b74b..9f1d5066e10 100644 --- a/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result +++ b/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result @@ -5,20 +5,20 @@ SELECT @start_value; '#---------------------FN_DYNVARS_004_01-------------------------#' SET @@global.log_slow_queries = DEFAULT; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SELECT @@global.log_slow_queries = 0; @@global.log_slow_queries = 0 1 '#--------------------FN_DYNVARS_004_02------------------------#' SET @@global.log_slow_queries = ON; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SELECT @@global.log_slow_queries; @@global.log_slow_queries 1 SET @@global.log_slow_queries = OFF; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SELECT @@global.log_slow_queries; @@global.log_slow_queries 0 @@ -61,7 +61,7 @@ IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE '#---------------------FN_DYNVARS_004_06----------------------#' SET @@global.log_slow_queries = 0; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SELECT @@global.log_slow_queries; @@global.log_slow_queries 0 @@ -72,7 +72,7 @@ IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE 1 SET @@global.log_slow_queries = 1; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SELECT @@global.log_slow_queries; @@global.log_slow_queries 1 @@ -84,7 +84,7 @@ IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE '#---------------------FN_DYNVARS_004_07----------------------#' SET @@global.log_slow_queries = TRUE; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SELECT @@global.log_slow_queries; @@global.log_slow_queries 1 @@ -95,7 +95,7 @@ IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE 1 SET @@global.log_slow_queries = FALSE; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SELECT @@global.log_slow_queries; @@global.log_slow_queries 0 @@ -107,7 +107,7 @@ IF(@@global.log_slow_queries, "ON", "OFF") = VARIABLE_VALUE '#---------------------FN_DYNVARS_004_08----------------------#' SET @@global.log_slow_queries = ON; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SELECT @@log_slow_queries = @@global.log_slow_queries; @@log_slow_queries = @@global.log_slow_queries 1 @@ -115,18 +115,18 @@ SELECT @@log_slow_queries = @@global.log_slow_queries; SET log_slow_queries = ON; ERROR HY000: Variable 'log_slow_queries' is a GLOBAL variable and should be set with SET GLOBAL SET local.log_slow_queries = OFF; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'log_slow_queries = OFF' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'log_slow_queries = OFF' at line 1 SELECT local.log_slow_queries; ERROR 42S02: Unknown table 'local' in field list SET global.log_slow_queries = ON; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'log_slow_queries = ON' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'log_slow_queries = ON' at line 1 SELECT global.log_slow_queries; ERROR 42S02: Unknown table 'global' in field list SELECT log_slow_queries = @@session.log_slow_queries; ERROR 42S22: Unknown column 'log_slow_queries' in 'field list' SET @@global.log_slow_queries = @start_value; Warnings: -Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MySQL 7.0. Please use '@@slow_query_log' instead +Warning 1287 The syntax '@@log_slow_queries' is deprecated and will be removed in MariaDB 7.0. Please use '@@slow_query_log' instead SELECT @@global.log_slow_queries; @@global.log_slow_queries 1 diff --git a/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result index 30eebdc9f44..707c4f2a058 100644 --- a/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result @@ -39,7 +39,7 @@ select @@global.log_slow_rate_limit; 1 set session log_slow_rate_limit=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect log_slow_rate_limit value: '18446744073709551615' select @@session.log_slow_rate_limit; @@session.log_slow_rate_limit diff --git a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result index d3c3cbd7a44..9f630e8bb00 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result @@ -137,11 +137,11 @@ SELECT @@max_binlog_cache_size; @@max_binlog_cache_size 4096 SET local.max_binlog_cache_size = 7000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_binlog_cache_size = 7000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_binlog_cache_size = 7000' at line 1 SELECT local.max_binlog_cache_size; ERROR 42S02: Unknown table 'local' in field list SET global.max_binlog_cache_size = 8000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_binlog_cache_size = 8000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_binlog_cache_size = 8000' at line 1 SELECT global.max_binlog_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT max_binlog_cache_size = @@session.max_binlog_cache_size; diff --git a/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result index 33f5495a011..87883351eb6 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result @@ -137,11 +137,11 @@ SELECT @@max_binlog_size; @@max_binlog_size 4096 SET local.max_binlog_size = 7000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_binlog_size = 7000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_binlog_size = 7000' at line 1 SELECT local.max_binlog_size; ERROR 42S02: Unknown table 'local' in field list SET global.max_binlog_size = 8000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_binlog_size = 8000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_binlog_size = 8000' at line 1 SELECT global.max_binlog_size; ERROR 42S02: Unknown table 'global' in field list SELECT max_binlog_size = @@session.max_binlog_size; diff --git a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result index 12f40ed87b5..14407672aa3 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result @@ -137,11 +137,11 @@ SELECT @@max_binlog_stmt_cache_size; @@max_binlog_stmt_cache_size 4096 SET local.max_binlog_stmt_cache_size = 7000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_binlog_stmt_cache_size = 7000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_binlog_stmt_cache_size = 7000' at line 1 SELECT local.max_binlog_stmt_cache_size; ERROR 42S02: Unknown table 'local' in field list SET global.max_binlog_stmt_cache_size = 8000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_binlog_stmt_cache_size = 8000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_binlog_stmt_cache_size = 8000' at line 1 SELECT global.max_binlog_stmt_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT max_binlog_stmt_cache_size = @@session.max_binlog_stmt_cache_size; diff --git a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result index 19f6f12a50b..be1a58394b8 100644 --- a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result +++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result @@ -119,11 +119,11 @@ SELECT @@max_connect_errors; @@max_connect_errors 5000 SET local.max_connect_errors = 7000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_connect_errors = 7000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connect_errors = 7000' at line 1 SELECT local.max_connect_errors; ERROR 42S02: Unknown table 'local' in field list SET global.max_connect_errors = 8000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_connect_errors = 8000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connect_errors = 8000' at line 1 SELECT global.max_connect_errors; ERROR 42S02: Unknown table 'global' in field list SELECT max_connect_errors = @@session.max_connect_errors; diff --git a/mysql-test/suite/sys_vars/r/max_connections_basic.result b/mysql-test/suite/sys_vars/r/max_connections_basic.result index eac35f3bf2b..708342b016d 100644 --- a/mysql-test/suite/sys_vars/r/max_connections_basic.result +++ b/mysql-test/suite/sys_vars/r/max_connections_basic.result @@ -119,11 +119,11 @@ SELECT @@max_connections; @@max_connections 5000 SET local.max_connections = 7000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_connections = 7000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connections = 7000' at line 1 SELECT local.max_connections; ERROR 42S02: Unknown table 'local' in field list SET global.max_connections = 8000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_connections = 8000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connections = 8000' at line 1 SELECT global.max_connections; ERROR 42S02: Unknown table 'global' in field list SELECT max_connections = @@session.max_connections; diff --git a/mysql-test/suite/sys_vars/r/max_join_size_basic.result b/mysql-test/suite/sys_vars/r/max_join_size_basic.result index 1f64514130c..b87de2bc45e 100644 --- a/mysql-test/suite/sys_vars/r/max_join_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_join_size_basic.result @@ -51,7 +51,7 @@ select @@sql_big_selects; 0 set max_join_size=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select @@sql_big_selects; @@sql_big_selects 1 diff --git a/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result index adfb9be367b..9419f251930 100644 --- a/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result +++ b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result @@ -117,11 +117,11 @@ SELECT @@max_prepared_stmt_count; @@max_prepared_stmt_count 5000 SET local.max_prepared_stmt_count = 7000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_prepared_stmt_count = 7000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_prepared_stmt_count = 7000' at line 1 SELECT local.max_prepared_stmt_count; ERROR 42S02: Unknown table 'local' in field list SET global.max_prepared_stmt_count = 8000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_prepared_stmt_count = 8000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_prepared_stmt_count = 8000' at line 1 SELECT global.max_prepared_stmt_count; ERROR 42S02: Unknown table 'global' in field list SELECT max_prepared_stmt_count = @@session.max_prepared_stmt_count; diff --git a/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result b/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result index 73d957accc1..d61e9dd20b0 100644 --- a/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result @@ -129,11 +129,11 @@ SELECT @@max_relay_log_size; @@max_relay_log_size 4096 SET local.max_relay_log_size = 7000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_relay_log_size = 7000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_relay_log_size = 7000' at line 1 SELECT local.max_relay_log_size; ERROR 42S02: Unknown table 'local' in field list SET global.max_relay_log_size = 8000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_relay_log_size = 8000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_relay_log_size = 8000' at line 1 SELECT global.max_relay_log_size; ERROR 42S02: Unknown table 'global' in field list SELECT max_relay_log_size = @@session.max_relay_log_size; diff --git a/mysql-test/suite/sys_vars/r/max_user_connections-2.result b/mysql-test/suite/sys_vars/r/max_user_connections-2.result index d9daec5c089..9f53fd80077 100644 --- a/mysql-test/suite/sys_vars/r/max_user_connections-2.result +++ b/mysql-test/suite/sys_vars/r/max_user_connections-2.result @@ -1,2 +1,2 @@ set global max_user_connections=100; -ERROR HY000: The MySQL server is running with the --max-user-connections=0 option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --max-user-connections=0 option so it cannot execute this statement diff --git a/mysql-test/suite/sys_vars/r/mrr_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/mrr_buffer_size_basic.result index ace7a44977e..b601bb6f513 100644 --- a/mysql-test/suite/sys_vars/r/mrr_buffer_size_basic.result +++ b/mysql-test/suite/sys_vars/r/mrr_buffer_size_basic.result @@ -43,7 +43,7 @@ select @@global.mrr_buffer_size; 8192 set session mrr_buffer_size=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect mrr_buffer_size value: '18446744073709551615' select @@session.mrr_buffer_size; @@session.mrr_buffer_size diff --git a/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result b/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result index d110188b3f6..f41870c873b 100644 --- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result +++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result @@ -9,121 +9,121 @@ SELECT @start_session_value; '#--------------------FN_DYNVARS_090_01-------------------------#' SET @@global.multi_range_count = 100; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SET @@global.multi_range_count = DEFAULT; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 256 SET @@session.multi_range_count = 200; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SET @@session.multi_range_count = DEFAULT; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 256 '#--------------------FN_DYNVARS_090_02-------------------------#' SET @@global.multi_range_count = DEFAULT; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count = 256; @@global.multi_range_count = 256 1 SET @@session.multi_range_count = DEFAULT; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count = 256; @@session.multi_range_count = 256 1 '#--------------------FN_DYNVARS_090_03-------------------------#' SET @@global.multi_range_count = 1; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 1 SET @@global.multi_range_count = 60020; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 60020 SET @@global.multi_range_count = 65535; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 65535 SET @@global.multi_range_count = 4294967295; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 4294967295 SET @@global.multi_range_count = 4294967294; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 4294967294 '#--------------------FN_DYNVARS_090_04-------------------------#' SET @@session.multi_range_count = 1; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 1 SET @@session.multi_range_count = 50050; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 50050 SET @@session.multi_range_count = 65535; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 65535 SET @@session.multi_range_count = 4294967295; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 4294967295 SET @@session.multi_range_count = 4294967294; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 4294967294 '#------------------FN_DYNVARS_090_05-----------------------#' SET @@global.multi_range_count = 0; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '0' SELECT @@global.multi_range_count; @@global.multi_range_count 1 SET @@global.multi_range_count = 4294967296; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 4294967296 SET @@global.multi_range_count = -1024; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '-1024' SELECT @@global.multi_range_count; @@global.multi_range_count 1 SET @@global.multi_range_count = 429496729500; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 429496729500 @@ -139,29 +139,29 @@ SELECT @@global.multi_range_count; 429496729500 SET @@session.multi_range_count = 0; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '0' SELECT @@session.multi_range_count; @@session.multi_range_count 1 SET @@session.multi_range_count = 4294967296; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 4294967296 SET @@session.multi_range_count = -1; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '-1' SELECT @@session.multi_range_count; @@session.multi_range_count 1 SET @@session.multi_range_count = 65530.34.; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.' at line 1 SET @@session.multi_range_count = 4294967295021; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 4294967295021 @@ -186,13 +186,13 @@ WHERE VARIABLE_NAME='multi_range_count'; '#------------------FN_DYNVARS_090_08-----------------------#' SET @@global.multi_range_count = TRUE; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 1 SET @@global.multi_range_count = FALSE; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '0' SELECT @@global.multi_range_count; @@global.multi_range_count @@ -200,14 +200,14 @@ SELECT @@global.multi_range_count; '#---------------------FN_DYNVARS_090_09----------------------#' SET @@global.multi_range_count = 10; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@multi_range_count = @@global.multi_range_count; @@multi_range_count = @@global.multi_range_count 0 '#---------------------FN_DYNVARS_090_10----------------------#' SET @@multi_range_count = 100; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@multi_range_count = @@local.multi_range_count; @@multi_range_count = @@local.multi_range_count 1 @@ -217,7 +217,7 @@ SELECT @@local.multi_range_count = @@session.multi_range_count; '#---------------------FN_DYNVARS_090_11----------------------#' SET multi_range_count = 1; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@multi_range_count; @@multi_range_count 1 @@ -229,13 +229,13 @@ SELECT multi_range_count = @@session.multi_range_count; ERROR 42S22: Unknown column 'multi_range_count' in 'field list' SET @@global.multi_range_count = @start_global_value; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 256 SET @@session.multi_range_count = @start_session_value; Warnings: -Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MySQL 5.7. Please use '@@mrr_buffer_size' instead +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 256 diff --git a/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result b/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result index f5f1c2d59cf..15725e757d5 100644 --- a/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result +++ b/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result @@ -106,9 +106,9 @@ nulls_unequal '#---------------------FN_DYNVARS_097_09----------------------#' SET myisam_stats_method = 'nulls_equal'; SET session.myisam_stats_method = 'nulls_equal'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'myisam_stats_method = 'nulls_equal'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'myisam_stats_method = 'nulls_equal'' at line 1 SET global.myisam_stats_method = 'nulls_equal'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'myisam_stats_method = 'nulls_equal'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'myisam_stats_method = 'nulls_equal'' at line 1 SET session myisam_stats_method = 'nulls_equal'; SELECT @@myisam_stats_method; @@myisam_stats_method diff --git a/mysql-test/suite/sys_vars/r/progress_report_time_basic.result b/mysql-test/suite/sys_vars/r/progress_report_time_basic.result index a50dbca2062..7aab917b4f8 100644 --- a/mysql-test/suite/sys_vars/r/progress_report_time_basic.result +++ b/mysql-test/suite/sys_vars/r/progress_report_time_basic.result @@ -37,7 +37,7 @@ select @@global.progress_report_time; 0 set session progress_report_time=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect progress_report_time value: '18446744073709551615' select @@session.progress_report_time; @@session.progress_report_time diff --git a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result index 074075dd2f7..892bc306bcb 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result @@ -114,11 +114,11 @@ SELECT @@query_cache_limit; @@query_cache_limit 1 SET local.query_cache_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_limit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1 SELECT local.query_cache_limit; ERROR 42S02: Unknown table 'local' in field list SET global.query_cache_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_limit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1 SELECT global.query_cache_limit; ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_limit = @@session.query_cache_limit; diff --git a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result index 91166b676d9..f02232d4d39 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result @@ -120,11 +120,11 @@ SELECT @@query_cache_min_res_unit; @@query_cache_min_res_unit 512 SET local.query_cache_min_res_unit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1 SELECT local.query_cache_min_res_unit; ERROR 42S02: Unknown table 'local' in field list SET global.query_cache_min_res_unit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1 SELECT global.query_cache_min_res_unit; ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_min_res_unit = @@session.query_cache_min_res_unit; diff --git a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result index c858adf9bcf..319948deefa 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result @@ -121,11 +121,11 @@ SELECT @@query_cache_size; @@query_cache_size 0 SET local.query_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1 SELECT local.query_cache_size; ERROR 42S02: Unknown table 'local' in field list SET global.query_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1 SELECT global.query_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_size = @@session.query_cache_size; diff --git a/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result index 33c76f05868..e2e9bcdc24a 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result +++ b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result @@ -3,7 +3,8 @@ select @@global.query_cache_strip_comments; @@global.query_cache_strip_comments 0 select @@session.query_cache_strip_comments; -ERROR HY000: Variable 'query_cache_strip_comments' is a GLOBAL variable +@@session.query_cache_strip_comments +0 show global variables like 'query_cache_strip_comments'; Variable_name Value query_cache_strip_comments OFF @@ -28,12 +29,22 @@ set global query_cache_strip_comments=1; select @@global.query_cache_strip_comments; @@global.query_cache_strip_comments 1 +set session query_cache_strip_comments=ON; +select @@session.query_cache_strip_comments; +@@session.query_cache_strip_comments +1 +set session query_cache_strip_comments=OFF; +select @@session.query_cache_strip_comments; +@@session.query_cache_strip_comments +0 set session query_cache_strip_comments=1; -ERROR HY000: Variable 'query_cache_strip_comments' is a GLOBAL variable and should be set with SET GLOBAL +select @@session.query_cache_strip_comments; +@@session.query_cache_strip_comments +1 set global query_cache_strip_comments=1.1; ERROR 42000: Incorrect argument type to variable 'query_cache_strip_comments' -set global query_cache_strip_comments=1e1; +set session query_cache_strip_comments=1e1; ERROR 42000: Incorrect argument type to variable 'query_cache_strip_comments' -set global query_cache_strip_comments="foo"; +set session query_cache_strip_comments="foo"; ERROR 42000: Variable 'query_cache_strip_comments' can't be set to the value of 'foo' SET @@global.query_cache_strip_comments = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/read_only_basic.result b/mysql-test/suite/sys_vars/r/read_only_basic.result index 0b344eeb932..6c2c50ced46 100644 --- a/mysql-test/suite/sys_vars/r/read_only_basic.result +++ b/mysql-test/suite/sys_vars/r/read_only_basic.result @@ -103,11 +103,11 @@ SELECT @@read_only; @@read_only 1 SET local.read_only = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read_only = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read_only = 1' at line 1 SELECT local.read_only; ERROR 42S02: Unknown table 'local' in field list SET global.read_only = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read_only = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'read_only = 1' at line 1 SELECT global.read_only; ERROR 42S02: Unknown table 'global' in field list SELECT read_only = @@session.read_only; diff --git a/mysql-test/suite/sys_vars/r/read_only_func.result b/mysql-test/suite/sys_vars/r/read_only_func.result index 7e98b7adc50..540a2a13c50 100644 --- a/mysql-test/suite/sys_vars/r/read_only_func.result +++ b/mysql-test/suite/sys_vars/r/read_only_func.result @@ -27,7 +27,7 @@ id INT NOT NULL auto_increment, PRIMARY KEY (id), name BLOB ); -ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement not updating values INSERT into t2(name) values("aaassssssssddddddddffffff"); Got one of the listed errors diff --git a/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result b/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result index 660550639cc..8de09fe6b39 100644 --- a/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result +++ b/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result @@ -83,7 +83,7 @@ SELECT @@relay_log_purge = @@global.relay_log_purge; SET relay_log_purge = 1; ERROR HY000: Variable 'relay_log_purge' is a GLOBAL variable and should be set with SET GLOBAL SET global.relay_log_purge = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'relay_log_purge = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'relay_log_purge = 1' at line 1 SELECT global.relay_log_purge; ERROR 42S02: Unknown table 'global' in field list SELECT relay_log_purge = @@session.relay_log_purge; diff --git a/mysql-test/suite/sys_vars/r/rowid_merge_buff_size_basic.result b/mysql-test/suite/sys_vars/r/rowid_merge_buff_size_basic.result index 6148f9e201b..bd2500eb872 100644 --- a/mysql-test/suite/sys_vars/r/rowid_merge_buff_size_basic.result +++ b/mysql-test/suite/sys_vars/r/rowid_merge_buff_size_basic.result @@ -37,7 +37,7 @@ select @@global.rowid_merge_buff_size; 0 set session rowid_merge_buff_size=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect rowid_merge_buff_size value: '18446744073709551615' select @@session.rowid_merge_buff_size; @@session.rowid_merge_buff_size diff --git a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result index 14a7cdd0046..5b685ae3706 100644 --- a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result +++ b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result @@ -5,41 +5,41 @@ SELECT @start_global_value; '#--------------------FN_DYNVARS_142_01-------------------------#' SET @@global.rpl_recovery_rank = 500000; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SET @@global.rpl_recovery_rank = DEFAULT; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 '#--------------------FN_DYNVARS_142_02-------------------------#' SET @@global.rpl_recovery_rank = 0; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 SET @@global.rpl_recovery_rank = 1024; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 1024 SET @@global.rpl_recovery_rank = 123456789; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 123456789 SET @@global.rpl_recovery_rank = 2147483648*2; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 4294967296 SET @@global.rpl_recovery_rank = 2147483648*1024; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 2199023255552 @@ -48,7 +48,7 @@ SELECT @@global.rpl_recovery_rank; 2199023255552 SET @@global.rpl_recovery_rank = 2147483648*2147483648; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 4611686018427387904 @@ -62,21 +62,21 @@ ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set '#------------------FN_DYNVARS_142_04-----------------------#' SET @@global.rpl_recovery_rank = -1; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. Warning 1292 Truncated incorrect rpl_recovery_rank value: '-1' SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 SET @@global.rpl_recovery_rank = -2147483648; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. Warning 1292 Truncated incorrect rpl_recovery_rank value: '-2147483648' SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 SET @@global.rpl_recovery_rank = -2147483649; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. Warning 1292 Truncated incorrect rpl_recovery_rank value: '-2147483649' SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank @@ -90,7 +90,7 @@ ERROR 42000: Incorrect argument type to variable 'rpl_recovery_rank' '#------------------FN_DYNVARS_142_05-----------------------#' SET @@global.rpl_recovery_rank = 3000; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='rpl_recovery_rank'; @@ -105,20 +105,20 @@ count(VARIABLE_VALUE) '#------------------FN_DYNVARS_142_07-----------------------#' SET @@global.rpl_recovery_rank = TRUE; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 1 SET @@global.rpl_recovery_rank = FALSE; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 '#---------------------FN_DYNVARS_001_08----------------------#' SET @@global.rpl_recovery_rank = 512; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@rpl_recovery_rank = @@global.rpl_recovery_rank; @@rpl_recovery_rank = @@global.rpl_recovery_rank 1 @@ -132,10 +132,10 @@ SELECT @@rpl_recovery_rank; 512 SET global rpl_recovery_rank = 64; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SET @@global.rpl_recovery_rank = @start_global_value; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 diff --git a/mysql-test/suite/sys_vars/r/secure_file_priv2.result b/mysql-test/suite/sys_vars/r/secure_file_priv2.result index ec91b6037d0..e55707fdfe9 100644 --- a/mysql-test/suite/sys_vars/r/secure_file_priv2.result +++ b/mysql-test/suite/sys_vars/r/secure_file_priv2.result @@ -1,6 +1,6 @@ CREATE TABLE t1 (c1 INT); LOAD DATA INFILE "t1.MYI" into table t1; -ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --secure-file-priv option so it cannot execute this statement LOAD DATA INFILE "/test" into table t1; -ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --secure-file-priv option so it cannot execute this statement DROP TABLE t1; diff --git a/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result b/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result index 4c7539be677..e21b177eec4 100644 --- a/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result +++ b/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result @@ -118,11 +118,11 @@ SELECT @@slow_launch_time; @@slow_launch_time 1 SET local.slow_launch_time = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'slow_launch_time = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'slow_launch_time = 1' at line 1 SELECT local.slow_launch_time; ERROR 42S02: Unknown table 'local' in field list SET global.slow_launch_time = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'slow_launch_time = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'slow_launch_time = 1' at line 1 SELECT global.slow_launch_time; ERROR 42S02: Unknown table 'global' in field list SELECT slow_launch_time = @@session.slow_launch_time; diff --git a/mysql-test/suite/sys_vars/r/slow_query_log_basic.result b/mysql-test/suite/sys_vars/r/slow_query_log_basic.result index aece80cdada..bf9a83f0380 100644 --- a/mysql-test/suite/sys_vars/r/slow_query_log_basic.result +++ b/mysql-test/suite/sys_vars/r/slow_query_log_basic.result @@ -79,11 +79,11 @@ SELECT @@slow_query_log = @@global.slow_query_log; SET slow_query_log = ON; ERROR HY000: Variable 'slow_query_log' is a GLOBAL variable and should be set with SET GLOBAL SET local.slow_query_log = OFF; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'slow_query_log = OFF' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'slow_query_log = OFF' at line 1 SELECT local.slow_query_log; ERROR 42S02: Unknown table 'local' in field list SET global.slow_query_log = ON; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'slow_query_log = ON' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'slow_query_log = ON' at line 1 SELECT global.slow_query_log; ERROR 42S02: Unknown table 'global' in field list SELECT slow_query_log = @@session.slow_query_log; diff --git a/mysql-test/suite/sys_vars/r/sql_big_selects_func.result b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result index ceac0ce539d..702273f73df 100644 --- a/mysql-test/suite/sys_vars/r/sql_big_selects_func.result +++ b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result @@ -5,7 +5,7 @@ SET @session_max_join_size = @@SESSION.max_join_size; SET @global_max_join_size = @@GLOBAL.max_join_size; SET SQL_MAX_JOIN_SIZE=9; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead CREATE TEMPORARY TABLE t1(a varchar(20) not null, b varchar(20)); CREATE TEMPORARY TABLE t2(a varchar(20) null, b varchar(20)); INSERT INTO t1 VALUES('aa','bb'); diff --git a/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result b/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result index 3d898c82d23..8e85fcc57b4 100644 --- a/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result +++ b/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result @@ -22,10 +22,10 @@ VARIABLE_NAME VARIABLE_VALUE SQL_MAX_JOIN_SIZE 18446744073709551615 set global sql_max_join_size=10; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead set session sql_max_join_size=20; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead select @@global.sql_max_join_size; @@global.sql_max_join_size 10 @@ -55,20 +55,20 @@ select @@sql_big_selects; 0 set sql_max_join_size=cast(-1 as unsigned int); Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead +Note 1105 Cast to unsigned converted negative integer to it's positive complement select @@sql_big_selects; @@sql_big_selects 1 set sql_max_join_size=100; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead select @@sql_big_selects; @@sql_big_selects 0 SET @@global.sql_max_join_size = @start_global_value; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead SELECT @@global.sql_max_join_size; @@global.sql_max_join_size 18446744073709551615 diff --git a/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result b/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result index 377c2c9c4ca..8595ff51734 100644 --- a/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result +++ b/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result @@ -17,7 +17,7 @@ INSERT INTO t2 VALUES('aa4','bb'); '#--------------------FN_DYNVARS_161_01-------------------------#' SET SESSION sql_max_join_size=9; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a; ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET MAX_JOIN_SIZE=# if the SELECT is okay Expected error The SELECT would examine more than MAX_JOIN_SIZE rows. @@ -33,7 +33,7 @@ aa4 bb aa4 bb This should work SET SESSION sql_max_join_size=DEFAULT; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead DELETE FROM t2 WHERE a = 'aa4'; SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a; a b a b @@ -45,7 +45,7 @@ This should work '#----------------------------FN_DYNVARS_136_05-------------------------#' SET GLOBAL sql_max_join_size = 4; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead ** Connecting con_int1 using root ** ** Connection con_int1 ** SELECT @@SESSION.sql_max_join_size; @@ -54,7 +54,7 @@ SELECT @@SESSION.sql_max_join_size; 4 Expected SET SESSION sql_max_join_size = 2; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead ** Connecting con_int2 using root ** ** Connection con_int2 ** SELECT @@SESSION.sql_max_join_size; @@ -63,7 +63,7 @@ SELECT @@SESSION.sql_max_join_size; 4 Expected SET SESSION sql_max_join_size = 10; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead ** Connection con_int2 ** SELECT @@SESSION.sql_max_join_size; @@SESSION.sql_max_join_size @@ -82,10 +82,10 @@ SELECT @@GLOBAL.sql_max_join_size; Disconnecting Connections con_int1, con_int2 SET @@SESSION.sql_max_join_size = @session_max_join_size; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead SET @@GLOBAL.sql_max_join_size = @global_max_join_size ; Warnings: -Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MySQL 7.0. Please use '@@max_join_size' instead +Warning 1287 The syntax '@@sql_max_join_size' is deprecated and will be removed in MariaDB 7.0. Please use '@@max_join_size' instead SET @@SESSION.sql_big_selects = @session_sql_big_selects; DROP TABLE t1; DROP TABLE t2; diff --git a/mysql-test/suite/sys_vars/r/sql_mode_basic.result b/mysql-test/suite/sys_vars/r/sql_mode_basic.result index df5f38c8b12..c806fadc4ed 100644 --- a/mysql-test/suite/sys_vars/r/sql_mode_basic.result +++ b/mysql-test/suite/sys_vars/r/sql_mode_basic.result @@ -382,9 +382,9 @@ SELECT @@global.sql_mode; '#---------------------FN_DYNVARS_152_09----------------------#' SET sql_mode = 'ANSI'; SET session.sql_mode = 'ANSI'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_mode = 'ANSI'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_mode = 'ANSI'' at line 1 SET global.sql_mode = 'ANSI'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sql_mode = 'ANSI'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sql_mode = 'ANSI'' at line 1 SET session sql_mode = 1; SELECT @@sql_mode; @@sql_mode diff --git a/mysql-test/suite/sys_vars/r/sync_binlog_basic.result b/mysql-test/suite/sys_vars/r/sync_binlog_basic.result index 89f99fcbbee..bb0c8136391 100644 --- a/mysql-test/suite/sys_vars/r/sync_binlog_basic.result +++ b/mysql-test/suite/sys_vars/r/sync_binlog_basic.result @@ -99,11 +99,11 @@ SELECT @@sync_binlog; @@sync_binlog 4294967295 SET local.sync_binlog = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sync_binlog = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sync_binlog = 1' at line 1 SELECT local.sync_binlog; ERROR 42S02: Unknown table 'local' in field list SET global.sync_binlog = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sync_binlog = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sync_binlog = 1' at line 1 SELECT global.sync_binlog; ERROR 42S02: Unknown table 'global' in field list SELECT sync_binlog = @@session.sync_binlog; diff --git a/mysql-test/suite/sys_vars/r/sync_frm_basic.result b/mysql-test/suite/sys_vars/r/sync_frm_basic.result index 1af4de8abad..0c633d30820 100644 --- a/mysql-test/suite/sys_vars/r/sync_frm_basic.result +++ b/mysql-test/suite/sys_vars/r/sync_frm_basic.result @@ -86,7 +86,7 @@ SELECT @@sync_frm; @@sync_frm 1 SET global.sync_frm = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sync_frm = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'sync_frm = 1' at line 1 SELECT global.sync_frm; ERROR 42S02: Unknown table 'global' in field list SELECT sync_frm = @@session.sync_frm; diff --git a/mysql-test/suite/sys_vars/r/sync_master_info_basic.result b/mysql-test/suite/sys_vars/r/sync_master_info_basic.result index eda8282f8f5..940282f629a 100644 --- a/mysql-test/suite/sys_vars/r/sync_master_info_basic.result +++ b/mysql-test/suite/sys_vars/r/sync_master_info_basic.result @@ -37,7 +37,7 @@ select @@global.sync_master_info; 0 set global sync_master_info=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect sync_master_info value: '18446744073709551615' select @@global.sync_master_info; @@global.sync_master_info diff --git a/mysql-test/suite/sys_vars/r/sync_relay_log_basic.result b/mysql-test/suite/sys_vars/r/sync_relay_log_basic.result index 1f96b4fb698..a98fcbfe44c 100644 --- a/mysql-test/suite/sys_vars/r/sync_relay_log_basic.result +++ b/mysql-test/suite/sys_vars/r/sync_relay_log_basic.result @@ -37,7 +37,7 @@ select @@global.sync_relay_log; 0 set global sync_relay_log=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect sync_relay_log value: '18446744073709551615' select @@global.sync_relay_log; @@global.sync_relay_log diff --git a/mysql-test/suite/sys_vars/r/sync_relay_log_info_basic.result b/mysql-test/suite/sys_vars/r/sync_relay_log_info_basic.result index 5b4592db72f..4900bf166b0 100644 --- a/mysql-test/suite/sys_vars/r/sync_relay_log_info_basic.result +++ b/mysql-test/suite/sys_vars/r/sync_relay_log_info_basic.result @@ -37,7 +37,7 @@ select @@global.sync_relay_log_info; 0 set global sync_relay_log_info=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect sync_relay_log_info value: '18446744073709551615' select @@global.sync_relay_log_info; @@global.sync_relay_log_info diff --git a/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result b/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result index 0f5794aa329..f6befe51bc1 100644 --- a/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result +++ b/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result @@ -100,7 +100,7 @@ SELECT @@table_definition_cache = @@global.table_definition_cache; SET table_definition_cache = 1; ERROR HY000: Variable 'table_definition_cache' is a GLOBAL variable and should be set with SET GLOBAL SET global.table_definition_cache = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'table_definition_cache = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'table_definition_cache = 1' at line 1 SELECT global.table_definition_cache; ERROR 42S02: Unknown table 'global' in field list SELECT table_definition_cache = @@session.table_definition_cache; diff --git a/mysql-test/suite/sys_vars/r/table_open_cache_basic.result b/mysql-test/suite/sys_vars/r/table_open_cache_basic.result index 0b0c3230e5e..2381dfe4900 100644 --- a/mysql-test/suite/sys_vars/r/table_open_cache_basic.result +++ b/mysql-test/suite/sys_vars/r/table_open_cache_basic.result @@ -96,7 +96,7 @@ SELECT @@table_open_cache = @@global.table_open_cache ; SET table_open_cache = 8; ERROR HY000: Variable 'table_open_cache' is a GLOBAL variable and should be set with SET GLOBAL SET global.table_open_cache = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'table_open_cache = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'table_open_cache = 10' at line 1 SELECT global.table_open_cache ; ERROR 42S02: Unknown table 'global' in field list SELECT table_open_cache = @@session.table_open_cache ; diff --git a/mysql-test/suite/sys_vars/r/thread_alarm_basic.result b/mysql-test/suite/sys_vars/r/thread_alarm_basic.result deleted file mode 100644 index f298c0204eb..00000000000 --- a/mysql-test/suite/sys_vars/r/thread_alarm_basic.result +++ /dev/null @@ -1,21 +0,0 @@ -select @@global.thread_alarm; -@@global.thread_alarm -1 -select @@session.thread_alarm; -ERROR HY000: Variable 'thread_alarm' is a GLOBAL variable -show global variables like 'thread_alarm'; -Variable_name Value -thread_alarm ON -show session variables like 'thread_alarm'; -Variable_name Value -thread_alarm ON -select * from information_schema.global_variables where variable_name='thread_alarm'; -VARIABLE_NAME VARIABLE_VALUE -THREAD_ALARM ON -select * from information_schema.session_variables where variable_name='thread_alarm'; -VARIABLE_NAME VARIABLE_VALUE -THREAD_ALARM ON -set global thread_alarm=1; -ERROR HY000: Variable 'thread_alarm' is a read only variable -set session thread_alarm=1; -ERROR HY000: Variable 'thread_alarm' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result b/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result index 9db720a11a2..af6777fcf45 100644 --- a/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/thread_cache_size_basic.result @@ -43,7 +43,7 @@ select @@global.thread_cache_size; 0 set global thread_cache_size=cast(-1 as unsigned int); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement Warning 1292 Truncated incorrect thread_cache_size value: '18446744073709551615' select @@global.thread_cache_size; @@global.thread_cache_size diff --git a/mysql-test/suite/sys_vars/r/time_zone_basic.result b/mysql-test/suite/sys_vars/r/time_zone_basic.result index e7d419f28b5..6115eeeaf9e 100644 --- a/mysql-test/suite/sys_vars/r/time_zone_basic.result +++ b/mysql-test/suite/sys_vars/r/time_zone_basic.result @@ -189,7 +189,7 @@ ERROR 42000: Incorrect argument type to variable 'time_zone' SET @@time_zone = +0200; ERROR 42000: Incorrect argument type to variable 'time_zone' SET @@time_zone = GMT+; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 SET @@time_zone = ""; ERROR HY000: Unknown or incorrect time zone: '' SET @@global.time_zone = 1; @@ -197,7 +197,7 @@ ERROR 42000: Incorrect argument type to variable 'time_zone' SET @@global.time_zone = +0200; ERROR 42000: Incorrect argument type to variable 'time_zone' SET @@global.time_zone = GMT+; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 SET @@global.time_zone = ""; ERROR HY000: Unknown or incorrect time zone: '' '#---------------------FN_DYNVARS_001_10----------------------#' diff --git a/mysql-test/suite/sys_vars/r/tx_isolation_basic.result b/mysql-test/suite/sys_vars/r/tx_isolation_basic.result index b784d6bb180..09ccebf12a2 100644 --- a/mysql-test/suite/sys_vars/r/tx_isolation_basic.result +++ b/mysql-test/suite/sys_vars/r/tx_isolation_basic.result @@ -124,9 +124,9 @@ READ-UNCOMMITTED '#---------------------FN_DYNVARS_183_09----------------------#' SET tx_isolation = 'REPEATABLE-READ'; SET session.tx_isolation = 'REPEATABLE-READ'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tx_isolation = 'REPEATABLE-READ'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tx_isolation = 'REPEATABLE-READ'' at line 1 SET global.tx_isolation = 'REPEATABLE-READ'; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'tx_isolation = 'REPEATABLE-READ'' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'tx_isolation = 'REPEATABLE-READ'' at line 1 SET session tx_isolation = 'REPEATABLE-READ'; SELECT @@tx_isolation; @@tx_isolation diff --git a/mysql-test/suite/sys_vars/t/debug_no_thread_alarm_basic.test b/mysql-test/suite/sys_vars/t/debug_no_thread_alarm_basic.test new file mode 100644 index 00000000000..39823ba2bf1 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/debug_no_thread_alarm_basic.test @@ -0,0 +1,21 @@ +# bool readonly + +# +# show values; +# +select @@global.debug_no_thread_alarm; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +select @@session.debug_no_thread_alarm; +show global variables like 'debug_no_thread_alarm'; +show session variables like 'debug_no_thread_alarm'; +select * from information_schema.global_variables where variable_name='debug_no_thread_alarm'; +select * from information_schema.session_variables where variable_name='debug_no_thread_alarm'; + +# +# show that it's read-only +# +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +set global debug_no_thread_alarm=1; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +set session debug_no_thread_alarm=1; + diff --git a/mysql-test/suite/sys_vars/t/query_cache_strip_comments_basic.test b/mysql-test/suite/sys_vars/t/query_cache_strip_comments_basic.test index 9a060bc9a0a..62bb4452bab 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_strip_comments_basic.test +++ b/mysql-test/suite/sys_vars/t/query_cache_strip_comments_basic.test @@ -1,12 +1,8 @@ -# bool global +# bool session SET @start_global_value = @@global.query_cache_strip_comments; -# -# exists as global only -# select @@global.query_cache_strip_comments; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.query_cache_strip_comments; show global variables like 'query_cache_strip_comments'; show session variables like 'query_cache_strip_comments'; @@ -22,17 +18,22 @@ set global query_cache_strip_comments=OFF; select @@global.query_cache_strip_comments; set global query_cache_strip_comments=1; select @@global.query_cache_strip_comments; ---error ER_GLOBAL_VARIABLE -set session query_cache_strip_comments=1; +set session query_cache_strip_comments=ON; +select @@session.query_cache_strip_comments; +set session query_cache_strip_comments=OFF; +select @@session.query_cache_strip_comments; +set session query_cache_strip_comments=1; +select @@session.query_cache_strip_comments; # # incorrect types # --error ER_WRONG_TYPE_FOR_VAR set global query_cache_strip_comments=1.1; --error ER_WRONG_TYPE_FOR_VAR -set global query_cache_strip_comments=1e1; +set session query_cache_strip_comments=1e1; --error ER_WRONG_VALUE_FOR_VAR -set global query_cache_strip_comments="foo"; +set session query_cache_strip_comments="foo"; SET @@global.query_cache_strip_comments = @start_global_value; + diff --git a/mysql-test/suite/sys_vars/t/thread_alarm_basic.test b/mysql-test/suite/sys_vars/t/thread_alarm_basic.test deleted file mode 100644 index 56bdc3d765b..00000000000 --- a/mysql-test/suite/sys_vars/t/thread_alarm_basic.test +++ /dev/null @@ -1,21 +0,0 @@ -# bool readonly - -# -# show values; -# -select @@global.thread_alarm; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.thread_alarm; -show global variables like 'thread_alarm'; -show session variables like 'thread_alarm'; -select * from information_schema.global_variables where variable_name='thread_alarm'; -select * from information_schema.session_variables where variable_name='thread_alarm'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global thread_alarm=1; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session thread_alarm=1; - diff --git a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs_innodb.result b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs_innodb.result index a4099dff381..cbb56977a93 100644 --- a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs_innodb.result @@ -213,7 +213,7 @@ ERROR HY000: Function or expression is not allowed for column 'b' # create table t1 (a int); create table t2 (a int, b int as (select count(*) from t1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select count(*) from t1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select count(*) from t1))' at line 1 drop table t1; create table t1 (a int, b int as ((select 1))); ERROR HY000: Function or expression is not allowed for column 'b' diff --git a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs_myisam.result b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs_myisam.result index dda222f5e8a..757964ff9f1 100644 --- a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs_myisam.result @@ -215,7 +215,7 @@ ERROR HY000: Function or expression is not allowed for column 'b' # create table t1 (a int); create table t2 (a int, b int as (select count(*) from t1)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select count(*) from t1))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select count(*) from t1))' at line 1 drop table t1; create table t1 (a int, b int as ((select 1))); ERROR HY000: Function or expression is not allowed for column 'b' diff --git a/mysql-test/suite/vcol/r/vcol_column_def_options_innodb.result b/mysql-test/suite/vcol/r/vcol_column_def_options_innodb.result index db16d25000a..e66c2d3a3c3 100644 --- a/mysql-test/suite/vcol/r/vcol_column_def_options_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_column_def_options_innodb.result @@ -8,42 +8,42 @@ SET @@session.storage_engine = 'InnoDB'; # - [PRIMARY] KEY # NOT NULL create table t1 (a int, b int as (a+1) not null); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null)' at line 1 create table t1 (a int); alter table t1 add column b int as (a+1) not null; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null' at line 1 drop table t1; # NULL create table t1 (a int, b int as (a+1) null); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null)' at line 1 create table t1 (a int); alter table t1 add column b int as (a+1) null; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null' at line 1 drop table t1; # DEFAULT create table t1 (a int, b int as (a+1) default 0); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default 0)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default 0)' at line 1 create table t1 (a int); alter table t1 add column b int as (a+1) default 0; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default 0' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default 0' at line 1 drop table t1; # AUTO_INCREMENT create table t1 (a int, b int as (a+1) AUTO_INCREMENT); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AUTO_INCREMENT)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AUTO_INCREMENT)' at line 1 create table t1 (a int); alter table t1 add column b int as (a+1) AUTO_INCREMENT; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AUTO_INCREMENT' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AUTO_INCREMENT' at line 1 drop table t1; # [PRIMARY] KEY create table t1 (a int, b int as (a+1) key); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key)' at line 1 create table t1 (a int, b int as (a+1) primary key); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary key)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'primary key)' at line 1 create table t1 (a int); alter table t1 add column b int as (a+1) key; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key' at line 1 alter table t1 add column b int as (a+1) primary key; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary key' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'primary key' at line 1 drop table t1; # Section 2. Other column definition options # - COMMENT @@ -136,7 +136,7 @@ t1 CREATE TABLE `t1` ( drop table t1; create table t1 (a int, b int as (a % 2)); alter table t1 modify b int as (a % 2) persistent references t2(a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'references t2(a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'references t2(a)' at line 1 show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/vcol/r/vcol_column_def_options_myisam.result b/mysql-test/suite/vcol/r/vcol_column_def_options_myisam.result index 1b4a5060e40..d60a3cf1a51 100644 --- a/mysql-test/suite/vcol/r/vcol_column_def_options_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_column_def_options_myisam.result @@ -8,42 +8,42 @@ SET @@session.storage_engine = 'MyISAM'; # - [PRIMARY] KEY # NOT NULL create table t1 (a int, b int as (a+1) not null); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null)' at line 1 create table t1 (a int); alter table t1 add column b int as (a+1) not null; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'not null' at line 1 drop table t1; # NULL create table t1 (a int, b int as (a+1) null); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null)' at line 1 create table t1 (a int); alter table t1 add column b int as (a+1) null; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'null' at line 1 drop table t1; # DEFAULT create table t1 (a int, b int as (a+1) default 0); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default 0)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default 0)' at line 1 create table t1 (a int); alter table t1 add column b int as (a+1) default 0; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default 0' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'default 0' at line 1 drop table t1; # AUTO_INCREMENT create table t1 (a int, b int as (a+1) AUTO_INCREMENT); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AUTO_INCREMENT)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AUTO_INCREMENT)' at line 1 create table t1 (a int); alter table t1 add column b int as (a+1) AUTO_INCREMENT; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'AUTO_INCREMENT' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AUTO_INCREMENT' at line 1 drop table t1; # [PRIMARY] KEY create table t1 (a int, b int as (a+1) key); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key)' at line 1 create table t1 (a int, b int as (a+1) primary key); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary key)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'primary key)' at line 1 create table t1 (a int); alter table t1 add column b int as (a+1) key; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key' at line 1 alter table t1 add column b int as (a+1) primary key; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary key' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'primary key' at line 1 drop table t1; # Section 2. Other column definition options # - COMMENT @@ -136,7 +136,7 @@ t1 CREATE TABLE `t1` ( drop table t1; create table t1 (a int, b int as (a % 2)); alter table t1 modify b int as (a % 2) persistent references t2(a); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'references t2(a)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'references t2(a)' at line 1 show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result index 63ad2eb705f..6efdc33d9d8 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result @@ -2687,14 +2687,14 @@ t1 CREATE TABLE `t1` ( insert into t1 values (1,default); insert into t1 values (-1,default); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select * from t1; a b 1 1 -1 18446744073709551615 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement drop table t1; set sql_warnings = 0; # Convert() @@ -2709,14 +2709,14 @@ t1 CREATE TABLE `t1` ( insert into t1 values (1,default); insert into t1 values (-1,default); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select * from t1; a b 1 1 -1 18446744073709551615 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement drop table t1; set sql_warnings = 0; # diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result index 35e27ee3099..65ace7acb65 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result @@ -2687,14 +2687,14 @@ t1 CREATE TABLE `t1` ( insert into t1 values (1,default); insert into t1 values (-1,default); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select * from t1; a b 1 1 -1 18446744073709551615 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement drop table t1; set sql_warnings = 0; # Convert() @@ -2709,14 +2709,14 @@ t1 CREATE TABLE `t1` ( insert into t1 values (1,default); insert into t1 values (-1,default); Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement select * from t1; a b 1 1 -1 18446744073709551615 Warnings: -Warning 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement +Note 1105 Cast to unsigned converted negative integer to it's positive complement drop table t1; set sql_warnings = 0; # diff --git a/sql/item_func.cc b/sql/item_func.cc index 251ecd00242..1d3a32ba4f1 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1064,7 +1064,7 @@ longlong Item_func_signed::val_int() return value; err: - push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_UNKNOWN_ERROR, "Cast to signed converted positive out-of-range integer to " "it's negative complement"); return value; @@ -1120,7 +1120,7 @@ longlong Item_func_unsigned::val_int() return value; err: - push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_UNKNOWN_ERROR, "Cast to unsigned converted negative integer to it's " "positive complement"); return value; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 564a8769b6b..6f5f7640ab6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -340,7 +340,6 @@ static bool volatile select_thread_in_use, signal_thread_in_use; static volatile bool ready_to_exit; static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0; static my_bool opt_short_log_format= 0; -static my_bool opt_sync= 0; static uint kill_cached_threads, wake_thread; static ulong max_used_connections; static volatile ulong cached_thread_count= 0; @@ -363,7 +362,7 @@ static mysql_cond_t COND_thread_cache, COND_flush_thread_cache; bool opt_bin_log, opt_ignore_builtin_innodb= 0; my_bool opt_log, opt_slow_log, debug_assert_if_crashed_table= 0, opt_help= 0; ulonglong log_output_options; -my_bool opt_userstat_running, opt_thread_alarm; +my_bool opt_userstat_running; my_bool opt_log_queries_not_using_indexes= 0; bool opt_error_log= IF_WIN(1,0); bool opt_disable_networking=0, opt_skip_show_db=0; @@ -425,7 +424,6 @@ my_bool opt_secure_auth= 0; char* opt_secure_file_priv; my_bool opt_log_slow_admin_statements= 0; my_bool opt_log_slow_slave_statements= 0; -my_bool opt_query_cache_strip_comments = 0; my_bool lower_case_file_system= 0; my_bool opt_large_pages= 0; my_bool opt_super_large_pages= 0; @@ -6175,7 +6173,7 @@ struct my_option my_long_options[]= &opt_help, &opt_help, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, #ifdef HAVE_REPLICATION - {"abort-slave-event-count", 0, + {"debug-abort-slave-event-count", 0, "Option used by mysql-test for debugging and testing of replication.", &abort_slave_event_count, &abort_slave_event_count, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -6261,7 +6259,7 @@ struct my_option my_long_options[]= 0, 0, 0, 0, 0, 0}, #endif /* HAVE_OPENSSL */ #ifdef HAVE_REPLICATION - {"disconnect-slave-event-count", 0, + {"debug-disconnect-slave-event-count", 0, "Option used by mysql-test for debugging and testing of replication.", &disconnect_slave_event_count, &disconnect_slave_event_count, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -6270,7 +6268,7 @@ struct my_option my_long_options[]= {"stack-trace", 0 , "Print a symbolic stack trace on failure", &opt_stack_trace, &opt_stack_trace, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, #endif /* HAVE_STACKTRACE */ - {"exit-info", 'T', "Used for debugging. Use at your own risk.", 0, 0, 0, + {"debug-exit-info", 'T', "Used for debugging. Use at your own risk.", 0, 0, 0, GET_LONG, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"external-locking", 0, "Use system (external) locking (disabled by " "default). With this option enabled you can run myisamchk to test " @@ -6280,6 +6278,10 @@ struct my_option my_long_options[]= /* We must always support the next option to make scripts like mysqltest easier to do */ {"gdb", 0, + "Set up signals usable for debugging. Deprecated, use --debug-gdb instead.", + &opt_debugging, &opt_debugging, + 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + {"debug-gdb", 0, "Set up signals usable for debugging.", &opt_debugging, &opt_debugging, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, @@ -6373,7 +6375,7 @@ struct my_option my_long_options[]= {"init-rpl-role", 0, "Set the replication role.", &rpl_status, &rpl_status, &rpl_role_typelib, GET_ENUM, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"max-binlog-dump-events", 0, + {"debug-max-binlog-dump-events", 0, "Option used by mysql-test for debugging and testing of replication.", &max_binlog_dump_events, &max_binlog_dump_events, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -6476,7 +6478,7 @@ struct my_option my_long_options[]= "because it has no effect; the implied behavior is already the default.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #ifdef HAVE_REPLICATION - {"sporadic-binlog-dump-fail", 0, + {"debug-sporadic-binlog-dump-fail", 0, "Option used by mysql-test for debugging and testing of replication.", &opt_sporadic_binlog_dump_fail, &opt_sporadic_binlog_dump_fail, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, @@ -6501,9 +6503,9 @@ struct my_option my_long_options[]= option if compiled with valgrind support. */ IF_VALGRIND(0,1), 0, 0, 0, 0, 0}, - {"sync_sys", 0, - "Enable system sync calls. Disable only when running tests or debugging!", - &opt_sync, &opt_sync, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, + {"debug-no-sync", 0, + "Disables system sync calls. Only for running tests or debugging!", + &my_disable_sync, &my_disable_sync, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"sysdate-is-now", 0, "Non-default option to alias SYSDATE() to NOW() to make it safe-replicable. " "Since 5.0, SYSDATE() returns a `dynamic' value different for different " @@ -7978,8 +7980,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr) In most cases the global variables will not be used */ my_disable_locking= myisam_single_user= test(opt_external_locking == 0); - my_disable_sync= opt_sync == 0; - my_disable_thr_alarm= opt_thread_alarm == 0; my_default_record_cache_size=global_system_variables.read_buff_size; /* diff --git a/sql/mysqld.h b/sql/mysqld.h index 81e91aef832..fc6794b2ab8 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -542,7 +542,6 @@ extern uint internal_tmp_table_max_key_length; extern uint internal_tmp_table_max_key_segments; extern uint volatile global_disable_checkpoint; -extern my_bool opt_help, opt_thread_alarm; -extern my_bool opt_query_cache_strip_comments; +extern my_bool opt_help; #endif /* MYSQLD_INCLUDED */ diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index e1c16b31b14..3d5d2eb9af5 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -874,7 +874,7 @@ ER_OUTOFMEMORY HY001 S1001 nla "Geen geheugen meer. Herstart server en probeer opnieuw (%d bytes nodig)" eng "Out of memory; restart server and try again (needed %d bytes)" jps "Out of memory. デーモンをリスタートã—ã¦ã¿ã¦ãã ã•ã„ (%d bytes å¿…è¦)", - est "Mälu sai otsa. Proovi MySQL uuesti käivitada (puudu jäi %d baiti)" + est "Mälu sai otsa. Proovi MariaDB uuesti käivitada (puudu jäi %d baiti)" fre "Manque de mémoire. Redémarrez le démon et ré-essayez (%d octets nécessaires)" ger "Kein Speicher vorhanden (%d Bytes benötigt). Bitte Server neu starten" greek "Δεν υπάÏχει διαθέσιμη μνήμη. ΠÏοσπαθήστε πάλι, επανεκινώντας τη διαδικασία (demon) (χÏειάζονται %d bytes)" @@ -888,7 +888,7 @@ ER_OUTOFMEMORY HY001 S1001 por "Sem memória. Reinicie o programa e tente novamente (necessita de %d bytes)" rum "Out of memory. Porneste daemon-ul din nou si incearca inca o data (e nevoie de %d bytes)" rus "ÐедоÑтаточно памÑти. ПерезапуÑтите Ñервер и попробуйте еще раз (нужно %d байт)" - serbian "Nema memorije. Restartujte MySQL server i probajte ponovo (potrebno je %d byte-ova)" + serbian "Nema memorije. Restartujte MariaDB server i probajte ponovo (potrebno je %d byte-ova)" slo "Málo pamäti. ReÅ¡tartujte daemona a skúste znova (je potrebných %d bytov)" spa "Memoria insuficiente. Reinicie el demonio e intentelo otra vez (necesita %d bytes)" swe "Oväntat slut pÃ¥ minnet, starta om programmet och försök pÃ¥ nytt (Behövde %d bytes)" @@ -899,7 +899,7 @@ ER_OUT_OF_SORTMEMORY HY001 S1001 nla "Geen geheugen om te sorteren. Verhoog de server sort buffer size" eng "Out of sort memory, consider increasing server sort buffer size" jps "Out of sort memory. sort buffer size ãŒè¶³ã‚Šãªã„よã†ã§ã™.", - est "Mälu sai sorteerimisel otsa. Suurenda MySQL-i sorteerimispuhvrit" + est "Mälu sai sorteerimisel otsa. Suurenda MariaDB-i sorteerimispuhvrit" fre "Manque de mémoire pour le tri. Augmentez-la." ger "Kein Speicher zum Sortieren vorhanden. sort_buffer_size sollte im Server erhöht werden" greek "Δεν υπάÏχει διαθέσιμη μνήμη για ταξινόμιση. Αυξήστε το sort buffer size για τη διαδικασία (demon)" @@ -913,7 +913,7 @@ ER_OUT_OF_SORTMEMORY HY001 S1001 por "Não há memória suficiente para ordenação. Considere aumentar o tamanho do retentor (buffer) de ordenação." rum "Out of memory pentru sortare. Largeste marimea buffer-ului pentru sortare in daemon (sort buffer size)" rus "ÐедоÑтаточно памÑти Ð´Ð»Ñ Ñортировки. Увеличьте размер буфера Ñортировки на Ñервере" - serbian "Nema memorije za sortiranje. Povećajte veliÄinu sort buffer-a MySQL server-u" + serbian "Nema memorije za sortiranje. Povećajte veliÄinu sort buffer-a MariaDB server-u" slo "Málo pamäti pre triedenie, zvýšte veľkosÅ¥ triediaceho bufferu" spa "Memoria de ordenacion insuficiente. Incremente el tamano del buffer de ordenacion" swe "Sorteringsbufferten räcker inte till. Kontrollera startparametrarna" @@ -974,7 +974,7 @@ ER_OUT_OF_RESOURCES nla "Geen thread geheugen meer; controleer of mysqld of andere processen al het beschikbare geheugen gebruikt. Zo niet, dan moet u wellicht 'ulimit' gebruiken om mysqld toe te laten meer geheugen te benutten, of u kunt extra swap ruimte toevoegen" eng "Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space" jps "Out of memory; mysqld ã‹ãã®ä»–ã®ãƒ—ロセスãŒãƒ¡ãƒ¢ãƒªãƒ¼ã‚’å…¨ã¦ä½¿ã£ã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ãã ã•ã„. メモリーを使ã„切ã£ã¦ã„ãªã„å ´åˆã€'ulimit' を設定ã—㦠mysqld ã®ãƒ¡ãƒ¢ãƒªãƒ¼ä½¿ç”¨é™ç•Œé‡ã‚’多ãã™ã‚‹ã‹ã€swap space を増やã—ã¦ã¿ã¦ãã ã•ã„", - est "Mälu sai otsa. Võimalik, et aitab swap-i lisamine või käsu 'ulimit' abil MySQL-le rohkema mälu kasutamise lubamine" + est "Mälu sai otsa. Võimalik, et aitab swap-i lisamine või käsu 'ulimit' abil MariaDB-le rohkema mälu kasutamise lubamine" fre "Manque de 'threads'/mémoire" ger "Kein Speicher mehr vorhanden. Prüfen Sie, ob mysqld oder ein anderer Prozess den gesamten Speicher verbraucht. Wenn nicht, sollten Sie mit 'ulimit' dafür sorgen, dass mysqld mehr Speicher benutzen darf, oder mehr Swap-Speicher einrichten" greek "ΠÏόβλημα με τη διαθέσιμη μνήμη (Out of thread space/memory)" @@ -988,7 +988,7 @@ ER_OUT_OF_RESOURCES por "Sem memória. Verifique se o mysqld ou algum outro processo está usando toda memória disponível. Se não, você pode ter que usar 'ulimit' para permitir ao mysqld usar mais memória ou você pode adicionar mais área de 'swap'" rum "Out of memory; Verifica daca mysqld sau vreun alt proces foloseste toate memoria disponbila. Altfel, trebuie sa folosesi 'ulimit' ca sa permiti lui memoria disponbila. Altfel, trebuie sa folosesi 'ulimit' ca sa permiti lui mysqld sa foloseasca mai multa memorie ori adauga mai mult spatiu pentru swap (swap space)" rus "ÐедоÑтаточно памÑти; удоÑтоверьтеÑÑŒ, что mysqld или какой-либо другой процеÑÑ Ð½Ðµ занимает вÑÑŽ доÑтупную памÑÑ‚ÑŒ. ЕÑли нет, то вы можете иÑпользовать ulimit, чтобы выделить Ð´Ð»Ñ mysqld больше памÑти, или увеличить объем файла подкачки" - serbian "Nema memorije; Proverite da li MySQL server ili neki drugi proces koristi svu slobodnu memoriju. (UNIX: Ako ne, probajte da upotrebite 'ulimit' komandu da biste dozvolili daemon-u da koristi viÅ¡e memorije ili probajte da dodate viÅ¡e swap memorije)" + serbian "Nema memorije; Proverite da li MariaDB server ili neki drugi proces koristi svu slobodnu memoriju. (UNIX: Ako ne, probajte da upotrebite 'ulimit' komandu da biste dozvolili daemon-u da koristi viÅ¡e memorije ili probajte da dodate viÅ¡e swap memorije)" slo "Málo miesta-pamäti pre vlákno" spa "Memoria/espacio de tranpaso insuficiente" swe "Fick slut pÃ¥ minnet. Kontrollera om mysqld eller nÃ¥gon annan process använder allt tillgängligt minne. Om inte, försök använda 'ulimit' eller allokera mera swap" @@ -1852,7 +1852,7 @@ ER_NORMAL_SHUTDOWN dan "%s: Normal nedlukning\n" nla "%s: Normaal afgesloten \n" eng "%s: Normal shutdown\n" - est "%s: MySQL lõpetas\n" + est "%s: MariaDB lõpetas\n" fre "%s: Arrêt normal du serveur\n" ger "%s: Normal heruntergefahren\n" greek "%s: Φυσιολογική διαδικασία shutdown\n" @@ -2013,7 +2013,7 @@ ER_WRONG_FIELD_TERMINATORS 42000 S1009 por "Argumento separador de campos não é o esperado. Cheque o manual" rum "Argumentul pentru separatorul de cimpuri este diferit de ce ma asteptam. Verifica manualul" rus "Ðргумент Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÐµÐ»Ñ Ð¿Ð¾Ð»ÐµÐ¹ - не тот, который ожидалÑÑ. ОбращайтеÑÑŒ к документации" - serbian "Argument separatora polja nije ono Å¡to se oÄekivalo. Proverite uputstvo MySQL server-a" + serbian "Argument separatora polja nije ono Å¡to se oÄekivalo. Proverite uputstvo MariaDB server-a" slo "Argument oddeľovaÄ polí nezodpovedá požiadavkám. Skontrolujte v manuáli" spa "Los separadores de argumentos del campo no son los especificados. Comprueba el manual" swe "Fältseparatorerna är vad som förväntades. Kontrollera mot manualen" @@ -2672,28 +2672,28 @@ ER_INVALID_GROUP_FUNC_USE swe "Felaktig användning av SQL grupp function" ukr "Хибне викориÑÑ‚Ð°Ð½Ð½Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ— групуваннÑ" ER_UNSUPPORTED_EXTENSION 42000 - cze "Tabulka '%-.192s' pou-Bžívá rozšíření, které v této verzi MySQL není" - dan "Tabellen '%-.192s' bruger et filtypenavn som ikke findes i denne MySQL version" - nla "Tabel '%-.192s' gebruikt een extensie, die niet in deze MySQL-versie voorkomt." - eng "Table '%-.192s' uses an extension that doesn't exist in this MySQL version" - est "Tabel '%-.192s' kasutab laiendust, mis ei eksisteeri antud MySQL versioonis" - fre "Table '%-.192s' : utilise une extension invalide pour cette version de MySQL" - ger "Tabelle '%-.192s' verwendet eine Erweiterung, die in dieser MySQL-Version nicht verfügbar ist" - greek "Ο πίνακς '%-.192s' χÏησιμοποιεί κάποιο extension που δεν υπάÏχει στην έκδοση αυτή της MySQL" - hun "A(z) '%-.192s' tabla olyan bovitest hasznal, amely nem letezik ebben a MySQL versioban." - ita "La tabella '%-.192s' usa un'estensione che non esiste in questa versione di MySQL" - kor "í…Œì´ë¸” '%-.192s'는 í™•ìž¥ëª…ë ¹ì„ ì´ìš©í•˜ì§€ë§Œ í˜„ìž¬ì˜ MySQL 버젼ì—서는 존재하지 않습니다." - nor "Table '%-.192s' uses a extension that doesn't exist in this MySQL version" - norwegian-ny "Table '%-.192s' uses a extension that doesn't exist in this MySQL version" - pol "Table '%-.192s' uses a extension that doesn't exist in this MySQL version" - por "Tabela '%-.192s' usa uma extensão que não existe nesta versão do MySQL" - rum "Tabela '%-.192s' foloseste o extensire inexistenta in versiunea curenta de MySQL" - rus "Ð’ таблице '%-.192s' иÑпользуютÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти, не поддерживаемые в Ñтой верÑии MySQL" - serbian "Tabela '%-.192s' koristi ekstenziju koje ne postoji u ovoj verziji MySQL-a" - slo "Tabuľka '%-.192s' používa rozšírenie, ktoré v tejto verzii MySQL nie je" - spa "Tabla '%-.192s' usa una extensión que no existe en esta MySQL versión" - swe "Tabell '%-.192s' har en extension som inte finns i denna version av MySQL" - ukr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ '%-.192s' викориÑтовує розширеннÑ, що не Ñ–Ñнує у цій верÑÑ–Ñ— MySQL" + cze "Tabulka '%-.192s' pou-Bžívá rozšíření, které v této verzi MariaDB není" + dan "Tabellen '%-.192s' bruger et filtypenavn som ikke findes i denne MariaDB version" + nla "Tabel '%-.192s' gebruikt een extensie, die niet in deze MariaDB-versie voorkomt." + eng "Table '%-.192s' uses an extension that doesn't exist in this MariaDB version" + est "Tabel '%-.192s' kasutab laiendust, mis ei eksisteeri antud MariaDB versioonis" + fre "Table '%-.192s' : utilise une extension invalide pour cette version de MariaDB" + ger "Tabelle '%-.192s' verwendet eine Erweiterung, die in dieser MariaDB-Version nicht verfügbar ist" + greek "Ο πίνακς '%-.192s' χÏησιμοποιεί κάποιο extension που δεν υπάÏχει στην έκδοση αυτή της MariaDB" + hun "A(z) '%-.192s' tabla olyan bovitest hasznal, amely nem letezik ebben a MariaDB versioban." + ita "La tabella '%-.192s' usa un'estensione che non esiste in questa versione di MariaDB" + kor "í…Œì´ë¸” '%-.192s'는 í™•ìž¥ëª…ë ¹ì„ ì´ìš©í•˜ì§€ë§Œ í˜„ìž¬ì˜ MariaDB 버젼ì—서는 존재하지 않습니다." + nor "Table '%-.192s' uses a extension that doesn't exist in this MariaDB version" + norwegian-ny "Table '%-.192s' uses a extension that doesn't exist in this MariaDB version" + pol "Table '%-.192s' uses a extension that doesn't exist in this MariaDB version" + por "Tabela '%-.192s' usa uma extensão que não existe nesta versão do MariaDB" + rum "Tabela '%-.192s' foloseste o extensire inexistenta in versiunea curenta de MariaDB" + rus "Ð’ таблице '%-.192s' иÑпользуютÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти, не поддерживаемые в Ñтой верÑии MariaDB" + serbian "Tabela '%-.192s' koristi ekstenziju koje ne postoji u ovoj verziji MariaDB-a" + slo "Tabuľka '%-.192s' používa rozšírenie, ktoré v tejto verzii MariaDB nie je" + spa "Tabla '%-.192s' usa una extensión que no existe en esta MariaDB versión" + swe "Tabell '%-.192s' har en extension som inte finns i denna version av MariaDB" + ukr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ '%-.192s' викориÑтовує розширеннÑ, що не Ñ–Ñнує у цій верÑÑ–Ñ— MariaDB" ER_TABLE_MUST_HAVE_COLUMNS 42000 cze "Tabulka mus-Bí mít alespoň jeden sloupec" dan "En tabel skal have mindst een kolonne" @@ -2761,27 +2761,27 @@ ER_UNKNOWN_CHARACTER_SET 42000 swe "Okänd teckenuppsättning: '%-.64s'" ukr "Ðевідома кодова таблицÑ: '%-.64s'" ER_TOO_MANY_TABLES - cze "P-BříliÅ¡ mnoho tabulek, MySQL jich může mít v joinu jen %d" - dan "For mange tabeller. MySQL kan kun bruge %d tabeller i et join" - nla "Teveel tabellen. MySQL kan slechts %d tabellen in een join bevatten" - eng "Too many tables; MySQL can only use %d tables in a join" - jps "テーブルãŒå¤šã™ãŽã¾ã™; MySQL can only use %d tables in a join", - est "Liiga palju tabeleid. MySQL suudab JOINiga ühendada kuni %d tabelit" - fre "Trop de tables. MySQL ne peut utiliser que %d tables dans un JOIN" - ger "Zu viele Tabellen. MySQL kann in einem Join maximal %d Tabellen verwenden" - greek "Î Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿Ï‚ αÏιθμός πινάκων. Η MySQL μποÏεί να χÏησιμοποιήσει %d πίνακες σε διαδικασία join" - hun "Tul sok tabla. A MySQL csak %d tablat tud kezelni osszefuzeskor" - ita "Troppe tabelle. MySQL puo` usare solo %d tabelle in una join" - jpn "テーブルãŒå¤šã™ãŽã¾ã™; MySQL can only use %d tables in a join" - kor "너무 ë§Žì€ í…Œì´ë¸”ì´ Joinë˜ì—ˆìŠµë‹ˆë‹¤. MySQLì—서는 JOINì‹œ %dê°œì˜ í…Œì´ë¸”만 사용할 수 있습니다." - por "Tabelas demais. O MySQL pode usar somente %d tabelas em uma junção (JOIN)" - rum "Prea multe tabele. MySQL nu poate folosi mai mult de %d tabele intr-un join" - rus "Слишком много таблиц. MySQL может иÑпользовать только %d таблиц в Ñоединении" - serbian "PreviÅ¡e tabela. MySQL može upotrebiti maksimum %d tabela pri 'JOIN' operaciji" - slo "PríliÅ¡ mnoho tabuliek. MySQL môže použiÅ¥ len %d v JOIN-e" - spa "Muchas tablas. MySQL solamente puede usar %d tablas en un join" - swe "För mÃ¥nga tabeller. MySQL can ha högst %d tabeller i en och samma join" - ukr "Забагато таблиць. MySQL може викориÑтовувати лише %d таблиць у об'єднанні" + cze "P-BříliÅ¡ mnoho tabulek, MariaDB jich může mít v joinu jen %d" + dan "For mange tabeller. MariaDB kan kun bruge %d tabeller i et join" + nla "Teveel tabellen. MariaDB kan slechts %d tabellen in een join bevatten" + eng "Too many tables; MariaDB can only use %d tables in a join" + jps "テーブルãŒå¤šã™ãŽã¾ã™; MariaDB can only use %d tables in a join", + est "Liiga palju tabeleid. MariaDB suudab JOINiga ühendada kuni %d tabelit" + fre "Trop de tables. MariaDB ne peut utiliser que %d tables dans un JOIN" + ger "Zu viele Tabellen. MariaDB kann in einem Join maximal %d Tabellen verwenden" + greek "Î Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿Ï‚ αÏιθμός πινάκων. Η MariaDB μποÏεί να χÏησιμοποιήσει %d πίνακες σε διαδικασία join" + hun "Tul sok tabla. A MariaDB csak %d tablat tud kezelni osszefuzeskor" + ita "Troppe tabelle. MariaDB puo` usare solo %d tabelle in una join" + jpn "テーブルãŒå¤šã™ãŽã¾ã™; MariaDB can only use %d tables in a join" + kor "너무 ë§Žì€ í…Œì´ë¸”ì´ Joinë˜ì—ˆìŠµë‹ˆë‹¤. MariaDBì—서는 JOINì‹œ %dê°œì˜ í…Œì´ë¸”만 사용할 수 있습니다." + por "Tabelas demais. O MariaDB pode usar somente %d tabelas em uma junção (JOIN)" + rum "Prea multe tabele. MariaDB nu poate folosi mai mult de %d tabele intr-un join" + rus "Слишком много таблиц. MariaDB может иÑпользовать только %d таблиц в Ñоединении" + serbian "PreviÅ¡e tabela. MariaDB može upotrebiti maksimum %d tabela pri 'JOIN' operaciji" + slo "PríliÅ¡ mnoho tabuliek. MariaDB môže použiÅ¥ len %d v JOIN-e" + spa "Muchas tablas. MariaDB solamente puede usar %d tablas en un join" + swe "För mÃ¥nga tabeller. MariaDB can ha högst %d tabeller i en och samma join" + ukr "Забагато таблиць. MariaDB може викориÑтовувати лише %d таблиць у об'єднанні" ER_TOO_MANY_FIELDS cze "P-BříliÅ¡ mnoho položek" dan "For mange felter" @@ -3048,50 +3048,50 @@ ER_HOST_IS_BLOCKED swe "Denna dator, '%-.64s', är blockerad pga mÃ¥nga felaktig paket. Gör 'mysqladmin flush-hosts' för att ta bort alla blockeringarna" ukr "ХоÑÑ‚ '%-.64s' заблоковано з причини великої кількоÑÑ‚Ñ– помилок з'єднаннÑ. Ð”Ð»Ñ Ñ€Ð¾Ð·Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñтовуйте 'mysqladmin flush-hosts'" ER_HOST_NOT_PRIVILEGED - cze "Stroj '%-.64s' nem-Bá povoleno se k tomuto MySQL serveru pÅ™ipojit" - dan "Værten '%-.64s' kan ikke tilkoble denne MySQL-server" - nla "Het is host '%-.64s' is niet toegestaan verbinding te maken met deze MySQL server" - eng "Host '%-.64s' is not allowed to connect to this MySQL server" - jps "Host '%-.64s' 㯠MySQL server ã«æŽ¥ç¶šã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“", - est "Masinal '%-.64s' puudub ligipääs sellele MySQL serverile" - fre "Le hôte '%-.64s' n'est pas authorisé à se connecter à ce serveur MySQL" - ger "Host '%-.64s' hat keine Berechtigung, sich mit diesem MySQL-Server zu verbinden" - greek "Ο υπολογιστής '%-.64s' δεν έχει δικαίωμα σÏνδεσης με τον MySQL server" - hun "A '%-.64s' host szamara nem engedelyezett a kapcsolodas ehhez a MySQL szerverhez" - ita "Al sistema '%-.64s' non e` consentita la connessione a questo server MySQL" - jpn "Host '%-.64s' 㯠MySQL server ã«æŽ¥ç¶šã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“" - kor "'%-.64s' 호스트는 ì´ MySQLì„œë²„ì— ì ‘ì†í•  허가를 받지 못했습니다." - por "'Host' '%-.64s' não tem permissão para se conectar com este servidor MySQL" - rum "Host-ul '%-.64s' nu este permis a se conecta la aceste server MySQL" - rus "ХоÑту '%-.64s' не разрешаетÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ðº Ñтому Ñерверу MySQL" - serbian "Host-u '%-.64s' nije dozvoljeno da se konektuje na ovaj MySQL server" - spa "Servidor '%-.64s' no está permitido para conectar con este servidor MySQL" - swe "Denna dator, '%-.64s', har inte privileger att använda denna MySQL server" - ukr "ХоÑту '%-.64s' не доволено зв'ÑзуватиÑÑŒ з цим Ñервером MySQL" + cze "Stroj '%-.64s' nem-Bá povoleno se k tomuto MariaDB serveru pÅ™ipojit" + dan "Værten '%-.64s' kan ikke tilkoble denne MariaDB-server" + nla "Het is host '%-.64s' is niet toegestaan verbinding te maken met deze MariaDB server" + eng "Host '%-.64s' is not allowed to connect to this MariaDB server" + jps "Host '%-.64s' 㯠MariaDB server ã«æŽ¥ç¶šã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“", + est "Masinal '%-.64s' puudub ligipääs sellele MariaDB serverile" + fre "Le hôte '%-.64s' n'est pas authorisé à se connecter à ce serveur MariaDB" + ger "Host '%-.64s' hat keine Berechtigung, sich mit diesem MariaDB-Server zu verbinden" + greek "Ο υπολογιστής '%-.64s' δεν έχει δικαίωμα σÏνδεσης με τον MariaDB server" + hun "A '%-.64s' host szamara nem engedelyezett a kapcsolodas ehhez a MariaDB szerverhez" + ita "Al sistema '%-.64s' non e` consentita la connessione a questo server MariaDB" + jpn "Host '%-.64s' 㯠MariaDB server ã«æŽ¥ç¶šã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“" + kor "'%-.64s' 호스트는 ì´ MariaDBì„œë²„ì— ì ‘ì†í•  허가를 받지 못했습니다." + por "'Host' '%-.64s' não tem permissão para se conectar com este servidor MariaDB" + rum "Host-ul '%-.64s' nu este permis a se conecta la aceste server MariaDB" + rus "ХоÑту '%-.64s' не разрешаетÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ðº Ñтому Ñерверу MariaDB" + serbian "Host-u '%-.64s' nije dozvoljeno da se konektuje na ovaj MariaDB server" + spa "Servidor '%-.64s' no está permitido para conectar con este servidor MariaDB" + swe "Denna dator, '%-.64s', har inte privileger att använda denna MariaDB server" + ukr "ХоÑту '%-.64s' не доволено зв'ÑзуватиÑÑŒ з цим Ñервером MariaDB" ER_PASSWORD_ANONYMOUS_USER 42000 - cze "Pou-Bžíváte MySQL jako anonymní uživatel a anonymní uživatelé nemají povoleno mÄ›nit hesla" - dan "Du bruger MySQL som anonym bruger. Anonyme brugere mÃ¥ ikke ændre adgangskoder" - nla "U gebruikt MySQL als anonieme gebruiker en deze mogen geen wachtwoorden wijzigen" - eng "You are using MySQL as an anonymous user and anonymous users are not allowed to change passwords" - jps "MySQL ã‚’ anonymous users ã§ä½¿ç”¨ã—ã¦ã„る状態ã§ã¯ã€ãƒ‘スワードã®å¤‰æ›´ã¯ã§ãã¾ã›ã‚“", - est "Te kasutate MySQL-i anonüümse kasutajana, kelledel pole parooli muutmise õigust" + cze "Pou-Bžíváte MariaDB jako anonymní uživatel a anonymní uživatelé nemají povoleno mÄ›nit hesla" + dan "Du bruger MariaDB som anonym bruger. Anonyme brugere mÃ¥ ikke ændre adgangskoder" + nla "U gebruikt MariaDB als anonieme gebruiker en deze mogen geen wachtwoorden wijzigen" + eng "You are using MariaDB as an anonymous user and anonymous users are not allowed to change passwords" + jps "MariaDB ã‚’ anonymous users ã§ä½¿ç”¨ã—ã¦ã„る状態ã§ã¯ã€ãƒ‘スワードã®å¤‰æ›´ã¯ã§ãã¾ã›ã‚“", + est "Te kasutate MariaDB-i anonüümse kasutajana, kelledel pole parooli muutmise õigust" fre "Vous utilisez un utilisateur anonyme et les utilisateurs anonymes ne sont pas autorisés à changer les mots de passe" - ger "Sie benutzen MySQL als anonymer Benutzer und dürfen daher keine Passwörter ändern" - greek "ΧÏησιμοποιείτε την MySQL σαν anonymous user και έτσι δεν μποÏείτε να αλλάξετε τα passwords άλλων χÏηστών" + ger "Sie benutzen MariaDB als anonymer Benutzer und dürfen daher keine Passwörter ändern" + greek "ΧÏησιμοποιείτε την MariaDB σαν anonymous user και έτσι δεν μποÏείτε να αλλάξετε τα passwords άλλων χÏηστών" hun "Nevtelen (anonymous) felhasznalokent nem negedelyezett a jelszovaltoztatas" - ita "Impossibile cambiare la password usando MySQL come utente anonimo" - jpn "MySQL ã‚’ anonymous users ã§ä½¿ç”¨ã—ã¦ã„る状態ã§ã¯ã€ãƒ‘スワードã®å¤‰æ›´ã¯ã§ãã¾ã›ã‚“" - kor "ë‹¹ì‹ ì€ MySQLì„œë²„ì— ìµëª…ì˜ ì‚¬ìš©ìžë¡œ ì ‘ì†ì„ 하셨습니다.ìµëª…ì˜ ì‚¬ìš©ìžëŠ” 암호를 변경할 수 없습니다." - por "Você está usando o MySQL como usuário anônimo e usuários anônimos não têm permissão para mudar senhas" - rum "Dumneavoastra folositi MySQL ca un utilizator anonim si utilizatorii anonimi nu au voie sa schime parolele" - rus "Ð’Ñ‹ иÑпользуете MySQL от имени анонимного пользователÑ, а анонимным пользователÑм не разрешаетÑÑ Ð¼ÐµÐ½ÑÑ‚ÑŒ пароли" - serbian "Vi koristite MySQL kao anonimni korisnik a anonimnim korisnicima nije dozvoljeno da menjaju lozinke" - spa "Tu estás usando MySQL como un usuario anonimo y usuarios anonimos no tienen permiso para cambiar las claves" - swe "Du använder MySQL som en anonym användare och som sÃ¥dan fÃ¥r du inte ändra ditt lösenord" - ukr "Ви викориÑтовуєте MySQL Ñк анонімний кориÑтувач, тому вам не дозволено змінювати паролі" + ita "Impossibile cambiare la password usando MariaDB come utente anonimo" + jpn "MariaDB ã‚’ anonymous users ã§ä½¿ç”¨ã—ã¦ã„る状態ã§ã¯ã€ãƒ‘スワードã®å¤‰æ›´ã¯ã§ãã¾ã›ã‚“" + kor "ë‹¹ì‹ ì€ MariaDBì„œë²„ì— ìµëª…ì˜ ì‚¬ìš©ìžë¡œ ì ‘ì†ì„ 하셨습니다.ìµëª…ì˜ ì‚¬ìš©ìžëŠ” 암호를 변경할 수 없습니다." + por "Você está usando o MariaDB como usuário anônimo e usuários anônimos não têm permissão para mudar senhas" + rum "Dumneavoastra folositi MariaDB ca un utilizator anonim si utilizatorii anonimi nu au voie sa schime parolele" + rus "Ð’Ñ‹ иÑпользуете MariaDB от имени анонимного пользователÑ, а анонимным пользователÑм не разрешаетÑÑ Ð¼ÐµÐ½ÑÑ‚ÑŒ пароли" + serbian "Vi koristite MariaDB kao anonimni korisnik a anonimnim korisnicima nije dozvoljeno da menjaju lozinke" + spa "Tu estás usando MariaDB como un usuario anonimo y usuarios anonimos no tienen permiso para cambiar las claves" + swe "Du använder MariaDB som en anonym användare och som sÃ¥dan fÃ¥r du inte ändra ditt lösenord" + ukr "Ви викориÑтовуєте MariaDB Ñк анонімний кориÑтувач, тому вам не дозволено змінювати паролі" ER_PASSWORD_NOT_ALLOWED 42000 cze "Na zm-BÄ›nu hesel ostatním musíte mít právo provést update tabulek v databázi mysql" - dan "Du skal have tilladelse til at opdatere tabeller i MySQL databasen for at ændre andres adgangskoder" + dan "Du skal have tilladelse til at opdatere tabeller i MariaDB databasen for at ændre andres adgangskoder" nla "U moet tabel update priveleges hebben in de mysql database om wachtwoorden voor anderen te mogen wijzigen" eng "You must have privileges to update tables in the mysql database to be able to change passwords for others" jps "ä»–ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ‘スワードを変更ã™ã‚‹ãŸã‚ã«ã¯, mysql データベースã«å¯¾ã—㦠update ã®è¨±å¯ãŒãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“.", @@ -3411,28 +3411,28 @@ ER_NONEXISTING_TABLE_GRANT 42000 swe "Det finns inget privilegium definierat för användare '%-.48s' pÃ¥ '%-.64s' för tabell '%-.192s'" ukr "Повноважень не визначено Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувача '%-.48s' з хоÑту '%-.64s' Ð´Ð»Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ– '%-.192s'" ER_NOT_ALLOWED_COMMAND 42000 - cze "Pou-Bžitý příkaz není v této verzi MySQL povolen" - dan "Den brugte kommando er ikke tilladt med denne udgave af MySQL" - nla "Het used commando is niet toegestaan in deze MySQL versie" - eng "The used command is not allowed with this MySQL version" - est "Antud käsk ei ole lubatud käesolevas MySQL versioonis" - fre "Cette commande n'existe pas dans cette version de MySQL" - ger "Der verwendete Befehl ist in dieser MySQL-Version nicht zulässig" - hun "A hasznalt parancs nem engedelyezett ebben a MySQL verzioban" - ita "Il comando utilizzato non e` supportato in questa versione di MySQL" - kor "ì‚¬ìš©ëœ ëª…ë ¹ì€ í˜„ìž¬ì˜ MySQL 버젼ì—서는 ì´ìš©ë˜ì§€ 않습니다." - por "Comando usado não é permitido para esta versão do MySQL" - rum "Comanda folosita nu este permisa pentru aceasta versiune de MySQL" - rus "Эта команда не допуÑкаетÑÑ Ð² данной верÑии MySQL" - serbian "Upotrebljena komanda nije dozvoljena sa ovom verzijom MySQL servera" - spa "El comando usado no es permitido con esta versión de MySQL" - swe "Du kan inte använda detta kommando med denna MySQL version" - ukr "ВикориÑтовувана команда не дозволена у цій верÑÑ–Ñ— MySQL" + cze "Pou-Bžitý příkaz není v této verzi MariaDB povolen" + dan "Den brugte kommando er ikke tilladt med denne udgave af MariaDB" + nla "Het used commando is niet toegestaan in deze MariaDB versie" + eng "The used command is not allowed with this MariaDB version" + est "Antud käsk ei ole lubatud käesolevas MariaDB versioonis" + fre "Cette commande n'existe pas dans cette version de MariaDB" + ger "Der verwendete Befehl ist in dieser MariaDB-Version nicht zulässig" + hun "A hasznalt parancs nem engedelyezett ebben a MariaDB verzioban" + ita "Il comando utilizzato non e` supportato in questa versione di MariaDB" + kor "ì‚¬ìš©ëœ ëª…ë ¹ì€ í˜„ìž¬ì˜ MariaDB 버젼ì—서는 ì´ìš©ë˜ì§€ 않습니다." + por "Comando usado não é permitido para esta versão do MariaDB" + rum "Comanda folosita nu este permisa pentru aceasta versiune de MariaDB" + rus "Эта команда не допуÑкаетÑÑ Ð² данной верÑии MariaDB" + serbian "Upotrebljena komanda nije dozvoljena sa ovom verzijom MariaDB servera" + spa "El comando usado no es permitido con esta versión de MariaDB" + swe "Du kan inte använda detta kommando med denna MariaDB version" + ukr "ВикориÑтовувана команда не дозволена у цій верÑÑ–Ñ— MariaDB" ER_SYNTAX_ERROR 42000 cze "Va-BÅ¡e syntaxe je nÄ›jaká divná" dan "Der er en fejl i SQL syntaksen" nla "Er is iets fout in de gebruikte syntax" - eng "You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use" + eng "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use" est "Viga SQL süntaksis" fre "Erreur de syntaxe" ger "Fehler in der SQL-Syntax. Bitte die korrekte Syntax im Handbuch nachschlagen" @@ -3446,7 +3446,7 @@ ER_SYNTAX_ERROR 42000 pol "Something is wrong in your syntax" por "Você tem um erro de sintaxe no seu SQL" rum "Aveti o eroare in sintaxa RSQL" - rus "У Ð²Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в запроÑе. Изучите документацию по иÑпользуемой верÑии MySQL на предмет корректного ÑинтакÑиÑа" + rus "У Ð²Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в запроÑе. Изучите документацию по иÑпользуемой верÑии MariaDB на предмет корректного ÑинтакÑиÑа" serbian "Imate greÅ¡ku u vaÅ¡oj SQL sintaksi" slo "Something is wrong in your syntax" spa "Algo está equivocado en su sintax" @@ -3905,22 +3905,22 @@ ER_REQUIRES_PRIMARY_KEY 42000 swe "Denna tabelltyp kräver en PRIMARY KEY" ukr "Цей тип таблиці потребує первинного ключа" ER_NO_RAID_COMPILED - cze "Tato verze MySQL nen-Bí zkompilována s podporou RAID" - dan "Denne udgave af MySQL er ikke oversat med understøttelse af RAID" - nla "Deze versie van MySQL is niet gecompileerd met RAID ondersteuning" - eng "This version of MySQL is not compiled with RAID support" - est "Antud MySQL versioon on kompileeritud ilma RAID toeta" - fre "Cette version de MySQL n'est pas compilée avec le support RAID" - ger "Diese MySQL-Version ist nicht mit RAID-Unterstützung kompiliert" - hun "Ezen leforditott MySQL verzio nem tartalmaz RAID support-ot" + cze "Tato verze MariaDB nen-Bí zkompilována s podporou RAID" + dan "Denne udgave af MariaDB er ikke oversat med understøttelse af RAID" + nla "Deze versie van MariaDB is niet gecompileerd met RAID ondersteuning" + eng "This version of MariaDB is not compiled with RAID support" + est "Antud MariaDB versioon on kompileeritud ilma RAID toeta" + fre "Cette version de MariaDB n'est pas compilée avec le support RAID" + ger "Diese MariaDB-Version ist nicht mit RAID-Unterstützung kompiliert" + hun "Ezen leforditott MariaDB verzio nem tartalmaz RAID support-ot" ita "Questa versione di MYSQL non e` compilata con il supporto RAID" - por "Esta versão do MySQL não foi compilada com suporte a RAID" - rum "Aceasta versiune de MySQL, nu a fost compilata cu suport pentru RAID" - rus "Эта верÑÐ¸Ñ MySQL Ñкомпилирована без поддержки RAID" - serbian "Ova verzija MySQL servera nije kompajlirana sa podrÅ¡kom za RAID ureÄ‘aje" - spa "Esta versión de MySQL no es compilada con soporte RAID" - swe "Denna version av MySQL är inte kompilerad med RAID" - ukr "Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ MySQL не зкомпільована з підтримкою RAID" + por "Esta versão do MariaDB não foi compilada com suporte a RAID" + rum "Aceasta versiune de MariaDB, nu a fost compilata cu suport pentru RAID" + rus "Эта верÑÐ¸Ñ MariaDB Ñкомпилирована без поддержки RAID" + serbian "Ova verzija MariaDB servera nije kompajlirana sa podrÅ¡kom za RAID ureÄ‘aje" + spa "Esta versión de MariaDB no es compilada con soporte RAID" + swe "Denna version av MariaDB är inte kompilerad med RAID" + ukr "Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ MariaDB не зкомпільована з підтримкою RAID" ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE cze "Update tabulky bez WHERE s kl-BíÄem není v módu bezpeÄných update dovoleno" dan "Du bruger sikker opdaterings modus ('safe update mode') og du forsøgte at opdatere en tabel uden en WHERE klausul, der gør brug af et KEY felt" @@ -3928,7 +3928,7 @@ ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE eng "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column" est "Katse muuta tabelit turvalises rezhiimis ilma WHERE klauslita" fre "Vous êtes en mode 'safe update' et vous essayez de faire un UPDATE sans clause WHERE utilisant un index" - ger "MySQL läuft im sicheren Aktualisierungsmodus (safe update mode). Sie haben versucht, eine Tabelle zu aktualisieren, ohne in der WHERE-Klausel ein KEY-Feld anzugeben" + ger "MariaDB läuft im sicheren Aktualisierungsmodus (safe update mode). Sie haben versucht, eine Tabelle zu aktualisieren, ohne in der WHERE-Klausel ein KEY-Feld anzugeben" hun "On a biztonsagos update modot hasznalja, es WHERE that uses a KEY column" ita "In modalita` 'safe update' si e` cercato di aggiornare una tabella senza clausola WHERE su una chiave" por "Você está usando modo de atualização seguro e tentou atualizar uma tabela sem uma cláusula WHERE que use uma coluna chave" @@ -4310,11 +4310,11 @@ ER_BAD_SLAVE swe "Servern är inte konfigurerade som en replikationsslav. Ändra konfigurationsfilen eller gör CHANGE MASTER TO" ukr "Сервер не зконфігуровано Ñк підлеглий, виправте це у файлі конфігурації або з CHANGE MASTER TO" ER_MASTER_INFO - eng "Could not initialize master info structure; more error messages can be found in the MySQL error log" - fre "Impossible d'initialiser les structures d'information de maître, vous trouverez des messages d'erreur supplémentaires dans le journal des erreurs de MySQL" - ger "Konnte Master-Info-Struktur nicht initialisieren. Weitere Fehlermeldungen können im MySQL-Error-Log eingesehen werden" + eng "Could not initialize master info structure; more error messages can be found in the MariaDB error log" + fre "Impossible d'initialiser les structures d'information de maître, vous trouverez des messages d'erreur supplémentaires dans le journal des erreurs de MariaDB" + ger "Konnte Master-Info-Struktur nicht initialisieren. Weitere Fehlermeldungen können im MariaDB-Error-Log eingesehen werden" serbian "Nisam mogao da inicijalizujem informacionu strukturu glavnog servera, proverite da li imam privilegije potrebne za pristup file-u 'master.info'" - swe "Kunde inte initialisera replikationsstrukturerna. See MySQL fel fil för mera information" + swe "Kunde inte initialisera replikationsstrukturerna. See MariaDB fel fil för mera information" ER_SLAVE_THREAD dan "Kunne ikke danne en slave-trÃ¥d; check systemressourcerne" nla "Kon slave thread niet aanmaken, controleer systeem resources" @@ -4692,14 +4692,14 @@ ER_CANT_USE_OPTION_HERE 42000 spa "Equivocado uso/colocación de '%s'" swe "Fel använding/placering av '%s'" ER_NOT_SUPPORTED_YET 42000 - nla "Deze versie van MySQL ondersteunt nog geen '%s'" - eng "This version of MySQL doesn't yet support '%s'" - ger "Diese MySQL-Version unterstützt '%s' nicht" - ita "Questa versione di MySQL non supporta ancora '%s'" - por "Esta versão de MySQL não suporta ainda '%s'" - rus "Эта верÑÐ¸Ñ MySQL пока еще не поддерживает '%s'" - spa "Esta versión de MySQL no soporta todavia '%s'" - swe "Denna version av MySQL kan ännu inte utföra '%s'" + nla "Deze versie van MariaDB ondersteunt nog geen '%s'" + eng "This version of MariaDB doesn't yet support '%s'" + ger "Diese MariaDB-Version unterstützt '%s' nicht" + ita "Questa versione di MariaDB non supporta ancora '%s'" + por "Esta versão de MariaDB não suporta ainda '%s'" + rus "Эта верÑÐ¸Ñ MariaDB пока еще не поддерживает '%s'" + spa "Esta versión de MariaDB no soporta todavia '%s'" + swe "Denna version av MariaDB kan ännu inte utföra '%s'" ER_MASTER_FATAL_ERROR_READING_BINLOG nla "Kreeg fatale fout %d: '%-.256s' van master tijdens lezen van data uit binaire log" eng "Got fatal error %d from master when reading data from binary log: '%-.256s'" @@ -4820,11 +4820,11 @@ ER_TABLENAME_NOT_ALLOWED_HERE 42000 spa "Tabla '%-.192s' de uno de los SELECT no puede ser usada en %-.32s" swe "Tabell '%-.192s' frÃ¥n en SELECT kan inte användas i %-.32s" ER_NOT_SUPPORTED_AUTH_MODE 08004 - eng "Client does not support authentication protocol requested by server; consider upgrading MySQL client" - ger "Client unterstützt das vom Server erwartete Authentifizierungsprotokoll nicht. Bitte aktualisieren Sie Ihren MySQL-Client" - nla "Client ondersteunt het door de server verwachtte authenticatieprotocol niet. Overweeg een nieuwere MySQL client te gebruiken" - por "Cliente não suporta o protocolo de autenticação exigido pelo servidor; considere a atualização do cliente MySQL" - spa "Cliente no soporta protocolo de autenticación solicitado por el servidor; considere actualizar el cliente MySQL" + eng "Client does not support authentication protocol requested by server; consider upgrading MariaDB client" + ger "Client unterstützt das vom Server erwartete Authentifizierungsprotokoll nicht. Bitte aktualisieren Sie Ihren MariaDB-Client" + nla "Client ondersteunt het door de server verwachtte authenticatieprotocol niet. Overweeg een nieuwere MariaDB client te gebruiken" + por "Cliente não suporta o protocolo de autenticação exigido pelo servidor; considere a atualização do cliente MariaDB" + spa "Cliente no soporta protocolo de autenticación solicitado por el servidor; considere actualizar el cliente MariaDB" swe "Klienten stöder inte autentiseringsprotokollet som begärts av servern; överväg uppgradering av klientprogrammet." ER_SPATIAL_CANT_HAVE_NULL 42000 eng "All parts of a SPATIAL index must be NOT NULL" @@ -4944,10 +4944,10 @@ ER_UNKNOWN_COLLATION por "Collation desconhecida: '%-.64s'" spa "Collation desconocida: '%-.64s'" ER_SLAVE_IGNORED_SSL_PARAMS - eng "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started" - ger "SSL-Parameter in CHANGE MASTER werden ignoriert, weil dieser MySQL-Slave ohne SSL-Unterstützung kompiliert wurde. Sie können aber später verwendet werden, wenn ein MySQL-Slave mit SSL gestartet wird" - por "SSL parâmetros em CHANGE MASTER são ignorados porque este escravo MySQL foi compilado sem o SSL suporte. Os mesmos podem ser usados mais tarde quando o escravo MySQL com SSL seja iniciado." - spa "Parametros SSL en CHANGE MASTER son ignorados porque este slave MySQL fue compilado sin soporte SSL; pueden ser usados despues cuando el slave MySQL con SSL sea inicializado" + eng "SSL parameters in CHANGE MASTER are ignored because this MariaDB slave was compiled without SSL support; they can be used later if MariaDB slave with SSL is started" + ger "SSL-Parameter in CHANGE MASTER werden ignoriert, weil dieser MariaDB-Slave ohne SSL-Unterstützung kompiliert wurde. Sie können aber später verwendet werden, wenn ein MariaDB-Slave mit SSL gestartet wird" + por "SSL parâmetros em CHANGE MASTER são ignorados porque este escravo MariaDB foi compilado sem o SSL suporte. Os mesmos podem ser usados mais tarde quando o escravo MariaDB com SSL seja iniciado." + spa "Parametros SSL en CHANGE MASTER son ignorados porque este slave MariaDB fue compilado sin soporte SSL; pueden ser usados despues cuando el slave MariaDB con SSL sea inicializado" ER_SERVER_IS_IN_SECURE_AUTH_MODE eng "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format" ger "Server läuft im Modus --secure-auth, aber '%s'@'%s' hat ein Passwort im alten Format. Bitte Passwort ins neue Format ändern" @@ -5009,10 +5009,10 @@ ER_UNKNOWN_KEY_CACHE spa "Desconocida key cache '%-.100s'" swe "Okänd nyckel cache '%-.100s'" ER_WARN_HOSTNAME_WONT_WORK - eng "MySQL is started in --skip-name-resolve mode; you must restart it without this switch for this grant to work" - ger "MySQL wurde mit --skip-name-resolve gestartet. Diese Option darf nicht verwendet werden, damit diese Rechtevergabe möglich ist" - por "MySQL foi inicializado em modo --skip-name-resolve. Você necesita reincializá-lo sem esta opção para este grant funcionar" - spa "MySQL esta inicializado en modo --skip-name-resolve. Usted necesita reinicializarlo sin esta opción para este derecho funcionar" + eng "MariaDB is started in --skip-name-resolve mode; you must restart it without this switch for this grant to work" + ger "MariaDB wurde mit --skip-name-resolve gestartet. Diese Option darf nicht verwendet werden, damit diese Rechtevergabe möglich ist" + por "MariaDB foi inicializado em modo --skip-name-resolve. Você necesita reincializá-lo sem esta opção para este grant funcionar" + spa "MariaDB esta inicializado en modo --skip-name-resolve. Usted necesita reinicializarlo sin esta opción para este derecho funcionar" ER_UNKNOWN_STORAGE_ENGINE 42000 eng "Unknown storage engine '%s'" ger "Unbekannte Speicher-Engine '%s'" @@ -5032,17 +5032,17 @@ ER_NON_UPDATABLE_TABLE swe "Tabell %-.100s använd med '%s' är inte uppdateringsbar" ukr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ %-.100s у %s не може оновлюватиÑÑŒ" ER_FEATURE_DISABLED - eng "The '%s' feature is disabled; you need MySQL built with '%s' to have it working" - ger "Das Feature '%s' ist ausgeschaltet, Sie müssen MySQL mit '%s' übersetzen, damit es verfügbar ist" - por "O recurso '%s' foi desativado; você necessita MySQL construído com '%s' para ter isto funcionando" - spa "El recurso '%s' fue deshabilitado; usted necesita construir MySQL con '%s' para tener eso funcionando" - swe "'%s' är inte aktiverad; För att aktivera detta mÃ¥ste du bygga om MySQL med '%s' definierad" + eng "The '%s' feature is disabled; you need MariaDB built with '%s' to have it working" + ger "Das Feature '%s' ist ausgeschaltet, Sie müssen MariaDB mit '%s' übersetzen, damit es verfügbar ist" + por "O recurso '%s' foi desativado; você necessita MariaDB construído com '%s' para ter isto funcionando" + spa "El recurso '%s' fue deshabilitado; usted necesita construir MariaDB con '%s' para tener eso funcionando" + swe "'%s' är inte aktiverad; För att aktivera detta mÃ¥ste du bygga om MariaDB med '%s' definierad" ER_OPTION_PREVENTS_STATEMENT - eng "The MySQL server is running with the %s option so it cannot execute this statement" - ger "Der MySQL-Server läuft mit der Option %s und kann diese Anweisung deswegen nicht ausführen" - por "O servidor MySQL está rodando com a opção %s razão pela qual não pode executar esse commando" - spa "El servidor MySQL está rodando con la opción %s tal que no puede ejecutar este comando" - swe "MySQL är startad med %s. Pga av detta kan du inte använda detta kommando" + eng "The MariaDB server is running with the %s option so it cannot execute this statement" + ger "Der MariaDB-Server läuft mit der Option %s und kann diese Anweisung deswegen nicht ausführen" + por "O servidor MariaDB está rodando com a opção %s razão pela qual não pode executar esse commando" + spa "El servidor MariaDB está rodando con la opción %s tal que no puede ejecutar este comando" + swe "MariaDB är startad med %s. Pga av detta kan du inte använda detta kommando" ER_DUPLICATED_VALUE_IN_TYPE eng "Column '%-.100s' has duplicated value '%-.64s' in %s" ger "Feld '%-.100s' hat doppelten Wert '%-.64s' in %s" @@ -5130,11 +5130,11 @@ ER_SP_BADSTATEMENT 0A000 eng "%s is not allowed in stored procedures" ger "%s ist in gespeicherten Prozeduren nicht erlaubt" ER_UPDATE_LOG_DEPRECATED_IGNORED 42000 - eng "The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6." - ger "Das Update-Log ist veraltet und wurde durch das Binär-Log ersetzt. SET SQL_LOG_UPDATE wird ignoriert. Diese Option wird in MySQL 5.6 entfernt." + eng "The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MariaDB 5.6." + ger "Das Update-Log ist veraltet und wurde durch das Binär-Log ersetzt. SET SQL_LOG_UPDATE wird ignoriert. Diese Option wird in MariaDB 5.6 entfernt." ER_UPDATE_LOG_DEPRECATED_TRANSLATED 42000 - eng "The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN. This option will be removed in MySQL 5.6." - ger "Das Update-Log ist veraltet und wurde durch das Binär-Log ersetzt. SET SQL_LOG_UPDATE wurde in SET SQL_LOG_BIN übersetzt. Diese Option wird in MySQL 5.6 entfernt." + eng "The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN. This option will be removed in MariaDB 5.6." + ger "Das Update-Log ist veraltet und wurde durch das Binär-Log ersetzt. SET SQL_LOG_UPDATE wurde in SET SQL_LOG_BIN übersetzt. Diese Option wird in MariaDB 5.6 entfernt." ER_QUERY_INTERRUPTED 70100 eng "Query execution was interrupted" ger "Ausführung der Abfrage wurde unterbrochen" @@ -5366,8 +5366,8 @@ ER_NO_BINARY_LOGGING eng "You are not using binary logging" ger "Sie verwenden keine Binärlogs" ER_RESERVED_SYNTAX - eng "The '%-.64s' syntax is reserved for purposes internal to the MySQL server" - ger "Die Schreibweise '%-.64s' ist für interne Zwecke des MySQL-Servers reserviert" + eng "The '%-.64s' syntax is reserved for purposes internal to the MariaDB server" + ger "Die Schreibweise '%-.64s' ist für interne Zwecke des MariaDB-Servers reserviert" ER_WSAS_FAILED eng "WSAStartup Failed" ger "WSAStartup fehlgeschlagen" @@ -5739,9 +5739,9 @@ ER_PARTITION_ENTRY_ERROR ger "Partitionierung kann in einer Abfrage nicht alleinstehend benutzt werden" swe "Partitioneringssyntax kan inte användas pÃ¥ egen hand i en SQL-frÃ¥ga" ER_MIX_HANDLER_ERROR - eng "The mix of handlers in the partitions is not allowed in this version of MySQL" - ger "Das Vermischen von Handlern in Partitionen ist in dieser Version von MySQL nicht erlaubt" - swe "Denna mix av lagringsmotorer är inte tillÃ¥ten i denna version av MySQL" + eng "The mix of handlers in the partitions is not allowed in this version of MariaDB" + ger "Das Vermischen von Handlern in Partitionen ist in dieser Version von MariaDB nicht erlaubt" + swe "Denna mix av lagringsmotorer är inte tillÃ¥ten i denna version av MariaDB" ER_PARTITION_NOT_DEFINED_ERROR eng "For the partitioned engine it is necessary to define all %-.64s" ger "Für die partitionierte Engine müssen alle %-.64s definiert sein" @@ -5936,8 +5936,8 @@ ER_DROP_INDEX_FK # When using this error message, use the ER_WARN_DEPRECATED_SYNTAX error # code. ER_WARN_DEPRECATED_SYNTAX_WITH_VER - eng "The syntax '%s' is deprecated and will be removed in MySQL %s. Please use %s instead" - ger "Die Syntax '%s' ist veraltet und wird in MySQL %s entfernt. Bitte benutzen Sie statt dessen %s" + eng "The syntax '%s' is deprecated and will be removed in MariaDB %s. Please use %s instead" + ger "Die Syntax '%s' ist veraltet und wird in MariaDB %s entfernt. Bitte benutzen Sie statt dessen %s" ER_CANT_WRITE_LOCK_LOG_TABLE eng "You can't write-lock a log table. Only read access is possible" ger "Eine Log-Tabelle kann nicht schreibgesperrt werden. Es ist ohnehin nur Lesezugriff möglich" @@ -5948,8 +5948,8 @@ ER_FOREIGN_DUPLICATE_KEY 23000 S1009 eng "Upholding foreign key constraints for table '%.192s', entry '%-.192s', key %d would lead to a duplicate entry" ger "Aufrechterhalten der Fremdschlüssel-Beschränkungen für Tabelle '%.192s', Eintrag '%-.192s', Schlüssel %d würde zu einem doppelten Eintrag führen" ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE - eng "Column count of mysql.%s is wrong. Expected %d, found %d. Created with MySQL %d, now running %d. Please use mysql_upgrade to fix this error." - ger "Spaltenanzahl von mysql.%s falsch. %d erwartet, aber %d erhalten. Erzeugt mit MySQL %d, jetzt unter %d. Bitte benutzen Sie mysql_upgrade, um den Fehler zu beheben" + eng "Column count of mysql.%s is wrong. Expected %d, found %d. Created with MariaDB %d, now running %d. Please use mysql_upgrade to fix this error." + ger "Spaltenanzahl von mysql.%s falsch. %d erwartet, aber %d erhalten. Erzeugt mit MariaDB %d, jetzt unter %d. Bitte benutzen Sie mysql_upgrade, um den Fehler zu beheben" ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR eng "Cannot switch out of the row-based binary log format when the session has open temporary tables" ger "Kann nicht aus dem zeilenbasierten Binärlog-Format herauswechseln, wenn die Sitzung offene temporäre Tabellen hat" @@ -6343,8 +6343,8 @@ ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT ER_PATH_LENGTH eng "The path specified for %.64s is too long." ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT - eng "The syntax '%s' is deprecated and will be removed in MySQL %s." - ger "Die Syntax '%s' ist veraltet und wird in MySQL %s entfernt." + eng "The syntax '%s' is deprecated and will be removed in MariaDB %s." + ger "Die Syntax '%s' ist veraltet und wird in MariaDB %s entfernt." ER_WRONG_NATIVE_TABLE_STRUCTURE eng "Native table '%-.64s'.'%-.64s' has the wrong structure" diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index e3c9ecc1a36..6bc1d5204b6 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1770,7 +1770,7 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length) goto err_unlock; Query_cache_block *query_block; - if (opt_query_cache_strip_comments) + if (thd->variables.query_cache_strip_comments) { make_base_query(&thd->base_query, sql, (size_t) (sql_end - sql), thd->db_length + 1 + QUERY_CACHE_FLAGS_SIZE); diff --git a/sql/sql_class.h b/sql/sql_class.h index 6f49f52331d..dd1617d7546 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -536,6 +536,7 @@ typedef struct system_variables my_bool old_alter_table; my_bool old_passwords; my_bool big_tables; + my_bool query_cache_strip_comments; plugin_ref table_plugin; diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index f9516b5f6aa..d2dcbb1b629 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3371,14 +3371,6 @@ static Sys_var_mybool Sys_replicate_annotate_row_events( CMD_LINE(OPT_ARG), DEFAULT(0)); #endif -#if 0 -static Sys_var_mybool Sys_safemalloc( - "safemalloc", - "Check all memory allocations for every malloc/free call (can be slow)", - GLOBAL_VAR(sf_malloc_trough_check), - CMD_LINE(OPT_ARG), DEFAULT(FALSE)); -#endif - static Sys_var_ulonglong Sys_join_buffer_space_limit( "join_buffer_space_limit", "The limit of the space for all join buffers used by a query", @@ -3393,18 +3385,18 @@ static Sys_var_ulong Sys_progress_report_time( SESSION_VAR(progress_report_time), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, UINT_MAX), DEFAULT(56), BLOCK_SIZE(1)); -static Sys_var_mybool Sys_thread_alarm( - "thread_alarm", - "Enable system thread alarm calls. Disabling it may be useful " +static Sys_var_mybool Sys_no_thread_alarm( + "debug_no_thread_alarm", + "Disable system thread alarm calls. Disabling it may be useful " "in debugging or testing, never do it in production", - READ_ONLY GLOBAL_VAR(opt_thread_alarm), CMD_LINE(OPT_ARG), - DEFAULT(TRUE)); + READ_ONLY GLOBAL_VAR(my_disable_thr_alarm), CMD_LINE(OPT_ARG), + DEFAULT(FALSE)); static Sys_var_mybool Sys_query_cache_strip_comments( "query_cache_strip_comments", "Strip all comments from a query before storing it " "in the query cache", - GLOBAL_VAR(opt_query_cache_strip_comments), CMD_LINE(OPT_ARG), + SESSION_VAR(query_cache_strip_comments), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); static ulonglong in_transaction(THD *thd) From 44d335b828440603353d8f1f4dfc6db2cf72ca8c Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 13 Dec 2011 11:07:55 +0100 Subject: [PATCH 06/20] bugfix: cxxabi.h was not found --- configure.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.cmake b/configure.cmake index fd4e22de447..2356d64336b 100644 --- a/configure.cmake +++ b/configure.cmake @@ -178,6 +178,7 @@ ENDIF() # Tests for header files # INCLUDE (CheckIncludeFiles) +INCLUDE (CheckIncludeFileCXX) CHECK_INCLUDE_FILES ("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS) CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H) @@ -185,7 +186,7 @@ CHECK_INCLUDE_FILES (alloca.h HAVE_ALLOCA_H) CHECK_INCLUDE_FILES (aio.h HAVE_AIO_H) CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H) CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H) -CHECK_INCLUDE_FILES (cxxabi.h HAVE_CXXABI_H) +CHECK_INCLUDE_FILE_CXX (cxxabi.h HAVE_CXXABI_H) CHECK_INCLUDE_FILES (bfd.h HAVE_BFD_H) CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H) CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H) From db8f698c8a03bcc920b9453f8822fbbd8ec7ea66 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 14 Dec 2011 10:53:32 +0100 Subject: [PATCH 07/20] new configure option: NOT_FOR_DISTRIBUTION fix safemalloc to compile w/o libbfd. CMakeLists.txt: NOT_FOR_DISTRIBUTION option cmake/readline.cmake: simplify libedit/readline detection. never use bundled libedit. use system readline v6 only if NOT_FOR_DISTRIBUTION=1 configure.cmake: use libbfd only if NOT_FOR_DISTRIBUTION=1 include/my_stacktrace.h: link with libbfd even w/o safemalloc. --- CMakeLists.txt | 11 ++- client/CMakeLists.txt | 5 +- cmake/readline.cmake | 157 ++++++++++++++---------------- configure.cmake | 9 +- include/my_stacktrace.h | 11 +-- libmysqld/examples/CMakeLists.txt | 5 +- mysys/my_addr_resolve.c | 1 + mysys/safemalloc.c | 2 +- 8 files changed, 103 insertions(+), 98 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6cfd7fc288..b6f771544a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,6 +166,7 @@ ENDIF() OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON) MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED) +OPTION(NOT_FOR_DISTRIBUTION "Allow linking with GPLv2-incompatible system libraries. Only set it you never plan to distribute the resulting binaries" OFF) OPTION(ENABLE_DEBUG_SYNC "Enable debug sync (debug builds only)" ON) IF(ENABLE_DEBUG_SYNC) @@ -264,9 +265,9 @@ MYSQL_CHECK_READLINE() # IF(MYSQL_MAINTAINER_MODE) # Set compiler flags required under maintainer mode. - MESSAGE(STATUS "C warning options: ${MY_MAINTAINER_C_WARNINGS}") + #MESSAGE(STATUS "C warning options: ${MY_MAINTAINER_C_WARNINGS}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_MAINTAINER_C_WARNINGS}") - MESSAGE(STATUS "C++ warning options: ${MY_MAINTAINER_CXX_WARNINGS}") + #MESSAGE(STATUS "C++ warning options: ${MY_MAINTAINER_CXX_WARNINGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_MAINTAINER_CXX_WARNINGS}") ENDIF() @@ -392,3 +393,9 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() + +IF(NON_DISTRIBUTABLE_WARNING) + MESSAGE(WARNING " +You have linked MariaDB with GPLv3 libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with Free Software Foundation.") +ENDIF() + diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 5ddaff67692..18ecf2de03d 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -21,16 +21,15 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/regex ${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/strings - ${READLINE_INCLUDE_DIR} + ${MY_READLINE_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) -ADD_DEFINITIONS(${READLINE_DEFINES}) ADD_DEFINITIONS(${SSL_DEFINES}) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) + TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -rdynamic") ENDIF(UNIX) diff --git a/cmake/readline.cmake b/cmake/readline.cmake index 4840229a82e..24a411e3f1d 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -14,6 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +INCLUDE(CheckCXXSourceCompiles) + MACRO (MYSQL_CHECK_MULTIBYTE) CHECK_INCLUDE_FILE(wctype.h HAVE_WCTYPE_H) CHECK_INCLUDE_FILE(wchar.h HAVE_WCHAR_H) @@ -112,56 +114,22 @@ ENDMACRO() MACRO (MYSQL_USE_BUNDLED_READLINE) SET(USE_NEW_READLINE_INTERFACE 1) SET(HAVE_HIST_ENTRY) - SET(USE_LIBEDIT_INTERFACE) SET(READLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils) SET(READLINE_LIBRARY readline) FIND_CURSES() ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/readline) ENDMACRO() -MACRO (MYSQL_USE_BUNDLED_LIBEDIT) - SET(USE_LIBEDIT_INTERFACE 1) - SET(HAVE_HIST_ENTRY 1) - SET(READLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit) - SET(READLINE_LIBRARY edit) - FIND_CURSES() - ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit) -ENDMACRO() - - -MACRO (MYSQL_FIND_SYSTEM_READLINE name) +MACRO (MYSQL_FIND_SYSTEM_READLINE) - FIND_PATH(${name}_INCLUDE_DIR readline/readline.h ) - FIND_LIBRARY(${name}_LIBRARY NAMES ${name}) - MARK_AS_ADVANCED(${name}_INCLUDE_DIR ${name}_LIBRARY) - - INCLUDE(CheckCXXSourceCompiles) - SET(CMAKE_REQUIRES_LIBRARIES ${${name}_LIBRARY}) - - IF(${name}_LIBRARY AND ${name}_INCLUDE_DIR) - SET(SYSTEM_READLINE_FOUND 1) - SET(CMAKE_REQUIRED_LIBRARIES ${${name}_LIBRARY}) - CHECK_CXX_SOURCE_COMPILES(" - #include - #include - int main(int argc, char **argv) - { - HIST_ENTRY entry; - return 0; - }" - ${name}_HAVE_HIST_ENTRY) - - CHECK_CXX_SOURCE_COMPILES(" - #include - #include - int main(int argc, char **argv) - { - char res= *(*rl_completion_entry_function)(0,0); - completion_matches(0,0); - }" - ${name}_USE_LIBEDIT_INTERFACE) + FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h ) + FIND_LIBRARY(READLINE_LIBRARY NAMES readline) + MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY) + SET(CMAKE_REQUIRES_LIBRARIES ${READLINE_LIBRARY}) + IF(READLINE_LIBRARY AND READLINE_INCLUDE_DIR) + SET(CMAKE_REQUIRED_LIBRARIES ${READLINE_LIBRARY}) CHECK_CXX_SOURCE_COMPILES(" #include #include @@ -170,16 +138,64 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE name) rl_completion_func_t *func1= (rl_completion_func_t*)0; rl_compentry_func_t *func2= (rl_compentry_func_t*)0; }" - ${name}_USE_NEW_READLINE_INTERFACE) + NEW_READLINE_INTERFACE) + + CHECK_CXX_SOURCE_COMPILES(" + #include + #include + int main(int argc, char **argv) + { + HIST_ENTRY entry; + return 0; + }" + HAVE_HIST_ENTRY) - IF(${name}_USE_LIBEDIT_INTERFACE OR ${name}_USE_NEW_READLINE_INTERFACE) - SET(READLINE_LIBRARY ${${name}_LIBRARY}) - SET(READLINE_INCLUDE_DIR ${${name}_INCLUDE_DIR}) - SET(HAVE_HIST_ENTRY ${${name}_HAVE_HIST_ENTRY}) - SET(USE_LIBEDIT_INTERFACE ${${name}_USE_LIBEDIT_INTERFACE}) - SET(USE_NEW_READLINE_INTERFACE ${${name}_USE_NEW_READLINE_INTERFACE}) - SET(READLINE_FOUND 1) - ENDIF() + CHECK_C_SOURCE_COMPILES(" + #include + #include + #if RL_VERSION_MAJOR > 5 + #error + #endif + int main(int argc, char **argv) + { + return 0; + }" + READLINE_V5) + + IF(NEW_READLINE_INTERFACE) + IF (READLINE_V5) + SET(USE_NEW_READLINE_INTERFACE 1) + ELSE() + IF(NOT_FOR_DISTRIBUTION) + SET(NON_DISTRIBUTABLE_WARNING 1) + SET(USE_NEW_READLINE_INTERFACE 1) + ELSE() + SET(USE_NEW_READLINE_INTERFACE 0) + ENDIF(NOT_FOR_DISTRIBUTION) + ENDIF(READLINE_V5) + ENDIF(NEW_READLINE_INTERFACE) + ENDIF() +ENDMACRO() + +MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) + + FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h ) + FIND_LIBRARY(READLINE_LIBRARY NAMES readline) + MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY) + + SET(CMAKE_REQUIRES_LIBRARIES ${READLINE_LIBRARY}) + + IF(READLINE_LIBRARY AND READLINE_INCLUDE_DIR) + CHECK_CXX_SOURCE_COMPILES(" + #include + #include + int main(int argc, char **argv) + { + char res= *(*rl_completion_entry_function)(0,0); + completion_matches(0,0); + }" + LIBEDIT_INTERFACE) + SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE}) ENDIF() ENDMACRO() @@ -187,44 +203,21 @@ ENDMACRO() MACRO (MYSQL_CHECK_READLINE) IF (NOT WIN32) MYSQL_CHECK_MULTIBYTE() - IF(NOT CYGWIN) - SET(WITH_LIBEDIT ON CACHE BOOL "Use bundled libedit") - SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline") - ELSE() - # Bundled libedit does not compile on cygwin, only readline - SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline") - ENDIF() - - # Handle mutual exclusion of WITH_READLINE/WITH_LIBEDIT variables - # We save current setting to recognize when user switched between - # WITH_READLINE and WITH_LIBEDIT - IF(WITH_READLINE) - IF(NOT SAVE_READLINE_SETTING OR SAVE_READLINE_SETTING MATCHES - "WITH_LIBEDIT") - SET(WITH_LIBEDIT OFF CACHE BOOL "Use bundled libedit" FORCE) - ENDIF() - ELSEIF(WITH_LIBEDIT) - IF(NOT SAVE_READLINE_SETTING OR SAVE_READLINE_SETTING MATCHES - "WITH_READLINE") - SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline" FORCE) - ENDIF() - ENDIF() + SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline") IF(WITH_READLINE) - MYSQL_USE_BUNDLED_READLINE() - SET(SAVE_READLINE_SETTING WITH_READLINE CACHE INTERNAL "" FORCE) - ELSEIF(WITH_LIBEDIT) - MYSQL_USE_BUNDLED_LIBEDIT() - SET(SAVE_READLINE_SETTING WITH_LIBEDIT CACHE INTERNAL "" FORCE) + MYSQL_USE_BUNDLED_READLINE() ELSE() - MYSQL_FIND_SYSTEM_READLINE(readline) - IF(NOT READLINE_FOUND) - MYSQL_FIND_SYSTEM_READLINE(edit) - IF(NOT READLINE_FOUND) - MESSAGE(FATAL_ERROR "Cannot find system readline or libedit libraries.Use WITH_READLINE or WITH_LIBEDIT") + MYSQL_FIND_SYSTEM_READLINE() + IF(NOT USE_NEW_READLINE_INTERFACE) + MYSQL_FIND_SYSTEM_LIBEDIT() + IF(NOT USE_LIBEDIT_INTERFACE) + MYSQL_USE_BUNDLED_READLINE() ENDIF() ENDIF() ENDIF() + SET(MY_READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR}) + SET(MY_READLINE_LIBRARY ${READLINE_LIBRARY}) ENDIF(NOT WIN32) ENDMACRO() diff --git a/configure.cmake b/configure.cmake index 2356d64336b..35c2027b4e0 100644 --- a/configure.cmake +++ b/configure.cmake @@ -187,7 +187,7 @@ CHECK_INCLUDE_FILES (aio.h HAVE_AIO_H) CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H) CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H) CHECK_INCLUDE_FILE_CXX (cxxabi.h HAVE_CXXABI_H) -CHECK_INCLUDE_FILES (bfd.h HAVE_BFD_H) +CHECK_INCLUDE_FILES (bfd.h BFD_H_EXISTS) CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H) CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H) CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H) @@ -261,6 +261,13 @@ CHECK_INCLUDE_FILES (wchar.h HAVE_WCHAR_H) CHECK_INCLUDE_FILES (wctype.h HAVE_WCTYPE_H) CHECK_INCLUDE_FILES (sys/sockio.h HAVE_SYS_SOCKIO_H) +IF(BFD_H_EXISTS) + IF(NOT_FOR_DISTRIBUTION) + SET(NON_DISTRIBUTABLE_WARNING 1) + SET(HAVE_BFD_H 1) + ENDIF() +ENDIF() + IF(HAVE_SYS_STREAM_H) # Needs sys/stream.h on Solaris CHECK_INCLUDE_FILES ("sys/stream.h;sys/ptem.h" HAVE_SYS_PTEM_H) diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index 30f0203a43e..a9590a76368 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.h @@ -55,23 +55,22 @@ void my_set_exception_pointers(EXCEPTION_POINTERS *ep); #endif #endif -/* at the moment, safemalloc is the main user of libbfd */ -#ifndef SAFEMALLOC -#undef HAVE_BFD_H -#endif - #ifdef HAVE_BFD_H #define HAVE_MY_ADDR_RESOLVE 1 #endif -#ifdef HAVE_MY_ADDR_RESOLVE typedef struct { const char *file; const char *func; uint line; } my_addr_loc; + +#ifdef HAVE_MY_ADDR_RESOLVE int my_addr_resolve(void *ptr, my_addr_loc *loc); const char *my_addr_resolve_init(); +#else +#define my_addr_resolve_init() (0) +#define my_addr_resolve(A,B) (1) #endif #ifdef HAVE_WRITE_CORE diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index 8d76698117a..209e27c7870 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libmysqld/include ${CMAKE_SOURCE_DIR}/regex - ${READLINE_INCLUDE_DIR} + ${MY_READLINE_INCLUDE_DIR} ) @@ -27,8 +27,7 @@ MYSQL_ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc ../../client/mysql.cc ../../client/readline.cc) TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver) IF(UNIX) - ADD_DEFINITIONS(${READLINE_DEFINES}) - TARGET_LINK_LIBRARIES(mysql_embedded ${READLINE_LIBRARY}) + TARGET_LINK_LIBRARIES(mysql_embedded ${MY_READLINE_LIBRARY}) ENDIF(UNIX) MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc) diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c index c9c9212eb7d..514f825750a 100644 --- a/mysys/my_addr_resolve.c +++ b/mysys/my_addr_resolve.c @@ -21,6 +21,7 @@ /** strip the path, leave the file name and the last dirname */ +static const char *strip_path(const char *s) __attribute__((unused)); static const char *strip_path(const char *s) { const char *prev, *last; diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 61ad9af0631..5206a759740 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -225,7 +225,7 @@ static void print_stack(void **frame) fprintf(stderr, ", "); if (my_addr_resolve(frame[i], &loc)) - fprintf(stderr, "..."); + fprintf(stderr, "%p", frame[i]); else fprintf(stderr, "%s:%u", loc.file, loc.line); } From 818af42f1de640f3951fcfde0cb9b7b76d06a01e Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 14 Dec 2011 10:59:11 +0100 Subject: [PATCH 08/20] new valgrind suppression for ld.so give mysqld more time to start under valgrind --- mysql-test/lib/mtr_process.pl | 9 +++++---- mysql-test/mysql-test-run.pl | 22 ++++++++++++++-------- mysql-test/valgrind.supp | 6 +++--- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 88e714f6f8d..cebb895da6e 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -40,7 +40,7 @@ BEGIN eval 'sub USE_NETPING { $use_netping }'; } -sub sleep_until_file_created ($$$); +sub sleep_until_file_created ($$$$); sub mtr_ping_port ($); sub mtr_ping_port ($) { @@ -102,10 +102,11 @@ sub mtr_ping_port ($) { # FIXME check that the pidfile contains the expected pid! -sub sleep_until_file_created ($$$) { +sub sleep_until_file_created ($$$$) { my $pidfile= shift; my $timeout= shift; my $proc= shift; + my $warn_seconds = shift; my $sleeptime= 100; # Milliseconds my $loops= ($timeout * 1000) / $sleeptime; @@ -128,8 +129,8 @@ sub sleep_until_file_created ($$$) { mtr_debug("Sleep $sleeptime milliseconds waiting for $pidfile"); - # Print extra message every 60 seconds - if ( $seconds > 1 && int($seconds * 10) % 600 == 0 && $seconds < $timeout ) + # Print extra message every $warn_seconds seconds + if ( $seconds > 1 && $seconds % $warn_seconds == 0 && $seconds < $timeout ) { my $left= $timeout - $seconds; mtr_warning("Waited $seconds seconds for $pidfile to be created, " . diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e3f5cb65507..a8a2a515196 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -311,6 +311,7 @@ my $valgrind_reports= 0; my $opt_callgrind; my %mysqld_logs; my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions. +my $warn_seconds = 60; sub testcase_timeout ($) { my ($tinfo)= @_; @@ -1737,12 +1738,6 @@ sub command_line_setup { $opt_valgrind= 1; $opt_valgrind_mysqld= 1; $opt_valgrind_mysqltest= 1; - - # Increase the timeouts when running with valgrind - $opt_testcase_timeout*= 10; - $opt_suite_timeout*= 6; - $opt_start_timeout*= 10; - } elsif ( $opt_valgrind_mysqld ) { @@ -1755,6 +1750,15 @@ sub command_line_setup { $opt_valgrind= 1; } + if ($opt_valgrind) + { + # Increase the timeouts when running with valgrind + $opt_testcase_timeout*= 10; + $opt_suite_timeout*= 6; + $opt_start_timeout*= 10; + $warn_seconds*= 10; + } + if ( $opt_callgrind ) { mtr_report("Turning on valgrind with callgrind for mysqld(s)"); @@ -3229,7 +3233,8 @@ sub mysql_server_wait { return not sleep_until_file_created($mysqld->value('pid-file'), $opt_start_timeout, - $mysqld->{'proc'}); + $mysqld->{'proc'}, + $warn_seconds); } sub create_config_file_for_extern { @@ -5472,7 +5477,8 @@ sub mysqld_start ($$) { if ( $wait_for_pid_file && !sleep_until_file_created($mysqld->value('pid-file'), $opt_start_timeout, - $mysqld->{'proc'})) + $mysqld->{'proc'}, + $warn_seconds)) { my $mname= $mysqld->name(); mtr_error("Failed to start mysqld $mname with command $exe"); diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp index 5174b04c054..d505cd80261 100644 --- a/mysql-test/valgrind.supp +++ b/mysql-test/valgrind.supp @@ -150,12 +150,12 @@ } { - strlen/_dl_init_paths/dl_main/_dl_sysdep_start(Cond) + somewhere in ld.so, when loading mysqld Memcheck:Cond - fun:strlen - fun:_dl_init_paths + ... fun:dl_main fun:_dl_sysdep_start + fun:_dl_start } { From 8404b44a845e8a827bf1986fe4450673782bfdae Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 14 Dec 2011 10:59:24 +0100 Subject: [PATCH 09/20] fix new String:realloc* variants always to zero-terminate the string --- sql/sql_string.cc | 3 +-- sql/sql_string.h | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 6c772617e7b..47170e6c3db 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -81,7 +81,7 @@ bool String::real_alloc(uint32 length) @retval true An error occured when attempting to allocate memory. */ -bool String::realloc(uint32 alloc_length) +bool String::realloc_raw(uint32 alloc_length) { if (Alloced_length <= alloc_length) { @@ -109,7 +109,6 @@ bool String::realloc(uint32 alloc_length) Ptr= new_ptr; Alloced_length= len; } - Ptr[alloc_length]=0; // This make other funcs shorter return FALSE; } diff --git a/sql/sql_string.h b/sql/sql_string.h index fcf04fb7690..7412022baf4 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -255,17 +255,30 @@ public: return real_alloc(arg_length); } bool real_alloc(uint32 arg_length); // Empties old string - bool realloc(uint32 arg_length); + bool realloc_raw(uint32 arg_length); + bool realloc(uint32 arg_length) + { + if (realloc_raw(arg_length)) + return TRUE; + Ptr[arg_length]=0; // This make other funcs shorter + return FALSE; + } bool realloc_with_extra(uint32 arg_length) { if (extra_alloc < 4096) extra_alloc= extra_alloc*2+128; - return realloc(arg_length + extra_alloc); + if (realloc_raw(arg_length + extra_alloc)) + return TRUE; + Ptr[arg_length]=0; // This make other funcs shorter + return FALSE; } bool realloc_with_extra_if_needed(uint32 arg_length) { if (arg_length < Alloced_length) + { + Ptr[arg_length]=0; // behave as if realloc was called. return 0; + } return realloc_with_extra(arg_length); } inline void shrink(uint32 arg_length) // Shrink buffer From 79479ee97571e8023b0269ffddbf525d54955273 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Dec 2011 12:02:03 +0100 Subject: [PATCH 10/20] After-merge fixes for 5.5 merge. Fix typo causing too low timeout value for wait_for_slave_param.inc. Fix binlog checksums following 5.5 merge. Make sure the rpl suite can run with --mysqld=--binlog-checksum=CRC32 Fix a number of problems in the code when checksums are enabled. --- mysql-test/include/wait_for_slave_param.inc | 2 +- .../suite/rpl/r/rpl_binlog_errors.result | 5 ++- .../rpl/r/rpl_manual_change_index_file.result | 1 - mysql-test/suite/rpl/r/rpl_packet.result | 1 - mysql-test/suite/rpl/t/rpl_binlog_errors.test | 12 ++----- .../rpl/t/rpl_manual_change_index_file.test | 2 +- mysql-test/suite/rpl/t/rpl_packet.test | 7 +++- sql/log.cc | 30 +++++++++------- sql/log_event.cc | 8 +++-- sql/log_event.h | 34 +++++++++++++------ sql/slave.cc | 6 +++- sql/sql_repl.cc | 20 +++++++++-- 12 files changed, 80 insertions(+), 48 deletions(-) diff --git a/mysql-test/include/wait_for_slave_param.inc b/mysql-test/include/wait_for_slave_param.inc index 131d91a8440..d6cff32b398 100644 --- a/mysql-test/include/wait_for_slave_param.inc +++ b/mysql-test/include/wait_for_slave_param.inc @@ -79,7 +79,7 @@ if ($_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/rpl/r/rpl_binlog_errors.result b/mysql-test/suite/rpl/r/rpl_binlog_errors.result index be1b3b150bc..d965686a34f 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result @@ -98,10 +98,9 @@ count(*) 1 ### check that the incident event is written to the current log SET GLOBAL debug="-d,error_unique_log_filename"; -FLUSH LOGS; -SHOW BINLOG EVENTS IN 'BINLOG_FILE' FROM LIMIT 1; +show binlog events from limit 4,1; Log_name Pos Event_type Server_id End_log_pos Info -BINLOG_FILE # Incident # # #1 (LOST_EVENTS) +master-bin.000001 # Incident # # #1 (LOST_EVENTS) DELETE FROM t4; RESET MASTER; ###################### TEST #8 diff --git a/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result index a1874ed1595..a2dc5d402a7 100644 --- a/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result +++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result @@ -5,7 +5,6 @@ CREATE TABLE t1(c1 INT); FLUSH LOGS; call mtr.add_suppression('Got fatal error 1236 from master when reading data from binary log: .*could not find next log'); include/wait_for_slave_io_error.inc [errno=1236] -Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'could not find next log; the last event was read from 'master-bin.000002' at 375, the last byte read was read from 'master-bin.000002' at 375.'' CREATE TABLE t2(c1 INT); FLUSH LOGS; CREATE TABLE t3(c1 INT); diff --git a/mysql-test/suite/rpl/r/rpl_packet.result b/mysql-test/suite/rpl/r/rpl_packet.result index be2f551f9c2..27f85cac7de 100644 --- a/mysql-test/suite/rpl/r/rpl_packet.result +++ b/mysql-test/suite/rpl/r/rpl_packet.result @@ -37,7 +37,6 @@ DROP TABLE t1; CREATE TABLE t1 (f1 int PRIMARY KEY, f2 LONGTEXT, f3 LONGTEXT) ENGINE=MyISAM; INSERT INTO t1(f1, f2, f3) VALUES(1, REPEAT('a', @@global.max_allowed_packet), REPEAT('b', @@global.max_allowed_packet)); include/wait_for_slave_io_error.inc [errno=1236] -Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from 'master-bin.000001' at 601, the last byte read was read from 'master-bin.000001' at 620.'' STOP SLAVE; RESET SLAVE; RESET MASTER; diff --git a/mysql-test/suite/rpl/t/rpl_binlog_errors.test b/mysql-test/suite/rpl/t/rpl_binlog_errors.test index 7c09dab704e..1b05e24c94e 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_errors.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_errors.test @@ -186,16 +186,8 @@ SELECT count(*) FROM t4; -- echo ### check that the incident event is written to the current log SET GLOBAL debug="-d,error_unique_log_filename"; --- let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1) --- let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1) - -# 53 is the size of the incident event, so we start from 22 bytes before the -# current position --- let $binlog_start = `SELECT $binlog_start - 53` -FLUSH LOGS; --- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start $binlog_file BINLOG_FILE --- replace_column 2 # 4 # 5 # --- eval SHOW BINLOG EVENTS IN '$binlog_file' FROM $binlog_start LIMIT 1 +-- let $binlog_limit= 4,1 +-- source include/show_binlog_events.inc # clean up and move to next test DELETE FROM t4; diff --git a/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test b/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test index b0d3b23b4e1..e1b8948281c 100644 --- a/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test +++ b/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test @@ -60,7 +60,7 @@ call mtr.add_suppression('Got fatal error 1236 from master when reading data fro connection slave; # 1236 = ER_MASTER_FATAL_ERROR_READING_BINLOG --let $slave_io_errno= 1236 ---let $show_slave_io_error= 1 +--let $show_slave_io_error= 0 --source include/wait_for_slave_io_error.inc connection master; diff --git a/mysql-test/suite/rpl/t/rpl_packet.test b/mysql-test/suite/rpl/t/rpl_packet.test index 7e9a35883a3..2b8a1fd8310 100644 --- a/mysql-test/suite/rpl/t/rpl_packet.test +++ b/mysql-test/suite/rpl/t/rpl_packet.test @@ -125,7 +125,12 @@ connection slave; # The slave I/O thread must stop after receiving # 1236=ER_MASTER_FATAL_ERROR_READING_BINLOG error message from master. --let $slave_io_errno= 1236 ---let $show_slave_io_error= 1 +# +# Win and Unix path is printed differently: BUG#13055685. So +# show_slave_io_error is made 0 until the bug fixes provide necessary +# facilities +# +--let $show_slave_io_error= 0 --source include/wait_for_slave_io_error.inc # Remove the bad binlog and clear error status on slave. diff --git a/sql/log.cc b/sql/log.cc index a7698fd3ae6..b882aab15e9 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -4821,7 +4821,7 @@ int THD::binlog_write_table_map(TABLE *table, bool is_transactional, cache_mngr->get_binlog_cache_log(use_trans_cache(this, is_transactional)); if (with_annotate && *with_annotate) { - Annotate_rows_log_event anno(current_thd, is_transactional); + Annotate_rows_log_event anno(current_thd, is_transactional, false); /* Annotate event should be written not more than once */ *with_annotate= 0; if ((error= anno.write(file))) @@ -4993,6 +4993,8 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) DBUG_ENTER("MYSQL_BIN_LOG::write(Log_event *)"); binlog_cache_data *cache_data= 0; bool is_trans_cache= FALSE; + bool using_trans= event_info->use_trans_cache(); + bool direct= event_info->use_direct_logging(); if (thd->binlog_evt_union.do_union) { @@ -5001,8 +5003,7 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) We will log the function call to the binary log on function exit */ thd->binlog_evt_union.unioned_events= TRUE; - thd->binlog_evt_union.unioned_events_trans |= - event_info->use_trans_cache(); + thd->binlog_evt_union.unioned_events_trans |= using_trans; DBUG_RETURN(0); } @@ -5013,8 +5014,7 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) */ bool const end_stmt= thd->locked_tables_mode && thd->lex->requires_prelocking(); - if (thd->binlog_flush_pending_rows_event(end_stmt, - event_info->use_trans_cache())) + if (thd->binlog_flush_pending_rows_event(end_stmt, using_trans)) DBUG_RETURN(error); /* @@ -5041,7 +5041,7 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) IO_CACHE *file= NULL; - if (event_info->use_direct_logging()) + if (direct) { file= &log_file; my_org_b_tell= my_b_tell(file); @@ -5055,7 +5055,7 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) binlog_cache_mngr *const cache_mngr= (binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton); - is_trans_cache= use_trans_cache(thd, event_info->use_trans_cache()); + is_trans_cache= use_trans_cache(thd, using_trans); file= cache_mngr->get_binlog_cache_log(is_trans_cache); cache_data= cache_mngr->get_binlog_cache_data(is_trans_cache); @@ -5078,7 +5078,7 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) if (with_annotate && *with_annotate) { DBUG_ASSERT(event_info->get_type_code() == TABLE_MAP_EVENT); - Annotate_rows_log_event anno(thd, event_info->cache_type); + Annotate_rows_log_event anno(thd, using_trans, direct); /* Annotate event should be written not more than once */ *with_annotate= 0; if (anno.write(file)) @@ -5093,7 +5093,8 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) if (thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt) { Intvar_log_event e(thd,(uchar) LAST_INSERT_ID_EVENT, - thd->first_successful_insert_id_in_prev_stmt_for_binlog); + thd->first_successful_insert_id_in_prev_stmt_for_binlog, + using_trans, direct); if (e.write(file)) goto err; } @@ -5104,13 +5105,14 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) nb_elements())); Intvar_log_event e(thd, (uchar) INSERT_ID_EVENT, thd->auto_inc_intervals_in_cur_stmt_for_binlog. - minimum()); + minimum(), using_trans, direct); if (e.write(file)) goto err; } if (thd->rand_used) { - Rand_log_event e(thd,thd->rand_saved_seed1,thd->rand_saved_seed2); + Rand_log_event e(thd,thd->rand_saved_seed1,thd->rand_saved_seed2, + using_trans, direct); if (e.write(file)) goto err; } @@ -5132,7 +5134,9 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) user_var_event->length, user_var_event->type, user_var_event->charset_number, - flags); + flags, + using_trans, + direct); if (e.write(file)) goto err; } @@ -5149,7 +5153,7 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info, my_bool *with_annotate) error= 0; err: - if (event_info->use_direct_logging()) + if (direct) { my_off_t offset= my_b_tell(file); diff --git a/sql/log_event.cc b/sql/log_event.cc index dddd24bc299..38af12cab9f 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -8575,14 +8575,16 @@ void Rows_log_event::print_helper(FILE *file, #ifndef MYSQL_CLIENT Annotate_rows_log_event::Annotate_rows_log_event(THD *thd, - uint16 cache_type_arg) - : Log_event(thd, 0, true), + bool using_trans, + bool direct) + : Log_event(thd, 0, using_trans), m_save_thd_query_txt(0), m_save_thd_query_len(0) { m_query_txt= thd->query(); m_query_len= thd->query_length(); - cache_type= cache_type_arg; + if (direct) + cache_type= Log_event::EVENT_NO_CACHE; } #endif diff --git a/sql/log_event.h b/sql/log_event.h index c9810cbb140..0accbd0dd1c 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -2462,9 +2462,13 @@ public: uchar type; #ifdef MYSQL_SERVER - Intvar_log_event(THD* thd_arg,uchar type_arg, ulonglong val_arg) - :Log_event(thd_arg,0,0),val(val_arg),type(type_arg) - {} +Intvar_log_event(THD* thd_arg,uchar type_arg, ulonglong val_arg, + bool using_trans, bool direct) + :Log_event(thd_arg,0,using_trans),val(val_arg),type(type_arg) + { + if (direct) + cache_type= Log_event::EVENT_NO_CACHE; + } #ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); #endif /* HAVE_REPLICATION */ @@ -2538,9 +2542,13 @@ class Rand_log_event: public Log_event ulonglong seed2; #ifdef MYSQL_SERVER - Rand_log_event(THD* thd_arg, ulonglong seed1_arg, ulonglong seed2_arg) - :Log_event(thd_arg,0,0),seed1(seed1_arg),seed2(seed2_arg) - {} + Rand_log_event(THD* thd_arg, ulonglong seed1_arg, ulonglong seed2_arg, + bool using_trans, bool direct) + :Log_event(thd_arg,0,using_trans),seed1(seed1_arg),seed2(seed2_arg) + { + if (direct) + cache_type= Log_event::EVENT_NO_CACHE; + } #ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); #endif /* HAVE_REPLICATION */ @@ -2641,11 +2649,17 @@ public: #ifdef MYSQL_SERVER User_var_log_event(THD* thd_arg, char *name_arg, uint name_len_arg, char *val_arg, ulong val_len_arg, Item_result type_arg, - uint charset_number_arg, uchar flags_arg) - :Log_event(), name(name_arg), name_len(name_len_arg), val(val_arg), + uint charset_number_arg, uchar flags_arg, + bool using_trans, bool direct) + :Log_event(thd_arg, 0, using_trans), + name(name_arg), name_len(name_len_arg), val(val_arg), val_len(val_len_arg), type(type_arg), charset_number(charset_number_arg), flags(flags_arg) - { is_null= !val; } + { + is_null= !val; + if (direct) + cache_type= Log_event::EVENT_NO_CACHE; + } void pack_info(Protocol* protocol); #else void print(FILE* file, PRINT_EVENT_INFO* print_event_info); @@ -3158,7 +3172,7 @@ class Annotate_rows_log_event: public Log_event { public: #ifndef MYSQL_CLIENT - Annotate_rows_log_event(THD*, uint16 cache_type_arg); + Annotate_rows_log_event(THD*, bool using_trans, bool direct); #endif Annotate_rows_log_event(const char *buf, uint event_len, const Format_description_log_event*); diff --git a/sql/slave.cc b/sql/slave.cc index bd6e9aa69f9..91ddf7bf171 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4274,7 +4274,11 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) HB (heartbeat) cannot come before RL (Relay) */ char llbuf[22]; - Heartbeat_log_event hb(buf, event_len, mi->rli.relay_log.description_event_for_queue); + Heartbeat_log_event hb(buf, + mi->rli.relay_log.relay_log_checksum_alg + != BINLOG_CHECKSUM_ALG_OFF ? + event_len - BINLOG_CHECKSUM_LEN : event_len, + mi->rli.relay_log.description_event_for_queue); if (!hb.is_valid()) { error= ER_SLAVE_HEARTBEAT_FAILURE; diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 16977d89cd6..4152c07da37 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -506,10 +506,13 @@ static ulonglong get_heartbeat_period(THD * thd) the dump thread. */ static int send_heartbeat_event(NET* net, String* packet, - const struct event_coordinates *coord) + const struct event_coordinates *coord, + uint8 checksum_alg_arg) { DBUG_ENTER("send_heartbeat_event"); char header[LOG_EVENT_HEADER_LEN]; + my_bool do_checksum= checksum_alg_arg != BINLOG_CHECKSUM_ALG_OFF && + checksum_alg_arg != BINLOG_CHECKSUM_ALG_UNDEF; /* 'when' (the timestamp) is set to 0 so that slave could distinguish between real and fake Rotate events (if necessary) @@ -521,7 +524,8 @@ static int send_heartbeat_event(NET* net, String* packet, char* p= coord->file_name + dirname_length(coord->file_name); uint ident_len = strlen(p); - ulong event_len = ident_len + LOG_EVENT_HEADER_LEN; + ulong event_len = ident_len + LOG_EVENT_HEADER_LEN + + (do_checksum ? BINLOG_CHECKSUM_LEN : 0); int4store(header + SERVER_ID_OFFSET, server_id); int4store(header + EVENT_LEN_OFFSET, event_len); int2store(header + FLAGS_OFFSET, 0); @@ -531,6 +535,16 @@ static int send_heartbeat_event(NET* net, String* packet, packet->append(header, sizeof(header)); packet->append(p, ident_len); // log_file_name + if (do_checksum) + { + char b[BINLOG_CHECKSUM_LEN]; + ha_checksum crc= my_checksum(0L, NULL, 0); + crc= my_checksum(crc, (uchar*) header, sizeof(header)); + crc= my_checksum(crc, (uchar*) p, ident_len); + int4store(b, crc); + packet->append(b, sizeof(b)); + } + if (my_net_write(net, (uchar*) packet->ptr(), packet->length()) || net_flush(net)) { @@ -1046,7 +1060,7 @@ impossible position"; thd->exit_cond(old_msg); goto err; } - if (send_heartbeat_event(net, packet, coord)) + if (send_heartbeat_event(net, packet, coord, current_checksum_alg)) { errmsg = "Failed on my_net_write()"; my_errno= ER_UNKNOWN_ERROR; From 6afbf295f018e077be7c569ef8e433e510441bea Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Dec 2011 14:58:22 +0100 Subject: [PATCH 11/20] Updated with XtraDB from Percona Server 5.5.17-rel22.1 Files copied from Percona-Server-5.5.17-rel22.1.tar.gz source tarball. --- btr/btr0btr.c | 102 +- btr/btr0cur.c | 175 +- btr/btr0pcur.c | 38 +- btr/btr0sea.c | 3 +- buf/buf0buddy.c | 526 ++---- buf/buf0buf.c | 694 ++----- buf/buf0flu.c | 4 +- buf/buf0lru.c | 298 ++- buf/buf0rea.c | 174 +- dict/dict0crea.c | 4 +- dict/dict0dict.c | 192 +- dict/dict0load.c | 94 +- fil/fil0fil.c | 4 +- handler/ha_innodb.cc | 346 +++- handler/handler0alter.cc | 21 + handler/i_s.cc | 42 +- ibuf/ibuf0ibuf.c | 48 +- include/btr0btr.h | 34 +- include/btr0btr.ic | 10 +- include/btr0pcur.h | 21 +- include/btr0pcur.ic | 9 +- include/buf0buddy.h | 50 +- include/buf0buddy.ic | 70 +- include/buf0buf.h | 47 +- include/buf0buf.ic | 59 +- include/buf0lru.h | 52 +- include/buf0rea.h | 26 + include/buf0types.h | 17 +- include/db0err.h | 6 +- include/dict0boot.h | 6 +- include/dict0dict.h | 82 +- include/dict0dict.ic | 46 +- include/dict0mem.h | 14 +- include/dict0types.h | 3 +- include/ha_prototypes.h | 11 + include/mtr0mtr.h | 10 - include/os0file.h | 3 +- include/page0page.h | 5 +- include/row0row.h | 28 +- include/row0row.ic | 25 +- include/row0upd.ic | 9 +- include/srv0srv.h | 10 + include/sync0sync.h | 10 +- include/sync0sync.ic | 5 +- include/trx0sys.h | 13 +- include/trx0sys.ic | 24 +- include/trx0trx.h | 3 + include/trx0undo.h | 46 +- include/ut0mem.h | 39 +- include/ut0mem.ic | 23 +- lock/lock0lock.c | 25 + mtr/mtr0mtr.c | 38 - os/os0file.c | 2 +- page/page0zip.c | 184 +- pars/pars0opt.c | 2 +- ...a_innodb_expand_fast_index_creation.result | 64 + ...ona_innodb_expand_fast_index_creation.test | 45 + .../percona_innodb_fake_changes.result | 55 + .../percona_innodb_fake_changes.test | 49 + .../percona_innodb_fake_changes_locks.result | 19 + .../percona_innodb_fake_changes_locks.test | 24 + .../percona_innodb_kill_idle_trx.result | 41 + .../percona_innodb_kill_idle_trx.test | 28 + .../percona_innodb_kill_idle_trx_locks.result | 45 + .../percona_innodb_kill_idle_trx_locks.test | 31 + .../percona_log_connection_error.result | 3 +- .../percona_log_connection_error.test | 12 +- .../percona_processlist_row_stats.result | 52 +- .../percona_processlist_row_stats.test | 63 +- ...ona_query_response_time-replication.result | 761 +++++++- ...rcona_query_response_time-replication.test | 77 +- .../percona_query_response_time-stored.result | 778 +++++--- .../percona_query_response_time-stored.test | 103 +- .../percona_query_response_time.result | 1626 +++++++++++++---- .../percona_query_response_time.test | 83 +- .../percona_server_variables_debug.result | 9 + .../percona_server_variables_release.result | 8 + .../percona_show_slave_status_nolock.result | 72 +- .../percona_show_slave_status_nolock.test | 131 +- ...rcona_status_wait_query_cache_mutex.result | 24 +- ...percona_status_wait_query_cache_mutex.test | 34 +- .../query_response_time-replication.inc | 57 + percona-suite/query_response_time-stored.inc | 37 + percona-suite/query_response_time.inc | 43 + que/que0que.c | 6 + rem/rem0rec.c | 10 +- row/row0ins.c | 36 +- row/row0merge.c | 9 +- row/row0mysql.c | 105 +- row/row0purge.c | 33 +- row/row0row.c | 55 +- row/row0sel.c | 116 +- row/row0uins.c | 4 +- row/row0umod.c | 25 + row/row0upd.c | 23 +- srv/srv0srv.c | 57 +- srv/srv0start.c | 6 + sync/sync0sync.c | 37 +- trx/trx0rec.c | 69 +- trx/trx0trx.c | 5 + trx/trx0undo.c | 66 +- ut/ut0mem.c | 49 +- ut/ut0ut.c | 6 +- 103 files changed, 5982 insertions(+), 2941 deletions(-) create mode 100644 percona-suite/percona_innodb_expand_fast_index_creation.result create mode 100644 percona-suite/percona_innodb_expand_fast_index_creation.test create mode 100644 percona-suite/percona_innodb_fake_changes.result create mode 100644 percona-suite/percona_innodb_fake_changes.test create mode 100644 percona-suite/percona_innodb_fake_changes_locks.result create mode 100644 percona-suite/percona_innodb_fake_changes_locks.test create mode 100644 percona-suite/percona_innodb_kill_idle_trx.result create mode 100644 percona-suite/percona_innodb_kill_idle_trx.test create mode 100644 percona-suite/percona_innodb_kill_idle_trx_locks.result create mode 100644 percona-suite/percona_innodb_kill_idle_trx_locks.test create mode 100644 percona-suite/query_response_time-replication.inc create mode 100644 percona-suite/query_response_time-stored.inc create mode 100644 percona-suite/query_response_time.inc diff --git a/btr/btr0btr.c b/btr/btr0btr.c index c0c27128441..ca98afc04ad 100644 --- a/btr/btr0btr.c +++ b/btr/btr0btr.c @@ -690,7 +690,8 @@ btr_root_block_get( zip_size = dict_table_zip_size(index->table); root_page_no = dict_index_get_page(index); - block = btr_block_get(space, zip_size, root_page_no, RW_X_LATCH, mtr); + block = btr_block_get(space, zip_size, root_page_no, RW_X_LATCH, + index, mtr); if (srv_pass_corrupt_table && !block) { return(0); @@ -897,7 +898,7 @@ btr_page_alloc_for_ibuf( dict_table_zip_size(index->table), node_addr.page, RW_X_LATCH, mtr); new_page = buf_block_get_frame(new_block); - buf_block_dbg_add_level(new_block, SYNC_TREE_NODE_NEW); + buf_block_dbg_add_level(new_block, SYNC_IBUF_TREE_NODE_NEW); flst_remove(root + PAGE_HEADER + PAGE_BTR_IBUF_FREE_LIST, new_page + PAGE_HEADER + PAGE_BTR_IBUF_FREE_LIST_NODE, @@ -1151,7 +1152,7 @@ btr_node_ptr_get_child( page_no = btr_node_ptr_get_child_page_no(node_ptr, offsets); return(btr_block_get(space, dict_table_zip_size(index->table), - page_no, RW_X_LATCH, mtr)); + page_no, RW_X_LATCH, index, mtr)); } /************************************************************//** @@ -1324,7 +1325,8 @@ btr_create( space, 0, IBUF_HEADER + IBUF_TREE_SEG_HEADER, mtr); - buf_block_dbg_add_level(ibuf_hdr_block, SYNC_TREE_NODE_NEW); + buf_block_dbg_add_level( + ibuf_hdr_block, SYNC_IBUF_TREE_NODE_NEW); ut_ad(buf_block_get_page_no(ibuf_hdr_block) == IBUF_HEADER_PAGE_NO); @@ -1362,10 +1364,9 @@ btr_create( page_no = buf_block_get_page_no(block); frame = buf_block_get_frame(block); - buf_block_dbg_add_level(block, SYNC_TREE_NODE_NEW); - if (type & DICT_IBUF) { /* It is an insert buffer tree: initialize the free list */ + buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE_NEW); ut_ad(page_no == IBUF_TREE_ROOT_PAGE_NO); @@ -1373,6 +1374,8 @@ btr_create( } else { /* It is a non-ibuf tree: create a file segment for leaf pages */ + buf_block_dbg_add_level(block, SYNC_TREE_NODE_NEW); + if (!fseg_create(space, page_no, PAGE_HEADER + PAGE_BTR_SEG_LEAF, mtr)) { /* Not enough space for new segment, free root @@ -1444,14 +1447,15 @@ btr_free_but_not_root( leaf_loop: mtr_start(&mtr); - root = btr_page_get(space, zip_size, root_page_no, RW_X_LATCH, &mtr); + root = btr_page_get(space, zip_size, root_page_no, RW_X_LATCH, + NULL, &mtr); if (srv_pass_corrupt_table && !root) { mtr_commit(&mtr); return; } ut_a(root); - + #ifdef UNIV_BTR_DEBUG ut_a(btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_LEAF + root, space)); @@ -1473,7 +1477,8 @@ leaf_loop: top_loop: mtr_start(&mtr); - root = btr_page_get(space, zip_size, root_page_no, RW_X_LATCH, &mtr); + root = btr_page_get(space, zip_size, root_page_no, RW_X_LATCH, + NULL, &mtr); if (srv_pass_corrupt_table && !root) { mtr_commit(&mtr); @@ -1505,13 +1510,13 @@ btr_free_root( ulint zip_size, /*!< in: compressed page size in bytes or 0 for uncompressed pages */ ulint root_page_no, /*!< in: root page number */ - mtr_t* mtr) /*!< in: a mini-transaction which has already - been started */ + mtr_t* mtr) /*!< in/out: mini-transaction */ { buf_block_t* block; fseg_header_t* header; - block = btr_block_get(space, zip_size, root_page_no, RW_X_LATCH, mtr); + block = btr_block_get(space, zip_size, root_page_no, RW_X_LATCH, + NULL, mtr); if (srv_pass_corrupt_table && !block) { return; @@ -2395,9 +2400,8 @@ btr_attach_half_pages( /* Update page links of the level */ if (prev_page_no != FIL_NULL) { - buf_block_t* prev_block = btr_block_get(space, zip_size, - prev_page_no, - RW_X_LATCH, mtr); + buf_block_t* prev_block = btr_block_get( + space, zip_size, prev_page_no, RW_X_LATCH, index, mtr); #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(prev_block->frame) == page_is_comp(page)); ut_a(btr_page_get_next(prev_block->frame, mtr) @@ -2410,9 +2414,8 @@ btr_attach_half_pages( } if (next_page_no != FIL_NULL) { - buf_block_t* next_block = btr_block_get(space, zip_size, - next_page_no, - RW_X_LATCH, mtr); + buf_block_t* next_block = btr_block_get( + space, zip_size, next_page_no, RW_X_LATCH, index, mtr); #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(next_block->frame) == page_is_comp(page)); ut_a(btr_page_get_prev(next_block->frame, mtr) @@ -2834,17 +2837,42 @@ func_exit: return(rec); } +#ifdef UNIV_SYNC_DEBUG +/*************************************************************//** +Removes a page from the level list of pages. +@param space in: space where removed +@param zip_size in: compressed page size in bytes, or 0 for uncompressed +@param page in/out: page to remove +@param index in: index tree +@param mtr in/out: mini-transaction */ +# define btr_level_list_remove(space,zip_size,page,index,mtr) \ + btr_level_list_remove_func(space,zip_size,page,index,mtr) +#else /* UNIV_SYNC_DEBUG */ +/*************************************************************//** +Removes a page from the level list of pages. +@param space in: space where removed +@param zip_size in: compressed page size in bytes, or 0 for uncompressed +@param page in/out: page to remove +@param index in: index tree +@param mtr in/out: mini-transaction */ +# define btr_level_list_remove(space,zip_size,page,index,mtr) \ + btr_level_list_remove_func(space,zip_size,page,mtr) +#endif /* UNIV_SYNC_DEBUG */ + /*************************************************************//** Removes a page from the level list of pages. */ -static +static __attribute__((nonnull)) void -btr_level_list_remove( -/*==================*/ - ulint space, /*!< in: space where removed */ - ulint zip_size,/*!< in: compressed page size in bytes - or 0 for uncompressed pages */ - page_t* page, /*!< in: page to remove */ - mtr_t* mtr) /*!< in: mtr */ +btr_level_list_remove_func( +/*=======================*/ + ulint space, /*!< in: space where removed */ + ulint zip_size,/*!< in: compressed page size in bytes + or 0 for uncompressed pages */ + page_t* page, /*!< in/out: page to remove */ +#ifdef UNIV_SYNC_DEBUG + const dict_index_t* index, /*!< in: index tree */ +#endif /* UNIV_SYNC_DEBUG */ + mtr_t* mtr) /*!< in/out: mini-transaction */ { ulint prev_page_no; ulint next_page_no; @@ -2862,7 +2890,7 @@ btr_level_list_remove( if (prev_page_no != FIL_NULL) { buf_block_t* prev_block = btr_block_get(space, zip_size, prev_page_no, - RW_X_LATCH, mtr); + RW_X_LATCH, index, mtr); page_t* prev_page = buf_block_get_frame(prev_block); #ifdef UNIV_BTR_DEBUG @@ -2879,7 +2907,7 @@ btr_level_list_remove( if (next_page_no != FIL_NULL) { buf_block_t* next_block = btr_block_get(space, zip_size, next_page_no, - RW_X_LATCH, mtr); + RW_X_LATCH, index, mtr); page_t* next_page = buf_block_get_frame(next_block); #ifdef UNIV_BTR_DEBUG @@ -3194,7 +3222,7 @@ btr_compress( if (is_left) { merge_block = btr_block_get(space, zip_size, left_page_no, - RW_X_LATCH, mtr); + RW_X_LATCH, index, mtr); merge_page = buf_block_get_frame(merge_block); #ifdef UNIV_BTR_DEBUG ut_a(btr_page_get_next(merge_page, mtr) @@ -3203,7 +3231,7 @@ btr_compress( } else if (right_page_no != FIL_NULL) { merge_block = btr_block_get(space, zip_size, right_page_no, - RW_X_LATCH, mtr); + RW_X_LATCH, index, mtr); merge_page = buf_block_get_frame(merge_block); #ifdef UNIV_BTR_DEBUG ut_a(btr_page_get_prev(merge_page, mtr) @@ -3292,7 +3320,7 @@ err_exit: btr_search_drop_page_hash_index(block, index); /* Remove the page from the level list */ - btr_level_list_remove(space, zip_size, page, mtr); + btr_level_list_remove(space, zip_size, page, index, mtr); btr_node_ptr_delete(index, block, mtr); lock_update_merge_left(merge_block, orig_pred, block); @@ -3345,7 +3373,7 @@ err_exit: #endif /* UNIV_BTR_DEBUG */ /* Remove the page from the level list */ - btr_level_list_remove(space, zip_size, page, mtr); + btr_level_list_remove(space, zip_size, page, index, mtr); /* Replace the address of the old child node (= page) with the address of the merge page to the right */ @@ -3528,7 +3556,7 @@ btr_discard_page( if (left_page_no != FIL_NULL) { merge_block = btr_block_get(space, zip_size, left_page_no, - RW_X_LATCH, mtr); + RW_X_LATCH, index, mtr); merge_page = buf_block_get_frame(merge_block); #ifdef UNIV_BTR_DEBUG ut_a(btr_page_get_next(merge_page, mtr) @@ -3536,7 +3564,7 @@ btr_discard_page( #endif /* UNIV_BTR_DEBUG */ } else if (right_page_no != FIL_NULL) { merge_block = btr_block_get(space, zip_size, right_page_no, - RW_X_LATCH, mtr); + RW_X_LATCH, index, mtr); merge_page = buf_block_get_frame(merge_block); #ifdef UNIV_BTR_DEBUG ut_a(btr_page_get_prev(merge_page, mtr) @@ -3571,7 +3599,7 @@ btr_discard_page( btr_node_ptr_delete(index, block, mtr); /* Remove the page from the level list */ - btr_level_list_remove(space, zip_size, page, mtr); + btr_level_list_remove(space, zip_size, page, index, mtr); #ifdef UNIV_ZIP_DEBUG { page_zip_des_t* merge_page_zip @@ -4089,7 +4117,7 @@ loop: if (right_page_no != FIL_NULL) { const rec_t* right_rec; right_block = btr_block_get(space, zip_size, right_page_no, - RW_X_LATCH, &mtr); + RW_X_LATCH, index, &mtr); right_page = buf_block_get_frame(right_block); if (UNIV_UNLIKELY(btr_page_get_prev(right_page, &mtr) != page_get_page_no(page))) { @@ -4315,7 +4343,7 @@ node_ptr_fails: mtr_start(&mtr); block = btr_block_get(space, zip_size, right_page_no, - RW_X_LATCH, &mtr); + RW_X_LATCH, index, &mtr); page = buf_block_get_frame(block); goto loop; diff --git a/btr/btr0cur.c b/btr/btr0cur.c index f6ef44e5b5c..717663a123a 100644 --- a/btr/btr0cur.c +++ b/btr/btr0cur.c @@ -249,7 +249,8 @@ btr_cur_latch_leaves( case BTR_SEARCH_LEAF: case BTR_MODIFY_LEAF: mode = latch_mode == BTR_SEARCH_LEAF ? RW_S_LATCH : RW_X_LATCH; - get_block = btr_block_get(space, zip_size, page_no, mode, mtr); + get_block = btr_block_get( + space, zip_size, page_no, mode, cursor->index, mtr); if (srv_pass_corrupt_table && !get_block) { return; @@ -265,9 +266,9 @@ btr_cur_latch_leaves( left_page_no = btr_page_get_prev(page, mtr); if (left_page_no != FIL_NULL) { - get_block = btr_block_get(space, zip_size, - left_page_no, - RW_X_LATCH, mtr); + get_block = btr_block_get( + space, zip_size, left_page_no, + RW_X_LATCH, cursor->index, mtr); if (srv_pass_corrupt_table && !get_block) { return; @@ -282,8 +283,9 @@ btr_cur_latch_leaves( get_block->check_index_page_at_flush = TRUE; } - get_block = btr_block_get(space, zip_size, page_no, - RW_X_LATCH, mtr); + get_block = btr_block_get( + space, zip_size, page_no, + RW_X_LATCH, cursor->index, mtr); if (srv_pass_corrupt_table && !get_block) { return; @@ -297,9 +299,9 @@ btr_cur_latch_leaves( right_page_no = btr_page_get_next(page, mtr); if (right_page_no != FIL_NULL) { - get_block = btr_block_get(space, zip_size, - right_page_no, - RW_X_LATCH, mtr); + get_block = btr_block_get( + space, zip_size, right_page_no, + RW_X_LATCH, cursor->index, mtr); if (srv_pass_corrupt_table && !get_block) { return; @@ -323,8 +325,9 @@ btr_cur_latch_leaves( left_page_no = btr_page_get_prev(page, mtr); if (left_page_no != FIL_NULL) { - get_block = btr_block_get(space, zip_size, - left_page_no, mode, mtr); + get_block = btr_block_get( + space, zip_size, + left_page_no, mode, cursor->index, mtr); cursor->left_block = get_block; if (srv_pass_corrupt_table && !get_block) { @@ -340,7 +343,8 @@ btr_cur_latch_leaves( get_block->check_index_page_at_flush = TRUE; } - get_block = btr_block_get(space, zip_size, page_no, mode, mtr); + get_block = btr_block_get( + space, zip_size, page_no, mode, cursor->index, mtr); if (srv_pass_corrupt_table && !get_block) { return; @@ -722,7 +726,9 @@ retry_page_get: ut_a(!page_zip || page_zip_validate(page_zip, page)); #endif /* UNIV_ZIP_DEBUG */ - buf_block_dbg_add_level(block, SYNC_TREE_NODE); + buf_block_dbg_add_level( + block, dict_index_is_ibuf(index) + ? SYNC_IBUF_TREE_NODE : SYNC_TREE_NODE); } ut_ad(index->id == btr_page_get_index_id(page)); @@ -820,7 +826,7 @@ retry_page_get: if (level != 0) { /* x-latch the page */ page = btr_page_get( - space, zip_size, page_no, RW_X_LATCH, mtr); + space, zip_size, page_no, RW_X_LATCH, index, mtr); ut_a((ibool)!!page_is_comp(page) == dict_table_is_comp(index->table)); @@ -1167,6 +1173,11 @@ btr_cur_ins_lock_and_undo( rec_t* rec; roll_ptr_t roll_ptr; + if (thr && thr_get_trx(thr)->fake_changes) { + /* skip LOCK, UNDO */ + return(DB_SUCCESS); + } + /* Check if we have to wait for a lock: enqueue an explicit lock request if yes */ @@ -1298,7 +1309,7 @@ btr_cur_optimistic_insert( } #endif /* UNIV_DEBUG */ - ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); + ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); max_size = page_get_max_insert_size_after_reorganize(page, 1); leaf = page_is_leaf(page); @@ -1393,6 +1404,12 @@ fail_err: goto fail_err; } + if (thr && thr_get_trx(thr)->fake_changes) { + /* skip CHANGE, LOG */ + *big_rec = big_rec_vec; + return(err); /* == DB_SUCCESS */ + } + page_cursor = btr_cur_get_page_cur(cursor); /* Now, try the insert */ @@ -1535,10 +1552,10 @@ btr_cur_pessimistic_insert( *big_rec = NULL; - ut_ad(mtr_memo_contains(mtr, + ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, dict_index_get_lock(btr_cur_get_index(cursor)), MTR_MEMO_X_LOCK)); - ut_ad(mtr_memo_contains(mtr, btr_cur_get_block(cursor), + ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, btr_cur_get_block(cursor), MTR_MEMO_PAGE_X_FIX)); /* Try first an optimistic insert; reset the cursor flag: we do not @@ -1604,6 +1621,16 @@ btr_cur_pessimistic_insert( } } + if (thr && thr_get_trx(thr)->fake_changes) { + /* skip CHANGE, LOG */ + if (n_extents > 0) { + fil_space_release_free_extents(index->space, + n_reserved); + } + *big_rec = big_rec_vec; + return(DB_SUCCESS); + } + if (dict_index_get_page(index) == buf_block_get_page_no(btr_cur_get_block(cursor))) { @@ -1660,6 +1687,11 @@ btr_cur_upd_lock_and_undo( ut_ad(cursor && update && thr && roll_ptr); + if (thr && thr_get_trx(thr)->fake_changes) { + /* skip LOCK, UNDO */ + return(DB_SUCCESS); + } + rec = btr_cur_get_rec(cursor); index = cursor->index; @@ -1917,6 +1949,7 @@ btr_cur_update_in_place( roll_ptr_t roll_ptr = 0; trx_t* trx; ulint was_delete_marked; + ibool is_hashed; mem_heap_t* heap = NULL; ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint* offsets = offsets_; @@ -1958,7 +1991,29 @@ btr_cur_update_in_place( return(err); } - if (block->is_hashed) { + if (trx->fake_changes) { + /* skip CHANGE, LOG */ + if (UNIV_LIKELY_NULL(heap)) { + mem_heap_free(heap); + } + return(err); /* == DB_SUCCESS */ + } + + if (!(flags & BTR_KEEP_SYS_FLAG)) { + row_upd_rec_sys_fields(rec, NULL, + index, offsets, trx, roll_ptr); + } + + was_delete_marked = rec_get_deleted_flag( + rec, page_is_comp(buf_block_get_frame(block))); + + is_hashed = block->is_hashed; + + if (is_hashed) { + /* TO DO: Can we skip this if none of the fields + index->search_info->curr_n_fields + are being updated? */ + /* The function row_upd_changes_ord_field_binary works only if the update vector was built for a clustered index, we must NOT call it if index is secondary */ @@ -1974,17 +2029,9 @@ btr_cur_update_in_place( rw_lock_x_lock(btr_search_get_latch(cursor->index->id)); } - if (!(flags & BTR_KEEP_SYS_FLAG)) { - row_upd_rec_sys_fields(rec, NULL, - index, offsets, trx, roll_ptr); - } - - was_delete_marked = rec_get_deleted_flag( - rec, page_is_comp(buf_block_get_frame(block))); - row_upd_rec_in_place(rec, index, offsets, update, page_zip); - if (block->is_hashed) { + if (is_hashed) { rw_lock_x_unlock(btr_search_get_latch(cursor->index->id)); } @@ -2061,7 +2108,7 @@ btr_cur_optimistic_update( rec = btr_cur_get_rec(cursor); index = cursor->index; ut_ad(!!page_rec_is_comp(rec) == dict_table_is_comp(index->table)); - ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); + ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); /* The insert buffer tree should never be updated in place. */ ut_ad(!dict_index_is_ibuf(index)); @@ -2174,6 +2221,11 @@ any_extern: goto err_exit; } + if (thr && thr_get_trx(thr)->fake_changes) { + /* skip CHANGE, LOG */ + goto err_exit; /* == DB_SUCCESS */ + } + /* Ok, we may do the replacement. Store on the page infimum the explicit locks on rec, before deleting rec (see the comment in btr_cur_pessimistic_update). */ @@ -2324,9 +2376,9 @@ btr_cur_pessimistic_update( rec = btr_cur_get_rec(cursor); index = cursor->index; - ut_ad(mtr_memo_contains(mtr, dict_index_get_lock(index), + ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, dict_index_get_lock(index), MTR_MEMO_X_LOCK)); - ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); + ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); #ifdef UNIV_ZIP_DEBUG ut_a(!page_zip || page_zip_validate(page_zip, page)); #endif /* UNIV_ZIP_DEBUG */ @@ -2414,6 +2466,9 @@ btr_cur_pessimistic_update( ut_ad(big_rec_vec == NULL); + /* fake_changes should not cause undo. so never reaches here */ + ut_ad(!(trx->fake_changes)); + btr_rec_free_updated_extern_fields( index, rec, page_zip, offsets, update, trx_is_recv(trx) ? RB_RECOVERY : RB_NORMAL, mtr); @@ -2448,6 +2503,12 @@ make_external: } } + if (trx->fake_changes) { + /* skip CHANGE, LOG */ + err = DB_SUCCESS; + goto return_after_reservations; + } + /* Store state of explicit locks on rec on the page infimum record, before deleting rec. The page infimum acts as a dummy carrier of the locks, taking care also of lock releases, before we can move the locks @@ -2685,7 +2746,8 @@ btr_cur_parse_del_mark_set_clust_rec( /* We do not need to reserve btr_search_latch, as the page is only being recovered, and there cannot be a hash index to - it. */ + it. Besides, these fields are being updated in place + and the adaptive hash index does not depend on them. */ btr_rec_set_deleted_flag(rec, page_zip, val); @@ -2749,6 +2811,11 @@ btr_cur_del_mark_set_clust_rec( ut_ad(dict_index_is_clust(index)); ut_ad(!rec_get_deleted_flag(rec, rec_offs_comp(offsets))); + if (thr && thr_get_trx(thr)->fake_changes) { + /* skip LOCK, UNDO, CHANGE, LOG */ + return(DB_SUCCESS); + } + err = lock_clust_rec_modify_check_and_lock(flags, block, rec, index, offsets, thr); @@ -2765,9 +2832,9 @@ btr_cur_del_mark_set_clust_rec( return(err); } - if (block->is_hashed) { - rw_lock_x_lock(btr_search_get_latch(index->id)); - } + /* The btr_search_latch is not needed here, because + the adaptive hash index does not depend on the delete-mark + and the delete-mark is being updated in place. */ page_zip = buf_block_get_page_zip(block); @@ -2781,10 +2848,6 @@ btr_cur_del_mark_set_clust_rec( index, offsets, trx, roll_ptr); } - if (block->is_hashed) { - rw_lock_x_unlock(btr_search_get_latch(index->id)); - } - btr_cur_del_mark_set_clust_rec_log(flags, rec, index, val, trx, roll_ptr, mtr); @@ -2860,7 +2923,8 @@ btr_cur_parse_del_mark_set_sec_rec( /* We do not need to reserve btr_search_latch, as the page is only being recovered, and there cannot be a hash index to - it. */ + it. Besides, the delete-mark flag is being updated in place + and the adaptive hash index does not depend on it. */ btr_rec_set_deleted_flag(rec, page_zip, val); } @@ -2886,6 +2950,11 @@ btr_cur_del_mark_set_sec_rec( rec_t* rec; ulint err; + if (thr && thr_get_trx(thr)->fake_changes) { + /* skip LOCK, CHANGE, LOG */ + return(DB_SUCCESS); + } + block = btr_cur_get_block(cursor); rec = btr_cur_get_rec(cursor); @@ -2908,16 +2977,11 @@ btr_cur_del_mark_set_sec_rec( ut_ad(!!page_rec_is_comp(rec) == dict_table_is_comp(cursor->index->table)); - if (block->is_hashed) { - rw_lock_x_lock(btr_search_get_latch(cursor->index->id)); - } - + /* We do not need to reserve btr_search_latch, as the + delete-mark flag is being updated in place and the adaptive + hash index does not depend on it. */ btr_rec_set_deleted_flag(rec, buf_block_get_page_zip(block), val); - if (block->is_hashed) { - rw_lock_x_unlock(btr_search_get_latch(cursor->index->id)); - } - btr_cur_del_mark_set_sec_rec_log(rec, val, mtr); return(DB_SUCCESS); @@ -2938,8 +3002,11 @@ btr_cur_set_deleted_flag_for_ibuf( ibool val, /*!< in: value to set */ mtr_t* mtr) /*!< in: mtr */ { - /* We do not need to reserve btr_search_latch, as the page has just - been read to the buffer pool and there cannot be a hash index to it. */ + /* We do not need to reserve btr_search_latch, as the page + has just been read to the buffer pool and there cannot be + a hash index to it. Besides, the delete-mark flag is being + updated in place and the adaptive hash index does not depend + on it. */ btr_rec_set_deleted_flag(rec, page_zip, val); @@ -3598,7 +3665,6 @@ static void btr_record_not_null_field_in_rec( /*=============================*/ - rec_t* rec, /*!< in: physical record */ ulint n_unique, /*!< in: dict_index_get_n_unique(index), number of columns uniquely determine an index entry */ @@ -3618,9 +3684,8 @@ btr_record_not_null_field_in_rec( for (i = 0; i < n_unique; i++) { ulint rec_len; - byte* field; - field = rec_get_nth_field(rec, offsets, i, &rec_len); + rec_get_nth_field_offs(offsets, i, &rec_len); if (rec_len != UNIV_SQL_NULL) { n_not_null[i]++; @@ -3740,7 +3805,7 @@ btr_estimate_number_of_different_key_vals( if (n_not_null) { btr_record_not_null_field_in_rec( - rec, n_cols, offsets_rec, n_not_null); + n_cols, offsets_rec, n_not_null); } } @@ -3775,7 +3840,7 @@ btr_estimate_number_of_different_key_vals( if (n_not_null) { btr_record_not_null_field_in_rec( - next_rec, n_cols, offsets_next_rec, + n_cols, offsets_next_rec, n_not_null); } @@ -4184,7 +4249,7 @@ btr_blob_free( && buf_block_get_space(block) == space && buf_block_get_page_no(block) == page_no) { - if (buf_LRU_free_block(&block->page, all, TRUE) != BUF_LRU_FREED + if (!buf_LRU_free_block(&block->page, all, TRUE) && all && block->page.zip.data /* Now, buf_LRU_free_block() may release mutex temporarily */ && buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE diff --git a/btr/btr0pcur.c b/btr/btr0pcur.c index f95a5487c94..081ef9c9457 100644 --- a/btr/btr0pcur.c +++ b/btr/btr0pcur.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -272,8 +272,10 @@ btr_pcur_restore_position_func( file, line, mtr))) { cursor->pos_state = BTR_PCUR_IS_POSITIONED; - buf_block_dbg_add_level(btr_pcur_get_block(cursor), - SYNC_TREE_NODE); + buf_block_dbg_add_level( + btr_pcur_get_block(cursor), + dict_index_is_ibuf(index) + ? SYNC_IBUF_TREE_NODE : SYNC_TREE_NODE); if (cursor->rel_pos == BTR_PCUR_ON) { #ifdef UNIV_DEBUG @@ -362,33 +364,6 @@ btr_pcur_restore_position_func( return(FALSE); } -/**************************************************************//** -If the latch mode of the cursor is BTR_LEAF_SEARCH or BTR_LEAF_MODIFY, -releases the page latch and bufferfix reserved by the cursor. -NOTE! In the case of BTR_LEAF_MODIFY, there should not exist changes -made by the current mini-transaction to the data protected by the -cursor latch, as then the latch must not be released until mtr_commit. */ -UNIV_INTERN -void -btr_pcur_release_leaf( -/*==================*/ - btr_pcur_t* cursor, /*!< in: persistent cursor */ - mtr_t* mtr) /*!< in: mtr */ -{ - buf_block_t* block; - - ut_a(cursor->pos_state == BTR_PCUR_IS_POSITIONED); - ut_ad(cursor->latch_mode != BTR_NO_LATCHES); - - block = btr_pcur_get_block(cursor); - - btr_leaf_page_release(block, cursor->latch_mode, mtr); - - cursor->latch_mode = BTR_NO_LATCHES; - - cursor->pos_state = BTR_PCUR_WAS_POSITIONED; -} - /*********************************************************//** Moves the persistent cursor to the first record on the next page. Releases the latch on the current page, and bufferunfixes it. Note that there must not be @@ -423,7 +398,8 @@ btr_pcur_move_to_next_page( ut_ad(next_page_no != FIL_NULL); next_block = btr_block_get(space, zip_size, next_page_no, - cursor->latch_mode, mtr); + cursor->latch_mode, + btr_pcur_get_btr_cur(cursor)->index, mtr); next_page = buf_block_get_frame(next_block); if (srv_pass_corrupt_table && !next_page) { diff --git a/btr/btr0sea.c b/btr/btr0sea.c index 0630b634b53..f27afe216ec 100644 --- a/btr/btr0sea.c +++ b/btr/btr0sea.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -878,6 +878,7 @@ btr_search_guess_on_hash( btr_pcur_t pcur; #endif ut_ad(index && info && tuple && cursor && mtr); + ut_ad(!dict_index_is_ibuf(index)); ut_ad((latch_mode == BTR_SEARCH_LEAF) || (latch_mode == BTR_MODIFY_LEAF)); diff --git a/buf/buf0buddy.c b/buf/buf0buddy.c index 07898950fab..9c1ff645260 100644 --- a/buf/buf0buddy.c +++ b/buf/buf0buddy.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2006, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 2006, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -56,6 +56,14 @@ buf_buddy_get( } } +/** Validate a given zip_free list. */ +#define BUF_BUDDY_LIST_VALIDATE(b, i) \ + UT_LIST_VALIDATE(zip_list, buf_page_t, \ + b->zip_free[i], \ + ut_ad(buf_page_get_state( \ + ut_list_node_313) \ + == BUF_BLOCK_ZIP_FREE)) + /**********************************************************************//** Add a block to the head of the appropriate buddy free list. */ UNIV_INLINE @@ -67,22 +75,11 @@ buf_buddy_add_to_free( ulint i) /*!< in: index of buf_pool->zip_free[] */ { -#ifdef UNIV_DEBUG_VALGRIND - buf_page_t* b = UT_LIST_GET_FIRST(buf_pool->zip_free[i]); - - if (b) UNIV_MEM_VALID(b, BUF_BUDDY_LOW << i); -#endif /* UNIV_DEBUG_VALGRIND */ - //ut_ad(buf_pool_mutex_own(buf_pool)); ut_ad(mutex_own(&buf_pool->zip_free_mutex)); ut_ad(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_FREE); ut_ad(buf_pool->zip_free[i].start != bpage); UT_LIST_ADD_FIRST(zip_list, buf_pool->zip_free[i], bpage); - -#ifdef UNIV_DEBUG_VALGRIND - if (b) UNIV_MEM_FREE(b, BUF_BUDDY_LOW << i); - UNIV_MEM_ASSERT_AND_FREE(bpage, BUF_BUDDY_LOW << i); -#endif /* UNIV_DEBUG_VALGRIND */ } /**********************************************************************//** @@ -96,26 +93,18 @@ buf_buddy_remove_from_free( ulint i) /*!< in: index of buf_pool->zip_free[] */ { -#ifdef UNIV_DEBUG_VALGRIND +#ifdef UNIV_DEBUG buf_page_t* prev = UT_LIST_GET_PREV(zip_list, bpage); buf_page_t* next = UT_LIST_GET_NEXT(zip_list, bpage); - if (prev) UNIV_MEM_VALID(prev, BUF_BUDDY_LOW << i); - if (next) UNIV_MEM_VALID(next, BUF_BUDDY_LOW << i); - ut_ad(!prev || buf_page_get_state(prev) == BUF_BLOCK_ZIP_FREE); ut_ad(!next || buf_page_get_state(next) == BUF_BLOCK_ZIP_FREE); -#endif /* UNIV_DEBUG_VALGRIND */ +#endif /* UNIV_DEBUG */ //ut_ad(buf_pool_mutex_own(buf_pool)); ut_ad(mutex_own(&buf_pool->zip_free_mutex)); ut_ad(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_FREE); UT_LIST_REMOVE(zip_list, buf_pool->zip_free[i], bpage); - -#ifdef UNIV_DEBUG_VALGRIND - if (prev) UNIV_MEM_FREE(prev, BUF_BUDDY_LOW << i); - if (next) UNIV_MEM_FREE(next, BUF_BUDDY_LOW << i); -#endif /* UNIV_DEBUG_VALGRIND */ } /**********************************************************************//** @@ -133,17 +122,13 @@ buf_buddy_alloc_zip( //ut_ad(buf_pool_mutex_own(buf_pool)); ut_ad(mutex_own(&buf_pool->zip_free_mutex)); ut_a(i < BUF_BUDDY_SIZES); + ut_a(i >= buf_buddy_get_slot(PAGE_ZIP_MIN_SIZE)); + + ut_d(BUF_BUDDY_LIST_VALIDATE(buf_pool, i)); -#ifndef UNIV_DEBUG_VALGRIND - /* Valgrind would complain about accessing free memory. */ - ut_d(UT_LIST_VALIDATE(zip_list, buf_page_t, buf_pool->zip_free[i], - ut_ad(buf_page_get_state(ut_list_node_313) - == BUF_BLOCK_ZIP_FREE))); -#endif /* !UNIV_DEBUG_VALGRIND */ bpage = UT_LIST_GET_LAST(buf_pool->zip_free[i]); if (bpage) { - UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i); ut_a(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_FREE); buf_buddy_remove_from_free(buf_pool, bpage, i); @@ -162,13 +147,10 @@ buf_buddy_alloc_zip( } } -#ifdef UNIV_DEBUG if (bpage) { - memset(bpage, ~i, BUF_BUDDY_LOW << i); + ut_d(memset(bpage, ~i, BUF_BUDDY_LOW << i)); + UNIV_MEM_ALLOC(bpage, BUF_BUDDY_SIZES << i); } -#endif /* UNIV_DEBUG */ - - UNIV_MEM_ALLOC(bpage, BUF_BUDDY_SIZES << i); return(bpage); } @@ -264,6 +246,7 @@ buf_buddy_alloc_from( { ulint offs = BUF_BUDDY_LOW << j; ut_ad(j <= BUF_BUDDY_SIZES); + ut_ad(i >= buf_buddy_get_slot(PAGE_ZIP_MIN_SIZE)); ut_ad(j >= i); ut_ad(!ut_align_offset(buf, offs)); @@ -277,13 +260,7 @@ buf_buddy_alloc_from( bpage = (buf_page_t*) ((byte*) buf + offs); ut_d(memset(bpage, j, BUF_BUDDY_LOW << j)); bpage->state = BUF_BLOCK_ZIP_FREE; -#ifndef UNIV_DEBUG_VALGRIND - /* Valgrind would complain about accessing free memory. */ - ut_d(UT_LIST_VALIDATE(zip_list, buf_page_t, buf_pool->zip_free[i], - ut_ad(buf_page_get_state( - ut_list_node_313) - == BUF_BLOCK_ZIP_FREE))); -#endif /* !UNIV_DEBUG_VALGRIND */ + ut_d(BUF_BUDDY_LIST_VALIDATE(buf_pool, i)); buf_buddy_add_to_free(buf_pool, bpage, j); } @@ -293,28 +270,29 @@ buf_buddy_alloc_from( /**********************************************************************//** Allocate a block. The thread calling this function must hold buf_pool->mutex and must not hold buf_pool->zip_mutex or any block->mutex. -The buf_pool->mutex may only be released and reacquired if lru != NULL. -@return allocated block, possibly NULL if lru==NULL */ +The buf_pool_mutex may be released and reacquired. +@return allocated block, never NULL */ UNIV_INTERN void* buf_buddy_alloc_low( /*================*/ - buf_pool_t* buf_pool, /*!< in: buffer pool instance */ + buf_pool_t* buf_pool, /*!< in/out: buffer pool instance */ ulint i, /*!< in: index of buf_pool->zip_free[], or BUF_BUDDY_SIZES */ ibool* lru, /*!< in: pointer to a variable that will be assigned TRUE if storage was allocated from the LRU list and buf_pool->mutex was temporarily - released, or NULL if the LRU list - should not be used */ + released */ ibool have_page_hash_mutex) { buf_block_t* block; + ut_ad(lru); //ut_ad(buf_pool_mutex_own(buf_pool)); ut_ad(mutex_own(&buf_pool->LRU_list_mutex)); ut_ad(!mutex_own(&buf_pool->zip_mutex)); + ut_ad(i >= buf_buddy_get_slot(PAGE_ZIP_MIN_SIZE)); if (i < BUF_BUDDY_SIZES) { /* Try to allocate from the buddy system. */ @@ -335,11 +313,6 @@ buf_buddy_alloc_low( goto alloc_big; } - if (!lru) { - - return(NULL); - } - /* Try replacing an uncompressed page in the buffer pool. */ //buf_pool_mutex_exit(buf_pool); mutex_exit(&buf_pool->LRU_list_mutex); @@ -368,76 +341,6 @@ func_exit: return(block); } -/**********************************************************************//** -Try to relocate the control block of a compressed page. -@return TRUE if relocated */ -static -ibool -buf_buddy_relocate_block( -/*=====================*/ - buf_page_t* bpage, /*!< in: block to relocate */ - buf_page_t* dpage) /*!< in: free block to relocate to */ -{ - buf_page_t* b; - buf_pool_t* buf_pool = buf_pool_from_bpage(bpage); - - //ut_ad(buf_pool_mutex_own(buf_pool)); -#ifdef UNIV_SYNC_DEBUG - ut_ad(rw_lock_own(&buf_pool->page_hash_latch, RW_LOCK_EX)); -#endif - - switch (buf_page_get_state(bpage)) { - case BUF_BLOCK_ZIP_FREE: - case BUF_BLOCK_NOT_USED: - case BUF_BLOCK_READY_FOR_USE: - case BUF_BLOCK_FILE_PAGE: - case BUF_BLOCK_MEMORY: - case BUF_BLOCK_REMOVE_HASH: - /* ut_error; */ /* optimistic */ - case BUF_BLOCK_ZIP_DIRTY: - /* Cannot relocate dirty pages. */ - return(FALSE); - - case BUF_BLOCK_ZIP_PAGE: - break; - } - - mutex_enter(&buf_pool->zip_mutex); - mutex_enter(&buf_pool->zip_free_mutex); - - if (!buf_page_can_relocate(bpage)) { - mutex_exit(&buf_pool->zip_mutex); - mutex_exit(&buf_pool->zip_free_mutex); - return(FALSE); - } - - if (bpage != buf_page_hash_get(buf_pool, - bpage->space, bpage->offset)) { - mutex_exit(&buf_pool->zip_mutex); - mutex_exit(&buf_pool->zip_free_mutex); - return(FALSE); - } - - buf_relocate(bpage, dpage); - ut_d(bpage->state = BUF_BLOCK_ZIP_FREE); - - /* relocate buf_pool->zip_clean */ - b = UT_LIST_GET_PREV(zip_list, dpage); - UT_LIST_REMOVE(zip_list, buf_pool->zip_clean, dpage); - - if (b) { - UT_LIST_INSERT_AFTER(zip_list, buf_pool->zip_clean, b, dpage); - } else { - UT_LIST_ADD_FIRST(zip_list, buf_pool->zip_clean, dpage); - } - - UNIV_MEM_INVALID(bpage, sizeof *bpage); - - mutex_exit(&buf_pool->zip_mutex); - mutex_exit(&buf_pool->zip_free_mutex); - return(TRUE); -} - /**********************************************************************//** Try to relocate a block. @return TRUE if relocated */ @@ -454,164 +357,122 @@ buf_buddy_relocate( { buf_page_t* bpage; const ulint size = BUF_BUDDY_LOW << i; - ullint usec = ut_time_us(NULL); + mutex_t* mutex; + ulint space; + ulint page_no; //ut_ad(buf_pool_mutex_own(buf_pool)); ut_ad(mutex_own(&buf_pool->zip_free_mutex)); ut_ad(!mutex_own(&buf_pool->zip_mutex)); ut_ad(!ut_align_offset(src, size)); ut_ad(!ut_align_offset(dst, size)); + ut_ad(i >= buf_buddy_get_slot(PAGE_ZIP_MIN_SIZE)); UNIV_MEM_ASSERT_W(dst, size); - /* We assume that all memory from buf_buddy_alloc() - is used for either compressed pages or buf_page_t - objects covering compressed pages. */ - - /* We look inside the allocated objects returned by - buf_buddy_alloc() and assume that anything of - PAGE_ZIP_MIN_SIZE or larger is a compressed page that contains - a valid space_id and page_no in the page header. Should the - fields be invalid, we will be unable to relocate the block. - We also assume that anything that fits sizeof(buf_page_t) - actually is a properly initialized buf_page_t object. */ - - if (size >= PAGE_ZIP_MIN_SIZE) { - /* This is a compressed page. */ - mutex_t* mutex; - ulint space, page_no; - - if (!have_page_hash_mutex) { - mutex_exit(&buf_pool->zip_free_mutex); - mutex_enter(&buf_pool->LRU_list_mutex); - rw_lock_x_lock(&buf_pool->page_hash_latch); - } - - /* The src block may be split into smaller blocks, - some of which may be free. Thus, the - mach_read_from_4() calls below may attempt to read - from free memory. The memory is "owned" by the buddy - allocator (and it has been allocated from the buffer - pool), so there is nothing wrong about this. The - mach_read_from_4() calls here will only trigger bogus - Valgrind memcheck warnings in UNIV_DEBUG_VALGRIND builds. */ - space = mach_read_from_4( - (const byte*) src + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID); - page_no = mach_read_from_4( - (const byte*) src + FIL_PAGE_OFFSET); - /* Suppress Valgrind warnings about conditional jump - on uninitialized value. */ - UNIV_MEM_VALID(&space, sizeof space); - UNIV_MEM_VALID(&page_no, sizeof page_no); - bpage = buf_page_hash_get(buf_pool, space, page_no); - - if (!bpage || bpage->zip.data != src) { - /* The block has probably been freshly - allocated by buf_LRU_get_free_block() but not - added to buf_pool->page_hash yet. Obviously, - it cannot be relocated. */ - - if (!have_page_hash_mutex) { - mutex_enter(&buf_pool->zip_free_mutex); - mutex_exit(&buf_pool->LRU_list_mutex); - rw_lock_x_unlock(&buf_pool->page_hash_latch); - } - return(FALSE); - } - - ut_ad(!buf_pool_watch_is_sentinel(buf_pool, bpage)); - - if (page_zip_get_size(&bpage->zip) != size) { - /* The block is of different size. We would - have to relocate all blocks covered by src. - For the sake of simplicity, give up. */ - ut_ad(page_zip_get_size(&bpage->zip) < size); - - if (!have_page_hash_mutex) { - mutex_enter(&buf_pool->zip_free_mutex); - mutex_exit(&buf_pool->LRU_list_mutex); - rw_lock_x_unlock(&buf_pool->page_hash_latch); - } - return(FALSE); - } - - /* To keep latch order */ - if (have_page_hash_mutex) - mutex_exit(&buf_pool->zip_free_mutex); - - /* The block must have been allocated, but it may - contain uninitialized data. */ - UNIV_MEM_ASSERT_W(src, size); - - mutex = buf_page_get_mutex_enter(bpage); - - mutex_enter(&buf_pool->zip_free_mutex); - - if (mutex && buf_page_can_relocate(bpage)) { - /* Relocate the compressed page. */ - ut_a(bpage->zip.data == src); - memcpy(dst, src, size); - bpage->zip.data = dst; - mutex_exit(mutex); -success: - UNIV_MEM_INVALID(src, size); - { - buf_buddy_stat_t* buddy_stat - = &buf_pool->buddy_stat[i]; - buddy_stat->relocated++; - buddy_stat->relocated_usec - += ut_time_us(NULL) - usec; - } - - if (!have_page_hash_mutex) { - mutex_exit(&buf_pool->LRU_list_mutex); - rw_lock_x_unlock(&buf_pool->page_hash_latch); - } - return(TRUE); - } - - if (!have_page_hash_mutex) { - mutex_exit(&buf_pool->LRU_list_mutex); - rw_lock_x_unlock(&buf_pool->page_hash_latch); - } - - if (mutex) { - mutex_exit(mutex); - } - } else if (i == buf_buddy_get_slot(sizeof(buf_page_t))) { - /* This must be a buf_page_t object. */ -#if UNIV_WORD_SIZE == 4 - /* On 32-bit systems, there is no padding in - buf_page_t. On other systems, Valgrind could complain - about uninitialized pad bytes. */ - UNIV_MEM_ASSERT_RW(src, size); -#endif - + if (!have_page_hash_mutex) { mutex_exit(&buf_pool->zip_free_mutex); - - if (!have_page_hash_mutex) { - mutex_enter(&buf_pool->LRU_list_mutex); - rw_lock_x_lock(&buf_pool->page_hash_latch); - } - - if (buf_buddy_relocate_block(src, dst)) { - mutex_enter(&buf_pool->zip_free_mutex); - - if (!have_page_hash_mutex) { - mutex_exit(&buf_pool->LRU_list_mutex); - rw_lock_x_unlock(&buf_pool->page_hash_latch); - } - - goto success; - } - - mutex_enter(&buf_pool->zip_free_mutex); - - if (!have_page_hash_mutex) { - mutex_exit(&buf_pool->LRU_list_mutex); - rw_lock_x_unlock(&buf_pool->page_hash_latch); - } + mutex_enter(&buf_pool->LRU_list_mutex); + rw_lock_x_lock(&buf_pool->page_hash_latch); } + /* We assume that all memory from buf_buddy_alloc() + is used for compressed page frames. */ + + /* We look inside the allocated objects returned by + buf_buddy_alloc() and assume that each block is a compressed + page that contains a valid space_id and page_no in the page + header. Should the fields be invalid, we will be unable to + relocate the block. */ + + /* The src block may be split into smaller blocks, + some of which may be free. Thus, the + mach_read_from_4() calls below may attempt to read + from free memory. The memory is "owned" by the buddy + allocator (and it has been allocated from the buffer + pool), so there is nothing wrong about this. The + mach_read_from_4() calls here will only trigger bogus + Valgrind memcheck warnings in UNIV_DEBUG_VALGRIND builds. */ + space = mach_read_from_4((const byte *) src + + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID); + page_no = mach_read_from_4((const byte *) src + + FIL_PAGE_OFFSET); + /* Suppress Valgrind warnings about conditional jump + on uninitialized value. */ + UNIV_MEM_VALID(&space, sizeof space); + UNIV_MEM_VALID(&page_no, sizeof page_no); + bpage = buf_page_hash_get(buf_pool, space, page_no); + + if (!bpage || bpage->zip.data != src) { + /* The block has probably been freshly + allocated by buf_LRU_get_free_block() but not + added to buf_pool->page_hash yet. Obviously, + it cannot be relocated. */ + + if (!have_page_hash_mutex) { + mutex_enter(&buf_pool->zip_free_mutex); + mutex_exit(&buf_pool->LRU_list_mutex); + rw_lock_x_unlock(&buf_pool->page_hash_latch); + } + return(FALSE); + } + + if (page_zip_get_size(&bpage->zip) != size) { + /* The block is of different size. We would + have to relocate all blocks covered by src. + For the sake of simplicity, give up. */ + ut_ad(page_zip_get_size(&bpage->zip) < size); + + if (!have_page_hash_mutex) { + mutex_enter(&buf_pool->zip_free_mutex); + mutex_exit(&buf_pool->LRU_list_mutex); + rw_lock_x_unlock(&buf_pool->page_hash_latch); + } + return(FALSE); + } + + /* To keep latch order */ + if (have_page_hash_mutex) + mutex_exit(&buf_pool->zip_free_mutex); + + /* The block must have been allocated, but it may + contain uninitialized data. */ + UNIV_MEM_ASSERT_W(src, size); + + mutex = buf_page_get_mutex_enter(bpage); + + mutex_enter(&buf_pool->zip_free_mutex); + + if (mutex && buf_page_can_relocate(bpage)) { + /* Relocate the compressed page. */ + ullint usec = ut_time_us(NULL); + ut_a(bpage->zip.data == src); + memcpy(dst, src, size); + bpage->zip.data = dst; + mutex_exit(mutex); + UNIV_MEM_INVALID(src, size); + { + buf_buddy_stat_t* buddy_stat + = &buf_pool->buddy_stat[i]; + buddy_stat->relocated++; + buddy_stat->relocated_usec + += ut_time_us(NULL) - usec; + } + + if (!have_page_hash_mutex) { + mutex_exit(&buf_pool->LRU_list_mutex); + rw_lock_x_unlock(&buf_pool->page_hash_latch); + } + return(TRUE); + } + + if (!have_page_hash_mutex) { + mutex_exit(&buf_pool->LRU_list_mutex); + rw_lock_x_unlock(&buf_pool->page_hash_latch); + } + + if (mutex) { + mutex_exit(mutex); + } return(FALSE); } @@ -635,12 +496,13 @@ buf_buddy_free_low( ut_ad(mutex_own(&buf_pool->zip_free_mutex)); ut_ad(!mutex_own(&buf_pool->zip_mutex)); ut_ad(i <= BUF_BUDDY_SIZES); + ut_ad(i >= buf_buddy_get_slot(PAGE_ZIP_MIN_SIZE)); ut_ad(buf_pool->buddy_stat[i].used > 0); buf_pool->buddy_stat[i].used--; recombine: UNIV_MEM_ASSERT_AND_ALLOC(buf, BUF_BUDDY_LOW << i); - ut_d(((buf_page_t*) buf)->state = BUF_BLOCK_ZIP_FREE); + ((buf_page_t*) buf)->state = BUF_BLOCK_ZIP_FREE; if (i == BUF_BUDDY_SIZES) { mutex_exit(&buf_pool->zip_free_mutex); @@ -653,32 +515,36 @@ recombine: ut_ad(buf == ut_align_down(buf, BUF_BUDDY_LOW << i)); ut_ad(!buf_pool_contains_zip(buf_pool, buf)); - /* Try to combine adjacent blocks. */ + /* Do not recombine blocks if there are few free blocks. + We may waste up to 15360*max_len bytes to free blocks + (1024 + 2048 + 4096 + 8192 = 15360) */ + if (UT_LIST_GET_LEN(buf_pool->zip_free[i]) < 16) { + goto func_exit; + } + /* Try to combine adjacent blocks. */ buddy = (buf_page_t*) buf_buddy_get(((byte*) buf), BUF_BUDDY_LOW << i); #ifndef UNIV_DEBUG_VALGRIND - /* Valgrind would complain about accessing free memory. */ + /* When Valgrind instrumentation is not enabled, we can read + buddy->state to quickly determine that a block is not free. + When the block is not free, buddy->state belongs to a compressed + page frame that may be flagged uninitialized in our Valgrind + instrumentation. */ if (buddy->state != BUF_BLOCK_ZIP_FREE) { goto buddy_nonfree; } - - /* The field buddy->state can only be trusted for free blocks. - If buddy->state == BUF_BLOCK_ZIP_FREE, the block is free if - it is in the free list. */ #endif /* !UNIV_DEBUG_VALGRIND */ for (bpage = UT_LIST_GET_FIRST(buf_pool->zip_free[i]); bpage; ) { - UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i); ut_ad(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_FREE); if (bpage == buddy) { -buddy_free: /* The buddy is free: recombine */ buf_buddy_remove_from_free(buf_pool, bpage, i); -buddy_free2: +buddy_is_free: ut_ad(buf_page_get_state(buddy) == BUF_BLOCK_ZIP_FREE); ut_ad(!buf_pool_contains_zip(buf_pool, buddy)); i++; @@ -688,122 +554,42 @@ buddy_free2: } ut_a(bpage != buf); - - { - buf_page_t* next = UT_LIST_GET_NEXT(zip_list, bpage); - UNIV_MEM_ASSERT_AND_FREE(bpage, BUF_BUDDY_LOW << i); - bpage = next; - } + UNIV_MEM_ASSERT_W(bpage, BUF_BUDDY_LOW << i); + bpage = UT_LIST_GET_NEXT(zip_list, bpage); } #ifndef UNIV_DEBUG_VALGRIND buddy_nonfree: - /* Valgrind would complain about accessing free memory. */ - ut_d(UT_LIST_VALIDATE(zip_list, buf_page_t, buf_pool->zip_free[i], - ut_ad(buf_page_get_state(ut_list_node_313) - == BUF_BLOCK_ZIP_FREE))); -#endif /* UNIV_DEBUG_VALGRIND */ +#endif /* !UNIV_DEBUG_VALGRIND */ + + ut_d(BUF_BUDDY_LIST_VALIDATE(buf_pool, i)); /* The buddy is not free. Is there a free block of this size? */ bpage = UT_LIST_GET_LAST(buf_pool->zip_free[i]); if (bpage) { + /* Remove the block from the free list, because a successful buf_buddy_relocate() will overwrite bpage->list. */ - - UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i); buf_buddy_remove_from_free(buf_pool, bpage, i); /* Try to relocate the buddy of buf to the free block. */ if (buf_buddy_relocate(buf_pool, buddy, bpage, i, have_page_hash_mutex)) { - ut_d(buddy->state = BUF_BLOCK_ZIP_FREE); - goto buddy_free2; + buddy->state = BUF_BLOCK_ZIP_FREE; + goto buddy_is_free; } buf_buddy_add_to_free(buf_pool, bpage, i); - - /* Try to relocate the buddy of the free block to buf. */ - buddy = (buf_page_t*) buf_buddy_get(((byte*) bpage), - BUF_BUDDY_LOW << i); - -#ifndef UNIV_DEBUG_VALGRIND - /* Valgrind would complain about accessing free memory. */ - - /* The buddy must not be (completely) free, because we - always recombine adjacent free blocks. - - (Parts of the buddy can be free in - buf_pool->zip_free[j] with j < i.) */ - ut_d(UT_LIST_VALIDATE(zip_list, buf_page_t, buf_pool->zip_free[i], - ut_ad(buf_page_get_state( - ut_list_node_313) - == BUF_BLOCK_ZIP_FREE - && ut_list_node_313 != buddy))); -#endif /* !UNIV_DEBUG_VALGRIND */ - - if (buf_buddy_relocate(buf_pool, buddy, buf, i, have_page_hash_mutex)) { - - buf = bpage; - UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i); - ut_d(buddy->state = BUF_BLOCK_ZIP_FREE); - goto buddy_free; - } } +func_exit: /* Free the block to the buddy list. */ bpage = buf; -#ifdef UNIV_DEBUG - if (i < buf_buddy_get_slot(PAGE_ZIP_MIN_SIZE)) { - /* This area has most likely been allocated for at - least one compressed-only block descriptor. Check - that there are no live objects in the area. This is - not a complete check: it may yield false positives as - well as false negatives. Also, due to buddy blocks - being recombined, it is possible (although unlikely) - that this branch is never reached. */ - char* c; - -# ifndef UNIV_DEBUG_VALGRIND - /* Valgrind would complain about accessing - uninitialized memory. Besides, Valgrind performs a - more exhaustive check, at every memory access. */ - const buf_page_t* b = buf; - const buf_page_t* const b_end = (buf_page_t*) - ((char*) b + (BUF_BUDDY_LOW << i)); - - for (; b < b_end; b++) { - /* Avoid false positives (and cause false - negatives) by checking for b->space < 1000. */ - - if ((b->state == BUF_BLOCK_ZIP_PAGE - || b->state == BUF_BLOCK_ZIP_DIRTY) - && b->space > 0 && b->space < 1000) { - fprintf(stderr, - "buddy dirty %p %u (%u,%u) %p,%lu\n", - (void*) b, - b->state, b->space, b->offset, - buf, i); - } - } -# endif /* !UNIV_DEBUG_VALGRIND */ - - /* Scramble the block. This should make any pointers - invalid and trigger a segmentation violation. Because - the scrambling can be reversed, it may be possible to - track down the object pointing to the freed data by - dereferencing the unscrambled bpage->LRU or - bpage->list pointers. */ - for (c = (char*) buf + (BUF_BUDDY_LOW << i); - c-- > (char*) buf; ) { - *c = ~*c ^ i; - } - } else { - /* Fill large blocks with a constant pattern. */ - memset(bpage, i, BUF_BUDDY_LOW << i); - } -#endif /* UNIV_DEBUG */ + /* Fill large blocks with a constant pattern. */ + ut_d(memset(bpage, i, BUF_BUDDY_LOW << i)); + UNIV_MEM_INVALID(bpage, BUF_BUDDY_LOW << i); bpage->state = BUF_BLOCK_ZIP_FREE; buf_buddy_add_to_free(buf_pool, bpage, i); } diff --git a/buf/buf0buf.c b/buf/buf0buf.c index d588d2b90f9..b75a7c82f42 100644 --- a/buf/buf0buf.c +++ b/buf/buf0buf.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -442,6 +442,7 @@ buf_get_total_stat( tot_stat->n_pages_read += buf_stat->n_pages_read; tot_stat->n_pages_written += buf_stat->n_pages_written; tot_stat->n_pages_created += buf_stat->n_pages_created; + tot_stat->n_ra_pages_read_rnd += buf_stat->n_ra_pages_read_rnd; tot_stat->n_ra_pages_read += buf_stat->n_ra_pages_read; tot_stat->n_ra_pages_evicted += buf_stat->n_ra_pages_evicted; tot_stat->n_pages_made_young += buf_stat->n_pages_made_young; @@ -1196,72 +1197,6 @@ buf_chunk_not_freed( return(NULL); } -/*********************************************************************//** -Checks that all blocks in the buffer chunk are in BUF_BLOCK_NOT_USED state. -@return TRUE if all freed */ -static -ibool -buf_chunk_all_free( -/*===============*/ - const buf_chunk_t* chunk) /*!< in: chunk being checked */ -{ - const buf_block_t* block; - ulint i; - - block = chunk->blocks; - - for (i = chunk->size; i--; block++) { - - if (buf_block_get_state(block) != BUF_BLOCK_NOT_USED) { - - return(FALSE); - } - } - - return(TRUE); -} - -/********************************************************************//** -Frees a chunk of buffer frames. */ -static -void -buf_chunk_free( -/*===========*/ - buf_pool_t* buf_pool, /*!< in: buffer pool instance */ - buf_chunk_t* chunk) /*!< out: chunk of buffers */ -{ - buf_block_t* block; - const buf_block_t* block_end; - - //ut_ad(buf_pool_mutex_own(buf_pool)); /* but we need all mutex here */ - - block_end = chunk->blocks + chunk->size; - - for (block = chunk->blocks; block < block_end; block++) { - ut_a(buf_block_get_state(block) == BUF_BLOCK_NOT_USED); - ut_a(!block->page.zip.data); - - ut_ad(!block->page.in_LRU_list); - ut_ad(!block->in_unzip_LRU_list); - ut_ad(!block->page.in_flush_list); - /* Remove the block from the free list. */ - mutex_enter(&buf_pool->free_list_mutex); - ut_ad(block->page.in_free_list); - UT_LIST_REMOVE(free, buf_pool->free, (&block->page)); - mutex_exit(&buf_pool->free_list_mutex); - - /* Free the latches. */ - mutex_free(&block->mutex); - rw_lock_free(&block->lock); -#ifdef UNIV_SYNC_DEBUG - rw_lock_free(&block->debug_latch); -#endif /* UNIV_SYNC_DEBUG */ - UNIV_MEM_UNDESC(block); - } - - os_mem_free_large(chunk->mem, chunk->mem_size); -} - /********************************************************************//** Set buffer pool size variables after resizing it */ static @@ -1387,8 +1322,6 @@ buf_pool_free_instance( chunk = chunks + buf_pool->n_chunks; while (--chunk >= chunks) { - /* Bypass the checks of buf_chunk_free(), since they - would fail at shutdown. */ os_mem_free_large(chunk->mem, chunk->mem_size); } @@ -1656,290 +1589,6 @@ buf_relocate( } /********************************************************************//** -Shrinks a buffer pool instance. */ -static -void -buf_pool_shrink_instance( -/*=====================*/ - buf_pool_t* buf_pool, /*!< in: buffer pool instance */ - ulint chunk_size) /*!< in: number of pages to remove */ -{ - buf_chunk_t* chunks; - buf_chunk_t* chunk; - ulint max_size; - ulint max_free_size; - buf_chunk_t* max_chunk; - buf_chunk_t* max_free_chunk; - - ut_ad(!buf_pool_mutex_own(buf_pool)); - -try_again: - btr_search_disable(); /* Empty the adaptive hash index again */ - //buf_pool_mutex_enter(buf_pool); - mutex_enter(&buf_pool->LRU_list_mutex); - -shrink_again: - if (buf_pool->n_chunks <= 1) { - - /* Cannot shrink if there is only one chunk */ - goto func_done; - } - - /* Search for the largest free chunk - not larger than the size difference */ - chunks = buf_pool->chunks; - chunk = chunks + buf_pool->n_chunks; - max_size = max_free_size = 0; - max_chunk = max_free_chunk = NULL; - - while (--chunk >= chunks) { - if (chunk->size <= chunk_size - && chunk->size > max_free_size) { - if (chunk->size > max_size) { - max_size = chunk->size; - max_chunk = chunk; - } - - if (buf_chunk_all_free(chunk)) { - max_free_size = chunk->size; - max_free_chunk = chunk; - } - } - } - - if (!max_free_size) { - - ulint dirty = 0; - ulint nonfree = 0; - buf_block_t* block; - buf_block_t* bend; - - /* Cannot shrink: try again later - (do not assign srv_buf_pool_old_size) */ - if (!max_chunk) { - - goto func_exit; - } - - block = max_chunk->blocks; - bend = block + max_chunk->size; - - /* Move the blocks of chunk to the end of the - LRU list and try to flush them. */ - for (; block < bend; block++) { - switch (buf_block_get_state(block)) { - case BUF_BLOCK_NOT_USED: - continue; - case BUF_BLOCK_FILE_PAGE: - break; - default: - nonfree++; - continue; - } - - mutex_enter(&block->mutex); - /* The following calls will temporarily - release block->mutex and buf_pool->mutex. - Therefore, we have to always retry, - even if !dirty && !nonfree. */ - - if (!buf_flush_ready_for_replace(&block->page)) { - - buf_LRU_make_block_old(&block->page); - dirty++; - } else if (buf_LRU_free_block(&block->page, TRUE, TRUE) - != BUF_LRU_FREED) { - nonfree++; - } - - mutex_exit(&block->mutex); - } - - //buf_pool_mutex_exit(buf_pool); - mutex_exit(&buf_pool->LRU_list_mutex); - - /* Request for a flush of the chunk if it helps. - Do not flush if there are non-free blocks, since - flushing will not make the chunk freeable. */ - if (nonfree) { - /* Avoid busy-waiting. */ - os_thread_sleep(100000); - } else if (dirty - && buf_flush_LRU(buf_pool, dirty) - == ULINT_UNDEFINED) { - - buf_flush_wait_batch_end(buf_pool, BUF_FLUSH_LRU); - } - - goto try_again; - } - - max_size = max_free_size; - max_chunk = max_free_chunk; - - buf_pool->old_pool_size = buf_pool->curr_pool_size; - - /* Rewrite buf_pool->chunks. Copy everything but max_chunk. */ - chunks = mem_alloc((buf_pool->n_chunks - 1) * sizeof *chunks); - memcpy(chunks, buf_pool->chunks, - (max_chunk - buf_pool->chunks) * sizeof *chunks); - memcpy(chunks + (max_chunk - buf_pool->chunks), - max_chunk + 1, - buf_pool->chunks + buf_pool->n_chunks - - (max_chunk + 1)); - ut_a(buf_pool->curr_size > max_chunk->size); - buf_pool->curr_size -= max_chunk->size; - buf_pool->curr_pool_size = buf_pool->curr_size * UNIV_PAGE_SIZE; - chunk_size -= max_chunk->size; - buf_chunk_free(buf_pool, max_chunk); - mem_free(buf_pool->chunks); - buf_pool->chunks = chunks; - buf_pool->n_chunks--; - - /* Allow a slack of one megabyte. */ - if (chunk_size > 1048576 / UNIV_PAGE_SIZE) { - - goto shrink_again; - } - goto func_exit; - -func_done: - buf_pool->old_pool_size = buf_pool->curr_pool_size; -func_exit: - //buf_pool_mutex_exit(buf_pool); - mutex_exit(&buf_pool->LRU_list_mutex); - btr_search_enable(); -} - -/********************************************************************//** -Shrinks the buffer pool. */ -static -void -buf_pool_shrink( -/*============*/ - ulint chunk_size) /*!< in: number of pages to remove */ -{ - ulint i; - - for (i = 0; i < srv_buf_pool_instances; i++) { - buf_pool_t* buf_pool; - ulint instance_chunk_size; - - instance_chunk_size = chunk_size / srv_buf_pool_instances; - buf_pool = buf_pool_from_array(i); - buf_pool_shrink_instance(buf_pool, instance_chunk_size); - } - - buf_pool_set_sizes(); -} - -/********************************************************************//** -Rebuild buf_pool->page_hash for a buffer pool instance. */ -static -void -buf_pool_page_hash_rebuild_instance( -/*================================*/ - buf_pool_t* buf_pool) /*!< in: buffer pool instance */ -{ - ulint i; - buf_page_t* b; - buf_chunk_t* chunk; - ulint n_chunks; - hash_table_t* zip_hash; - hash_table_t* page_hash; - - //buf_pool_mutex_enter(buf_pool); - mutex_enter(&buf_pool->LRU_list_mutex); - rw_lock_x_lock(&buf_pool->page_hash_latch); - - /* Free, create, and populate the hash table. */ - hash_table_free(buf_pool->page_hash); - buf_pool->page_hash = page_hash = hash_create(2 * buf_pool->curr_size); - zip_hash = hash_create(2 * buf_pool->curr_size); - - HASH_MIGRATE(buf_pool->zip_hash, zip_hash, buf_page_t, hash, - BUF_POOL_ZIP_FOLD_BPAGE); - - hash_table_free(buf_pool->zip_hash); - buf_pool->zip_hash = zip_hash; - - /* Insert the uncompressed file pages to buf_pool->page_hash. */ - - chunk = buf_pool->chunks; - n_chunks = buf_pool->n_chunks; - - for (i = 0; i < n_chunks; i++, chunk++) { - ulint j; - buf_block_t* block = chunk->blocks; - - for (j = 0; j < chunk->size; j++, block++) { - if (buf_block_get_state(block) - == BUF_BLOCK_FILE_PAGE) { - ut_ad(!block->page.in_zip_hash); - ut_ad(block->page.in_page_hash); - - HASH_INSERT(buf_page_t, hash, page_hash, - buf_page_address_fold( - block->page.space, - block->page.offset), - &block->page); - } - } - } - - /* Insert the compressed-only pages to buf_pool->page_hash. - All such blocks are either in buf_pool->zip_clean or - in buf_pool->flush_list. */ - - mutex_enter(&buf_pool->zip_mutex); - for (b = UT_LIST_GET_FIRST(buf_pool->zip_clean); b; - b = UT_LIST_GET_NEXT(zip_list, b)) { - ut_a(buf_page_get_state(b) == BUF_BLOCK_ZIP_PAGE); - ut_ad(!b->in_flush_list); - ut_ad(b->in_LRU_list); - ut_ad(b->in_page_hash); - ut_ad(!b->in_zip_hash); - - HASH_INSERT(buf_page_t, hash, page_hash, - buf_page_address_fold(b->space, b->offset), b); - } - mutex_exit(&buf_pool->zip_mutex); - - buf_flush_list_mutex_enter(buf_pool); - for (b = UT_LIST_GET_FIRST(buf_pool->flush_list); b; - b = UT_LIST_GET_NEXT(flush_list, b)) { - ut_ad(b->in_flush_list); - ut_ad(b->in_LRU_list); - ut_ad(b->in_page_hash); - ut_ad(!b->in_zip_hash); - - switch (buf_page_get_state(b)) { - case BUF_BLOCK_ZIP_DIRTY: - HASH_INSERT(buf_page_t, hash, page_hash, - buf_page_address_fold(b->space, - b->offset), b); - break; - case BUF_BLOCK_FILE_PAGE: - /* uncompressed page */ - break; - case BUF_BLOCK_ZIP_FREE: - case BUF_BLOCK_ZIP_PAGE: - case BUF_BLOCK_NOT_USED: - case BUF_BLOCK_READY_FOR_USE: - case BUF_BLOCK_MEMORY: - case BUF_BLOCK_REMOVE_HASH: - ut_error; - break; - } - } - - buf_flush_list_mutex_exit(buf_pool); - //buf_pool_mutex_exit(buf_pool); - mutex_exit(&buf_pool->LRU_list_mutex); - rw_lock_x_unlock(&buf_pool->page_hash_latch); -} - -/******************************************************************** Determine if a block is a sentinel for a buffer pool watch. @return TRUE if a sentinel for a buffer pool watch, FALSE if not */ UNIV_INTERN @@ -2060,127 +1709,6 @@ buf_pool_watch_set( return(NULL); } -/********************************************************************//** -Rebuild buf_pool->page_hash. */ -static -void -buf_pool_page_hash_rebuild(void) -/*============================*/ -{ - ulint i; - - for (i = 0; i < srv_buf_pool_instances; i++) { - buf_pool_page_hash_rebuild_instance(buf_pool_from_array(i)); - } -} - -/********************************************************************//** -Increase the buffer pool size of one buffer pool instance. */ -static -void -buf_pool_increase_instance( -/*=======================*/ - buf_pool_t* buf_pool, /*!< in: buffer pool instane */ - ulint change_size) /*!< in: new size of the pool */ -{ - buf_chunk_t* chunks; - buf_chunk_t* chunk; - - mutex_enter(&buf_pool->LRU_list_mutex); - rw_lock_x_lock(&buf_pool->page_hash_latch); - buf_pool_mutex_enter(buf_pool); - chunks = mem_alloc((buf_pool->n_chunks + 1) * sizeof *chunks); - - memcpy(chunks, buf_pool->chunks, buf_pool->n_chunks * sizeof *chunks); - - chunk = &chunks[buf_pool->n_chunks]; - - if (!buf_chunk_init(buf_pool, chunk, change_size)) { - mem_free(chunks); - } else { - buf_pool->old_pool_size = buf_pool->curr_pool_size; - buf_pool->curr_size += chunk->size; - buf_pool->curr_pool_size = buf_pool->curr_size * UNIV_PAGE_SIZE; - mem_free(buf_pool->chunks); - buf_pool->chunks = chunks; - buf_pool->n_chunks++; - } - - mutex_exit(&buf_pool->LRU_list_mutex); - rw_lock_x_unlock(&buf_pool->page_hash_latch); - buf_pool_mutex_exit(buf_pool); -} - -/********************************************************************//** -Increase the buffer pool size. */ -static -void -buf_pool_increase( -/*==============*/ - ulint change_size) -{ - ulint i; - - for (i = 0; i < srv_buf_pool_instances; i++) { - buf_pool_increase_instance( - buf_pool_from_array(i), - change_size / srv_buf_pool_instances); - } - - buf_pool_set_sizes(); -} - -/********************************************************************//** -Resizes the buffer pool. */ -UNIV_INTERN -void -buf_pool_resize(void) -/*=================*/ -{ - ulint change_size; - ulint min_change_size = 1048576 * srv_buf_pool_instances; - - buf_pool_mutex_enter_all(); - - if (srv_buf_pool_old_size == srv_buf_pool_size) { - - buf_pool_mutex_exit_all(); - - return; - - } else if (srv_buf_pool_curr_size + min_change_size - > srv_buf_pool_size) { - - change_size = (srv_buf_pool_curr_size - srv_buf_pool_size) - / UNIV_PAGE_SIZE; - - buf_pool_mutex_exit_all(); - - /* Disable adaptive hash indexes and empty the index - in order to free up memory in the buffer pool chunks. */ - buf_pool_shrink(change_size); - - } else if (srv_buf_pool_curr_size + min_change_size - < srv_buf_pool_size) { - - /* Enlarge the buffer pool by at least one megabyte */ - - change_size = srv_buf_pool_size - srv_buf_pool_curr_size; - - buf_pool_mutex_exit_all(); - - buf_pool_increase(change_size); - } else { - srv_buf_pool_size = srv_buf_pool_old_size; - - buf_pool_mutex_exit_all(); - - return; - } - - buf_pool_page_hash_rebuild(); -} - /****************************************************************//** Remove the sentinel block for the watch before replacing it with a real block. buf_page_watch_clear() or buf_page_watch_occurred() will notice that @@ -2524,6 +2052,27 @@ lookup: #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ } + if (UNIV_UNLIKELY(bpage->space_was_being_deleted)) { + /* This page is obsoleted, should discard and retry */ + rw_lock_s_unlock(&buf_pool->page_hash_latch); + + mutex_enter(&buf_pool->LRU_list_mutex); + block_mutex = buf_page_get_mutex_enter(bpage); + + if (UNIV_UNLIKELY(!block_mutex)) { + mutex_exit(&buf_pool->LRU_list_mutex); + goto lookup; + } + + buf_LRU_free_block(bpage, TRUE, TRUE); + + mutex_exit(&buf_pool->LRU_list_mutex); + mutex_exit(block_mutex); + block_mutex = NULL; + + goto lookup; + } + if (UNIV_UNLIKELY(!bpage->zip.data)) { /* There is no compressed page. */ err_exit: @@ -2580,7 +2129,7 @@ err_exit: } /* Discard the uncompressed page frame if possible. */ - if (buf_LRU_free_block(bpage, FALSE, TRUE) == BUF_LRU_FREED) { + if (buf_LRU_free_block(bpage, FALSE, TRUE)) { mutex_exit(&buf_pool->LRU_list_mutex); mutex_exit(block_mutex); goto lookup; @@ -3010,12 +2559,8 @@ loop: block_mutex = buf_page_get_mutex_enter((buf_page_t*)block); /* If the guess is a compressed page descriptor that - has been allocated by buf_buddy_alloc(), it may have - been invalidated by buf_buddy_relocate(). In that - case, block could point to something that happens to - contain the expected bits in block->page. Similarly, - the guess may be pointing to a buffer pool chunk that - has been released when resizing the buffer pool. */ + has been allocated by buf_page_alloc_descriptor(), + it may have been freed by buf_relocate(). */ if (!block_mutex) { block = guess = NULL; @@ -3038,6 +2583,27 @@ loop: block = (buf_block_t*) buf_page_hash_get_low( buf_pool, space, offset, fold); if (block) { + if (UNIV_UNLIKELY(block->page.space_was_being_deleted)) { + /* This page is obsoleted, should discard and retry */ + rw_lock_s_unlock(&buf_pool->page_hash_latch); + + mutex_enter(&buf_pool->LRU_list_mutex); + block_mutex = buf_page_get_mutex_enter((buf_page_t*)block); + + if (UNIV_UNLIKELY(!block_mutex)) { + mutex_exit(&buf_pool->LRU_list_mutex); + goto loop; + } + + buf_LRU_free_block((buf_page_t*)block, TRUE, TRUE); + + mutex_exit(&buf_pool->LRU_list_mutex); + mutex_exit(block_mutex); + block_mutex = NULL; + + goto loop; + } + block_mutex = buf_page_get_mutex_enter((buf_page_t*)block); ut_a(block_mutex); } @@ -3075,6 +2641,9 @@ loop2: } if (buf_read_page(space, zip_size, offset, trx)) { + buf_read_ahead_random(space, zip_size, offset, + ibuf_inside(mtr), trx); + retries = 0; } else if (retries < BUF_PAGE_READ_MAX_RETRIES) { ++retries; @@ -3237,8 +2806,10 @@ wait_until_unfixed: if (buf_page_get_state(&block->page) == BUF_BLOCK_ZIP_PAGE) { +#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG UT_LIST_REMOVE(zip_list, buf_pool->zip_clean, &block->page); +#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ ut_ad(!block->page.in_flush_list); } else { /* Relocate buf_pool->flush_list. */ @@ -3269,11 +2840,10 @@ wait_until_unfixed: buf_pool->n_pend_unzip++; buf_pool_mutex_exit(buf_pool); - bpage->state = BUF_BLOCK_ZIP_FREE; - buf_buddy_free(buf_pool, bpage, sizeof *bpage, FALSE); - //buf_pool_mutex_exit(buf_pool); + buf_page_free_descriptor(bpage); + /* Decompress the page and apply buffered operations while not holding buf_pool->mutex or block->mutex. */ success = buf_zip_decompress(block, srv_use_checksums); @@ -3322,7 +2892,7 @@ wait_until_unfixed: /* Try to evict the block from the buffer pool, to use the insert buffer (change buffer) as much as possible. */ - if (buf_LRU_free_block(&block->page, TRUE, FALSE) == BUF_LRU_FREED) { + if (buf_LRU_free_block(&block->page, TRUE, FALSE)) { mutex_exit(block_mutex); if (mode == BUF_GET_IF_IN_POOL_OR_WATCH) { /* Set the watch, as it would have @@ -3809,19 +3379,20 @@ buf_page_init_low( /********************************************************************//** Inits a page to the buffer buf_pool. */ -static +static __attribute__((nonnull)) void buf_page_init( /*==========*/ + buf_pool_t* buf_pool,/*!< in/out: buffer pool */ ulint space, /*!< in: space id */ ulint offset, /*!< in: offset of the page within space in units of a page */ ulint fold, /*!< in: buf_page_address_fold(space,offset) */ - buf_block_t* block) /*!< in: block to init */ + buf_block_t* block) /*!< in/out: block to init */ { buf_page_t* hash_page; - buf_pool_t* buf_pool = buf_pool_get(space, offset); + ut_ad(buf_pool == buf_pool_get(space, offset)); //ut_ad(buf_pool_mutex_own(buf_pool)); #ifdef UNIV_SYNC_DEBUG ut_ad(rw_lock_own(&buf_pool->page_hash_latch, RW_LOCK_EX)); @@ -3955,11 +3526,28 @@ buf_page_init_for_read( fold = buf_page_address_fold(space, offset); +retry: //buf_pool_mutex_enter(buf_pool); mutex_enter(&buf_pool->LRU_list_mutex); rw_lock_x_lock(&buf_pool->page_hash_latch); watch_page = buf_page_hash_get_low(buf_pool, space, offset, fold); + + if (UNIV_UNLIKELY(watch_page && watch_page->space_was_being_deleted)) { + mutex_t* block_mutex = buf_page_get_mutex_enter(watch_page); + + /* This page is obsoleted, should discard and retry */ + rw_lock_x_unlock(&buf_pool->page_hash_latch); + ut_a(block_mutex); + + buf_LRU_free_block(watch_page, TRUE, TRUE); + + mutex_exit(&buf_pool->LRU_list_mutex); + mutex_exit(block_mutex); + + goto retry; + } + if (watch_page && !buf_pool_watch_is_sentinel(buf_pool, watch_page)) { /* The page is already in the buffer pool. */ watch_page = NULL; @@ -3995,7 +3583,7 @@ err_exit: ut_ad(buf_pool_from_bpage(bpage) == buf_pool); - buf_page_init(space, offset, fold, block); + buf_page_init(buf_pool, space, offset, fold, block); rw_lock_x_unlock(&buf_pool->page_hash_latch); @@ -4042,20 +3630,11 @@ err_exit: mutex_exit(&buf_pool->LRU_list_mutex); mutex_exit(&block->mutex); } else { - /* Defer buf_buddy_alloc() until after the block has - been found not to exist. The buf_buddy_alloc() and - buf_buddy_free() calls may be expensive because of - buf_buddy_relocate(). */ - /* The compressed page must be allocated before the control block (bpage), in order to avoid the invocation of buf_buddy_relocate_block() on uninitialized data. */ data = buf_buddy_alloc(buf_pool, zip_size, &lru, TRUE); - bpage = buf_buddy_alloc(buf_pool, sizeof *bpage, &lru, TRUE); - - /* Initialize the buf_pool pointer. */ - bpage->buf_pool_index = buf_pool_index(buf_pool); /* If buf_buddy_alloc() allocated storage from the LRU list, it released and reacquired buf_pool->mutex. Thus, we must @@ -4071,8 +3650,6 @@ err_exit: /* The block was added by some other thread. */ watch_page = NULL; - bpage->state = BUF_BLOCK_ZIP_FREE; - buf_buddy_free(buf_pool, bpage, sizeof *bpage, TRUE); buf_buddy_free(buf_pool, data, zip_size, TRUE); mutex_exit(&buf_pool->LRU_list_mutex); @@ -4083,6 +3660,11 @@ err_exit: } } + bpage = buf_page_alloc_descriptor(); + + /* Initialize the buf_pool pointer. */ + bpage->buf_pool_index = buf_pool_index(buf_pool); + page_zip_des_init(&bpage->zip); page_zip_set_size(&bpage->zip, zip_size); bpage->zip.data = data; @@ -4098,7 +3680,6 @@ err_exit: bpage->offset = offset; bpage->space_was_being_deleted = FALSE; - #ifdef UNIV_DEBUG bpage->in_page_hash = FALSE; bpage->in_zip_hash = FALSE; @@ -4125,7 +3706,9 @@ err_exit: /* The block must be put to the LRU list, to the old blocks */ buf_LRU_add_block(bpage, TRUE/* to old blocks */); +#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG buf_LRU_insert_zip_clean(bpage); +#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ mutex_exit(&buf_pool->LRU_list_mutex); @@ -4180,6 +3763,7 @@ buf_page_create( fold = buf_page_address_fold(space, offset); +retry: //buf_pool_mutex_enter(buf_pool); mutex_enter(&buf_pool->LRU_list_mutex); rw_lock_x_lock(&buf_pool->page_hash_latch); @@ -4187,6 +3771,21 @@ buf_page_create( block = (buf_block_t*) buf_page_hash_get_low( buf_pool, space, offset, fold); + if (UNIV_UNLIKELY(block && block->page.space_was_being_deleted)) { + mutex_t* block_mutex = buf_page_get_mutex_enter((buf_page_t*)block); + + /* This page is obsoleted, should discard and retry */ + rw_lock_x_unlock(&buf_pool->page_hash_latch); + ut_a(block_mutex); + + buf_LRU_free_block((buf_page_t*)block, TRUE, TRUE); + + mutex_exit(&buf_pool->LRU_list_mutex); + mutex_exit(block_mutex); + + goto retry; + } + if (block && buf_page_in_file(&block->page) && !buf_pool_watch_is_sentinel(buf_pool, &block->page)) { @@ -4221,7 +3820,7 @@ buf_page_create( mutex_enter(&block->mutex); - buf_page_init(space, offset, fold, block); + buf_page_init(buf_pool, space, offset, fold, block); rw_lock_x_unlock(&buf_pool->page_hash_latch); /* The block must be put to the LRU list */ @@ -4306,6 +3905,59 @@ buf_page_create( return(block); } +/********************************************************************//** +Mark a table with the specified space pointed by bpage->space corrupted. +Also remove the bpage from LRU list. +@return TRUE if successful */ +static +ibool +buf_mark_space_corrupt( +/*===================*/ + buf_page_t* bpage) /*!< in: pointer to the block in question */ +{ + buf_pool_t* buf_pool = buf_pool_from_bpage(bpage); + const ibool uncompressed = (buf_page_get_state(bpage) + == BUF_BLOCK_FILE_PAGE); + ulint space = bpage->space; + ibool ret = TRUE; + + /* First unfix and release lock on the bpage */ + //buf_pool_mutex_enter(buf_pool); + mutex_enter(&buf_pool->LRU_list_mutex); + rw_lock_x_lock(&buf_pool->page_hash_latch); + mutex_enter(buf_page_get_mutex(bpage)); + ut_ad(buf_page_get_io_fix(bpage) == BUF_IO_READ); + ut_ad(bpage->buf_fix_count == 0); + + /* Set BUF_IO_NONE before we remove the block from LRU list */ + buf_page_set_io_fix(bpage, BUF_IO_NONE); + + if (uncompressed) { + rw_lock_x_unlock_gen( + &((buf_block_t*) bpage)->lock, + BUF_IO_READ); + } + + /* Find the table with specified space id, and mark it corrupted */ + if (dict_set_corrupted_by_space(space)) { + buf_LRU_free_one_page(bpage); + } else { + ret = FALSE; + } + + buf_pool_mutex_enter(buf_pool); + ut_ad(buf_pool->n_pend_reads > 0); + buf_pool->n_pend_reads--; + buf_pool_mutex_exit(buf_pool); + + mutex_exit(buf_page_get_mutex(bpage)); + //buf_pool_mutex_exit(buf_pool); + mutex_exit(&buf_pool->LRU_list_mutex); + rw_lock_x_unlock(&buf_pool->page_hash_latch); + + return(ret); +} + /********************************************************************//** Completes an asynchronous read or write request of a file page to or from the buffer pool. */ @@ -4452,10 +4104,19 @@ corrupt: bpage->is_corrupt = TRUE; } else if (srv_force_recovery < SRV_FORCE_IGNORE_CORRUPT) { - fputs("InnoDB: Ending processing because of" - " a corrupt database page.\n", - stderr); - exit(1); + /* If page space id is larger than TRX_SYS_SPACE + (0), we will attempt to mark the corresponding + table as corrupted instead of crashing server */ + if (bpage->space > TRX_SYS_SPACE + && buf_mark_space_corrupt(bpage)) { + return; + } else { + fputs("InnoDB: Ending processing" + " because of" + " a corrupt database page.\n", + stderr); + ut_error; + } } } } /**/ @@ -4478,8 +4139,11 @@ corrupt: } if (io_type == BUF_IO_WRITE - && (buf_page_get_state(bpage) == BUF_BLOCK_ZIP_DIRTY - || buf_page_get_flush_type(bpage) == BUF_FLUSH_LRU)) { + && ( +#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG + buf_page_get_state(bpage) == BUF_BLOCK_ZIP_DIRTY || +#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ + buf_page_get_flush_type(bpage) == BUF_FLUSH_LRU)) { /* to keep consistency at buf_LRU_insert_zip_clean() */ have_LRU_mutex = TRUE; /* optimistic */ } @@ -5314,6 +4978,7 @@ buf_stats_aggregate_pool_info( total_info->n_pages_created += pool_info->n_pages_created; total_info->n_pages_written += pool_info->n_pages_written; total_info->n_page_gets += pool_info->n_page_gets; + total_info->n_ra_pages_read_rnd += pool_info->n_ra_pages_read_rnd; total_info->n_ra_pages_read += pool_info->n_ra_pages_read; total_info->n_ra_pages_evicted += pool_info->n_ra_pages_evicted; total_info->page_made_young_rate += pool_info->page_made_young_rate; @@ -5326,6 +4991,7 @@ buf_stats_aggregate_pool_info( total_info->page_read_delta += pool_info->page_read_delta; total_info->young_making_delta += pool_info->young_making_delta; total_info->not_young_making_delta += pool_info->not_young_making_delta; + total_info->pages_readahead_rnd_rate += pool_info->pages_readahead_rnd_rate; total_info->pages_readahead_rate += pool_info->pages_readahead_rate; total_info->pages_evicted_rate += pool_info->pages_evicted_rate; total_info->unzip_lru_len += pool_info->unzip_lru_len; @@ -5407,6 +5073,7 @@ buf_stats_get_pool_info( pool_info->n_page_gets = buf_pool->stat.n_page_gets; + pool_info->n_ra_pages_read_rnd = buf_pool->stat.n_ra_pages_read_rnd; pool_info->n_ra_pages_read = buf_pool->stat.n_ra_pages_read; pool_info->n_ra_pages_evicted = buf_pool->stat.n_ra_pages_evicted; @@ -5446,6 +5113,10 @@ buf_stats_get_pool_info( buf_pool->stat.n_pages_not_made_young - buf_pool->old_stat.n_pages_not_made_young; } + pool_info->pages_readahead_rnd_rate = + (buf_pool->stat.n_ra_pages_read_rnd + - buf_pool->old_stat.n_ra_pages_read_rnd) / time_elapsed; + pool_info->pages_readahead_rate = (buf_pool->stat.n_ra_pages_read @@ -5535,9 +5206,12 @@ buf_print_io_instance( /* Statistics about read ahead algorithm */ fprintf(file, "Pages read ahead %.2f/s," - " evicted without access %.2f/s\n", + " evicted without access %.2f/s," + " Random read ahead %.2f/s\n", + pool_info->pages_readahead_rate, - pool_info->pages_evicted_rate); + pool_info->pages_evicted_rate, + pool_info->pages_readahead_rnd_rate); /* Print some values to help us with visualizing what is happening with LRU eviction. */ diff --git a/buf/buf0flu.c b/buf/buf0flu.c index 09d11dd21db..73a9ff96289 100644 --- a/buf/buf0flu.c +++ b/buf/buf0flu.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -534,7 +534,9 @@ buf_flush_remove( case BUF_BLOCK_ZIP_DIRTY: buf_page_set_state(bpage, BUF_BLOCK_ZIP_PAGE); UT_LIST_REMOVE(flush_list, buf_pool->flush_list, bpage); +#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG buf_LRU_insert_zip_clean(bpage); +#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ break; case BUF_BLOCK_FILE_PAGE: UT_LIST_REMOVE(flush_list, buf_pool->flush_list, bpage); diff --git a/buf/buf0lru.c b/buf/buf0lru.c index c92e72a1729..06ce43a4d2d 100644 --- a/buf/buf0lru.c +++ b/buf/buf0lru.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -390,39 +390,41 @@ scan_again: while (bpage != NULL) { buf_page_t* prev_bpage; - ibool prev_bpage_buf_fix = FALSE; + mutex_t* block_mutex = NULL; ut_a(buf_page_in_file(bpage)); prev_bpage = UT_LIST_GET_PREV(LRU, bpage); /* bpage->space and bpage->io_fix are protected by - buf_pool->mutex and block_mutex. It is safe to check - them while holding buf_pool->mutex only. */ + buf_pool_mutex and block_mutex. It is safe to check + them while holding buf_pool_mutex only. */ if (buf_page_get_space(bpage) != id) { /* Skip this block, as it does not belong to the space that is being invalidated. */ + goto next_page; } else if (buf_page_get_io_fix(bpage) != BUF_IO_NONE) { /* We cannot remove this page during this scan yet; maybe the system is currently reading it in, or flushing the modifications to the file */ all_freed = FALSE; + goto next_page; } else { - mutex_t* block_mutex = buf_page_get_mutex_enter(bpage); + block_mutex = buf_page_get_mutex_enter(bpage); if (!block_mutex) { /* It may be impossible case... Something wrong, so will be scan_again */ all_freed = FALSE; - - goto next_page_no_mutex; + goto next_page; } if (bpage->buf_fix_count > 0) { + mutex_exit(block_mutex); /* We cannot remove this page during this scan yet; maybe the system is currently reading it in, or flushing @@ -432,108 +434,61 @@ scan_again: goto next_page; } - -#ifdef UNIV_DEBUG - if (buf_debug_prints) { - fprintf(stderr, - "Dropping space %lu page %lu\n", - (ulong) buf_page_get_space(bpage), - (ulong) buf_page_get_page_no(bpage)); - } -#endif - if (buf_page_get_state(bpage) != BUF_BLOCK_FILE_PAGE) { - /* This is a compressed-only block - descriptor. Ensure that prev_bpage - cannot be relocated when bpage is freed. */ - if (UNIV_LIKELY(prev_bpage != NULL)) { - switch (buf_page_get_state( - prev_bpage)) { - case BUF_BLOCK_FILE_PAGE: - /* Descriptors of uncompressed - blocks will not be relocated, - because we are holding the - buf_pool->mutex. */ - break; - case BUF_BLOCK_ZIP_PAGE: - case BUF_BLOCK_ZIP_DIRTY: - /* Descriptors of compressed- - only blocks can be relocated, - unless they are buffer-fixed. - Because both bpage and - prev_bpage are protected by - buf_pool_zip_mutex, it is - not necessary to acquire - further mutexes. */ - ut_ad(&buf_pool->zip_mutex - == block_mutex); - ut_ad(mutex_own(block_mutex)); - prev_bpage_buf_fix = TRUE; - prev_bpage->buf_fix_count++; - break; - default: - ut_error; - } - } - } else if (((buf_block_t*) bpage)->is_hashed) { - ulint page_no; - ulint zip_size; - - //buf_pool_mutex_exit(buf_pool); - mutex_exit(&buf_pool->LRU_list_mutex); - rw_lock_x_unlock(&buf_pool->page_hash_latch); - - zip_size = buf_page_get_zip_size(bpage); - page_no = buf_page_get_page_no(bpage); - - mutex_exit(block_mutex); - - /* Note that the following call will acquire - an S-latch on the page */ - - btr_search_drop_page_hash_when_freed( - id, zip_size, page_no); - goto scan_again; - } - - if (bpage->oldest_modification != 0) { - - buf_flush_remove(bpage); - } - - /* Remove from the LRU list. */ - - if (buf_LRU_block_remove_hashed_page(bpage, TRUE) - != BUF_BLOCK_ZIP_FREE) { - buf_LRU_block_free_hashed_page((buf_block_t*) - bpage, TRUE); - } else { - /* The block_mutex should have been - released by buf_LRU_block_remove_hashed_page() - when it returns BUF_BLOCK_ZIP_FREE. */ - ut_ad(block_mutex == &buf_pool->zip_mutex); - ut_ad(!mutex_own(block_mutex)); - - if (prev_bpage_buf_fix) { - /* We temporarily buffer-fixed - prev_bpage, so that - buf_buddy_free() could not - relocate it, in case it was a - compressed-only block - descriptor. */ - - mutex_enter(block_mutex); - ut_ad(prev_bpage->buf_fix_count > 0); - prev_bpage->buf_fix_count--; - mutex_exit(block_mutex); - } - - goto next_page_no_mutex; - } -next_page: - mutex_exit(block_mutex); } -next_page_no_mutex: + ut_ad(mutex_own(block_mutex)); + +#ifdef UNIV_DEBUG + if (buf_debug_prints) { + fprintf(stderr, + "Dropping space %lu page %lu\n", + (ulong) buf_page_get_space(bpage), + (ulong) buf_page_get_page_no(bpage)); + } +#endif + if (buf_page_get_state(bpage) != BUF_BLOCK_FILE_PAGE) { + /* This is a compressed-only block + descriptor. Do nothing. */ + } else if (((buf_block_t*) bpage)->is_hashed) { + ulint page_no; + ulint zip_size; + + //buf_pool_mutex_exit(buf_pool); + mutex_exit(&buf_pool->LRU_list_mutex); + rw_lock_x_unlock(&buf_pool->page_hash_latch); + + zip_size = buf_page_get_zip_size(bpage); + page_no = buf_page_get_page_no(bpage); + + mutex_exit(block_mutex); + + /* Note that the following call will acquire + an S-latch on the page */ + + btr_search_drop_page_hash_when_freed( + id, zip_size, page_no); + goto scan_again; + } + + if (bpage->oldest_modification != 0) { + + buf_flush_remove(bpage); + } + + /* Remove from the LRU list. */ + + if (buf_LRU_block_remove_hashed_page(bpage, TRUE) + != BUF_BLOCK_ZIP_FREE) { + buf_LRU_block_free_hashed_page((buf_block_t*) bpage, TRUE); + mutex_exit(block_mutex); + } else { + /* The block_mutex should have been released + by buf_LRU_block_remove_hashed_page() when it + returns BUF_BLOCK_ZIP_FREE. */ + ut_ad(block_mutex == &buf_pool->zip_mutex); + ut_ad(!mutex_own(block_mutex)); + } +next_page: bpage = prev_bpage; } @@ -587,6 +542,8 @@ buf_LRU_mark_space_was_deleted( for (i = 0; i < srv_buf_pool_instances; i++) { buf_pool_t* buf_pool; buf_page_t* bpage; + buf_chunk_t* chunk; + ulint j, k; buf_pool = buf_pool_from_array(i); @@ -602,9 +559,33 @@ buf_LRU_mark_space_was_deleted( } mutex_exit(&buf_pool->LRU_list_mutex); + + btr_search_s_lock_all(); + chunk = buf_pool->chunks; + for (j = buf_pool->n_chunks; j--; chunk++) { + buf_block_t* block = chunk->blocks; + for (k = chunk->size; k--; block++) { + if (buf_block_get_state(block) + != BUF_BLOCK_FILE_PAGE + || !block->is_hashed + || buf_page_get_space(&block->page) != id) { + continue; + } + + btr_search_s_unlock_all(); + + rw_lock_x_lock(&block->lock); + btr_search_drop_page_hash_index(block, NULL); + rw_lock_x_unlock(&block->lock); + + btr_search_s_lock_all(); + } + } + btr_search_s_unlock_all(); } } +#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG /********************************************************************//** Insert a compressed block into buf_pool->zip_clean in the LRU order. */ UNIV_INTERN @@ -639,6 +620,7 @@ buf_LRU_insert_zip_clean( UT_LIST_ADD_FIRST(zip_list, buf_pool->zip_clean, bpage); } } +#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ /******************************************************************//** Try to free an uncompressed page of a compressed block from the unzip @@ -684,7 +666,7 @@ restart: UNIV_LIKELY(block != NULL) && UNIV_LIKELY(distance > 0); block = UT_LIST_GET_PREV(unzip_LRU, block), distance--) { - enum buf_lru_free_block_status freed; + ibool freed; mutex_enter(&block->mutex); if (!block->in_unzip_LRU_list || !block->page.in_LRU_list @@ -700,24 +682,9 @@ restart: freed = buf_LRU_free_block(&block->page, FALSE, have_LRU_mutex); mutex_exit(&block->mutex); - switch (freed) { - case BUF_LRU_FREED: + if (freed) { return(TRUE); - - case BUF_LRU_CANNOT_RELOCATE: - /* If we failed to relocate, try - regular LRU eviction. */ - return(FALSE); - - case BUF_LRU_NOT_FREED: - /* The block was buffer-fixed or I/O-fixed. - Keep looking. */ - continue; } - - /* inappropriate return value from - buf_LRU_free_block() */ - ut_error; } return(FALSE); @@ -752,10 +719,9 @@ restart: UNIV_LIKELY(bpage != NULL) && UNIV_LIKELY(distance > 0); bpage = UT_LIST_GET_PREV(LRU, bpage), distance--) { - enum buf_lru_free_block_status freed; - unsigned accessed; - mutex_t* block_mutex - = buf_page_get_mutex_enter(bpage); + ibool freed; + unsigned accessed; + mutex_t* block_mutex = buf_page_get_mutex_enter(bpage); if (!block_mutex) { goto restart; @@ -774,8 +740,7 @@ restart: freed = buf_LRU_free_block(bpage, TRUE, have_LRU_mutex); mutex_exit(block_mutex); - switch (freed) { - case BUF_LRU_FREED: + if (freed) { /* Keep track of pages that are evicted without ever being accessed. This gives us a measure of the effectiveness of readahead */ @@ -783,21 +748,7 @@ restart: ++buf_pool->stat.n_ra_pages_evicted; } return(TRUE); - - case BUF_LRU_NOT_FREED: - /* The block was dirty, buffer-fixed, or I/O-fixed. - Keep looking. */ - continue; - - case BUF_LRU_CANNOT_RELOCATE: - /* This should never occur, because we - want to discard the compressed page too. */ - break; } - - /* inappropriate return value from - buf_LRU_free_block() */ - ut_error; } return(FALSE); @@ -1549,17 +1500,16 @@ buf_LRU_make_block_old( Try to free a block. If bpage is a descriptor of a compressed-only page, the descriptor object will be freed as well. -NOTE: If this function returns BUF_LRU_FREED, it will temporarily +NOTE: If this function returns TRUE, it will temporarily release buf_pool->mutex. Furthermore, the page frame will no longer be accessible via bpage. The caller must hold buf_pool->mutex and buf_page_get_mutex(bpage) and release these two mutexes after the call. No other buf_page_get_mutex() may be held when calling this function. -@return BUF_LRU_FREED if freed, BUF_LRU_CANNOT_RELOCATE or -BUF_LRU_NOT_FREED otherwise. */ +@return TRUE if freed, FALSE otherwise. */ UNIV_INTERN -enum buf_lru_free_block_status +ibool buf_LRU_free_block( /*===============*/ buf_page_t* bpage, /*!< in: block to be freed */ @@ -1586,7 +1536,7 @@ buf_LRU_free_block( if (!bpage->in_LRU_list || !block_mutex || !buf_page_can_relocate(bpage)) { /* Do not free buffer-fixed or I/O-fixed blocks. */ - return(BUF_LRU_NOT_FREED); + return(FALSE); } if (bpage->space_was_being_deleted && bpage->oldest_modification != 0) { @@ -1602,7 +1552,7 @@ buf_LRU_free_block( /* Do not completely free dirty blocks. */ if (bpage->oldest_modification) { - return(BUF_LRU_NOT_FREED); + return(FALSE); } } else if (bpage->oldest_modification) { /* Do not completely free dirty blocks. */ @@ -1610,7 +1560,7 @@ buf_LRU_free_block( if (buf_page_get_state(bpage) != BUF_BLOCK_FILE_PAGE) { ut_ad(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_DIRTY); - return(BUF_LRU_NOT_FREED); + return(FALSE); } goto alloc; @@ -1619,14 +1569,8 @@ buf_LRU_free_block( If it cannot be allocated (without freeing a block from the LRU list), refuse to free bpage. */ alloc: - //buf_pool_mutex_exit_forbid(buf_pool); - b = buf_buddy_alloc(buf_pool, sizeof *b, NULL, FALSE); - //buf_pool_mutex_exit_allow(buf_pool); - - if (UNIV_UNLIKELY(!b)) { - return(BUF_LRU_CANNOT_RELOCATE); - } - + b = buf_page_alloc_descriptor(); + ut_a(b); //memcpy(b, bpage, sizeof *b); } @@ -1656,7 +1600,7 @@ not_freed: if (!have_LRU_mutex) mutex_exit(&buf_pool->LRU_list_mutex); rw_lock_x_unlock(&buf_pool->page_hash_latch); - return(BUF_LRU_NOT_FREED); + return(FALSE); } else if (zip || !bpage->zip.data) { if (bpage->oldest_modification) goto not_freed; @@ -1768,7 +1712,9 @@ not_freed: mutex_enter(&buf_pool->zip_mutex); if (b->state == BUF_BLOCK_ZIP_PAGE) { +#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG buf_LRU_insert_zip_clean(b); +#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ } else { /* Relocate on buf_pool->flush_list. */ buf_flush_relocate_on_flush_list(bpage, b); @@ -1844,7 +1790,7 @@ not_freed: rw_lock_x_unlock(&buf_pool->page_hash_latch); } - return(BUF_LRU_FREED); + return(TRUE); } /******************************************************************//** @@ -2073,7 +2019,9 @@ buf_LRU_block_remove_hashed_page( ut_a(bpage->zip.data); ut_a(buf_page_get_zip_size(bpage)); +#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG UT_LIST_REMOVE(zip_list, buf_pool->zip_clean, bpage); +#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ mutex_exit(&buf_pool->zip_mutex); //buf_pool_mutex_exit_forbid(buf_pool); @@ -2082,11 +2030,8 @@ buf_LRU_block_remove_hashed_page( buf_pool, bpage->zip.data, page_zip_get_size(&bpage->zip), TRUE); - bpage->state = BUF_BLOCK_ZIP_FREE; - buf_buddy_free(buf_pool, bpage, sizeof(*bpage), TRUE); //buf_pool_mutex_exit_allow(buf_pool); - - UNIV_MEM_UNDESC(bpage); + buf_page_free_descriptor(bpage); return(BUF_BLOCK_ZIP_FREE); case BUF_BLOCK_FILE_PAGE: @@ -2154,6 +2099,22 @@ buf_LRU_block_free_hashed_page( buf_LRU_block_free_non_file_page(block, have_page_hash_mutex); } +/******************************************************************//** +Remove one page from LRU list and put it to free list */ +UNIV_INTERN +void +buf_LRU_free_one_page( +/*==================*/ + buf_page_t* bpage) /*!< in/out: block, must contain a file page and + be in a state where it can be freed; there + may or may not be a hash index to the page */ +{ + if (buf_LRU_block_remove_hashed_page(bpage, TRUE) + != BUF_BLOCK_ZIP_FREE) { + buf_LRU_block_free_hashed_page((buf_block_t*) bpage, TRUE); + } +} + /**********************************************************************//** Updates buf_pool->LRU_old_ratio for one buffer pool instance. @return updated old_pct */ @@ -2445,6 +2406,11 @@ buf_LRU_file_restore(void) " InnoDB: cannot open %s\n", LRU_DUMP_FILE); goto end; } + + ut_print_timestamp(stderr); + fprintf(stderr, " InnoDB: Restoring buffer pool pages from %s\n", + LRU_DUMP_FILE); + if (size == 0 || size_high > 0 || size % 8) { fprintf(stderr, " InnoDB: broken LRU dump file\n"); goto end; @@ -2546,7 +2512,7 @@ buf_LRU_file_restore(void) ut_print_timestamp(stderr); fprintf(stderr, - " InnoDB: reading pages based on the dumped LRU list was done." + " InnoDB: Completed reading buffer pool pages" " (requested: %lu, read: %lu)\n", req, reads); ret = TRUE; end: diff --git a/buf/buf0rea.c b/buf/buf0rea.c index 587b982b3e0..645d5fdc2f3 100644 --- a/buf/buf0rea.c +++ b/buf/buf0rea.c @@ -40,8 +40,10 @@ Created 11/5/1995 Heikki Tuuri #include "mysql/plugin.h" #include "mysql/service_thd_wait.h" -/** The linear read-ahead area size */ -#define BUF_READ_AHEAD_LINEAR_AREA BUF_READ_AHEAD_AREA +/** There must be at least this many pages in buf_pool in the area to start +a random read-ahead */ +#define BUF_READ_AHEAD_RANDOM_THRESHOLD(b) \ + (5 + BUF_READ_AHEAD_AREA(b) / 8) /** If there are buf_pool->curr_size per the number below pending reads, then read-ahead is not done: this is to prevent flooding the buffer pool with @@ -211,6 +213,172 @@ not_to_recover: return(1); } +/********************************************************************//** +Applies a random read-ahead in buf_pool if there are at least a threshold +value of accessed pages from the random read-ahead area. Does not read any +page, not even the one at the position (space, offset), if the read-ahead +mechanism is not activated. NOTE 1: the calling thread may own latches on +pages: to avoid deadlocks this function must be written such that it cannot +end up waiting for these latches! NOTE 2: the calling thread must want +access to the page given: this rule is set to prevent unintended read-aheads +performed by ibuf routines, a situation which could result in a deadlock if +the OS does not support asynchronous i/o. +@return number of page read requests issued; NOTE that if we read ibuf +pages, it may happen that the page at the given page number does not +get read even if we return a positive value! +@return number of page read requests issued */ +UNIV_INTERN +ulint +buf_read_ahead_random( +/*==================*/ + ulint space, /*!< in: space id */ + ulint zip_size, /*!< in: compressed page size in bytes, + or 0 */ + ulint offset, /*!< in: page number of a page which + the current thread wants to access */ + ibool inside_ibuf, /*!< in: TRUE if we are inside ibuf + routine */ + trx_t* trx) +{ + buf_pool_t* buf_pool = buf_pool_get(space, offset); + ib_int64_t tablespace_version; + ulint recent_blocks = 0; + ulint ibuf_mode; + ulint count; + ulint low, high; + ulint err; + ulint i; + const ulint buf_read_ahead_random_area + = BUF_READ_AHEAD_AREA(buf_pool); + + if (!srv_random_read_ahead) { + /* Disabled by user */ + return(0); + } + + if (srv_startup_is_before_trx_rollback_phase) { + /* No read-ahead to avoid thread deadlocks */ + return(0); + } + + if (ibuf_bitmap_page(zip_size, offset) + || trx_sys_hdr_page(space, offset)) { + + /* If it is an ibuf bitmap page or trx sys hdr, we do + no read-ahead, as that could break the ibuf page access + order */ + + return(0); + } + + /* Remember the tablespace version before we ask te tablespace size + below: if DISCARD + IMPORT changes the actual .ibd file meanwhile, we + do not try to read outside the bounds of the tablespace! */ + + tablespace_version = fil_space_get_version(space); + + low = (offset / buf_read_ahead_random_area) + * buf_read_ahead_random_area; + high = (offset / buf_read_ahead_random_area + 1) + * buf_read_ahead_random_area; + if (high > fil_space_get_size(space)) { + + high = fil_space_get_size(space); + } + + buf_pool_mutex_enter(buf_pool); + + if (buf_pool->n_pend_reads + > buf_pool->curr_size / BUF_READ_AHEAD_PEND_LIMIT) { + buf_pool_mutex_exit(buf_pool); + + return(0); + } + + /* Count how many blocks in the area have been recently accessed, + that is, reside near the start of the LRU list. */ + + for (i = low; i < high; i++) { + const buf_page_t* bpage = + buf_page_hash_get(buf_pool, space, i); + + if (bpage + && buf_page_is_accessed(bpage) + && buf_page_peek_if_young(bpage)) { + + recent_blocks++; + + if (recent_blocks + >= BUF_READ_AHEAD_RANDOM_THRESHOLD(buf_pool)) { + + buf_pool_mutex_exit(buf_pool); + goto read_ahead; + } + } + } + + buf_pool_mutex_exit(buf_pool); + /* Do nothing */ + return(0); + +read_ahead: + /* Read all the suitable blocks within the area */ + + if (inside_ibuf) { + ibuf_mode = BUF_READ_IBUF_PAGES_ONLY; + } else { + ibuf_mode = BUF_READ_ANY_PAGE; + } + + count = 0; + + for (i = low; i < high; i++) { + /* It is only sensible to do read-ahead in the non-sync aio + mode: hence FALSE as the first parameter */ + + if (!ibuf_bitmap_page(zip_size, i)) { + count += buf_read_page_low( + &err, FALSE, + ibuf_mode | OS_AIO_SIMULATED_WAKE_LATER, + space, zip_size, FALSE, + tablespace_version, i, trx); + if (err == DB_TABLESPACE_DELETED) { + ut_print_timestamp(stderr); + fprintf(stderr, + " InnoDB: Warning: in random" + " readahead trying to access\n" + "InnoDB: tablespace %lu page %lu,\n" + "InnoDB: but the tablespace does not" + " exist or is just being dropped.\n", + (ulong) space, (ulong) i); + } + } + } + + /* In simulated aio we wake the aio handler threads only after + queuing all aio requests, in native aio the following call does + nothing: */ + + os_aio_simulated_wake_handler_threads(); + +#ifdef UNIV_DEBUG + if (buf_debug_prints && (count > 0)) { + fprintf(stderr, + "Random read-ahead space %lu offset %lu pages %lu\n", + (ulong) space, (ulong) offset, + (ulong) count); + } +#endif /* UNIV_DEBUG */ + + /* Read ahead is considered one I/O operation for the purpose of + LRU policy decision. */ + buf_LRU_stat_inc_io(); + + buf_pool->stat.n_ra_pages_read_rnd += count; + srv_buf_pool_reads += count; + return(count); +} + /********************************************************************//** High-level function which reads a page asynchronously from a file to the buffer buf_pool if it is not already there. Sets the io_fix flag and sets @@ -309,7 +477,7 @@ buf_read_ahead_linear( ulint err; ulint i; const ulint buf_read_ahead_linear_area - = BUF_READ_AHEAD_LINEAR_AREA(buf_pool); + = BUF_READ_AHEAD_AREA(buf_pool); ulint threshold; if (!(srv_read_ahead & 2)) { diff --git a/dict/dict0crea.c b/dict/dict0crea.c index 49c16b1daab..b67f7fdde1c 100644 --- a/dict/dict0crea.c +++ b/dict/dict0crea.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -898,7 +898,7 @@ dict_truncate_index_tree( appropriate field in the SYS_INDEXES record: this mini-transaction marks the B-tree totally truncated */ - btr_block_get(space, zip_size, root_page_no, RW_X_LATCH, mtr); + btr_block_get(space, zip_size, root_page_no, RW_X_LATCH, NULL, mtr); btr_free_root(space, zip_size, root_page_no, mtr); create: diff --git a/dict/dict0dict.c b/dict/dict0dict.c index 1ad540f47ab..edcacb5919d 100644 --- a/dict/dict0dict.c +++ b/dict/dict0dict.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -54,6 +54,7 @@ UNIV_INTERN dict_index_t* dict_ind_compact; #include "row0merge.h" #include "m_ctype.h" /* my_isspace() */ #include "ha_prototypes.h" /* innobase_strcasecmp(), innobase_casedn_str()*/ +#include "row0upd.h" #include "srv0start.h" /* SRV_LOG_SPACE_FIRST_ID */ #include @@ -612,8 +613,7 @@ dict_table_get_on_id( { dict_table_t* table; - if (table_id <= DICT_FIELDS_ID - || trx->dict_operation_lock_mode == RW_X_LATCH) { + if (trx->dict_operation_lock_mode == RW_X_LATCH) { /* Note: An X latch implies that the transaction already owns the dictionary mutex. */ @@ -1777,7 +1777,8 @@ undo_size_ok: new_index->page = page_no; rw_lock_create(index_tree_rw_lock_key, &new_index->lock, - SYNC_INDEX_TREE); + dict_index_is_ibuf(index) + ? SYNC_IBUF_INDEX_TREE : SYNC_INDEX_TREE); if (!UNIV_UNLIKELY(new_index->type & DICT_UNIVERSAL)) { @@ -5522,6 +5523,189 @@ dict_close(void) } } +/**********************************************************************//** +Find a table in dict_sys->table_LRU list with specified space id +@return table if found, NULL if not */ +static +dict_table_t* +dict_find_table_by_space( +/*=====================*/ + ulint space_id) /*!< in: space ID */ +{ + dict_table_t* table; + ulint num_item; + ulint count = 0; + + ut_ad(space_id > 0); + + table = UT_LIST_GET_FIRST(dict_sys->table_LRU); + num_item = UT_LIST_GET_LEN(dict_sys->table_LRU); + + /* This function intentionally does not acquire mutex as it is used + by error handling code in deep call stack as last means to avoid + killing the server, so it worth to risk some consequencies for + the action. */ + while (table && count < num_item) { + if (table->space == space_id) { + return(table); + } + + table = UT_LIST_GET_NEXT(table_LRU, table); + count++; + } + + return(NULL); +} + +/**********************************************************************//** +Flags a table with specified space_id corrupted in the data dictionary +cache +@return TRUE if successful */ +UNIV_INTERN +ibool +dict_set_corrupted_by_space( +/*========================*/ + ulint space_id) /*!< in: space ID */ +{ + dict_table_t* table; + + table = dict_find_table_by_space(space_id); + + if (!table) { + return(FALSE); + } + + /* mark the table->corrupted bit only, since the caller + could be too deep in the stack for SYS_INDEXES update */ + table->corrupted = TRUE; + + return(TRUE); +} + +/**********************************************************************//** +Flags an index corrupted both in the data dictionary cache +and in the SYS_INDEXES */ +UNIV_INTERN +void +dict_set_corrupted( +/*===============*/ + dict_index_t* index) /*!< in/out: index */ +{ + mem_heap_t* heap; + mtr_t mtr; + dict_index_t* sys_index; + dtuple_t* tuple; + dfield_t* dfield; + byte* buf; + const char* status; + btr_cur_t cursor; + + ut_ad(index); + ut_ad(mutex_own(&dict_sys->mutex)); + ut_ad(!dict_table_is_comp(dict_sys->sys_tables)); + ut_ad(!dict_table_is_comp(dict_sys->sys_indexes)); + +#ifdef UNIV_SYNC_DEBUG + ut_ad(sync_thread_levels_empty_except_dict()); +#endif + + /* Mark the table as corrupted only if the clustered index + is corrupted */ + if (dict_index_is_clust(index)) { + index->table->corrupted = TRUE; + } + + if (UNIV_UNLIKELY(dict_index_is_corrupted(index))) { + /* The index was already flagged corrupted. */ + ut_ad(index->table->corrupted); + return; + } + + heap = mem_heap_create(sizeof(dtuple_t) + 2 * (sizeof(dfield_t) + + sizeof(que_fork_t) + sizeof(upd_node_t) + + sizeof(upd_t) + 12)); + mtr_start(&mtr); + index->type |= DICT_CORRUPT; + + sys_index = UT_LIST_GET_FIRST(dict_sys->sys_indexes->indexes); + + /* Find the index row in SYS_INDEXES */ + tuple = dtuple_create(heap, 2); + + dfield = dtuple_get_nth_field(tuple, 0); + buf = mem_heap_alloc(heap, 8); + mach_write_to_8(buf, index->table->id); + dfield_set_data(dfield, buf, 8); + + dfield = dtuple_get_nth_field(tuple, 1); + buf = mem_heap_alloc(heap, 8); + mach_write_to_8(buf, index->id); + dfield_set_data(dfield, buf, 8); + + dict_index_copy_types(tuple, sys_index, 2); + + btr_cur_search_to_nth_level(sys_index, 0, tuple, PAGE_CUR_GE, + BTR_MODIFY_LEAF, + &cursor, 0, __FILE__, __LINE__, &mtr); + + if (cursor.up_match == dtuple_get_n_fields(tuple)) { + /* UPDATE SYS_INDEXES SET TYPE=index->type + WHERE TABLE_ID=index->table->id AND INDEX_ID=index->id */ + ulint len; + byte* field = rec_get_nth_field_old( + btr_cur_get_rec(&cursor), + DICT_SYS_INDEXES_TYPE_FIELD, &len); + if (len != 4) { + goto fail; + } + mlog_write_ulint(field, index->type, MLOG_4BYTES, &mtr); + status = " InnoDB: Flagged corruption of "; + } else { +fail: + status = " InnoDB: Unable to flag corruption of "; + } + + mtr_commit(&mtr); + mem_heap_free(heap); + + ut_print_timestamp(stderr); + fputs(status, stderr); + dict_index_name_print(stderr, NULL, index); + putc('\n', stderr); +} + +/**********************************************************************//** +Flags an index corrupted in the data dictionary cache only. This +is used mostly to mark a corrupted index when index's own dictionary +is corrupted, and we force to load such index for repair purpose */ +UNIV_INTERN +void +dict_set_corrupted_index_cache_only( +/*================================*/ + dict_index_t* index, /*!< in/out: index */ + dict_table_t* table) /*!< in/out: table */ +{ + ut_ad(index); + ut_ad(mutex_own(&dict_sys->mutex)); + ut_ad(!dict_table_is_comp(dict_sys->sys_tables)); + ut_ad(!dict_table_is_comp(dict_sys->sys_indexes)); + + /* Mark the table as corrupted only if the clustered index + is corrupted */ + if (dict_index_is_clust(index)) { + dict_table_t* corrupt_table; + + corrupt_table = table ? table : index->table; + ut_ad(!index->table || !table || index->table == table); + + if (corrupt_table) { + corrupt_table->corrupted = TRUE; + } + } + + index->type |= DICT_CORRUPT; +} + /************************************************************************* set is_corrupt flag by space_id*/ diff --git a/dict/dict0load.c b/dict/dict0load.c index c5bd84f84ad..20b9caf7322 100644 --- a/dict/dict0load.c +++ b/dict/dict0load.c @@ -54,6 +54,11 @@ static const char* SYSTEM_TABLE_NAME[] = { "SYS_FOREIGN_COLS", "SYS_STATS" }; + +/* If this flag is TRUE, then we will load the cluster index's (and tables') +metadata even if it is marked as "corrupted". */ +UNIV_INTERN my_bool srv_load_corrupted = FALSE; + /****************************************************************//** Compare the name of an index column. @return TRUE if the i'th column of index is 'name'. */ @@ -1396,6 +1401,9 @@ err_len: goto err_len; } type = mach_read_from_4(field); + if (UNIV_UNLIKELY(type & (~0 << DICT_IT_BITS))) { + return("unknown SYS_INDEXES.TYPE bits"); + } field = rec_get_nth_field_old(rec, 7/*SPACE*/, &len); if (UNIV_UNLIKELY(len != 4)) { @@ -1495,16 +1503,47 @@ dict_load_indexes( goto next_rec; } else if (err_msg) { fprintf(stderr, "InnoDB: %s\n", err_msg); + if (ignore_err & DICT_ERR_IGNORE_CORRUPT) { + goto next_rec; + } error = DB_CORRUPTION; goto func_exit; } ut_ad(index); + /* Check whether the index is corrupted */ + if (dict_index_is_corrupted(index)) { + ut_print_timestamp(stderr); + fputs(" InnoDB: ", stderr); + dict_index_name_print(stderr, NULL, index); + fputs(" is corrupted\n", stderr); + + if (!srv_load_corrupted + && !(ignore_err & DICT_ERR_IGNORE_CORRUPT) + && dict_index_is_clust(index)) { + dict_mem_index_free(index); + + error = DB_INDEX_CORRUPT; + goto func_exit; + } else { + /* We will load the index if + 1) srv_load_corrupted is TRUE + 2) ignore_err is set with + DICT_ERR_IGNORE_CORRUPT + 3) if the index corrupted is a secondary + index */ + ut_print_timestamp(stderr); + fputs(" InnoDB: load corrupted index ", stderr); + dict_index_name_print(stderr, NULL, index); + putc('\n', stderr); + } + } + /* We check for unsupported types first, so that the subsequent checks are relevant for the supported types. */ - if (index->type & ~(DICT_CLUSTERED | DICT_UNIQUE)) { - + if (index->type & ~(DICT_CLUSTERED | DICT_UNIQUE + | DICT_CORRUPT)) { fprintf(stderr, "InnoDB: Error: unknown type %lu" " of index %s of table %s\n", @@ -1525,9 +1564,14 @@ dict_load_indexes( /* If caller can tolerate this error, we will continue to load the index and let caller deal with this error. However - mark the index and table corrupted */ - index->corrupted = TRUE; - table->corrupted = TRUE; + mark the index and table corrupted. We + only need to mark such in the index + dictionary cache for such metadata corruption, + since we would always be able to set it + when loading the dictionary cache */ + dict_set_corrupted_index_cache_only( + index, table); + fprintf(stderr, "InnoDB: Index is corrupt but forcing" " load into data dictionary\n"); @@ -1567,9 +1611,10 @@ corrupted: index->name, table->name); /* If the force recovery flag is set, and - if the failed index is not the primary index, we - will continue and open other indexes */ - if (srv_force_recovery + if the failed index is not the clustered index, + we will continue and open other indexes */ + if ((srv_force_recovery + || srv_load_corrupted) && !dict_index_is_clust(index)) { error = DB_SUCCESS; goto next_rec; @@ -1884,6 +1929,30 @@ err_exit: err = dict_load_indexes(table, heap, ignore_err); + if (err == DB_INDEX_CORRUPT) { + /* Refuse to load the table if the table has a corrupted + cluster index */ + if (!srv_load_corrupted) { + fprintf(stderr, "InnoDB: Error: Load table "); + ut_print_name(stderr, NULL, TRUE, table->name); + fprintf(stderr, " failed, the table has corrupted" + " clustered indexes. Turn on" + " 'innodb_force_load_corrupted'" + " to drop it\n"); + + dict_table_remove_from_cache(table); + table = NULL; + goto func_exit; + } else { + dict_index_t* clust_index; + clust_index = dict_table_get_first_index(table); + + if (dict_index_is_corrupted(clust_index)) { + table->corrupted = TRUE; + } + } + } + /* Initialize table foreign_child value. Its value could be changed when dict_load_foreigns() is called below */ table->fk_max_recusive_level = 0; @@ -1910,9 +1979,15 @@ err_exit: index = dict_table_get_first_index(table); if (!srv_force_recovery || !index - || !dict_index_is_clust(index)) { + || !dict_index_is_clust(index)) { dict_table_remove_from_cache(table); table = NULL; + } else if (dict_index_is_corrupted(index)) { + + /* It is possible we force to load a corrupted + clustered index if srv_load_corrupted is set. + Mark the table as corrupted in this case */ + table->corrupted = TRUE; } } #if 0 @@ -1939,6 +2014,7 @@ err_exit: mutex_exit(&dict_foreign_err_mutex); } #endif /* 0 */ +func_exit: mem_heap_free(heap); return(table); diff --git a/fil/fil0fil.c b/fil/fil0fil.c index 0e42214aa31..380f471e67b 100644 --- a/fil/fil0fil.c +++ b/fil/fil0fil.c @@ -3541,7 +3541,7 @@ skip_info: ULINT_UNDEFINED, &heap); n_fields = rec_offs_n_fields(offsets); if (!offset) { - offset = row_get_trx_id_offset(rec, index, offsets); + offset = row_get_trx_id_offset(index, offsets); } trx_write_trx_id(rec + offset, 1); @@ -3826,7 +3826,7 @@ convert_err_exit: ULINT_UNDEFINED, &heap); n_fields = rec_offs_n_fields(offsets); if (!offset) { - offset = row_get_trx_id_offset(rec, index, offsets); + offset = row_get_trx_id_offset(index, offsets); } trx_write_trx_id(rec + offset, 1); diff --git a/handler/ha_innodb.cc b/handler/ha_innodb.cc index 7a2d8e8fdbe..26212cca36e 100644 --- a/handler/ha_innodb.cc +++ b/handler/ha_innodb.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2000, 2011, MySQL AB & Innobase Oy. All Rights Reserved. +Copyright (c) 2000, 2011, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, 2009 Google Inc. Copyright (c) 2009, Percona Inc. @@ -193,16 +193,18 @@ static my_bool innobase_overwrite_relay_log_info = FALSE; static my_bool innobase_rollback_on_timeout = FALSE; static my_bool innobase_create_status_file = FALSE; static my_bool innobase_stats_on_metadata = TRUE; +static my_bool innobase_large_prefix = FALSE; static my_bool innobase_use_sys_stats_table = FALSE; static my_bool innobase_buffer_pool_shm_checksum = TRUE; static uint innobase_buffer_pool_shm_key = 0; -static my_bool innobase_large_prefix = FALSE; static char* internal_innobase_data_file_path = NULL; static char* innodb_version_str = (char*) INNODB_VERSION_STR; +static my_bool innobase_blocking_lru_restore = FALSE; + /** Possible values for system variable "innodb_stats_method". The values are defined the same as its corresponding MyISAM system variable "myisam_stats_method"(see "myisam_stats_method_names"), for better usability */ @@ -486,6 +488,12 @@ static MYSQL_THDVAR_ULONG(flush_log_at_trx_commit, PLUGIN_VAR_OPCMDARG, " or 2 (write at commit, flush once per second).", NULL, NULL, 1, 0, 2, 0); +static MYSQL_THDVAR_BOOL(fake_changes, PLUGIN_VAR_OPCMDARG, + "In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records " + "and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. " + "This is to cause replication prefetch IO. ATTENTION: the transaction started after enabled is affected.", + NULL, NULL, FALSE); + static handler *innobase_create_handler(handlerton *hton, TABLE_SHARE *table, @@ -673,6 +681,8 @@ static SHOW_VAR innodb_status_variables[]= { (char*) &export_vars.innodb_buffer_pool_pages_old, SHOW_LONG}, {"buffer_pool_pages_total", (char*) &export_vars.innodb_buffer_pool_pages_total, SHOW_LONG}, + {"buffer_pool_read_ahead_rnd", + (char*) &export_vars.innodb_buffer_pool_read_ahead_rnd, SHOW_LONG}, {"buffer_pool_read_ahead", (char*) &export_vars.innodb_buffer_pool_read_ahead, SHOW_LONG}, {"buffer_pool_read_ahead_evicted", @@ -989,6 +999,19 @@ thd_flush_log_at_trx_commit( return(THDVAR((THD*) thd, flush_log_at_trx_commit)); } +/******************************************************************//** +Returns true if expand_fast_index_creation is enabled for the current +session. +@return the value of the server's expand_fast_index_creation variable */ +extern "C" UNIV_INTERN +ibool +thd_expand_fast_index_creation( +/*================================*/ + void* thd) +{ + return((ibool) (((THD*) thd)->variables.expand_fast_index_creation)); +} + /********************************************************************//** Obtain the InnoDB transaction of a MySQL thread. @return reference to transaction pointer */ @@ -1142,7 +1165,6 @@ convert_error_code_to_mysql( misleading, a new MySQL error code should be introduced */ - case DB_COL_APPEARS_TWICE_IN_INDEX: case DB_CORRUPTION: return(HA_ERR_CRASHED); @@ -1194,6 +1216,10 @@ convert_error_code_to_mysql( #endif /* HA_ERR_TOO_MANY_CONCURRENT_TRXS */ case DB_UNSUPPORTED: return(HA_ERR_UNSUPPORTED); + case DB_INDEX_CORRUPT: + return(HA_ERR_INDEX_CORRUPT); + case DB_UNDO_RECORD_TOO_BIG: + return(HA_ERR_UNDO_REC_TOO_BIG); } } @@ -1682,6 +1708,8 @@ innobase_trx_init( trx->check_unique_secondary = !thd_test_options( thd, OPTION_RELAXED_UNIQUE_CHECKS); + trx->fake_changes = THDVAR(thd, fake_changes); + #ifdef EXTENDED_SLOWLOG if (thd_log_slow_verbosity(thd) & SLOG_V_INNODB) { trx->take_stats = TRUE; @@ -2265,6 +2293,29 @@ no_db_name: } +/*****************************************************************//** +A wrapper function of innobase_convert_name(), convert a table or +index name to the MySQL system_charset_info (UTF-8) and quote it if needed. +@return pointer to the end of buf */ +static inline +void +innobase_format_name( +/*==================*/ + char* buf, /*!< out: buffer for converted identifier */ + ulint buflen, /*!< in: length of buf, in bytes */ + const char* name, /*!< in: index or table name to format */ + ibool is_index_name) /*!< in: index name */ +{ + const char* bufend; + + bufend = innobase_convert_name(buf, buflen, name, strlen(name), + NULL, !is_index_name); + + ut_ad((ulint) (bufend - buf) < buflen); + + buf[bufend - buf] = '\0'; +} + /**********************************************************************//** Determines if the currently running transaction has been interrupted. @return TRUE if interrupted */ @@ -2795,6 +2846,8 @@ innobase_change_buffering_inited_ok: srv_use_checksums = (ibool) innobase_use_checksums; srv_fast_checksum = (ibool) innobase_fast_checksum; + srv_blocking_lru_restore = (ibool) innobase_blocking_lru_restore; + #ifdef HAVE_LARGE_PAGES if ((os_use_large_pages = (ibool) my_use_large_pages)) os_large_page_size = (ulint) opt_large_page_size; @@ -2828,6 +2881,10 @@ innobase_change_buffering_inited_ok: innobase_commit_concurrency_init_default(); +#ifndef EXTENDED_FOR_KILLIDLE + srv_kill_idle_transaction = 0; +#endif + #ifdef HAVE_PSI_INTERFACE /* Register keys with MySQL performance schema */ if (PSI_server) { @@ -3160,6 +3217,11 @@ innobase_commit( trx_search_latch_release_if_reserved(trx); } + if (trx->fake_changes && (all || (!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))) { + innobase_rollback(hton, thd, all); /* rollback implicitly */ + thd->stmt_da->reset_diagnostics_area(); /* because debug assertion code complains, if something left */ + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } /* Transaction is deregistered only in a commit or a rollback. If it is deregistered we know there cannot be resources to be freed and we could return immediately. For the time being, we play safe @@ -4188,11 +4250,11 @@ retry: DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE); } - if (share->ib_table) { - ut_a(share->ib_table == ib_table); - } else { - share->ib_table = ib_table; - } + share->ib_table = ib_table; + + + + if (NULL == ib_table) { if (is_part && retries < 10) { @@ -4493,25 +4555,6 @@ field_in_record_is_null( return(0); } -/**************************************************************//** -Sets a field in a record to SQL NULL. Uses the record format -information in table to track the null bit in record. */ -static inline -void -set_field_in_record_to_null( -/*========================*/ - TABLE* table, /*!< in: MySQL table object */ - Field* field, /*!< in: MySQL field object */ - char* record) /*!< in: a row in MySQL format */ -{ - int null_offset; - - null_offset = (uint) ((char*) field->null_ptr - - (char*) table->record[0]); - - record[null_offset] = record[null_offset] | field->null_bit; -} - /*************************************************************//** InnoDB uses this function to compare two data fields for which the data type is such that we must use MySQL code to compare them. NOTE that the prototype @@ -6160,12 +6203,14 @@ ha_innobase::index_read( index = prebuilt->index; - if (UNIV_UNLIKELY(index == NULL)) { + if (UNIV_UNLIKELY(index == NULL) || dict_index_is_corrupted(index)) { prebuilt->index_usable = FALSE; DBUG_RETURN(HA_ERR_CRASHED); } if (UNIV_UNLIKELY(!prebuilt->index_usable)) { - DBUG_RETURN(HA_ERR_TABLE_DEF_CHANGED); + DBUG_RETURN(dict_index_is_corrupted(index) + ? HA_ERR_INDEX_CORRUPT + : HA_ERR_TABLE_DEF_CHANGED); } /* Note that if the index for which the search template is built is not @@ -6233,7 +6278,7 @@ ha_innobase::index_read( table->status = 0; #ifdef EXTENDED_FOR_USERSTAT rows_read++; - if (active_index >= 0 && active_index < MAX_KEY) + if (active_index < MAX_KEY) index_rows_read[active_index]++; #endif break; @@ -6364,10 +6409,33 @@ ha_innobase::change_active_index( prebuilt->index); if (UNIV_UNLIKELY(!prebuilt->index_usable)) { - push_warning_printf(user_thd, MYSQL_ERROR::WARN_LEVEL_WARN, - HA_ERR_TABLE_DEF_CHANGED, - "InnoDB: insufficient history for index %u", - keynr); + if (dict_index_is_corrupted(prebuilt->index)) { + char index_name[MAX_FULL_NAME_LEN + 1]; + char table_name[MAX_FULL_NAME_LEN + 1]; + + innobase_format_name( + index_name, sizeof index_name, + prebuilt->index->name, TRUE); + + innobase_format_name( + table_name, sizeof table_name, + prebuilt->index->table->name, FALSE); + + push_warning_printf( + user_thd, MYSQL_ERROR::WARN_LEVEL_WARN, + HA_ERR_INDEX_CORRUPT, + "InnoDB: Index %s for table %s is" + " marked as corrupted", + index_name, table_name); + DBUG_RETURN(1); + } else { + push_warning_printf( + user_thd, MYSQL_ERROR::WARN_LEVEL_WARN, + HA_ERR_TABLE_DEF_CHANGED, + "InnoDB: insufficient history for index %u", + keynr); + } + /* The caller seems to ignore this. Thus, we must check this again in row_search_for_mysql(). */ DBUG_RETURN(2); @@ -6459,7 +6527,7 @@ ha_innobase::general_fetch( table->status = 0; #ifdef EXTENDED_FOR_USERSTAT rows_read++; - if (active_index >= 0 && active_index < MAX_KEY) + if (active_index < MAX_KEY) index_rows_read[active_index]++; #endif break; @@ -7503,6 +7571,12 @@ ha_innobase::create( trx = innobase_trx_allocate(thd); + if (trx->fake_changes) { + innobase_commit_low(trx); + trx_free_for_mysql(trx); + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } + /* Latch the InnoDB data dictionary exclusively so that no deadlocks or lock waits can happen in it during a table create operation. Drop table etc. do this latching in row0mysql.c. */ @@ -7723,6 +7797,10 @@ ha_innobase::truncate(void) DBUG_RETURN(HA_ERR_CRASHED); } + if (prebuilt->trx->fake_changes) { + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } + /* Truncate the table in InnoDB */ error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx); @@ -7779,6 +7857,12 @@ ha_innobase::delete_table( trx = innobase_trx_allocate(thd); + if (trx->fake_changes) { + innobase_commit_low(trx); + trx_free_for_mysql(trx); + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } + name_len = strlen(name); ut_a(name_len < 1000); @@ -7865,6 +7949,12 @@ innobase_drop_database( trx->mysql_thd = NULL; #else trx = innobase_trx_allocate(thd); + if (trx->fake_changes) { + my_free(namebuf); + innobase_commit_low(trx); + trx_free_for_mysql(trx); + return; /* ignore */ + } #endif row_drop_database_for_mysql(namebuf, trx); my_free(namebuf); @@ -7970,6 +8060,11 @@ ha_innobase::rename_table( trx_search_latch_release_if_reserved(parent_trx); trx = innobase_trx_allocate(thd); + if (trx->fake_changes) { + innobase_commit_low(trx); + trx_free_for_mysql(trx); + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } error = innobase_rename_table(trx, from, to, TRUE); @@ -8056,6 +8151,10 @@ ha_innobase::records_in_range( n_rows = HA_POS_ERROR; goto func_exit; } + if (dict_index_is_corrupted(index)) { + n_rows = HA_ERR_INDEX_CORRUPT; + goto func_exit; + } if (UNIV_UNLIKELY(!row_merge_is_index_usable(prebuilt->trx, index))) { n_rows = HA_ERR_TABLE_DEF_CHANGED; goto func_exit; @@ -8470,6 +8569,8 @@ ha_innobase::info_low( if (flag & HA_STATUS_VARIABLE) { + ulint page_size; + dict_table_stats_lock(ib_table, RW_S_LATCH); n_rows = ib_table->stat_n_rows; @@ -8512,14 +8613,19 @@ ha_innobase::info_low( prebuilt->autoinc_last_value = 0; } + page_size = dict_table_zip_size(ib_table); + if (page_size == 0) { + page_size = UNIV_PAGE_SIZE; + } + stats.records = (ha_rows)n_rows; stats.deleted = 0; - stats.data_file_length = ((ulonglong) - ib_table->stat_clustered_index_size) - * UNIV_PAGE_SIZE; - stats.index_file_length = ((ulonglong) - ib_table->stat_sum_of_other_index_sizes) - * UNIV_PAGE_SIZE; + stats.data_file_length + = ((ulonglong) ib_table->stat_clustered_index_size) + * page_size; + stats.index_file_length = + ((ulonglong) ib_table->stat_sum_of_other_index_sizes) + * page_size; dict_table_stats_unlock(ib_table, RW_S_LATCH); @@ -8757,6 +8863,7 @@ ha_innobase::check( ulint n_rows_in_table = ULINT_UNDEFINED; ibool is_ok = TRUE; ulint old_isolation_level; + ibool table_corrupted; DBUG_ENTER("ha_innobase::check"); DBUG_ASSERT(thd == ha_thd()); @@ -8798,6 +8905,14 @@ ha_innobase::check( prebuilt->trx->isolation_level = TRX_ISO_REPEATABLE_READ; + /* Check whether the table is already marked as corrupted + before running the check table */ + table_corrupted = prebuilt->table->corrupted; + + /* Reset table->corrupted bit so that check table can proceed to + do additional check */ + prebuilt->table->corrupted = FALSE; + /* Enlarge the fatal lock wait timeout during CHECK TABLE. */ mutex_enter(&kernel_mutex); srv_fatal_semaphore_wait_threshold += 7200; /* 2 hours */ @@ -8806,6 +8921,7 @@ ha_innobase::check( for (index = dict_table_get_first_index(prebuilt->table); index != NULL; index = dict_table_get_next_index(index)) { + char index_name[MAX_FULL_NAME_LEN + 1]; #if 0 fputs("Validating index ", stderr); ut_print_name(stderr, trx, FALSE, index->name); @@ -8814,11 +8930,16 @@ ha_innobase::check( if (!btr_validate_index(index, prebuilt->trx)) { is_ok = FALSE; + + innobase_format_name( + index_name, sizeof index_name, + prebuilt->index->name, TRUE); + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_NOT_KEYFILE, "InnoDB: The B-tree of" - " index '%-.200s' is corrupted.", - index->name); + " index %s is corrupted.", + index_name); continue; } @@ -8831,11 +8952,26 @@ ha_innobase::check( prebuilt->trx, prebuilt->index); if (UNIV_UNLIKELY(!prebuilt->index_usable)) { - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - HA_ERR_TABLE_DEF_CHANGED, - "InnoDB: Insufficient history for" - " index '%-.200s'", - index->name); + innobase_format_name( + index_name, sizeof index_name, + prebuilt->index->name, TRUE); + + if (dict_index_is_corrupted(prebuilt->index)) { + push_warning_printf( + user_thd, MYSQL_ERROR::WARN_LEVEL_WARN, + HA_ERR_INDEX_CORRUPT, + "InnoDB: Index %s is marked as" + " corrupted", + index_name); + is_ok = FALSE; + } else { + push_warning_printf( + thd, MYSQL_ERROR::WARN_LEVEL_WARN, + HA_ERR_TABLE_DEF_CHANGED, + "InnoDB: Insufficient history for" + " index %s", + index_name); + } continue; } @@ -8849,12 +8985,19 @@ ha_innobase::check( prebuilt->select_lock_type = LOCK_NONE; if (!row_check_index_for_mysql(prebuilt, index, &n_rows)) { + innobase_format_name( + index_name, sizeof index_name, + index->name, TRUE); + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_NOT_KEYFILE, "InnoDB: The B-tree of" - " index '%-.200s' is corrupted.", - index->name); + " index %s is corrupted.", + index_name); is_ok = FALSE; + row_mysql_lock_data_dictionary(prebuilt->trx); + dict_set_corrupted(index); + row_mysql_unlock_data_dictionary(prebuilt->trx); } if (thd_killed(user_thd)) { @@ -8881,6 +9024,20 @@ ha_innobase::check( } } + if (table_corrupted) { + /* If some previous operation has marked the table as + corrupted in memory, and has not propagated such to + clustered index, we will do so here */ + index = dict_table_get_first_index(prebuilt->table); + + if (!dict_index_is_corrupted(index)) { + mutex_enter(&dict_sys->mutex); + dict_set_corrupted(index); + mutex_exit(&dict_sys->mutex); + } + prebuilt->table->corrupted = TRUE; + } + /* Restore the original isolation level */ prebuilt->trx->isolation_level = old_isolation_level; @@ -10768,6 +10925,10 @@ innobase_xa_prepare( return(0); } + if (trx->fake_changes) { + return(0); + } + thd_get_xid(thd, (MYSQL_XID*) &trx->xid); /* Release a possible FIFO ticket and search latch. Since we will @@ -11586,6 +11747,57 @@ innobase_index_name_is_reserved( return(false); } +/*********************************************************************** +functions for kill session of idle transaction */ +extern "C" +ibool +innobase_thd_is_idle( +/*=================*/ + const void* thd) /*!< in: thread handle (THD*) */ +{ +#ifdef EXTENDED_FOR_KILLIDLE + return(thd_command((const THD*) thd) == COM_SLEEP); +#else + return(FALSE); +#endif +} + +extern "C" +ib_int64_t +innobase_thd_get_start_time( +/*========================*/ + const void* thd) /*!< in: thread handle (THD*) */ +{ +#ifdef EXTENDED_FOR_KILLIDLE + return((ib_int64_t)thd_start_time((const THD*) thd)); +#else + return(0); /*dummy value*/ +#endif +} + +extern "C" +void +innobase_thd_kill( +/*==============*/ + ulong thd_id) +{ +#ifdef EXTENDED_FOR_KILLIDLE + thd_kill(thd_id); +#else + return; +#endif +} + +extern "C" +ulong +innobase_thd_get_thread_id( +/*=======================*/ + const void* thd) +{ + return(thd_get_thread_id((const THD*) thd)); +} + + static SHOW_VAR innodb_status_variables_export[]= { {"Innodb", (char*) &show_innodb_vars, SHOW_FUNC}, {NullS, NullS, SHOW_LONG} @@ -11731,6 +11943,11 @@ static MYSQL_SYSVAR_BOOL(large_prefix, innobase_large_prefix, "Support large index prefix length of REC_VERSION_56_MAX_INDEX_COL_LEN (3072) bytes.", NULL, NULL, FALSE); +static MYSQL_SYSVAR_BOOL(force_load_corrupted, srv_load_corrupted, + PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, + "Force InnoDB to load metadata of corrupted table.", + NULL, NULL, FALSE); + static MYSQL_SYSVAR_BOOL(locks_unsafe_for_binlog, innobase_locks_unsafe_for_binlog, PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, "Force InnoDB to not use next-key locking, to use only row-level locking.", @@ -11872,6 +12089,15 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter, "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket", NULL, NULL, 500L, 1L, ~0L, 0); +static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction, + PLUGIN_VAR_RQCMDARG, +#ifdef EXTENDED_FOR_KILLIDLE + "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB.", +#else + "No effect for this build.", +#endif + NULL, NULL, 0, 0, LONG_MAX, 0); + static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR, "Number of file I/O threads in InnoDB.", @@ -12012,6 +12238,11 @@ static MYSQL_SYSVAR_UINT(change_buffering_debug, ibuf_debug, NULL, NULL, 0, 0, 1, 0); #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ +static MYSQL_SYSVAR_BOOL(random_read_ahead, srv_random_read_ahead, + PLUGIN_VAR_NOCMDARG, + "Whether to use read ahead for random access within an extent.", + NULL, NULL, FALSE); + static MYSQL_SYSVAR_ULONG(read_ahead_threshold, srv_read_ahead_threshold, PLUGIN_VAR_RQCMDARG, "Number of pages that must be accessed sequentially for InnoDB to " @@ -12123,6 +12354,13 @@ static MYSQL_SYSVAR_UINT(buffer_pool_restore_at_startup, srv_auto_lru_dump, "0 (the default) disables automatic dumps.", NULL, NULL, 0, 0, UINT_MAX32, 0); +static MYSQL_SYSVAR_BOOL(blocking_buffer_pool_restore, + innobase_blocking_lru_restore, + PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, + "Block XtraDB startup process until buffer pool is full restored from a " + "dump file (if present). Disabled by default.", + NULL, NULL, FALSE); + const char *corrupt_table_action_names[]= { "assert", /* 0 */ @@ -12162,6 +12400,7 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(fast_checksum), MYSQL_SYSVAR(commit_concurrency), MYSQL_SYSVAR(concurrency_tickets), + MYSQL_SYSVAR(kill_idle_transaction), MYSQL_SYSVAR(data_file_path), MYSQL_SYSVAR(doublewrite_file), MYSQL_SYSVAR(data_home_dir), @@ -12180,6 +12419,7 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(flush_method), MYSQL_SYSVAR(force_recovery), MYSQL_SYSVAR(large_prefix), + MYSQL_SYSVAR(force_load_corrupted), MYSQL_SYSVAR(locks_unsafe_for_binlog), MYSQL_SYSVAR(lock_wait_timeout), #ifdef UNIV_LOG_ARCHIVE @@ -12236,14 +12476,17 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG MYSQL_SYSVAR(change_buffering_debug), #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ + MYSQL_SYSVAR(random_read_ahead), MYSQL_SYSVAR(read_ahead_threshold), MYSQL_SYSVAR(io_capacity), MYSQL_SYSVAR(buffer_pool_restore_at_startup), + MYSQL_SYSVAR(blocking_buffer_pool_restore), MYSQL_SYSVAR(purge_threads), MYSQL_SYSVAR(purge_batch_size), MYSQL_SYSVAR(rollback_segments), MYSQL_SYSVAR(corrupt_table_action), MYSQL_SYSVAR(lazy_drop_table), + MYSQL_SYSVAR(fake_changes), NULL }; @@ -12260,7 +12503,8 @@ mysql_declare_plugin(innobase) INNODB_VERSION_SHORT, innodb_status_variables_export,/* status variables */ innobase_system_variables, /* system variables */ - NULL /* reserved */ + NULL, /* reserved */ + 0, /* flags */ }, i_s_innodb_rseg, i_s_innodb_trx, diff --git a/handler/handler0alter.cc b/handler/handler0alter.cc index 6d5b7b4668f..8c5783fa8b9 100644 --- a/handler/handler0alter.cc +++ b/handler/handler0alter.cc @@ -695,6 +695,10 @@ ha_innobase::add_index( possible adaptive hash latch to avoid deadlocks of threads. */ trx_search_latch_release_if_reserved(prebuilt->trx); + if (prebuilt->trx->fake_changes) { + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } + /* Check if the index name is reserved. */ if (innobase_index_name_is_reserved(user_thd, key_info, num_of_keys)) { DBUG_RETURN(-1); @@ -732,6 +736,13 @@ ha_innobase::add_index( /* Create a background transaction for the operations on the data dictionary tables. */ trx = innobase_trx_allocate(user_thd); + if (trx->fake_changes) { + mem_heap_free(heap); + trx_general_rollback_for_mysql(trx, NULL); + trx_free_for_mysql(trx); + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } + trx_start_if_not_started(trx); /* Create table containing all indexes to be built in this @@ -1092,6 +1103,10 @@ ha_innobase::prepare_drop_index( trx_search_latch_release_if_reserved(prebuilt->trx); trx = prebuilt->trx; + if (trx->fake_changes) { + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } + /* Test and mark all the indexes to be dropped */ row_mysql_lock_data_dictionary(trx); @@ -1296,6 +1311,12 @@ ha_innobase::final_drop_index( /* Create a background transaction for the operations on the data dictionary tables. */ trx = innobase_trx_allocate(user_thd); + if (trx->fake_changes) { + trx_general_rollback_for_mysql(trx, NULL); + trx_free_for_mysql(trx); + DBUG_RETURN(HA_ERR_WRONG_COMMAND); + } + trx_start_if_not_started(trx); /* Flag this transaction as a dictionary operation, so that diff --git a/handler/i_s.cc b/handler/i_s.cc index 839dce206d3..c0ad731e336 100644 --- a/handler/i_s.cc +++ b/handler/i_s.cc @@ -645,7 +645,11 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_trx = /* reserved for dependency checking */ /* void* */ - STRUCT_FLD(__reserved1, NULL) + STRUCT_FLD(__reserved1, NULL), + + /* Plugin flags */ + /* unsigned long */ + STRUCT_FLD(flags, 0UL), }; /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */ @@ -911,7 +915,11 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_locks = /* reserved for dependency checking */ /* void* */ - STRUCT_FLD(__reserved1, NULL) + STRUCT_FLD(__reserved1, NULL), + + /* Plugin flags */ + /* unsigned long */ + STRUCT_FLD(flags, 0UL), }; /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */ @@ -1094,7 +1102,11 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_lock_waits = /* reserved for dependency checking */ /* void* */ - STRUCT_FLD(__reserved1, NULL) + STRUCT_FLD(__reserved1, NULL), + + /* Plugin flags */ + /* unsigned long */ + STRUCT_FLD(flags, 0UL), }; /*******************************************************************//** @@ -1427,7 +1439,11 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmp = /* reserved for dependency checking */ /* void* */ - STRUCT_FLD(__reserved1, NULL) + STRUCT_FLD(__reserved1, NULL), + + /* Plugin flags */ + /* unsigned long */ + STRUCT_FLD(flags, 0UL), }; UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmp_reset = @@ -1477,7 +1493,11 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmp_reset = /* reserved for dependency checking */ /* void* */ - STRUCT_FLD(__reserved1, NULL) + STRUCT_FLD(__reserved1, NULL), + + /* Plugin flags */ + /* unsigned long */ + STRUCT_FLD(flags, 0UL), }; /* Fields of the dynamic table information_schema.innodb_cmpmem. */ @@ -1720,7 +1740,11 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmpmem = /* reserved for dependency checking */ /* void* */ - STRUCT_FLD(__reserved1, NULL) + STRUCT_FLD(__reserved1, NULL), + + /* Plugin flags */ + /* unsigned long */ + STRUCT_FLD(flags, 0UL), }; UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmpmem_reset = @@ -1770,7 +1794,11 @@ UNIV_INTERN struct st_mysql_plugin i_s_innodb_cmpmem_reset = /* reserved for dependency checking */ /* void* */ - STRUCT_FLD(__reserved1, NULL) + STRUCT_FLD(__reserved1, NULL), + + /* Plugin flags */ + /* unsigned long */ + STRUCT_FLD(flags, 0UL), }; /*******************************************************************//** diff --git a/ibuf/ibuf0ibuf.c b/ibuf/ibuf0ibuf.c index f5ed301dcf1..7def360867d 100644 --- a/ibuf/ibuf0ibuf.c +++ b/ibuf/ibuf0ibuf.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1997, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -402,7 +402,7 @@ ibuf_tree_root_get( block = buf_page_get( IBUF_SPACE_ID, 0, FSP_IBUF_TREE_ROOT_PAGE_NO, RW_X_LATCH, mtr); - buf_block_dbg_add_level(block, SYNC_TREE_NODE); + buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE_NEW); root = buf_block_get_frame(block); @@ -590,7 +590,7 @@ ibuf_init_at_db_start(void) block = buf_page_get( IBUF_SPACE_ID, 0, FSP_IBUF_TREE_ROOT_PAGE_NO, RW_X_LATCH, &mtr); - buf_block_dbg_add_level(block, SYNC_TREE_NODE); + buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE); root = buf_block_get_frame(block); } @@ -2251,17 +2251,18 @@ ibuf_add_free_page(void) } else { buf_block_t* block = buf_page_get( IBUF_SPACE_ID, 0, page_no, RW_X_LATCH, &mtr); - buf_block_dbg_add_level(block, SYNC_TREE_NODE_NEW); + + ibuf_enter(&mtr); + + mutex_enter(&ibuf_mutex); + + root = ibuf_tree_root_get(&mtr); + + buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE_NEW); page = buf_block_get_frame(block); } - ibuf_enter(&mtr); - - mutex_enter(&ibuf_mutex); - - root = ibuf_tree_root_get(&mtr); - /* Add the page to the free list and update the ibuf size data */ flst_add_last(root + PAGE_HEADER + PAGE_BTR_IBUF_FREE_LIST, @@ -2374,8 +2375,7 @@ ibuf_remove_free_page(void) block = buf_page_get( IBUF_SPACE_ID, 0, page_no, RW_X_LATCH, &mtr); - buf_block_dbg_add_level(block, SYNC_TREE_NODE); - + buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE); page = buf_block_get_frame(block); } @@ -3066,7 +3066,7 @@ ibuf_get_volume_buffered( IBUF_SPACE_ID, 0, prev_page_no, RW_X_LATCH, mtr); - buf_block_dbg_add_level(block, SYNC_TREE_NODE); + buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE); prev_page = buf_block_get_frame(block); @@ -3139,7 +3139,7 @@ count_later: IBUF_SPACE_ID, 0, next_page_no, RW_X_LATCH, mtr); - buf_block_dbg_add_level(block, SYNC_TREE_NODE); + buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE); next_page = buf_block_get_frame(block); @@ -3377,7 +3377,7 @@ ibuf_set_entry_counter( IBUF_SPACE_ID, 0, prev_page_no, RW_X_LATCH, mtr); - buf_block_dbg_add_level(block, SYNC_TREE_NODE); + buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE); prev_page = buf_block_get_frame(block); @@ -3496,6 +3496,8 @@ ibuf_insert_low( ut_a(trx_sys_multiple_tablespace_format); + ut_ad(!(thr_get_trx(thr)->fake_changes)); + do_merge = FALSE; /* Perform dirty reads of ibuf->size and ibuf->max_size, to @@ -4465,6 +4467,7 @@ ibuf_merge_or_delete_for_page( ut_ad(!block || buf_block_get_space(block) == space); ut_ad(!block || buf_block_get_page_no(block) == page_no); ut_ad(!block || buf_block_get_zip_size(block) == zip_size); + ut_ad(!block || buf_block_get_io_fix(block) == BUF_IO_READ); if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE || trx_sys_hdr_page(space, page_no)) { @@ -4617,7 +4620,13 @@ loop: ut_a(success); - buf_block_dbg_add_level(block, SYNC_TREE_NODE); + /* This is a user page (secondary index leaf page), + but we pretend that it is a change buffer page in + order to obey the latching order. This should be OK, + because buffered changes are applied immediately while + the block is io-fixed. Other threads must not try to + latch an io-fixed block. */ + buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE); } /* Position pcur in the insert buffer at the first entry for this @@ -4721,7 +4730,12 @@ loop: __FILE__, __LINE__, &mtr); ut_a(success); - buf_block_dbg_add_level(block, SYNC_TREE_NODE); + /* This is a user page (secondary + index leaf page), but it should be OK + to use too low latching order for it, + as the block is io-fixed. */ + buf_block_dbg_add_level( + block, SYNC_IBUF_TREE_NODE); if (!ibuf_restore_pos(space, page_no, search_tuple, diff --git a/include/btr0btr.h b/include/btr0btr.h index c632e034581..058fcfb64de 100644 --- a/include/btr0btr.h +++ b/include/btr0btr.h @@ -199,26 +199,45 @@ btr_block_get_func( ulint mode, /*!< in: latch mode */ const char* file, /*!< in: file name */ ulint line, /*!< in: line where called */ - mtr_t* mtr) /*!< in/out: mtr */ - __attribute__((nonnull)); +# ifdef UNIV_SYNC_DEBUG + const dict_index_t* index, /*!< in: index tree, may be NULL + if it is not an insert buffer tree */ +# endif /* UNIV_SYNC_DEBUG */ + mtr_t* mtr); /*!< in/out: mini-transaction */ +# ifdef UNIV_SYNC_DEBUG /** Gets a buffer page and declares its latching order level. @param space tablespace identifier @param zip_size compressed page size in bytes or 0 for uncompressed pages @param page_no page number @param mode latch mode +@param index index tree, may be NULL if not the insert buffer tree @param mtr mini-transaction handle @return the block descriptor */ -# define btr_block_get(space,zip_size,page_no,mode,mtr) \ - btr_block_get_func(space,zip_size,page_no,mode,__FILE__,__LINE__,mtr) +# define btr_block_get(space,zip_size,page_no,mode,index,mtr) \ + btr_block_get_func(space,zip_size,page_no,mode, \ + __FILE__,__LINE__,index,mtr) +# else /* UNIV_SYNC_DEBUG */ /** Gets a buffer page and declares its latching order level. @param space tablespace identifier @param zip_size compressed page size in bytes or 0 for uncompressed pages @param page_no page number @param mode latch mode +@param idx index tree, may be NULL if not the insert buffer tree +@param mtr mini-transaction handle +@return the block descriptor */ +# define btr_block_get(space,zip_size,page_no,mode,idx,mtr) \ + btr_block_get_func(space,zip_size,page_no,mode,__FILE__,__LINE__,mtr) +# endif /* UNIV_SYNC_DEBUG */ +/** Gets a buffer page and declares its latching order level. +@param space tablespace identifier +@param zip_size compressed page size in bytes or 0 for uncompressed pages +@param page_no page number +@param mode latch mode +@param idx index tree, may be NULL if not the insert buffer tree @param mtr mini-transaction handle @return the uncompressed page frame */ -# define btr_page_get(space,zip_size,page_no,mode,mtr) \ - buf_block_get_frame(btr_block_get(space,zip_size,page_no,mode,mtr)) +# define btr_page_get(space,zip_size,page_no,mode,idx,mtr) \ + buf_block_get_frame(btr_block_get(space,zip_size,page_no,mode,idx,mtr)) /**************************************************************//** Sets the index id field of a page. */ UNIV_INLINE @@ -389,8 +408,7 @@ btr_free_root( ulint zip_size, /*!< in: compressed page size in bytes or 0 for uncompressed pages */ ulint root_page_no, /*!< in: root page number */ - mtr_t* mtr); /*!< in: a mini-transaction which has already - been started */ + mtr_t* mtr); /*!< in/out: mini-transaction */ /*************************************************************//** Makes tree one level higher by splitting the root, and inserts the tuple. It is assumed that mtr contains an x-latch on the tree. diff --git a/include/btr0btr.ic b/include/btr0btr.ic index 99c02ab30dc..f446ecb69d3 100644 --- a/include/btr0btr.ic +++ b/include/btr0btr.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -48,6 +48,10 @@ btr_block_get_func( ulint mode, /*!< in: latch mode */ const char* file, /*!< in: file name */ ulint line, /*!< in: line where called */ +#ifdef UNIV_SYNC_DEBUG + const dict_index_t* index, /*!< in: index tree, may be NULL + if it is not an insert buffer tree */ +#endif /* UNIV_SYNC_DEBUG */ mtr_t* mtr) /*!< in/out: mtr */ { buf_block_t* block; @@ -59,7 +63,9 @@ btr_block_get_func( if (block && mode != RW_NO_LATCH) { - buf_block_dbg_add_level(block, SYNC_TREE_NODE); + buf_block_dbg_add_level( + block, index != NULL && dict_index_is_ibuf(index) + ? SYNC_IBUF_TREE_NODE : SYNC_TREE_NODE); } return(block); diff --git a/include/btr0pcur.h b/include/btr0pcur.h index 6c11c973fc9..f605c476844 100644 --- a/include/btr0pcur.h +++ b/include/btr0pcur.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -244,18 +244,6 @@ btr_pcur_restore_position_func( mtr_t* mtr); /*!< in: mtr */ #define btr_pcur_restore_position(l,cur,mtr) \ btr_pcur_restore_position_func(l,cur,__FILE__,__LINE__,mtr) -/**************************************************************//** -If the latch mode of the cursor is BTR_LEAF_SEARCH or BTR_LEAF_MODIFY, -releases the page latch and bufferfix reserved by the cursor. -NOTE! In the case of BTR_LEAF_MODIFY, there should not exist changes -made by the current mini-transaction to the data protected by the -cursor latch, as then the latch must not be released until mtr_commit. */ -UNIV_INTERN -void -btr_pcur_release_leaf( -/*==================*/ - btr_pcur_t* cursor, /*!< in: persistent cursor */ - mtr_t* mtr); /*!< in: mtr */ /*********************************************************//** Gets the rel_pos field for a cursor whose position has been stored. @return BTR_PCUR_ON, ... */ @@ -266,10 +254,9 @@ btr_pcur_get_rel_pos( const btr_pcur_t* cursor);/*!< in: persistent cursor */ /**************************************************************//** Commits the mtr and sets the pcur latch mode to BTR_NO_LATCHES, -that is, the cursor becomes detached. If there have been modifications -to the page where pcur is positioned, this can be used instead of -btr_pcur_release_leaf. Function btr_pcur_store_position should be used -before calling this, if restoration of cursor is wanted later. */ +that is, the cursor becomes detached. +Function btr_pcur_store_position should be used before calling this, +if restoration of cursor is wanted later. */ UNIV_INLINE void btr_pcur_commit_specify_mtr( diff --git a/include/btr0pcur.ic b/include/btr0pcur.ic index 59fdb21824b..d86601e5a32 100644 --- a/include/btr0pcur.ic +++ b/include/btr0pcur.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -369,10 +369,9 @@ btr_pcur_move_to_next( /**************************************************************//** Commits the mtr and sets the pcur latch mode to BTR_NO_LATCHES, -that is, the cursor becomes detached. If there have been modifications -to the page where pcur is positioned, this can be used instead of -btr_pcur_release_leaf. Function btr_pcur_store_position should be used -before calling this, if restoration of cursor is wanted later. */ +that is, the cursor becomes detached. +Function btr_pcur_store_position should be used before calling this, +if restoration of cursor is wanted later. */ UNIV_INLINE void btr_pcur_commit_specify_mtr( diff --git a/include/buf0buddy.h b/include/buf0buddy.h index f51b8020918..eeea8f76351 100644 --- a/include/buf0buddy.h +++ b/include/buf0buddy.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2006, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 2006, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -37,39 +37,39 @@ Created December 2006 by Marko Makela /**********************************************************************//** Allocate a block. The thread calling this function must hold buf_pool->mutex and must not hold buf_pool->zip_mutex or any -block->mutex. The buf_pool->mutex may only be released and reacquired -if lru != NULL. This function should only be used for allocating -compressed page frames or control blocks (buf_page_t). Allocated -control blocks must be properly initialized immediately after -buf_buddy_alloc() has returned the memory, before releasing -buf_pool->mutex. -@return allocated block, possibly NULL if lru == NULL */ +block->mutex. The buf_pool->mutex may be released and reacquired. +This function should only be used for allocating compressed page frames. +@return allocated block, never NULL */ UNIV_INLINE -void* +byte* buf_buddy_alloc( /*============*/ - buf_pool_t* buf_pool, - /*!< buffer pool in which the block resides */ - ulint size, /*!< in: block size, up to UNIV_PAGE_SIZE */ - ibool* lru, /*!< in: pointer to a variable that will be assigned - TRUE if storage was allocated from the LRU list - and buf_pool->mutex was temporarily released, - or NULL if the LRU list should not be used */ - ibool have_page_hash_mutex) - __attribute__((malloc)); + buf_pool_t* buf_pool, /*!< in/out: buffer pool in which + the page resides */ + ulint size, /*!< in: compressed page size + (between PAGE_ZIP_MIN_SIZE and + UNIV_PAGE_SIZE) */ + ibool* lru, /*!< in: pointer to a variable + that will be assigned TRUE if + storage was allocated from the + LRU list and buf_pool->mutex was + temporarily released */ + ibool have_page_hash_mutex) + __attribute__((malloc, nonnull)); /**********************************************************************//** -Release a block. */ +Deallocate a block. */ UNIV_INLINE void buf_buddy_free( /*===========*/ - buf_pool_t* buf_pool, - /*!< buffer pool in which the block resides */ - void* buf, /*!< in: block to be freed, must not be - pointed to by the buffer pool */ - ulint size, /*!< in: block size, up to UNIV_PAGE_SIZE */ - ibool have_page_hash_mutex) + buf_pool_t* buf_pool, /*!< in/out: buffer pool in which + the block resides */ + void* buf, /*!< in: block to be freed, must not + be pointed to by the buffer pool */ + ulint size, /*!< in: block size, + up to UNIV_PAGE_SIZE */ + ibool have_page_hash_mutex) __attribute__((nonnull)); #ifndef UNIV_NONINL diff --git a/include/buf0buddy.ic b/include/buf0buddy.ic index 4dbfed52abe..3dd75276656 100644 --- a/include/buf0buddy.ic +++ b/include/buf0buddy.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2006, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 2006, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -36,22 +36,22 @@ Created December 2006 by Marko Makela /**********************************************************************//** Allocate a block. The thread calling this function must hold buf_pool->mutex and must not hold buf_pool->zip_mutex or any block->mutex. -The buf_pool->mutex may only be released and reacquired if lru != NULL. -@return allocated block, possibly NULL if lru==NULL */ +The buf_pool_mutex may be released and reacquired. +@return allocated block, never NULL */ UNIV_INTERN void* buf_buddy_alloc_low( /*================*/ - buf_pool_t* buf_pool, - /*!< in: buffer pool in which the page resides */ - ulint i, /*!< in: index of buf_pool->zip_free[], - or BUF_BUDDY_SIZES */ - ibool* lru, /*!< in: pointer to a variable that will be assigned - TRUE if storage was allocated from the LRU list - and buf_pool->mutex was temporarily released, - or NULL if the LRU list should not be used */ - ibool have_page_hash_mutex) - __attribute__((malloc)); + buf_pool_t* buf_pool, /*!< in/out: buffer pool instance */ + ulint i, /*!< in: index of buf_pool->zip_free[], + or BUF_BUDDY_SIZES */ + ibool* lru, /*!< in: pointer to a variable that + will be assigned TRUE if storage was + allocated from the LRU list and + buf_pool->mutex was temporarily + released */ + ibool have_page_hash_mutex) + __attribute__((malloc, nonnull)); /**********************************************************************//** Deallocate a block. */ @@ -79,6 +79,8 @@ buf_buddy_get_slot( ulint i; ulint s; + ut_ad(size >= PAGE_ZIP_MIN_SIZE); + for (i = 0, s = BUF_BUDDY_LOW; s < size; i++, s <<= 1) { } @@ -89,32 +91,32 @@ buf_buddy_get_slot( /**********************************************************************//** Allocate a block. The thread calling this function must hold buf_pool->mutex and must not hold buf_pool->zip_mutex or any -block->mutex. The buf_pool->mutex may only be released and reacquired -if lru != NULL. This function should only be used for allocating -compressed page frames or control blocks (buf_page_t). Allocated -control blocks must be properly initialized immediately after -buf_buddy_alloc() has returned the memory, before releasing -buf_pool->mutex. -@return allocated block, possibly NULL if lru == NULL */ +block->mutex. The buf_pool->mutex may be released and reacquired. +This function should only be used for allocating compressed page frames. +@return allocated block, never NULL */ UNIV_INLINE -void* +byte* buf_buddy_alloc( /*============*/ - buf_pool_t* buf_pool, /*!< in: buffer pool in which + buf_pool_t* buf_pool, /*!< in/out: buffer pool in which the page resides */ - ulint size, /*!< in: block size, up to - UNIV_PAGE_SIZE */ + ulint size, /*!< in: compressed page size + (between PAGE_ZIP_MIN_SIZE and + UNIV_PAGE_SIZE) */ ibool* lru, /*!< in: pointer to a variable that will be assigned TRUE if storage was allocated from the LRU list and buf_pool->mutex was - temporarily released, or NULL if - the LRU list should not be used */ + temporarily released */ ibool have_page_hash_mutex) { //ut_ad(buf_pool_mutex_own(buf_pool)); + ut_ad(ut_is_2pow(size)); + ut_ad(size >= PAGE_ZIP_MIN_SIZE); + ut_ad(size <= UNIV_PAGE_SIZE); - return(buf_buddy_alloc_low(buf_pool, buf_buddy_get_slot(size), lru, have_page_hash_mutex)); + return((byte*) buf_buddy_alloc_low(buf_pool, buf_buddy_get_slot(size), + lru, have_page_hash_mutex)); } /**********************************************************************//** @@ -123,14 +125,18 @@ UNIV_INLINE void buf_buddy_free( /*===========*/ - buf_pool_t* buf_pool, /*!< in: buffer pool instance */ - void* buf, /*!< in: block to be freed, must not be - pointed to by the buffer pool */ - ulint size, /*!< in: block size, up to - UNIV_PAGE_SIZE */ + buf_pool_t* buf_pool, /*!< in/out: buffer pool in which + the block resides */ + void* buf, /*!< in: block to be freed, must not + be pointed to by the buffer pool */ + ulint size, /*!< in: block size, + up to UNIV_PAGE_SIZE */ ibool have_page_hash_mutex) { //ut_ad(buf_pool_mutex_own(buf_pool)); + ut_ad(ut_is_2pow(size)); + ut_ad(size >= PAGE_ZIP_MIN_SIZE); + ut_ad(size <= UNIV_PAGE_SIZE); if (!have_page_hash_mutex) { mutex_enter(&buf_pool->LRU_list_mutex); diff --git a/include/buf0buf.h b/include/buf0buf.h index ef6a26f9459..d85dac5cc91 100644 --- a/include/buf0buf.h +++ b/include/buf0buf.h @@ -148,6 +148,8 @@ struct buf_pool_info_struct{ ulint n_pages_created; /*!< buf_pool->n_pages_created */ ulint n_pages_written; /*!< buf_pool->n_pages_written */ ulint n_page_gets; /*!< buf_pool->n_page_gets */ + ulint n_ra_pages_read_rnd; /*!< buf_pool->n_ra_pages_read_rnd, + number of pages readahead */ ulint n_ra_pages_read; /*!< buf_pool->n_ra_pages_read, number of pages readahead */ ulint n_ra_pages_evicted; /*!< buf_pool->n_ra_pages_evicted, @@ -172,6 +174,8 @@ struct buf_pool_info_struct{ last printout */ /* Statistics about read ahead algorithm. */ + double pages_readahead_rnd_rate;/*!< random readahead rate in pages per + second */ double pages_readahead_rate; /*!< readahead rate in pages per second */ double pages_evicted_rate; /*!< rate of readahead page evicted @@ -261,12 +265,6 @@ buf_relocate( BUF_BLOCK_ZIP_DIRTY or BUF_BLOCK_ZIP_PAGE */ buf_page_t* dpage) /*!< in/out: destination control block */ __attribute__((nonnull)); -/********************************************************************//** -Resizes the buffer pool. */ -UNIV_INTERN -void -buf_pool_resize(void); -/*=================*/ /*********************************************************************//** Gets the current size of buffer buf_pool in bytes. @return size in bytes */ @@ -289,6 +287,23 @@ UNIV_INTERN ib_uint64_t buf_pool_get_oldest_modification(void); /*==================================*/ +/********************************************************************//** +Allocates a buf_page_t descriptor. This function must succeed. In case +of failure we assert in this function. */ +UNIV_INLINE +buf_page_t* +buf_page_alloc_descriptor(void) +/*===========================*/ + __attribute__((malloc)); +/********************************************************************//** +Free a buf_page_t descriptor. */ +UNIV_INLINE +void +buf_page_free_descriptor( +/*=====================*/ + buf_page_t* bpage) /*!< in: bpage descriptor to free. */ + __attribute__((nonnull)); + /********************************************************************//** Allocates a buffer block. @return own: the allocated block, in state BUF_BLOCK_MEMORY */ @@ -546,6 +561,18 @@ buf_block_get_freed_page_clock( __attribute__((pure)); /********************************************************************//** +Tells if a block is still close enough to the MRU end of the LRU list +meaning that it is not in danger of getting evicted and also implying +that it has been accessed recently. +Note that this is for heuristics only and does not reserve buffer pool +mutex. +@return TRUE if block is close to MRU end of LRU */ +UNIV_INLINE +ibool +buf_page_peek_if_young( +/*===================*/ + const buf_page_t* bpage); /*!< in: block */ +/********************************************************************//** Recommends a move of a block to the start of the LRU list if there is danger of dropping from the buffer pool. NOTE: does not reserve the buffer pool mutex. @@ -1233,7 +1260,7 @@ ulint buf_get_free_list_len(void); /*=======================*/ -/******************************************************************** +/********************************************************************//** Determine if a block is a sentinel for a buffer pool watch. @return TRUE if a sentinel for a buffer pool watch, FALSE if not */ UNIV_INTERN @@ -1622,6 +1649,8 @@ struct buf_pool_stat_struct{ ulint n_pages_written;/*!< number write operations */ ulint n_pages_created;/*!< number of pages created in the pool with no read */ + ulint n_ra_pages_read_rnd;/*!< number of pages read in + as part of random read ahead */ ulint n_ra_pages_read;/*!< number of pages read in as part of read ahead */ ulint n_ra_pages_evicted;/*!< number of read ahead @@ -1766,7 +1795,7 @@ struct buf_pool_struct{ UT_LIST_BASE_NODE_T(buf_page_t) LRU; /*!< base node of the LRU list */ buf_page_t* LRU_old; /*!< pointer to the about - buf_LRU_old_ratio/BUF_LRU_OLD_RATIO_DIV + LRU_old_ratio/BUF_LRU_OLD_RATIO_DIV oldest blocks in the LRU list; NULL if LRU length less than BUF_LRU_OLD_MIN_LEN; @@ -1790,8 +1819,10 @@ struct buf_pool_struct{ frames and buf_page_t descriptors of blocks that exist in the buffer pool only in compressed form. */ /* @{ */ +#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG UT_LIST_BASE_NODE_T(buf_page_t) zip_clean; /*!< unmodified compressed pages */ +#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ UT_LIST_BASE_NODE_T(buf_page_t) zip_free[BUF_BUDDY_SIZES_MAX]; /*!< buddy free lists */ diff --git a/include/buf0buf.ic b/include/buf0buf.ic index 1a96b575d9b..98d575075ba 100644 --- a/include/buf0buf.ic +++ b/include/buf0buf.ic @@ -124,6 +124,29 @@ buf_block_get_freed_page_clock( return(buf_page_get_freed_page_clock(&block->page)); } +/********************************************************************//** +Tells if a block is still close enough to the MRU end of the LRU list +meaning that it is not in danger of getting evicted and also implying +that it has been accessed recently. +Note that this is for heuristics only and does not reserve buffer pool +mutex. +@return TRUE if block is close to MRU end of LRU */ +UNIV_INLINE +ibool +buf_page_peek_if_young( +/*===================*/ + const buf_page_t* bpage) /*!< in: block */ +{ + buf_pool_t* buf_pool = buf_pool_from_bpage(bpage); + + /* FIXME: bpage->freed_page_clock is 31 bits */ + return((buf_pool->freed_page_clock & ((1UL << 31) - 1)) + < ((ulint) bpage->freed_page_clock + + (buf_pool->curr_size + * (BUF_LRU_OLD_RATIO_DIV - buf_pool->LRU_old_ratio) + / (BUF_LRU_OLD_RATIO_DIV * 4)))); +} + /********************************************************************//** Recommends a move of a block to the start of the LRU list if there is danger of dropping from the buffer pool. NOTE: does not reserve the buffer pool @@ -154,12 +177,7 @@ buf_page_peek_if_too_old( buf_pool->stat.n_pages_not_made_young++; return(FALSE); } else { - /* FIXME: bpage->freed_page_clock is 31 bits */ - return((buf_pool->freed_page_clock & ((1UL << 31) - 1)) - > ((ulint) bpage->freed_page_clock - + (buf_pool->curr_size - * (BUF_LRU_OLD_RATIO_DIV - buf_pool->LRU_old_ratio) - / (BUF_LRU_OLD_RATIO_DIV * 4)))); + return(!buf_page_peek_if_young(bpage)); } } @@ -791,6 +809,35 @@ buf_block_get_lock_hash_val( return(block->lock_hash_val); } +/********************************************************************//** +Allocates a buf_page_t descriptor. This function must succeed. In case +of failure we assert in this function. +@return: the allocated descriptor. */ +UNIV_INLINE +buf_page_t* +buf_page_alloc_descriptor(void) +/*===========================*/ +{ + buf_page_t* bpage; + + bpage = (buf_page_t*) ut_malloc(sizeof *bpage); + ut_d(memset(bpage, 0, sizeof *bpage)); + UNIV_MEM_ALLOC(bpage, sizeof *bpage); + + return(bpage); +} + +/********************************************************************//** +Free a buf_page_t descriptor. */ +UNIV_INLINE +void +buf_page_free_descriptor( +/*=====================*/ + buf_page_t* bpage) /*!< in: bpage descriptor to free. */ +{ + ut_free(bpage); +} + /********************************************************************//** Frees a buffer block which does not contain a file page. */ UNIV_INLINE diff --git a/include/buf0lru.h b/include/buf0lru.h index 5d004ec4bb7..700136ec488 100644 --- a/include/buf0lru.h +++ b/include/buf0lru.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -30,18 +30,6 @@ Created 11/5/1995 Heikki Tuuri #include "ut0byte.h" #include "buf0types.h" -/** The return type of buf_LRU_free_block() */ -enum buf_lru_free_block_status { - /** freed */ - BUF_LRU_FREED = 0, - /** not freed because the caller asked to remove the - uncompressed frame but the control block cannot be - relocated */ - BUF_LRU_CANNOT_RELOCATE, - /** not freed because of some other reason */ - BUF_LRU_NOT_FREED -}; - /******************************************************************//** Tries to remove LRU flushed blocks from the end of the LRU list and put them to the free list. This is beneficial for the efficiency of the insert buffer @@ -85,6 +73,7 @@ void buf_LRU_invalidate_tablespace( /*==========================*/ ulint id); /*!< in: space id */ + /******************************************************************//** */ UNIV_INTERN @@ -92,6 +81,7 @@ void buf_LRU_mark_space_was_deleted( /*===========================*/ ulint id); /*!< in: space id */ +#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG /********************************************************************//** Insert a compressed block into buf_pool->zip_clean in the LRU order. */ UNIV_INTERN @@ -99,22 +89,22 @@ void buf_LRU_insert_zip_clean( /*=====================*/ buf_page_t* bpage); /*!< in: pointer to the block in question */ +#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ /******************************************************************//** Try to free a block. If bpage is a descriptor of a compressed-only page, the descriptor object will be freed as well. -NOTE: If this function returns BUF_LRU_FREED, it will temporarily +NOTE: If this function returns TRUE, it will temporarily release buf_pool->mutex. Furthermore, the page frame will no longer be accessible via bpage. The caller must hold buf_pool->mutex and buf_page_get_mutex(bpage) and release these two mutexes after the call. No other buf_page_get_mutex() may be held when calling this function. -@return BUF_LRU_FREED if freed, BUF_LRU_CANNOT_RELOCATE or -BUF_LRU_NOT_FREED otherwise. */ +@return TRUE if freed, FALSE otherwise. */ UNIV_INTERN -enum buf_lru_free_block_status +ibool buf_LRU_free_block( /*===============*/ buf_page_t* bpage, /*!< in: block to be freed */ @@ -204,7 +194,7 @@ buf_LRU_make_block_old( /*===================*/ buf_page_t* bpage); /*!< in: control block */ /**********************************************************************//** -Updates buf_LRU_old_ratio. +Updates buf_pool->LRU_old_ratio. @return updated old_pct */ UNIV_INTERN ulint @@ -213,7 +203,7 @@ buf_LRU_old_ratio_update( uint old_pct,/*!< in: Reserve this percentage of the buffer pool for "old" blocks. */ ibool adjust);/*!< in: TRUE=adjust the LRU list; - FALSE=just assign buf_LRU_old_ratio + FALSE=just assign buf_pool->LRU_old_ratio during the initialization of InnoDB */ /********************************************************************//** Update the historical stats that we are collecting for LRU eviction @@ -235,6 +225,17 @@ ibool buf_LRU_file_restore(void); /*======================*/ +/******************************************************************//** +Remove one page from LRU list and put it to free list */ +UNIV_INTERN +void +buf_LRU_free_one_page( +/*==================*/ + buf_page_t* bpage) /*!< in/out: block, must contain a file page and + be in a state where it can be freed; there + may or may not be a hash index to the page */ + __attribute__((nonnull)); + #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG /**********************************************************************//** Validates the LRU list. @@ -254,18 +255,15 @@ buf_LRU_print(void); #endif /* UNIV_DEBUG_PRINT || UNIV_DEBUG || UNIV_BUF_DEBUG */ /** @name Heuristics for detecting index scan @{ */ -/** Reserve this much/BUF_LRU_OLD_RATIO_DIV of the buffer pool for -"old" blocks. Protected by buf_pool->mutex. */ -extern uint buf_LRU_old_ratio; -/** The denominator of buf_LRU_old_ratio. */ +/** The denominator of buf_pool->LRU_old_ratio. */ #define BUF_LRU_OLD_RATIO_DIV 1024 -/** Maximum value of buf_LRU_old_ratio. +/** Maximum value of buf_pool->LRU_old_ratio. @see buf_LRU_old_adjust_len -@see buf_LRU_old_ratio_update */ +@see buf_pool->LRU_old_ratio_update */ #define BUF_LRU_OLD_RATIO_MAX BUF_LRU_OLD_RATIO_DIV -/** Minimum value of buf_LRU_old_ratio. +/** Minimum value of buf_pool->LRU_old_ratio. @see buf_LRU_old_adjust_len -@see buf_LRU_old_ratio_update +@see buf_pool->LRU_old_ratio_update The minimum must exceed (BUF_LRU_OLD_TOLERANCE + 5) * BUF_LRU_OLD_RATIO_DIV / BUF_LRU_OLD_MIN_LEN. */ #define BUF_LRU_OLD_RATIO_MIN 51 diff --git a/include/buf0rea.h b/include/buf0rea.h index 4910c1e2aca..dedd1904d31 100644 --- a/include/buf0rea.h +++ b/include/buf0rea.h @@ -76,6 +76,32 @@ buf_read_page( ulint offset, /*!< in: page number */ trx_t* trx); /********************************************************************//** +Applies a random read-ahead in buf_pool if there are at least a threshold +value of accessed pages from the random read-ahead area. Does not read any +page, not even the one at the position (space, offset), if the read-ahead +mechanism is not activated. NOTE 1: the calling thread may own latches on +pages: to avoid deadlocks this function must be written such that it cannot +end up waiting for these latches! NOTE 2: the calling thread must want +access to the page given: this rule is set to prevent unintended read-aheads +performed by ibuf routines, a situation which could result in a deadlock if +the OS does not support asynchronous i/o. +@return number of page read requests issued; NOTE that if we read ibuf +pages, it may happen that the page at the given page number does not +get read even if we return a positive value! +@return number of page read requests issued */ +UNIV_INTERN +ulint +buf_read_ahead_random( +/*==================*/ + ulint space, /*!< in: space id */ + ulint zip_size, /*!< in: compressed page size in bytes, + or 0 */ + ulint offset, /*!< in: page number of a page which + the current thread wants to access */ + ibool inside_ibuf, /*!< in: TRUE if we are inside ibuf + routine */ + trx_t* trx); +/********************************************************************//** Applies linear read-ahead if in the buf_pool the page is a border page of a linear read-ahead area and all the pages in the area have been accessed. Does not read any page if the read-ahead mechanism is not activated. Note diff --git a/include/buf0types.h b/include/buf0types.h index 888be86e332..156093aad01 100644 --- a/include/buf0types.h +++ b/include/buf0types.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -26,6 +26,8 @@ Created 11/17/1995 Heikki Tuuri #ifndef buf0types_h #define buf0types_h +#include "page0types.h" + /** Buffer page (uncompressed or compressed) */ typedef struct buf_page_struct buf_page_t; /** Buffer block for which an uncompressed page exists */ @@ -60,17 +62,10 @@ enum buf_io_fix { /** Parameters of binary buddy system for compressed pages (buf0buddy.h) */ /* @{ */ -#if UNIV_WORD_SIZE <= 4 /* 32-bit system */ -/** Base-2 logarithm of the smallest buddy block size */ -# define BUF_BUDDY_LOW_SHIFT 6 -#else /* 64-bit system */ -/** Base-2 logarithm of the smallest buddy block size */ -# define BUF_BUDDY_LOW_SHIFT 7 -#endif +#define BUF_BUDDY_LOW_SHIFT PAGE_ZIP_MIN_SIZE_SHIFT + #define BUF_BUDDY_LOW (1 << BUF_BUDDY_LOW_SHIFT) - /*!< minimum block size in the binary - buddy system; must be at least - sizeof(buf_page_t) */ + #define BUF_BUDDY_SIZES (UNIV_PAGE_SIZE_SHIFT - BUF_BUDDY_LOW_SHIFT) #define BUF_BUDDY_SIZES_MAX (UNIV_PAGE_SIZE_SHIFT_MAX - BUF_BUDDY_LOW_SHIFT) /*!< number of buddy sizes */ diff --git a/include/db0err.h b/include/db0err.h index 74a2354bce3..e0952f0709d 100644 --- a/include/db0err.h +++ b/include/db0err.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -64,8 +64,6 @@ enum db_err { DB_CANNOT_ADD_CONSTRAINT, /* adding a foreign key constraint to a table failed */ DB_CORRUPTION, /* data structure corruption noticed */ - DB_COL_APPEARS_TWICE_IN_INDEX, /* InnoDB cannot handle an index - where same column appears twice */ DB_CANNOT_DROP_CONSTRAINT, /* dropping a foreign key constraint from a table failed */ DB_NO_SAVEPOINT, /* no savepoint exists with the given @@ -112,6 +110,8 @@ enum db_err { foreign keys as its prefix columns */ DB_TOO_BIG_INDEX_COL, /* index column size exceeds maximum limit */ + DB_INDEX_CORRUPT, /* we have corrupted index */ + DB_UNDO_RECORD_TOO_BIG, /* the undo log record is too big */ /* The following are partial failure codes */ DB_FAIL = 1000, diff --git a/include/dict0boot.h b/include/dict0boot.h index c8a09ca7de4..a817775c93c 100644 --- a/include/dict0boot.h +++ b/include/dict0boot.h @@ -141,8 +141,10 @@ dict_create(void); #define DICT_HDR_XTRADB_MARK 256 /* Flag to distinguish expansion of XtraDB */ /*-------------------------------------------------------------*/ -/* The field number of the page number field in the sys_indexes table -clustered index */ +/* The field numbers in the SYS_TABLES clustered index */ +#define DICT_SYS_TABLES_TYPE_FIELD 5 + +/* The field numbers in the SYS_INDEXES clustered index */ #define DICT_SYS_INDEXES_PAGE_NO_FIELD 8 #define DICT_SYS_INDEXES_SPACE_NO_FIELD 7 #define DICT_SYS_INDEXES_TYPE_FIELD 6 diff --git a/include/dict0dict.h b/include/dict0dict.h index d99177e0330..fb5285fae0b 100644 --- a/include/dict0dict.h +++ b/include/dict0dict.h @@ -585,6 +585,20 @@ dict_table_get_next_index( # define dict_table_get_next_index(index) UT_LIST_GET_NEXT(indexes, index) #endif /* UNIV_DEBUG */ #endif /* !UNIV_HOTBACKUP */ + +/* Skip corrupted index */ +#define dict_table_skip_corrupt_index(index) \ + while (index && dict_index_is_corrupted(index)) { \ + index = dict_table_get_next_index(index); \ + } + +/* Get the next non-corrupt index */ +#define dict_table_next_uncorrupted_index(index) \ +do { \ + index = dict_table_get_next_index(index); \ + dict_table_skip_corrupt_index(index); \ +} while (0) + /********************************************************************//** Check whether the index is the clustered index. @return nonzero for clustered index, zero for other indexes */ @@ -593,7 +607,7 @@ ulint dict_index_is_clust( /*================*/ const dict_index_t* index) /*!< in: index */ - __attribute__((pure)); + __attribute__((nonnull, pure, warn_unused_result)); /********************************************************************//** Check whether the index is unique. @return nonzero for unique index, zero for other indexes */ @@ -602,7 +616,7 @@ ulint dict_index_is_unique( /*=================*/ const dict_index_t* index) /*!< in: index */ - __attribute__((pure)); + __attribute__((nonnull, pure, warn_unused_result)); /********************************************************************//** Check whether the index is the insert buffer tree. @return nonzero for insert buffer, zero for other indexes */ @@ -611,7 +625,7 @@ ulint dict_index_is_ibuf( /*===============*/ const dict_index_t* index) /*!< in: index */ - __attribute__((pure)); + __attribute__((nonnull, pure, warn_unused_result)); /********************************************************************//** Check whether the index is a secondary index or the insert buffer tree. @return nonzero for insert buffer, zero for other indexes */ @@ -620,7 +634,7 @@ ulint dict_index_is_sec_or_ibuf( /*======================*/ const dict_index_t* index) /*!< in: index */ - __attribute__((pure)); + __attribute__((nonnull, pure, warn_unused_result)); /********************************************************************//** Gets the number of user-defined columns in a table in the dictionary @@ -630,7 +644,8 @@ UNIV_INLINE ulint dict_table_get_n_user_cols( /*=======================*/ - const dict_table_t* table); /*!< in: table */ + const dict_table_t* table) /*!< in: table */ + __attribute__((nonnull, pure, warn_unused_result)); /********************************************************************//** Gets the number of system columns in a table in the dictionary cache. @return number of system (e.g., ROW_ID) columns of a table */ @@ -638,7 +653,8 @@ UNIV_INLINE ulint dict_table_get_n_sys_cols( /*======================*/ - const dict_table_t* table); /*!< in: table */ + const dict_table_t* table) /*!< in: table */ + __attribute__((nonnull, pure, warn_unused_result)); /********************************************************************//** Gets the number of all columns (also system) in a table in the dictionary cache. @@ -647,7 +663,8 @@ UNIV_INLINE ulint dict_table_get_n_cols( /*==================*/ - const dict_table_t* table); /*!< in: table */ + const dict_table_t* table) /*!< in: table */ + __attribute__((nonnull, pure, warn_unused_result)); #ifdef UNIV_DEBUG /********************************************************************//** Gets the nth column of a table. @@ -1258,6 +1275,57 @@ void dict_close(void); /*============*/ +/**********************************************************************//** +Check whether the table is corrupted. +@return nonzero for corrupted table, zero for valid tables */ +UNIV_INLINE +ulint +dict_table_is_corrupted( +/*====================*/ + const dict_table_t* table) /*!< in: table */ + __attribute__((nonnull, pure, warn_unused_result)); + +/**********************************************************************//** +Check whether the index is corrupted. +@return nonzero for corrupted index, zero for valid indexes */ +UNIV_INLINE +ulint +dict_index_is_corrupted( +/*====================*/ + const dict_index_t* index) /*!< in: index */ + __attribute__((nonnull, pure, warn_unused_result)); + +/**********************************************************************//** +Flags an index and table corrupted both in the data dictionary cache +and in the system table SYS_INDEXES. */ +UNIV_INTERN +void +dict_set_corrupted( +/*===============*/ + dict_index_t* index) /*!< in/out: index */ + UNIV_COLD __attribute__((nonnull)); + +/**********************************************************************//** +Flags an index corrupted in the data dictionary cache only. This +is used mostly to mark a corrupted index when index's own dictionary +is corrupted, and we force to load such index for repair purpose */ +UNIV_INTERN +void +dict_set_corrupted_index_cache_only( +/*================================*/ + dict_index_t* index, /*!< in/out: index */ + dict_table_t* table); /*!< in/out: table */ + +/**********************************************************************//** +Flags a table with specified space_id corrupted in the table dictionary +cache. +@return TRUE if successful */ +UNIV_INTERN +ibool +dict_set_corrupted_by_space( +/*========================*/ + ulint space_id); /*!< in: space ID */ + /************************************************************************* set is_corrupt flag by space_id*/ diff --git a/include/dict0dict.ic b/include/dict0dict.ic index b03f5117295..ecb5ec0a408 100644 --- a/include/dict0dict.ic +++ b/include/dict0dict.ic @@ -27,6 +27,7 @@ Created 1/8/1996 Heikki Tuuri #ifndef UNIV_HOTBACKUP #include "dict0load.h" #include "rem0types.h" +#include "srv0srv.h" /*********************************************************************//** Gets the minimum number of bytes per character. @@ -835,7 +836,7 @@ dict_table_check_if_in_cache_low( } /**********************************************************************//** -load a table into dictionary cache, ignore any error specified during load; +load a table into dictionary cache, ignore any error specified during load; @return table, NULL if not found */ UNIV_INLINE dict_table_t* @@ -879,6 +880,18 @@ dict_table_get_low( table = dict_table_check_if_in_cache_low(table_name); + if (table && table->corrupted) { + fprintf(stderr, "InnoDB: table"); + ut_print_name(stderr, NULL, TRUE, table->name); + if (srv_load_corrupted) { + fputs(" is corrupted, but" + " innodb_force_load_corrupted is set\n", stderr); + } else { + fputs(" is corrupted\n", stderr); + return(NULL); + } + } + if (table == NULL) { table = dict_load_table(table_name, TRUE, DICT_ERR_IGNORE_NONE); } @@ -950,4 +963,35 @@ dict_max_field_len_store_undo( return(prefix_len); } +/********************************************************************//** +Check whether the table is corrupted. +@return nonzero for corrupted table, zero for valid tables */ +UNIV_INLINE +ulint +dict_table_is_corrupted( +/*====================*/ + const dict_table_t* table) /*!< in: table */ +{ + ut_ad(table); + ut_ad(table->magic_n == DICT_TABLE_MAGIC_N); + + return(UNIV_UNLIKELY(table->corrupted)); +} + +/********************************************************************//** +Check whether the index is corrupted. +@return nonzero for corrupted index, zero for valid indexes */ +UNIV_INLINE +ulint +dict_index_is_corrupted( +/*====================*/ + const dict_index_t* index) /*!< in: index */ +{ + ut_ad(index); + ut_ad(index->magic_n == DICT_INDEX_MAGIC_N); + + return(UNIV_UNLIKELY((index->type & DICT_CORRUPT) + || (index->table && index->table->corrupted))); +} + #endif /* !UNIV_HOTBACKUP */ diff --git a/include/dict0mem.h b/include/dict0mem.h index 71af9ce2f0c..4701fcd87f9 100644 --- a/include/dict0mem.h +++ b/include/dict0mem.h @@ -51,7 +51,12 @@ combination of types */ #define DICT_UNIQUE 2 /*!< unique index */ #define DICT_UNIVERSAL 4 /*!< index which can contain records from any other index */ -#define DICT_IBUF 8 /*!< insert buffer tree */ +#define DICT_IBUF 8 /*!< insert buffer tree */ +#define DICT_CORRUPT 16 /*!< bit to store the corrupted flag + in SYS_INDEXES.TYPE */ + +#define DICT_IT_BITS 5 /*!< number of bits used for + SYS_INDEXES.TYPE */ /* @} */ /** Types for a table object */ @@ -369,8 +374,9 @@ struct dict_index_struct{ /*!< space where the index tree is placed */ unsigned page:32;/*!< index tree root page number */ #endif /* !UNIV_HOTBACKUP */ - unsigned type:4; /*!< index type (DICT_CLUSTERED, DICT_UNIQUE, - DICT_UNIVERSAL, DICT_IBUF) */ + unsigned type:DICT_IT_BITS; + /*!< index type (DICT_CLUSTERED, DICT_UNIQUE, + DICT_UNIVERSAL, DICT_IBUF, DICT_CORRUPT) */ unsigned trx_id_offset:10;/*!< position of the trx id column in a clustered index record, if the fields before it are known to be of a fixed size, @@ -391,8 +397,6 @@ struct dict_index_struct{ /*!< TRUE if this index is marked to be dropped in ha_innobase::prepare_drop_index(), otherwise FALSE */ - unsigned corrupted:1; - /*!< TRUE if the index object is corrupted */ dict_field_t* fields; /*!< array of field descriptions */ #ifndef UNIV_HOTBACKUP UT_LIST_NODE_T(dict_index_t) diff --git a/include/dict0types.h b/include/dict0types.h index 8cbd7cd5783..f0a05a38070 100644 --- a/include/dict0types.h +++ b/include/dict0types.h @@ -51,7 +51,8 @@ be or-ed together */ enum dict_err_ignore { DICT_ERR_IGNORE_NONE = 0, /*!< no error to ignore */ DICT_ERR_IGNORE_INDEX_ROOT = 1, /*!< ignore error if index root - page is FIL_NUL or incorrect value */ + page is FIL_NULL or incorrect value */ + DICT_ERR_IGNORE_CORRUPT = 2, /*!< skip corrupted indexes */ DICT_ERR_IGNORE_ALL = 0xFFFF /*!< ignore all errors */ }; diff --git a/include/ha_prototypes.h b/include/ha_prototypes.h index 02e7712df58..8dc968baebe 100644 --- a/include/ha_prototypes.h +++ b/include/ha_prototypes.h @@ -303,4 +303,15 @@ ulint innobase_get_lower_case_table_names(void); /*=====================================*/ +/******************************************************************//** +Returns true if innodb_expand_fast_index_creation is enabled for the current +session. +@return the value of the server's innodb_expand_fast_index_creation variable */ + +ibool +thd_expand_fast_index_creation( +/*==================*/ + void* thd); /*!< in: thread handle (THD*) */ + + #endif diff --git a/include/mtr0mtr.h b/include/mtr0mtr.h index 5582ad63039..7f608546cc2 100644 --- a/include/mtr0mtr.h +++ b/include/mtr0mtr.h @@ -213,16 +213,6 @@ ulint mtr_set_savepoint( /*==============*/ mtr_t* mtr); /*!< in: mtr */ -/**********************************************************//** -Releases the latches stored in an mtr memo down to a savepoint. -NOTE! The mtr must not have made changes to buffer pages after the -savepoint, as these can be handled only by mtr_commit. */ -UNIV_INTERN -void -mtr_rollback_to_savepoint( -/*======================*/ - mtr_t* mtr, /*!< in: mtr */ - ulint savepoint); /*!< in: savepoint */ #ifndef UNIV_HOTBACKUP /**********************************************************//** Releases the (index tree) s-latch stored in an mtr memo after a diff --git a/include/os0file.h b/include/os0file.h index b778adaa809..366a2862e99 100644 --- a/include/os0file.h +++ b/include/os0file.h @@ -290,7 +290,8 @@ The wrapper functions have the prefix of "innodb_". */ __FILE__, __LINE__) # define os_file_read_trx(file, buf, offset, offset_high, n, trx) \ - os_file_read_func(file, buf, offset, offset_high, n, trx) + pfs_os_file_read_func(file, buf, offset, offset_high, n, trx, \ + __FILE__, __LINE__) # define os_file_read_no_error_handling(file, buf, offset, \ offset_high, n) \ diff --git a/include/page0page.h b/include/page0page.h index d4b90078029..3647dc57235 100644 --- a/include/page0page.h +++ b/include/page0page.h @@ -68,10 +68,7 @@ typedef byte page_header_t; #define PAGE_MAX_TRX_ID 18 /* highest id of a trx which may have modified a record on the page; trx_id_t; defined only in secondary indexes and in the insert buffer - tree; NOTE: this may be modified only - when the thread has an x-latch to the page, - and ALSO an x-latch to btr_search_latch - if there is a hash index to the page! */ + tree */ #define PAGE_HEADER_PRIV_END 26 /* end of private data structure of the page header which are set in a page create */ /*----*/ diff --git a/include/row0row.h b/include/row0row.h index 75e15d67246..c2849be7c3e 100644 --- a/include/row0row.h +++ b/include/row0row.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -38,27 +38,16 @@ Created 4/20/1996 Heikki Tuuri #include "btr0types.h" /*********************************************************************//** -Gets the offset of the trx id field, in bytes relative to the origin of +Gets the offset of the DB_TRX_ID field, in bytes relative to the origin of a clustered index record. @return offset of DATA_TRX_ID */ UNIV_INLINE ulint -row_get_trx_id_offset_func( -/*=======================*/ -#ifdef UNIV_DEBUG - const rec_t* rec, /*!< in: record */ -#endif /* UNIV_DEBUG */ +row_get_trx_id_offset( +/*==================*/ const dict_index_t* index, /*!< in: clustered index */ - const ulint* offsets)/*!< in: rec_get_offsets(rec, index) */ + const ulint* offsets)/*!< in: record offsets */ __attribute__((nonnull, warn_unused_result)); -#ifdef UNIV_DEBUG -# define row_get_trx_id_offset(rec, index, offsets) \ - row_get_trx_id_offset_func(rec, index, offsets) -#else /* UNIV_DEBUG */ -# define row_get_trx_id_offset(rec, index, offsets) \ - row_get_trx_id_offset_func(index, offsets) -#endif /* UNIV_DEBUG */ - /*********************************************************************//** Reads the trx id field from a clustered index record. @return value of the field */ @@ -77,9 +66,10 @@ UNIV_INLINE roll_ptr_t row_get_rec_roll_ptr( /*=================*/ - const rec_t* rec, /*!< in: record */ - dict_index_t* index, /*!< in: clustered index */ - const ulint* offsets);/*!< in: rec_get_offsets(rec, index) */ + const rec_t* rec, /*!< in: record */ + const dict_index_t* index, /*!< in: clustered index */ + const ulint* offsets)/*!< in: rec_get_offsets(rec, index) */ + __attribute__((nonnull, warn_unused_result)); /*****************************************************************//** When an insert or purge to a table is performed, this function builds the entry to be inserted into or purged from an index on the table. diff --git a/include/row0row.ic b/include/row0row.ic index 9d19e430e16..0b9ca982af8 100644 --- a/include/row0row.ic +++ b/include/row0row.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -28,25 +28,22 @@ Created 4/20/1996 Heikki Tuuri #include "trx0undo.h" /*********************************************************************//** -Gets the offset of trx id field, in bytes relative to the origin of +Gets the offset of the DB_TRX_ID field, in bytes relative to the origin of a clustered index record. @return offset of DATA_TRX_ID */ UNIV_INLINE ulint -row_get_trx_id_offset_func( -/*=======================*/ -#ifdef UNIV_DEBUG - const rec_t* rec, /*!< in: record */ -#endif /* UNIV_DEBUG */ +row_get_trx_id_offset( +/*==================*/ const dict_index_t* index, /*!< in: clustered index */ - const ulint* offsets)/*!< in: rec_get_offsets(rec, index) */ + const ulint* offsets)/*!< in: record offsets */ { ulint pos; ulint offset; ulint len; ut_ad(dict_index_is_clust(index)); - ut_ad(rec_offs_validate(rec, index, offsets)); + ut_ad(rec_offs_validate(NULL, index, offsets)); pos = dict_index_get_sys_col_pos(index, DATA_TRX_ID); @@ -76,7 +73,7 @@ row_get_rec_trx_id( offset = index->trx_id_offset; if (!offset) { - offset = row_get_trx_id_offset(rec, index, offsets); + offset = row_get_trx_id_offset(index, offsets); } return(trx_read_trx_id(rec + offset)); @@ -89,9 +86,9 @@ UNIV_INLINE roll_ptr_t row_get_rec_roll_ptr( /*=================*/ - const rec_t* rec, /*!< in: record */ - dict_index_t* index, /*!< in: clustered index */ - const ulint* offsets)/*!< in: rec_get_offsets(rec, index) */ + const rec_t* rec, /*!< in: record */ + const dict_index_t* index, /*!< in: clustered index */ + const ulint* offsets)/*!< in: rec_get_offsets(rec, index) */ { ulint offset; @@ -101,7 +98,7 @@ row_get_rec_roll_ptr( offset = index->trx_id_offset; if (!offset) { - offset = row_get_trx_id_offset(rec, index, offsets); + offset = row_get_trx_id_offset(index, offsets); } return(trx_read_roll_ptr(rec + offset + DATA_TRX_ID_LEN)); diff --git a/include/row0upd.ic b/include/row0upd.ic index 2968a548b34..11db82f64da 100644 --- a/include/row0upd.ic +++ b/include/row0upd.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -157,11 +157,6 @@ row_upd_rec_sys_fields( { ut_ad(dict_index_is_clust(index)); ut_ad(rec_offs_validate(rec, index, offsets)); -#ifdef UNIV_SYNC_DEBUG - if (!rw_lock_own(btr_search_get_latch(index->id), RW_LOCK_EX)) { - ut_ad(!buf_block_align(rec)->is_hashed); - } -#endif /* UNIV_SYNC_DEBUG */ if (UNIV_LIKELY_NULL(page_zip)) { ulint pos = dict_index_get_sys_col_pos(index, DATA_TRX_ID); @@ -171,7 +166,7 @@ row_upd_rec_sys_fields( ulint offset = index->trx_id_offset; if (!offset) { - offset = row_get_trx_id_offset(rec, index, offsets); + offset = row_get_trx_id_offset(index, offsets); } #if DATA_TRX_ID + 1 != DATA_ROLL_PTR diff --git a/include/srv0srv.h b/include/srv0srv.h index 6277439694f..a36ee77929a 100644 --- a/include/srv0srv.h +++ b/include/srv0srv.h @@ -149,6 +149,10 @@ extern ulint srv_log_buffer_size; extern char srv_use_global_flush_log_at_trx_commit; extern char srv_adaptive_flushing; +/* If this flag is TRUE, then we will load the indexes' (and tables') metadata +even if they are marked as "corrupted". Mostly it is for DBA to process +corrupted index and table */ +extern my_bool srv_load_corrupted; extern ulint srv_show_locks_held; extern ulint srv_show_verbose_locks; @@ -171,6 +175,7 @@ extern ulint srv_lock_table_size; extern ibool srv_thread_concurrency_timer_based; extern ulint srv_n_file_io_threads; +extern my_bool srv_random_read_ahead; extern ulong srv_read_ahead_threshold; extern ulint srv_n_read_io_threads; extern ulint srv_n_write_io_threads; @@ -291,6 +296,7 @@ extern ibool srv_print_latch_waits; extern ulint srv_activity_count; extern ulint srv_fatal_semaphore_wait_threshold; extern ulint srv_dml_needed_delay; +extern lint srv_kill_idle_transaction; extern mutex_t* kernel_mutex_temp;/* mutex protecting the server, trx structs, query threads, and lock table: we allocate @@ -365,6 +371,9 @@ extern ulint srv_buf_pool_reads; /** Time in seconds between automatic buffer pool dumps */ extern uint srv_auto_lru_dump; +/** Whether startup should be blocked until buffer pool is fully restored */ +extern ibool srv_blocking_lru_restore; + /** Status variables to be passed to MySQL */ typedef struct export_var_struct export_struc; @@ -762,6 +771,7 @@ struct export_var_struct{ ulint innodb_buffer_pool_pages_flushed; /*!< srv_buf_pool_flushed */ ulint innodb_buffer_pool_pages_LRU_flushed; /*!< buf_lru_flush_page_count */ ulint innodb_buffer_pool_write_requests;/*!< srv_buf_pool_write_requests */ + ulint innodb_buffer_pool_read_ahead_rnd;/*!< srv_read_ahead_rnd */ ulint innodb_buffer_pool_read_ahead; /*!< srv_read_ahead */ ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/ ulint innodb_checkpoint_age; diff --git a/include/sync0sync.h b/include/sync0sync.h index 32a20807ba0..d32c872c407 100644 --- a/include/sync0sync.h +++ b/include/sync0sync.h @@ -640,10 +640,6 @@ or row lock! */ #define SYNC_DICT_HEADER 995 #define SYNC_IBUF_HEADER 914 #define SYNC_IBUF_PESS_INSERT_MUTEX 912 -#define SYNC_IBUF_MUTEX 910 /* ibuf mutex is really below - SYNC_FSP_PAGE: we assign a value this - high only to make the program to pass - the debug checks */ /*-------------------------------*/ #define SYNC_INDEX_TREE 900 #define SYNC_TREE_NODE_NEW 892 @@ -659,8 +655,11 @@ or row lock! */ #define SYNC_FSP 400 #define SYNC_FSP_PAGE 395 /*------------------------------------- Insert buffer headers */ -/*------------------------------------- ibuf_mutex */ +#define SYNC_IBUF_MUTEX 370 /* ibuf_mutex */ /*------------------------------------- Insert buffer tree */ +#define SYNC_IBUF_INDEX_TREE 360 +#define SYNC_IBUF_TREE_NODE_NEW 359 +#define SYNC_IBUF_TREE_NODE 358 #define SYNC_IBUF_BITMAP_MUTEX 351 #define SYNC_IBUF_BITMAP 350 /*------------------------------------- MySQL query cache mutex */ @@ -693,7 +692,6 @@ or row lock! */ #define SYNC_DOUBLEWRITE 140 #define SYNC_OUTER_ANY_LATCH 136 #define SYNC_ANY_LATCH 135 -#define SYNC_THR_LOCAL 133 #define SYNC_MEM_HASH 131 #define SYNC_MEM_POOL 130 diff --git a/include/sync0sync.ic b/include/sync0sync.ic index 1d9c8d59b12..aa54226be5d 100644 --- a/include/sync0sync.ic +++ b/include/sync0sync.ic @@ -272,11 +272,10 @@ pfs_mutex_enter_nowait_func( ulint ret; struct PSI_mutex_locker* locker = NULL; PSI_mutex_locker_state state; - int result = 0; if (UNIV_LIKELY(PSI_server && mutex->pfs_psi)) { locker = PSI_server->get_thread_mutex_locker( - &state, mutex->pfs_psi, PSI_MUTEX_LOCK); + &state, mutex->pfs_psi, PSI_MUTEX_TRYLOCK); if (locker) { PSI_server->start_mutex_wait(locker, file_name, line); } @@ -285,7 +284,7 @@ pfs_mutex_enter_nowait_func( ret = mutex_enter_nowait_func(mutex, file_name, line); if (locker) { - PSI_server->end_mutex_wait(locker, result); + PSI_server->end_mutex_wait(locker, ret); } return(ret); diff --git a/include/trx0sys.h b/include/trx0sys.h index db7bf68deae..495ce0e1184 100644 --- a/include/trx0sys.h +++ b/include/trx0sys.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2011, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -304,6 +304,17 @@ ibool trx_in_trx_list( /*============*/ trx_t* in_trx);/*!< in: trx */ +#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG +/***********************************************************//** +Assert that a transaction has been recovered. +@return TRUE */ +UNIV_INLINE +ibool +trx_assert_recovered( +/*=================*/ + trx_id_t trx_id) /*!< in: transaction identifier */ + __attribute__((warn_unused_result)); +#endif /* UNIV_DEBUG || UNIV_BLOB_LIGHT_DEBUG */ /*****************************************************************//** Updates the offset information about the end of the MySQL binlog entry which corresponds to the transaction just being committed. In a MySQL diff --git a/include/trx0sys.ic b/include/trx0sys.ic index aa2d2ea26b0..af05ab2f5ed 100644 --- a/include/trx0sys.ic +++ b/include/trx0sys.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -311,6 +311,28 @@ trx_get_on_id( return(NULL); } +#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG +/***********************************************************//** +Assert that a transaction has been recovered. +@return TRUE */ +UNIV_INLINE +ibool +trx_assert_recovered( +/*=================*/ + trx_id_t trx_id) /*!< in: transaction identifier */ +{ + trx_t* trx; + + mutex_enter(&kernel_mutex); + trx = trx_get_on_id(trx_id); + ut_a(trx); + ut_a(trx->is_recovered); + mutex_exit(&kernel_mutex); + + return(TRUE); +} +#endif /* UNIV_DEBUG || UNIV_BLOB_LIGHT_DEBUG */ + /****************************************************************//** Returns the minumum trx id in trx list. This is the smallest id for which the trx can possibly be active. (But, you must look at the trx->conc_state to diff --git a/include/trx0trx.h b/include/trx0trx.h index ab7404c5eff..4e010592e5a 100644 --- a/include/trx0trx.h +++ b/include/trx0trx.h @@ -512,6 +512,7 @@ struct trx_struct{ FALSE, one can save CPU time and about 150 bytes in the undo log size as then we skip XA steps */ + ulint fake_changes; ulint flush_log_later;/* In 2PC, we hold the prepare_commit mutex across both phases. In that case, we @@ -594,6 +595,8 @@ struct trx_struct{ replication has processed */ const char* mysql_relay_log_file_name; ib_int64_t mysql_relay_log_pos; + time_t idle_start; + ib_int64_t last_stmt_start; /*------------------------------*/ ulint n_mysql_tables_in_use; /* number of Innobase tables used in the processing of the current diff --git a/include/trx0undo.h b/include/trx0undo.h index df16c939070..50aa6d0ac09 100644 --- a/include/trx0undo.h +++ b/include/trx0undo.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -204,17 +204,51 @@ trx_undo_add_page( mtr_t* mtr); /*!< in: mtr which does not have a latch to any undo log page; the caller must have reserved the rollback segment mutex */ +/********************************************************************//** +Frees the last undo log page. +The caller must hold the rollback segment mutex. */ +UNIV_INTERN +void +trx_undo_free_last_page_func( +/*==========================*/ +#ifdef UNIV_DEBUG + const trx_t* trx, /*!< in: transaction */ +#endif /* UNIV_DEBUG */ + trx_undo_t* undo, /*!< in/out: undo log memory copy */ + mtr_t* mtr) /*!< in/out: mini-transaction which does not + have a latch to any undo log page or which + has allocated the undo log page */ + __attribute__((nonnull)); +#ifdef UNIV_DEBUG +# define trx_undo_free_last_page(trx,undo,mtr) \ + trx_undo_free_last_page_func(trx,undo,mtr) +#else /* UNIV_DEBUG */ +# define trx_undo_free_last_page(trx,undo,mtr) \ + trx_undo_free_last_page_func(undo,mtr) +#endif /* UNIV_DEBUG */ + /***********************************************************************//** Truncates an undo log from the end. This function is used during a rollback to free space from an undo log. */ UNIV_INTERN void -trx_undo_truncate_end( -/*==================*/ - trx_t* trx, /*!< in: transaction whose undo log it is */ - trx_undo_t* undo, /*!< in: undo log */ - undo_no_t limit); /*!< in: all undo records with undo number +trx_undo_truncate_end_func( +/*=======================*/ +#ifdef UNIV_DEBUG + const trx_t* trx, /*!< in: transaction whose undo log it is */ +#endif /* UNIV_DEBUG */ + trx_undo_t* undo, /*!< in/out: undo log */ + undo_no_t limit) /*!< in: all undo records with undo number >= this value should be truncated */ + __attribute__((nonnull)); +#ifdef UNIV_DEBUG +# define trx_undo_truncate_end(trx,undo,limit) \ + trx_undo_truncate_end_func(trx,undo,limit) +#else /* UNIV_DEBUG */ +# define trx_undo_truncate_end(trx,undo,limit) \ + trx_undo_truncate_end_func(undo,limit) +#endif /* UNIV_DEBUG */ + /***********************************************************************//** Truncates an undo log from the start. This function is used during a purge operation. */ diff --git a/include/ut0mem.h b/include/ut0mem.h index 57dfb08f41c..faf6f242883 100644 --- a/include/ut0mem.h +++ b/include/ut0mem.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -209,43 +209,6 @@ ut_strlcpy_rev( const char* src, /*!< in: source buffer */ ulint size); /*!< in: size of destination buffer */ -/**********************************************************************//** -Compute strlen(ut_strcpyq(str, q)). -@return length of the string when quoted */ -UNIV_INLINE -ulint -ut_strlenq( -/*=======*/ - const char* str, /*!< in: null-terminated string */ - char q); /*!< in: the quote character */ - -/**********************************************************************//** -Make a quoted copy of a NUL-terminated string. Leading and trailing -quotes will not be included; only embedded quotes will be escaped. -See also ut_strlenq() and ut_memcpyq(). -@return pointer to end of dest */ -UNIV_INTERN -char* -ut_strcpyq( -/*=======*/ - char* dest, /*!< in: output buffer */ - char q, /*!< in: the quote character */ - const char* src); /*!< in: null-terminated string */ - -/**********************************************************************//** -Make a quoted copy of a fixed-length string. Leading and trailing -quotes will not be included; only embedded quotes will be escaped. -See also ut_strlenq() and ut_strcpyq(). -@return pointer to end of dest */ -UNIV_INTERN -char* -ut_memcpyq( -/*=======*/ - char* dest, /*!< in: output buffer */ - char q, /*!< in: the quote character */ - const char* src, /*!< in: string to be quoted */ - ulint len); /*!< in: length of src */ - /**********************************************************************//** Return the number of times s2 occurs in s1. Overlapping instances of s2 are only counted once. diff --git a/include/ut0mem.ic b/include/ut0mem.ic index f36c28f1989..c06e2b3ae81 100644 --- a/include/ut0mem.ic +++ b/include/ut0mem.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -98,27 +98,6 @@ ut_strcmp(const char* str1, const char* str2) return(strcmp(str1, str2)); } -/**********************************************************************//** -Compute strlen(ut_strcpyq(str, q)). -@return length of the string when quoted */ -UNIV_INLINE -ulint -ut_strlenq( -/*=======*/ - const char* str, /*!< in: null-terminated string */ - char q) /*!< in: the quote character */ -{ - ulint len; - - for (len = 0; *str; len++, str++) { - if (*str == q) { - len++; - } - } - - return(len); -} - /**********************************************************************//** Converts a raw binary data to a NUL-terminated hex string. The output is truncated if there is not enough space in "hex", make sure "hex_size" is at diff --git a/lock/lock0lock.c b/lock/lock0lock.c index 0fcbee32454..5fce345d0fe 100644 --- a/lock/lock0lock.c +++ b/lock/lock0lock.c @@ -3912,6 +3912,10 @@ lock_table( trx = thr_get_trx(thr); + if (trx->fake_changes && mode == LOCK_IX) { + mode = LOCK_IS; + } + lock_mutex_enter_kernel(); /* Look for stronger locks the same trx already has on the table */ @@ -5114,6 +5118,11 @@ lock_rec_insert_check_and_lock( } trx = thr_get_trx(thr); + + if (trx->fake_changes) { + return(DB_SUCCESS); + } + next_rec = page_rec_get_next_const(rec); next_rec_heap_no = page_rec_get_heap_no(next_rec); @@ -5282,6 +5291,10 @@ lock_clust_rec_modify_check_and_lock( return(DB_SUCCESS); } + if (thr && thr_get_trx(thr)->fake_changes) { + return(DB_SUCCESS); + } + heap_no = rec_offs_comp(offsets) ? rec_get_heap_no_new(rec) : rec_get_heap_no_old(rec); @@ -5340,6 +5353,10 @@ lock_sec_rec_modify_check_and_lock( return(DB_SUCCESS); } + if (thr && thr_get_trx(thr)->fake_changes) { + return(DB_SUCCESS); + } + heap_no = page_rec_get_heap_no(rec); /* Another transaction cannot have an implicit lock on the record, @@ -5427,6 +5444,10 @@ lock_sec_rec_read_check_and_lock( return(DB_SUCCESS); } + if (thr && thr_get_trx(thr)->fake_changes && mode == LOCK_X) { + mode = LOCK_S; + } + heap_no = page_rec_get_heap_no(rec); lock_mutex_enter_kernel(); @@ -5503,6 +5524,10 @@ lock_clust_rec_read_check_and_lock( return(DB_SUCCESS); } + if (thr && thr_get_trx(thr)->fake_changes && mode == LOCK_X) { + mode = LOCK_S; + } + heap_no = page_rec_get_heap_no(rec); lock_mutex_enter_kernel(); diff --git a/mtr/mtr0mtr.c b/mtr/mtr0mtr.c index 439b429db43..08234609ff0 100644 --- a/mtr/mtr0mtr.c +++ b/mtr/mtr0mtr.c @@ -282,44 +282,6 @@ mtr_commit( } #ifndef UNIV_HOTBACKUP -/**********************************************************//** -Releases the latches stored in an mtr memo down to a savepoint. -NOTE! The mtr must not have made changes to buffer pages after the -savepoint, as these can be handled only by mtr_commit. */ -UNIV_INTERN -void -mtr_rollback_to_savepoint( -/*======================*/ - mtr_t* mtr, /*!< in: mtr */ - ulint savepoint) /*!< in: savepoint */ -{ - mtr_memo_slot_t* slot; - dyn_array_t* memo; - ulint offset; - - ut_ad(mtr); - ut_ad(mtr->magic_n == MTR_MAGIC_N); - ut_ad(mtr->state == MTR_ACTIVE); - - memo = &(mtr->memo); - - offset = dyn_array_get_data_size(memo); - ut_ad(offset >= savepoint); - - while (offset > savepoint) { - offset -= sizeof(mtr_memo_slot_t); - - slot = dyn_array_get_element(memo, offset); - - ut_ad(slot->type != MTR_MEMO_MODIFY); - - /* We do not call mtr_memo_slot_note_modification() - because there MUST be no changes made to the buffer - pages after the savepoint */ - mtr_memo_slot_release(mtr, slot); - } -} - /***************************************************//** Releases an object in the memo stack. */ UNIV_INTERN diff --git a/os/os0file.c b/os/os0file.c index 835210140f8..0b1294a169e 100644 --- a/os/os0file.c +++ b/os/os0file.c @@ -4161,7 +4161,7 @@ os_aio_func( and os_file_write_func() */ if (type == OS_FILE_READ) { - return(os_file_read_trx(file, buf, offset, + return(os_file_read_func(file, buf, offset, offset_high, n, trx)); } diff --git a/page/page0zip.c b/page/page0zip.c index b81cba4826a..fc9f30ed94e 100644 --- a/page/page0zip.c +++ b/page/page0zip.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2005, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 2005, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -150,6 +150,20 @@ page_zip_empty_size( } #endif /* !UNIV_HOTBACKUP */ +/*************************************************************//** +Gets the number of elements in the dense page directory, +including deleted records (the free list). +@return number of elements in the dense page directory */ +UNIV_INLINE +ulint +page_zip_dir_elems( +/*===============*/ + const page_zip_des_t* page_zip) /*!< in: compressed page */ +{ + /* Exclude the page infimum and supremum from the record count. */ + return(page_dir_get_n_heap(page_zip->data) - PAGE_HEAP_NO_USER_LOW); +} + /*************************************************************//** Gets the size of the compressed page trailer (the dense page directory), including deleted records (the free list). @@ -160,13 +174,41 @@ page_zip_dir_size( /*==============*/ const page_zip_des_t* page_zip) /*!< in: compressed page */ { - /* Exclude the page infimum and supremum from the record count. */ - ulint size = PAGE_ZIP_DIR_SLOT_SIZE - * (page_dir_get_n_heap(page_zip->data) - - PAGE_HEAP_NO_USER_LOW); - return(size); + return(PAGE_ZIP_DIR_SLOT_SIZE * page_zip_dir_elems(page_zip)); } +/*************************************************************//** +Gets an offset to the compressed page trailer (the dense page directory), +including deleted records (the free list). +@return offset of the dense page directory */ +UNIV_INLINE +ulint +page_zip_dir_start_offs( +/*====================*/ + const page_zip_des_t* page_zip, /*!< in: compressed page */ + ulint n_dense) /*!< in: directory size */ +{ + ut_ad(n_dense * PAGE_ZIP_DIR_SLOT_SIZE < page_zip_get_size(page_zip)); + + return(page_zip_get_size(page_zip) - n_dense * PAGE_ZIP_DIR_SLOT_SIZE); +} + +/*************************************************************//** +Gets a pointer to the compressed page trailer (the dense page directory), +including deleted records (the free list). +@param[in] page_zip compressed page +@param[in] n_dense number of entries in the directory +@return pointer to the dense page directory */ +#define page_zip_dir_start_low(page_zip, n_dense) \ + ((page_zip)->data + page_zip_dir_start_offs(page_zip, n_dense)) +/*************************************************************//** +Gets a pointer to the compressed page trailer (the dense page directory), +including deleted records (the free list). +@param[in] page_zip compressed page +@return pointer to the dense page directory */ +#define page_zip_dir_start(page_zip) \ + page_zip_dir_start_low(page_zip, page_zip_dir_elems(page_zip)) + /*************************************************************//** Gets the size of the compressed page trailer (the dense page directory), only including user records (excluding the free list). @@ -2246,8 +2288,7 @@ zlib_done: } /* Restore the uncompressed columns in heap_no order. */ - storage = page_zip->data + page_zip_get_size(page_zip) - - n_dense * PAGE_ZIP_DIR_SLOT_SIZE; + storage = page_zip_dir_start_low(page_zip, n_dense); for (slot = 0; slot < n_dense; slot++) { rec_t* rec = recs[slot]; @@ -2732,8 +2773,7 @@ zlib_done: return(FALSE); } - storage = page_zip->data + page_zip_get_size(page_zip) - - n_dense * PAGE_ZIP_DIR_SLOT_SIZE; + storage = page_zip_dir_start_low(page_zip, n_dense); externs = storage - n_dense * (DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN); @@ -3461,9 +3501,7 @@ page_zip_write_rec( } /* Write the data bytes. Store the uncompressed bytes separately. */ - storage = page_zip->data + page_zip_get_size(page_zip) - - (page_dir_get_n_heap(page) - PAGE_HEAP_NO_USER_LOW) - * PAGE_ZIP_DIR_SLOT_SIZE; + storage = page_zip_dir_start(page_zip); if (page_is_leaf(page)) { ulint len; @@ -3759,9 +3797,7 @@ corrupt: field = page + offset; storage = page_zip->data + z_offset; - storage_end = page_zip->data + page_zip_get_size(page_zip) - - (page_dir_get_n_heap(page) - PAGE_HEAP_NO_USER_LOW) - * PAGE_ZIP_DIR_SLOT_SIZE; + storage_end = page_zip_dir_start(page_zip); heap_no = 1 + (storage_end - storage) / REC_NODE_PTR_SIZE; @@ -3797,7 +3833,9 @@ page_zip_write_node_ptr( { byte* field; byte* storage; +#ifdef UNIV_DEBUG page_t* page = page_align(rec); +#endif /* UNIV_DEBUG */ ut_ad(PAGE_ZIP_MATCH(rec, page_zip)); ut_ad(page_simple_validate_new(page)); @@ -3814,9 +3852,7 @@ page_zip_write_node_ptr( UNIV_MEM_ASSERT_RW(page_zip->data, page_zip_get_size(page_zip)); UNIV_MEM_ASSERT_RW(rec, size); - storage = page_zip->data + page_zip_get_size(page_zip) - - (page_dir_get_n_heap(page) - PAGE_HEAP_NO_USER_LOW) - * PAGE_ZIP_DIR_SLOT_SIZE + storage = page_zip_dir_start(page_zip) - (rec_get_heap_no_new(rec) - 1) * REC_NODE_PTR_SIZE; field = rec + size - REC_NODE_PTR_SIZE; @@ -3865,7 +3901,9 @@ page_zip_write_trx_id_and_roll_ptr( { byte* field; byte* storage; +#ifdef UNIV_DEBUG page_t* page = page_align(rec); +#endif /* UNIV_DEBUG */ ulint len; ut_ad(PAGE_ZIP_MATCH(rec, page_zip)); @@ -3883,9 +3921,7 @@ page_zip_write_trx_id_and_roll_ptr( UNIV_MEM_ASSERT_RW(page_zip->data, page_zip_get_size(page_zip)); - storage = page_zip->data + page_zip_get_size(page_zip) - - (page_dir_get_n_heap(page) - PAGE_HEAP_NO_USER_LOW) - * PAGE_ZIP_DIR_SLOT_SIZE + storage = page_zip_dir_start(page_zip) - (rec_get_heap_no_new(rec) - 1) * (DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN); @@ -3916,17 +3952,9 @@ page_zip_write_trx_id_and_roll_ptr( UNIV_MEM_ASSERT_RW(page_zip->data, page_zip_get_size(page_zip)); } -#ifdef UNIV_ZIP_DEBUG -/** Set this variable in a debugger to disable page_zip_clear_rec(). -The only observable effect should be the compression ratio due to -deleted records not being zeroed out. In rare cases, there can be -page_zip_validate() failures on the node_ptr, trx_id and roll_ptr -columns if the space is reallocated for a smaller record. */ -UNIV_INTERN ibool page_zip_clear_rec_disable; -#endif /* UNIV_ZIP_DEBUG */ - /**********************************************************************//** -Clear an area on the uncompressed and compressed page, if possible. */ +Clear an area on the uncompressed and compressed page. +Do not clear the data payload, as that would grow the modification log. */ static void page_zip_clear_rec( @@ -3938,6 +3966,9 @@ page_zip_clear_rec( { ulint heap_no; page_t* page = page_align(rec); + byte* storage; + byte* field; + ulint len; /* page_zip_validate() would fail here if a record containing externally stored columns is being deleted. */ ut_ad(rec_offs_validate(rec, index, offsets)); @@ -3953,60 +3984,38 @@ page_zip_clear_rec( UNIV_MEM_ASSERT_RW(rec - rec_offs_extra_size(offsets), rec_offs_extra_size(offsets)); - if ( -#ifdef UNIV_ZIP_DEBUG - !page_zip_clear_rec_disable && -#endif /* UNIV_ZIP_DEBUG */ - page_zip->m_end - + 1 + ((heap_no - 1) >= 64)/* size of the log entry */ - + page_zip_get_trailer_len(page_zip, - dict_index_is_clust(index), NULL) - < page_zip_get_size(page_zip)) { - byte* data; + if (!page_is_leaf(page)) { + /* Clear node_ptr. On the compressed page, + there is an array of node_ptr immediately before the + dense page directory, at the very end of the page. */ + storage = page_zip_dir_start(page_zip); + ut_ad(dict_index_get_n_unique_in_tree(index) == + rec_offs_n_fields(offsets) - 1); + field = rec_get_nth_field(rec, offsets, + rec_offs_n_fields(offsets) - 1, + &len); + ut_ad(len == REC_NODE_PTR_SIZE); - /* Clear only the data bytes, because the allocator and - the decompressor depend on the extra bytes. */ - memset(rec, 0, rec_offs_data_size(offsets)); + ut_ad(!rec_offs_any_extern(offsets)); + memset(field, 0, REC_NODE_PTR_SIZE); + memset(storage - (heap_no - 1) * REC_NODE_PTR_SIZE, + 0, REC_NODE_PTR_SIZE); + } else if (dict_index_is_clust(index)) { + /* Clear trx_id and roll_ptr. On the compressed page, + there is an array of these fields immediately before the + dense page directory, at the very end of the page. */ + const ulint trx_id_pos + = dict_col_get_clust_pos( + dict_table_get_sys_col( + index->table, DATA_TRX_ID), index); + storage = page_zip_dir_start(page_zip); + field = rec_get_nth_field(rec, offsets, trx_id_pos, &len); + ut_ad(len == DATA_TRX_ID_LEN); - if (!page_is_leaf(page)) { - /* Clear node_ptr on the compressed page. */ - byte* storage = page_zip->data - + page_zip_get_size(page_zip) - - (page_dir_get_n_heap(page) - - PAGE_HEAP_NO_USER_LOW) - * PAGE_ZIP_DIR_SLOT_SIZE; - - memset(storage - (heap_no - 1) * REC_NODE_PTR_SIZE, - 0, REC_NODE_PTR_SIZE); - } else if (dict_index_is_clust(index)) { - /* Clear trx_id and roll_ptr on the compressed page. */ - byte* storage = page_zip->data - + page_zip_get_size(page_zip) - - (page_dir_get_n_heap(page) - - PAGE_HEAP_NO_USER_LOW) - * PAGE_ZIP_DIR_SLOT_SIZE; - - memset(storage - (heap_no - 1) - * (DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN), - 0, DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN); - } - - /* Log that the data was zeroed out. */ - data = page_zip->data + page_zip->m_end; - ut_ad(!*data); - if (UNIV_UNLIKELY(heap_no - 1 >= 64)) { - *data++ = (byte) (0x80 | (heap_no - 1) >> 7); - ut_ad(!*data); - } - *data++ = (byte) ((heap_no - 1) << 1 | 1); - ut_ad(!*data); - ut_ad((ulint) (data - page_zip->data) - < page_zip_get_size(page_zip)); - page_zip->m_end = data - page_zip->data; - page_zip->m_nonempty = TRUE; - } else if (page_is_leaf(page) && dict_index_is_clust(index)) { - /* Do not clear the record, because there is not enough space - to log the operation. */ + memset(field, 0, DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN); + memset(storage - (heap_no - 1) + * (DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN), + 0, DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN); if (rec_offs_any_extern(offsets)) { ulint i; @@ -4015,15 +4024,18 @@ page_zip_clear_rec( /* Clear all BLOB pointers in order to make page_zip_validate() pass. */ if (rec_offs_nth_extern(offsets, i)) { - ulint len; - byte* field = rec_get_nth_field( + field = rec_get_nth_field( rec, offsets, i, &len); + ut_ad(len + == BTR_EXTERN_FIELD_REF_SIZE); memset(field + len - BTR_EXTERN_FIELD_REF_SIZE, 0, BTR_EXTERN_FIELD_REF_SIZE); } } } + } else { + ut_ad(!rec_offs_any_extern(offsets)); } #ifdef UNIV_ZIP_DEBUG diff --git a/pars/pars0opt.c b/pars/pars0opt.c index 2e392ba4836..d992805d9ef 100644 --- a/pars/pars0opt.c +++ b/pars/pars0opt.c @@ -568,7 +568,7 @@ opt_search_plan_for_table( best_last_op = last_op; } - index = dict_table_get_next_index(index); + dict_table_next_uncorrupted_index(index); } plan->index = best_index; diff --git a/percona-suite/percona_innodb_expand_fast_index_creation.result b/percona-suite/percona_innodb_expand_fast_index_creation.result new file mode 100644 index 00000000000..b8cec3d4398 --- /dev/null +++ b/percona-suite/percona_innodb_expand_fast_index_creation.result @@ -0,0 +1,64 @@ +CREATE TABLE t1( +id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, +a CHAR(1) NOT NULL, +b CHAR(36) NOT NULL) ENGINE=InnoDB; +INSERT INTO t1(a,b) VALUES ('a','b'); +INSERT INTO t1(a,b) SELECT a,b FROM t1; +INSERT INTO t1(a,b) SELECT a,b FROM t1; +INSERT INTO t1(a,b) SELECT a,b FROM t1; +INSERT INTO t1(a,b) SELECT a,b FROM t1; +ALTER TABLE t1 ADD KEY (a); +affected rows: 0 +info: Records: 0 Duplicates: 0 Warnings: 0 +EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b; +id 1 +select_type SIMPLE +table t1 +type ALL +possible_keys a +key NULL +key_len NULL +ref NULL +rows 16 +Extra +id 1 +select_type SIMPLE +table t2 +type ref +possible_keys a +key a +key_len 1 +ref test.t1.a +rows 1 +Extra Using where +ALTER TABLE t1 DROP KEY a; +SET expand_fast_index_creation = 1; +SELECT @@expand_fast_index_creation; +@@expand_fast_index_creation +1 +ALTER TABLE t1 ADD KEY (a); +affected rows: 0 +info: Records: 0 Duplicates: 0 Warnings: 0 +EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b; +id 1 +select_type SIMPLE +table t1 +type ALL +possible_keys a +key NULL +key_len NULL +ref NULL +rows 16 +Extra +id 1 +select_type SIMPLE +table t2 +type ALL +possible_keys a +key NULL +key_len NULL +ref NULL +rows 16 +Extra Using where; Using join buffer +SET expand_fast_index_creation = 0; +DROP TABLE t1; diff --git a/percona-suite/percona_innodb_expand_fast_index_creation.test b/percona-suite/percona_innodb_expand_fast_index_creation.test new file mode 100644 index 00000000000..06e6c719c17 --- /dev/null +++ b/percona-suite/percona_innodb_expand_fast_index_creation.test @@ -0,0 +1,45 @@ +--source include/have_innodb.inc + +######################################################################## +# Bug #857590: Fast index creation does not update index statistics +######################################################################## + +CREATE TABLE t1( + id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + a CHAR(1) NOT NULL, + b CHAR(36) NOT NULL) ENGINE=InnoDB; + +INSERT INTO t1(a,b) VALUES ('a','b'); +INSERT INTO t1(a,b) SELECT a,b FROM t1; +INSERT INTO t1(a,b) SELECT a,b FROM t1; +INSERT INTO t1(a,b) SELECT a,b FROM t1; +INSERT INTO t1(a,b) SELECT a,b FROM t1; + +# Check that fast index creation is used +--enable_info +ALTER TABLE t1 ADD KEY (a); +--disable_info + +# The default (wrong) plan due to bogus statistics +--vertical_results +EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b; +--horizontal_results + +ALTER TABLE t1 DROP KEY a; + +SET expand_fast_index_creation = 1; +SELECT @@expand_fast_index_creation; + +# Check that stats are updated with the option enabled + +--enable_info +ALTER TABLE t1 ADD KEY (a); +--disable_info + +--vertical_results +EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b; +--horizontal_results + +SET expand_fast_index_creation = 0; + +DROP TABLE t1; diff --git a/percona-suite/percona_innodb_fake_changes.result b/percona-suite/percona_innodb_fake_changes.result new file mode 100644 index 00000000000..7f00c687c54 --- /dev/null +++ b/percona-suite/percona_innodb_fake_changes.result @@ -0,0 +1,55 @@ +DROP TABLE IF EXISTS t1; +# Checking variables +SHOW VARIABLES LIKE 'innodb_fake_changes'; +Variable_name Value +innodb_fake_changes OFF +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; +VARIABLE_VALUE +OFF +SET innodb_fake_changes=1; +SHOW VARIABLES LIKE 'innodb_fake_changes'; +Variable_name Value +innodb_fake_changes ON +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; +VARIABLE_VALUE +ON +SET innodb_fake_changes=default; +SHOW VARIABLES LIKE 'innodb_fake_changes'; +Variable_name Value +innodb_fake_changes OFF +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; +VARIABLE_VALUE +OFF +# Explicit COMMIT should fail when innodb_fake_changes is enabled +# DML should be fine +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +SET autocommit=0; +SET innodb_fake_changes=1; +BEGIN; +INSERT INTO t1 VALUES (2); +UPDATE t1 SET a=0; +DELETE FROM t1 LIMIT 1; +SELECT * FROM t1; +a +1 +COMMIT; +ERROR HY000: Got error 131 during COMMIT +SET innodb_fake_changes=default; +DROP TABLE t1; +# DDL must result in error +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +SET autocommit=0; +SET innodb_fake_changes=1; +BEGIN; +CREATE TABLE t2 (a INT) ENGINE=InnoDB; +ERROR HY000: Can't create table 'test.t2' (errno: 131) +DROP TABLE t1; +ERROR 42S02: Unknown table 't1' +TRUNCATE TABLE t1; +ERROR HY000: Got error 131 during COMMIT +ALTER TABLE t1 ENGINE=MyISAM; +ERROR HY000: Got error 131 during COMMIT +ROLLBACK; +SET innodb_fake_changes=default; +DROP TABLE t1; diff --git a/percona-suite/percona_innodb_fake_changes.test b/percona-suite/percona_innodb_fake_changes.test new file mode 100644 index 00000000000..fd231ae096f --- /dev/null +++ b/percona-suite/percona_innodb_fake_changes.test @@ -0,0 +1,49 @@ +--source include/have_innodb.inc + +--disable_warnings +DROP TABLE IF EXISTS t1; +--enable_warnings + + +--echo # Checking variables +SHOW VARIABLES LIKE 'innodb_fake_changes'; +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; +SET innodb_fake_changes=1; +SHOW VARIABLES LIKE 'innodb_fake_changes'; +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; +SET innodb_fake_changes=default; +SHOW VARIABLES LIKE 'innodb_fake_changes'; +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; + +--echo # Explicit COMMIT should fail when innodb_fake_changes is enabled +--echo # DML should be fine +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +SET autocommit=0; +SET innodb_fake_changes=1; +BEGIN; +INSERT INTO t1 VALUES (2); +UPDATE t1 SET a=0; +DELETE FROM t1 LIMIT 1; +SELECT * FROM t1; +--error 1180 +COMMIT; +SET innodb_fake_changes=default; +DROP TABLE t1; + +--echo # DDL must result in error +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +SET autocommit=0; +SET innodb_fake_changes=1; +BEGIN; +--error 1005 +CREATE TABLE t2 (a INT) ENGINE=InnoDB; +--error 1051 +DROP TABLE t1; +--error 1180 +TRUNCATE TABLE t1; +--error 1180 +ALTER TABLE t1 ENGINE=MyISAM; +ROLLBACK; +SET innodb_fake_changes=default; +DROP TABLE t1; diff --git a/percona-suite/percona_innodb_fake_changes_locks.result b/percona-suite/percona_innodb_fake_changes_locks.result new file mode 100644 index 00000000000..c2b533ca9f3 --- /dev/null +++ b/percona-suite/percona_innodb_fake_changes_locks.result @@ -0,0 +1,19 @@ +DROP TABLE IF EXISTS t1; +# Verifying that X_LOCK not acquired +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +SET autocommit=0; +SET innodb_fake_changes=1; +BEGIN; +SELECT * FROM t1 FOR UPDATE; +a +1 +SET innodb_lock_wait_timeout=3; +UPDATE t1 SET a=2; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +SELECT * FROM t1 LOCK IN SHARE MODE; +a +1 +ROLLBACK; +SET innodb_fake_changes=default; +DROP TABLE t1; diff --git a/percona-suite/percona_innodb_fake_changes_locks.test b/percona-suite/percona_innodb_fake_changes_locks.test new file mode 100644 index 00000000000..e298405cd43 --- /dev/null +++ b/percona-suite/percona_innodb_fake_changes_locks.test @@ -0,0 +1,24 @@ +--source include/have_innodb.inc + +--disable_warnings +DROP TABLE IF EXISTS t1; +--enable_warnings + +--echo # Verifying that X_LOCK not acquired +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +--connect (conn1,localhost,root,,) +--connection conn1 +SET autocommit=0; +SET innodb_fake_changes=1; +BEGIN; +SELECT * FROM t1 FOR UPDATE; +--connection default +SET innodb_lock_wait_timeout=3; +--error 1205 +UPDATE t1 SET a=2; +SELECT * FROM t1 LOCK IN SHARE MODE; +--connection conn1 +ROLLBACK; +SET innodb_fake_changes=default; +DROP TABLE t1; diff --git a/percona-suite/percona_innodb_kill_idle_trx.result b/percona-suite/percona_innodb_kill_idle_trx.result new file mode 100644 index 00000000000..a05b5a912fe --- /dev/null +++ b/percona-suite/percona_innodb_kill_idle_trx.result @@ -0,0 +1,41 @@ +DROP TABLE IF EXISTS t1; +SET autocommit=0; +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; +Variable_name Value +innodb_kill_idle_transaction 0 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_KILL_IDLE_TRANSACTION 0 +SET GLOBAL innodb_kill_idle_transaction=1; +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; +Variable_name Value +innodb_kill_idle_transaction 1 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_KILL_IDLE_TRANSACTION 1 +BEGIN; +INSERT INTO t1 VALUES (1),(2),(3); +COMMIT; +SELECT * FROM t1; +a +1 +2 +3 +BEGIN; +INSERT INTO t1 VALUES (4),(5),(6); +SELECT * FROM t1; +ERROR HY000: MySQL server has gone away +SELECT * FROM t1; +a +1 +2 +3 +DROP TABLE t1; +SET GLOBAL innodb_kill_idle_transaction=0; +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; +Variable_name Value +innodb_kill_idle_transaction 0 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_KILL_IDLE_TRANSACTION 0 diff --git a/percona-suite/percona_innodb_kill_idle_trx.test b/percona-suite/percona_innodb_kill_idle_trx.test new file mode 100644 index 00000000000..908f313752e --- /dev/null +++ b/percona-suite/percona_innodb_kill_idle_trx.test @@ -0,0 +1,28 @@ +--source include/have_innodb.inc +--disable_warnings +DROP TABLE IF EXISTS t1; +--enable_warnings + +SET autocommit=0; +CREATE TABLE t1 (a INT) ENGINE=InnoDB; + +--source include/percona_innodb_kill_idle_trx_show.inc +SET GLOBAL innodb_kill_idle_transaction=1; +--source include/percona_innodb_kill_idle_trx_show.inc + +BEGIN; +INSERT INTO t1 VALUES (1),(2),(3); +COMMIT; +SELECT * FROM t1; + +BEGIN; +INSERT INTO t1 VALUES (4),(5),(6); +sleep 3; + +--enable_reconnect +--error 2006 --error CR_SERVER_GONE_ERROR +SELECT * FROM t1; +SELECT * FROM t1; +DROP TABLE t1; +SET GLOBAL innodb_kill_idle_transaction=0; +--source include/percona_innodb_kill_idle_trx_show.inc diff --git a/percona-suite/percona_innodb_kill_idle_trx_locks.result b/percona-suite/percona_innodb_kill_idle_trx_locks.result new file mode 100644 index 00000000000..6bdd2617805 --- /dev/null +++ b/percona-suite/percona_innodb_kill_idle_trx_locks.result @@ -0,0 +1,45 @@ +DROP TABLE IF EXISTS t1; +SET autocommit=0; +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; +Variable_name Value +innodb_kill_idle_transaction 0 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_KILL_IDLE_TRANSACTION 0 +SET GLOBAL innodb_kill_idle_transaction=5; +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; +Variable_name Value +innodb_kill_idle_transaction 5 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_KILL_IDLE_TRANSACTION 5 +BEGIN; +INSERT INTO t1 VALUES (1),(2),(3); +COMMIT; +SELECT * FROM t1; +a +1 +2 +3 +### Locking rows. Lock should be released when idle trx is killed. +BEGIN; +SELECT * FROM t1 FOR UPDATE; +a +1 +2 +3 +UPDATE t1 set a=4; +SELECT * FROM t1; +a +4 +4 +4 +DROP TABLE t1; +SET GLOBAL innodb_kill_idle_transaction=0; +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; +Variable_name Value +innodb_kill_idle_transaction 0 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_KILL_IDLE_TRANSACTION 0 diff --git a/percona-suite/percona_innodb_kill_idle_trx_locks.test b/percona-suite/percona_innodb_kill_idle_trx_locks.test new file mode 100644 index 00000000000..20e2cc54a84 --- /dev/null +++ b/percona-suite/percona_innodb_kill_idle_trx_locks.test @@ -0,0 +1,31 @@ +--source include/have_innodb.inc +--disable_warnings +DROP TABLE IF EXISTS t1; +--enable_warnings + +SET autocommit=0; +CREATE TABLE t1 (a INT) ENGINE=InnoDB; + +--source include/percona_innodb_kill_idle_trx_show.inc +SET GLOBAL innodb_kill_idle_transaction=5; +--source include/percona_innodb_kill_idle_trx_show.inc + +connect (conn1,localhost,root,,); +connection conn1; + +BEGIN; +INSERT INTO t1 VALUES (1),(2),(3); +COMMIT; +SELECT * FROM t1; + +--echo ### Locking rows. Lock should be released when idle trx is killed. +BEGIN; +SELECT * FROM t1 FOR UPDATE; + +connection default; +UPDATE t1 set a=4; + +SELECT * FROM t1; +DROP TABLE t1; +SET GLOBAL innodb_kill_idle_transaction=0; +--source include/percona_innodb_kill_idle_trx_show.inc diff --git a/percona-suite/percona_log_connection_error.result b/percona-suite/percona_log_connection_error.result index 3c6c67f770c..352c9ca2a99 100644 --- a/percona-suite/percona_log_connection_error.result +++ b/percona-suite/percona_log_connection_error.result @@ -12,4 +12,5 @@ connect(localhost,root,,test,port,socket); ERROR HY000: Too many connections SET GLOBAL max_connections = @old_max_connections; SET GLOBAL log_warnings = @old_log_warnings; -1 +[log_grep.inc] file: percona.log_connection_error.err pattern: Too many connections +[log_grep.inc] lines: 1 diff --git a/percona-suite/percona_log_connection_error.test b/percona-suite/percona_log_connection_error.test index b1c03bfebc4..84af364cc96 100644 --- a/percona-suite/percona_log_connection_error.test +++ b/percona-suite/percona_log_connection_error.test @@ -45,10 +45,10 @@ if(!`select LENGTH('$log_error_')`) # does not know the location of its .err log, use default location let $log_error_ = $MYSQLTEST_VARDIR/log/mysqld.1.err; } -# Assign env variable LOG_ERROR -let LOG_ERROR=$log_error_; ---let grep_file = $log_error ---let grep_pattern = Too many connections ---source include/grep.inc -exec $cmd; +--let log_error=$log_error_ +--let log_file=percona.log_connection_error.err +--let log_file_full_path=$log_error +--let grep_pattern= Too many connections +--source include/log_grep.inc + diff --git a/percona-suite/percona_processlist_row_stats.result b/percona-suite/percona_processlist_row_stats.result index e9b07b2eaea..109b6a912d9 100644 --- a/percona-suite/percona_processlist_row_stats.result +++ b/percona-suite/percona_processlist_row_stats.result @@ -6,69 +6,65 @@ INSERT INTO t2 VALUES(10); INSERT INTO t2 VALUES(20); INSERT INTO t2 VALUES(10); INSERT INTO t2 VALUES(20); -Issuing operation that should not return any rows and stopping the thread #1 SET DEBUG_SYNC= 'locked_table_name SIGNAL thread1_ready WAIT_FOR threads_dumped'; CREATE TABLE t1 (a INT); SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; -Thread #1 stopped -Issuing row-returning query and stopping the thread #2 at the end of query SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread2_ready WAIT_FOR threads_dumped'; SELECT a FROM t2 WHERE a > 15; SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; -Thread #2 stopped -Look at thread states SHOW PROCESSLIST; Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read ### root ### test Query ### ### SHOW PROCESSLIST 0 0 2 ### root ### test Query ### ### CREATE TABLE t1 (a INT) 0 0 1 ### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 2 5 6 -SELECT id, info, rows_sent, rows_examined, rows_read FROM information_schema.processlist -ORDER BY id; +SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id; id info rows_sent rows_examined rows_read -### SELECT id, info, rows_sent, rows_examined, rows_read FROM information_schema.processlist -ORDER BY id 0 0 1 +### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1 ### CREATE TABLE t1 (a INT) 0 0 1 ### SELECT a FROM t2 WHERE a > 15 2 5 6 -Let threads #1 and #2 finish their job SET DEBUG_SYNC= 'now SIGNAL threads_dumped'; a 20 20 -Issuing row-returning query and stopping the thread #2 in the middle of query +SET DEBUG_SYNC= 'sent_row SIGNAL thread1_ready WAIT_FOR threads_dumped'; +SELECT a FROM t2 WHERE a < 15; +SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; SET DEBUG_SYNC= 'sent_row SIGNAL thread2_ready WAIT_FOR threads_dumped'; SELECT a FROM t2 WHERE a > 15; SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; -Thread #2 stopped, look at its state SHOW PROCESSLIST; Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read ### root ### test Query ### ### SHOW PROCESSLIST 0 0 4 -### root ### test Sleep ### ### NULL 0 0 1 +### root ### test Query ### ### SELECT a FROM t2 WHERE a < 15 1 0 1 ### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 1 0 3 -SELECT id,rows_sent,rows_examined,rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY Id; -id rows_sent rows_examined rows_read -### 0 0 1 -### 0 0 1 -### 1 0 3 +SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id; +id info rows_sent rows_examined rows_read +### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1 +### SELECT a FROM t2 WHERE a < 15 1 0 1 +### SELECT a FROM t2 WHERE a > 15 1 0 3 SET DEBUG_SYNC= 'now SIGNAL threads_dumped'; -Let thread #2 finish its job +a +10 +10 +10 a 20 20 -Issuing an UPDATE and stopping thread #2 +SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread1_ready WAIT_FOR threads_dumped'; +UPDATE t2 SET a = 15 WHERE a = 20; +SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread2_ready WAIT_FOR threads_dumped'; UPDATE t2 SET a = 15 WHERE a = 10; SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; -Thread #2 stopped, look at its state SHOW PROCESSLIST; Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read ### root ### test Query ### ### SHOW PROCESSLIST 0 0 4 -### root ### test Sleep ### ### NULL 0 0 1 +### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 20 0 5 6 ### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 10 0 5 6 -SELECT id,rows_sent,rows_examined,rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY Id; -id rows_sent rows_examined rows_read -### 0 0 1 -### 0 0 1 -### 0 5 6 +SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id; +id info rows_sent rows_examined rows_read +### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1 +### UPDATE t2 SET a = 15 WHERE a = 20 0 5 6 +### UPDATE t2 SET a = 15 WHERE a = 10 0 5 6 SET DEBUG_SYNC= 'now SIGNAL threads_dumped'; -Let thread #2 finish its job DROP TABLES t1, t2; diff --git a/percona-suite/percona_processlist_row_stats.test b/percona-suite/percona_processlist_row_stats.test index 230a9f4c311..17ebfedfa40 100644 --- a/percona-suite/percona_processlist_row_stats.test +++ b/percona-suite/percona_processlist_row_stats.test @@ -13,76 +13,63 @@ INSERT INTO t2 VALUES(20); INSERT INTO t2 VALUES(10); INSERT INTO t2 VALUES(20); -connect (conn1, localhost, root, ,); -connect (conn2, localhost, root, ,); +--connect (conn1, localhost, root, ,) +--connect (conn2, localhost, root, ,) --connection conn1 -echo Issuing operation that should not return any rows and stopping the thread #1; SET DEBUG_SYNC= 'locked_table_name SIGNAL thread1_ready WAIT_FOR threads_dumped'; send CREATE TABLE t1 (a INT); - --connection default SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; ---echo Thread #1 stopped --connection conn2 -echo Issuing row-returning query and stopping the thread #2 at the end of query; SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread2_ready WAIT_FOR threads_dumped'; send SELECT a FROM t2 WHERE a > 15; - --connection default SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; ---echo Thread #2 stopped ---echo Look at thread states ---replace_column 1 ### 3 ### 6 ### 7 ### -SHOW PROCESSLIST; -# The running threads are different between SHOW above and SELECT below. Thus select info too to -# show the difference. Results are in the same order as in SHOW. ---replace_column 1 ### -SELECT id, info, rows_sent, rows_examined, rows_read FROM information_schema.processlist -ORDER BY id; - -echo Let threads #1 and #2 finish their job; -SET DEBUG_SYNC= 'now SIGNAL threads_dumped'; +--source include/percona_processlist_row_stats_show.inc --connection conn1 reap; - --connection conn2 reap; -echo Issuing row-returning query and stopping the thread #2 in the middle of query; + +--connection conn1 +SET DEBUG_SYNC= 'sent_row SIGNAL thread1_ready WAIT_FOR threads_dumped'; +send SELECT a FROM t2 WHERE a < 15; +--connection default +SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; + +--connection conn2 SET DEBUG_SYNC= 'sent_row SIGNAL thread2_ready WAIT_FOR threads_dumped'; send SELECT a FROM t2 WHERE a > 15; - --connection default SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; -echo Thread #2 stopped, look at its state; ---replace_column 1 ### 3 ### 6 ### 7 ### -SHOW PROCESSLIST; ---replace_column 1 ### -SELECT id,rows_sent,rows_examined,rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY Id; -SET DEBUG_SYNC= 'now SIGNAL threads_dumped'; -echo Let thread #2 finish its job; +--source include/percona_processlist_row_stats_show.inc +--connection conn1 +reap; --connection conn2 reap; -echo Issuing an UPDATE and stopping thread #2; + +--connection conn1 +SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread1_ready WAIT_FOR threads_dumped'; +send UPDATE t2 SET a = 15 WHERE a = 20; +--connection default +SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; + +--connection conn2 SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread2_ready WAIT_FOR threads_dumped'; send UPDATE t2 SET a = 15 WHERE a = 10; - --connection default SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; -echo Thread #2 stopped, look at its state; ---replace_column 1 ### 3 ### 6 ### 7 ### -SHOW PROCESSLIST; ---replace_column 1 ### -SELECT id,rows_sent,rows_examined,rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY Id; -SET DEBUG_SYNC= 'now SIGNAL threads_dumped'; -echo Let thread #2 finish its job; +--source include/percona_processlist_row_stats_show.inc +--connection conn1 +reap; --connection conn2 reap; diff --git a/percona-suite/percona_query_response_time-replication.result b/percona-suite/percona_query_response_time-replication.result index fd06d07b4d8..c00520110c2 100644 --- a/percona-suite/percona_query_response_time-replication.result +++ b/percona-suite/percona_query_response_time-replication.result @@ -1,66 +1,727 @@ +SET GLOBAL query_exec_time=0.1; include/master-slave.inc [connection master] -DROP TABLE IF EXISTS t; CREATE TABLE t(id INT); -SELECT * from t; -id -SELECT * from t; -id -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; +SET GLOBAL query_exec_time = 0.1; +include/restart_slave.inc +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1; Warnings: Warning 1292 Truncated incorrect query_response_time_range_base value: '1' +FLUSH QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time = 0.31; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.32; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.33; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.34; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.35; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.36; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.37; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.38; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.39; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.2; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 3.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 4.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 5.1; +INSERT INTO t VALUES(1); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 2 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 1 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 1 0.100000 + 0.250000 0 0.000000 + 0.500000 30 10.650000 + 1.000000 3 1.500000 + 2.000000 15 19.500000 + 4.000000 12 30.000000 + 8.000000 6 27.599997 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 1 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 1 0.100000 + 0.250000 0 0.000000 + 0.500000 30 10.650000 + 1.000000 3 1.500000 + 2.000000 15 19.500000 + 4.000000 12 30.000000 + 8.000000 6 27.599997 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; +DROP TABLE t; +CREATE TABLE t(id INT); +SET GLOBAL query_exec_time = 0.1; +include/restart_slave.inc +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2; +FLUSH QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time = 0.31; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.32; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.33; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.34; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.35; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.36; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.37; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.38; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.39; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.2; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 3.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 4.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 5.1; +INSERT INTO t VALUES(1); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; +Variable_name Value +query_response_time_range_base 2 +SHOW QUERY_RESPONSE_TIME; + + 0.000001 1 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 1 0.100000 + 0.250000 0 0.000000 + 0.500000 30 10.650000 + 1.000000 3 1.500000 + 2.000000 15 19.500000 + 4.000000 12 30.000000 + 8.000000 6 27.599997 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 1 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 1 0.100000 + 0.250000 0 0.000000 + 0.500000 30 10.650000 + 1.000000 3 1.500000 + 2.000000 15 19.500000 + 4.000000 12 30.000000 + 8.000000 6 27.599997 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; +DROP TABLE t; +CREATE TABLE t(id INT); +SET GLOBAL query_exec_time = 0.1; +include/restart_slave.inc +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10; +FLUSH QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time = 0.31; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.32; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.33; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.34; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.35; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.36; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.37; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.38; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.39; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.2; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 3.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 4.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 5.1; +INSERT INTO t VALUES(1); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 10 +SHOW QUERY_RESPONSE_TIME; + + 0.000001 1 0.000000 + 0.000010 0 0.000000 + 0.000100 0 0.000000 + 0.001000 0 0.000000 + 0.010000 0 0.000000 + 0.100000 0 0.000000 + 1.000000 34 12.250000 + 10.000000 33 77.099997 + 100.000000 0 0.000000 + 1000.000000 0 0.000000 + 10000.000000 0 0.000000 + 100000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 1 0.000000 + 0.000010 0 0.000000 + 0.000100 0 0.000000 + 0.001000 0 0.000000 + 0.010000 0 0.000000 + 0.100000 0 0.000000 + 1.000000 34 12.250000 + 10.000000 33 77.099997 + 100.000000 0 0.000000 + 1000.000000 0 0.000000 + 10000.000000 0 0.000000 + 100000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; +DROP TABLE t; +CREATE TABLE t(id INT); +SET GLOBAL query_exec_time = 0.1; +include/restart_slave.inc +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7; FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=ON; -INSERT INTO t SELECT SLEEP(0.4); -Warnings: -Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -0 -INSERT INTO t SELECT SLEEP(0.4); -Warnings: -Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -0 -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -2 -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -3 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time = 0.31; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.32; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.33; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.34; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.35; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.36; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.37; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.38; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.39; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.2; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 3.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 4.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 5.1; +INSERT INTO t VALUES(1); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value -query_response_time_range_base 2 +query_response_time_range_base 7 +SHOW QUERY_RESPONSE_TIME; + + 0.000001 1 0.000000 + 0.000008 0 0.000000 + 0.000059 0 0.000000 + 0.000416 0 0.000000 + 0.002915 0 0.000000 + 0.020408 0 0.000000 + 0.142857 1 0.100000 + 1.000000 33 12.150000 + 7.000000 33 77.099997 + 49.000000 0 0.000000 + 343.000000 0 0.000000 + 2401.000000 0 0.000000 + 16807.000000 0 0.000000 + 117649.000000 0 0.000000 + 823543.000000 0 0.000000 + 5764801.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 1 0.000000 + 0.000008 0 0.000000 + 0.000059 0 0.000000 + 0.000416 0 0.000000 + 0.002915 0 0.000000 + 0.020408 0 0.000000 + 0.142857 1 0.100000 + 1.000000 33 12.150000 + 7.000000 33 77.099997 + 49.000000 0 0.000000 + 343.000000 0 0.000000 + 2401.000000 0 0.000000 + 16807.000000 0 0.000000 + 117649.000000 0 0.000000 + 823543.000000 0 0.000000 + 5764801.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; +DROP TABLE t; +CREATE TABLE t(id INT); +SET GLOBAL query_exec_time = 0.1; +include/restart_slave.inc +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156; FLUSH QUERY_RESPONSE_TIME; -INSERT INTO t SELECT SLEEP(0.4); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time = 0.31; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.32; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.33; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.34; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.35; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.36; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.37; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.38; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.39; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.2; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 3.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 4.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 5.1; +INSERT INTO t VALUES(1); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; +Variable_name Value +query_response_time_range_base 156 +SHOW QUERY_RESPONSE_TIME; + + 0.000041 1 0.000000 + 0.006410 0 0.000000 + 1.000000 34 12.250000 + 156.000000 33 77.099997 + 24336.000000 0 0.000000 + 3796416.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000041 1 0.000000 + 0.006410 0 0.000000 + 1.000000 34 12.250000 + 156.000000 33 77.099997 + 24336.000000 0 0.000000 + 3796416.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; +DROP TABLE t; +CREATE TABLE t(id INT); +SET GLOBAL query_exec_time = 0.1; +include/restart_slave.inc +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000; +FLUSH QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time = 0.31; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.32; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.33; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.34; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.35; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.36; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.37; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.38; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.39; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.2; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 3.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 4.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 5.1; +INSERT INTO t VALUES(1); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; +Variable_name Value +query_response_time_range_base 1000 +SHOW QUERY_RESPONSE_TIME; + + 0.000001 1 0.000000 + 0.001000 0 0.000000 + 1.000000 34 12.250000 + 1000.000000 33 77.099997 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 1 0.000000 + 0.001000 0 0.000000 + 1.000000 34 12.250000 + 1000.000000 33 77.099997 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; +DROP TABLE t; +CREATE TABLE t(id INT); +SET GLOBAL query_exec_time = 0.1; +include/restart_slave.inc +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1001; Warnings: -Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -0 -INSERT INTO t SELECT SLEEP(0.4); -Warnings: -Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -0 -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -2 -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -3 -DROP TABLE IF EXISTS t; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=OFF; -STOP SLAVE; -include/wait_for_slave_to_stop.inc +Warning 1292 Truncated incorrect query_response_time_range_base value: '1001' +FLUSH QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time = 0.31; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.32; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.33; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.34; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.35; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.36; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.37; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.38; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.39; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.2; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.4; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.3; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.5; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 3.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 4.1; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 5.1; +INSERT INTO t VALUES(1); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; +Variable_name Value +query_response_time_range_base 1000 +SHOW QUERY_RESPONSE_TIME; + + 0.000001 1 0.000000 + 0.001000 0 0.000000 + 1.000000 34 12.250000 + 1000.000000 33 77.099997 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 1 0.000000 + 0.001000 0 0.000000 + 1.000000 34 12.250000 + 1000.000000 33 77.099997 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; +DROP TABLE t; +include/rpl_end.inc +SET GLOBAL query_exec_time=default; +SET GLOBAL query_exec_time=default; diff --git a/percona-suite/percona_query_response_time-replication.test b/percona-suite/percona_query_response_time-replication.test index 199ecce0977..1207e5d1c3d 100644 --- a/percona-suite/percona_query_response_time-replication.test +++ b/percona-suite/percona_query_response_time-replication.test @@ -1,61 +1,28 @@ +SET GLOBAL query_exec_time=0.1; + --source include/have_response_time_distribution.inc ---source include/master-slave.inc ---source include/have_binlog_format_statement.inc --source include/have_debug.inc ---disable_query_log -call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. Statement:"); ---enable_query_log +--source include/have_binlog_format_statement.inc +--source include/master-slave.inc -connection master; --- disable_warnings -DROP TABLE IF EXISTS t; --- enable_warnings -CREATE TABLE t(id INT); -SELECT * from t; +--let base=1 +--source include/query_response_time-replication.inc +--let base=2 +--source include/query_response_time-replication.inc +--let base=10 +--source include/query_response_time-replication.inc +--let base=7 +--source include/query_response_time-replication.inc +--let base=156 +--source include/query_response_time-replication.inc +--let base=1000 +--source include/query_response_time-replication.inc +--let base=1001 +--source include/query_response_time-replication.inc -sync_slave_with_master; +--source include/rpl_end.inc + +SET GLOBAL query_exec_time=default; connection slave; -SELECT * from t; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -source include/percona_query_response_time_flush.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=ON; - -connection master; -INSERT INTO t SELECT SLEEP(0.4); -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -INSERT INTO t SELECT SLEEP(0.4); -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -sync_slave_with_master; - -connection slave; -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; - -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -source include/percona_query_response_time_flush.inc; - -connection master; -INSERT INTO t SELECT SLEEP(0.4); -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -INSERT INTO t SELECT SLEEP(0.4); -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -sync_slave_with_master; - -connection slave; -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; - -connection master; -DROP TABLE IF EXISTS t; -sync_slave_with_master; -connection slave; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=OFF; - -STOP SLAVE; --- source include/wait_for_slave_to_stop.inc +SET GLOBAL query_exec_time=default; diff --git a/percona-suite/percona_query_response_time-stored.result b/percona-suite/percona_query_response_time-stored.result index 0168c4630be..7385231241e 100644 --- a/percona-suite/percona_query_response_time-stored.result +++ b/percona-suite/percona_query_response_time-stored.result @@ -1,306 +1,544 @@ -SET GLOBAL debug="d,query_exec_time_debug"; -CREATE FUNCTION test_f() -RETURNS CHAR(30) DETERMINISTIC +CREATE TABLE t(a INT); +CREATE PROCEDURE test_f(t DECIMAL(3,2)) BEGIN -SET SESSION debug="+d,query_exec_time_1.1"; -RETURN 'Hello, world!'; -END/ -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; +SET SESSION query_exec_time=t; +INSERT INTO t VALUES(1); +SET SESSION query_exec_time=0.1; +DELETE FROM t; +END^ +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1; Warnings: Warning 1292 Truncated incorrect query_response_time_range_base value: '1' -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 FLUSH QUERY_RESPONSE_TIME; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -44 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000003 - 0.000007 - 0.000015 - 0.000030 - 0.000061 - 0.000122 - 0.000244 - 0.000488 - 0.000976 - 0.001953 - 0.003906 - 0.007812 - 0.015625 - 0.031250 - 0.062500 - 0.125000 - 0.250000 - 0.500000 - 1.000000 - 2.000000 - 4.000000 - 8.000000 - 16.000000 - 32.000000 - 64.000000 - 128.000000 - 256.000000 - 512.000000 - 1024.000000 - 2048.000000 - 4096.000000 - 8192.000000 - 16384.000000 - 32768.000000 - 65536.000000 - 131072.000000 - 262144.000000 - 524288.000000 - 1048576.00000 - 2097152.00000 - 4194304.00000 - 8388608.00000 -TOO LONG SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -test_f() -Hello, world! -SELECT test_f(); -test_f() -Hello, world! -SELECT test_f(); -test_f() -Hello, world! -SELECT test_f(); -test_f() -Hello, world! +CALL test_f(0.31); +CALL test_f(0.32); +CALL test_f(0.33); +CALL test_f(0.34); +CALL test_f(0.35); +CALL test_f(0.36); +CALL test_f(0.37); +CALL test_f(0.38); +CALL test_f(0.39); +CALL test_f(0.4); +CALL test_f(1.1); +CALL test_f(1.2); +CALL test_f(1.3); +CALL test_f(1.5); +CALL test_f(1.4); +CALL test_f(0.5); +CALL test_f(2.1); +CALL test_f(2.3); +CALL test_f(2.5); +CALL test_f(3.1); +CALL test_f(4.1); +CALL test_f(5.1); SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -4 4 4 1 44 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -44 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000003 - 0.000007 - 0.000015 - 0.000030 - 0.000061 - 0.000122 - 0.000244 - 0.000488 - 0.000976 - 0.001953 - 0.003906 - 0.007812 - 0.015625 - 0.031250 - 0.062500 - 0.125000 - 0.250000 - 0.500000 - 1.000000 - 2.000000 - 4.000000 - 8.000000 - 16.000000 - 32.000000 - 64.000000 - 128.000000 - 256.000000 - 512.000000 - 1024.000000 - 2048.000000 - 4096.000000 - 8192.000000 - 16384.000000 - 32768.000000 - 65536.000000 - 131072.000000 - 262144.000000 - 524288.000000 - 1048576.00000 - 2097152.00000 - 4194304.00000 - 8388608.00000 -TOO LONG SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 2 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 45 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 44 4.400000 + 0.250000 0 0.000000 + 0.500000 10 3.550000 + 1.000000 1 0.500000 + 2.000000 5 6.500000 + 4.000000 4 10.000000 + 8.000000 2 9.199999 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 45 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 44 4.400000 + 0.250000 0 0.000000 + 0.500000 10 3.550000 + 1.000000 1 0.500000 + 2.000000 5 6.500000 + 4.000000 4 10.000000 + 8.000000 2 9.199999 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2; +FLUSH QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +CALL test_f(0.31); +CALL test_f(0.32); +CALL test_f(0.33); +CALL test_f(0.34); +CALL test_f(0.35); +CALL test_f(0.36); +CALL test_f(0.37); +CALL test_f(0.38); +CALL test_f(0.39); +CALL test_f(0.4); +CALL test_f(1.1); +CALL test_f(1.2); +CALL test_f(1.3); +CALL test_f(1.5); +CALL test_f(1.4); +CALL test_f(0.5); +CALL test_f(2.1); +CALL test_f(2.3); +CALL test_f(2.5); +CALL test_f(3.1); +CALL test_f(4.1); +CALL test_f(5.1); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; +Variable_name Value +query_response_time_range_base 2 +SHOW QUERY_RESPONSE_TIME; + + 0.000001 45 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 44 4.400000 + 0.250000 0 0.000000 + 0.500000 10 3.550000 + 1.000000 1 0.500000 + 2.000000 5 6.500000 + 4.000000 4 10.000000 + 8.000000 2 9.199999 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 45 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 44 4.400000 + 0.250000 0 0.000000 + 0.500000 10 3.550000 + 1.000000 1 0.500000 + 2.000000 5 6.500000 + 4.000000 4 10.000000 + 8.000000 2 9.199999 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10; +FLUSH QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +CALL test_f(0.31); +CALL test_f(0.32); +CALL test_f(0.33); +CALL test_f(0.34); +CALL test_f(0.35); +CALL test_f(0.36); +CALL test_f(0.37); +CALL test_f(0.38); +CALL test_f(0.39); +CALL test_f(0.4); +CALL test_f(1.1); +CALL test_f(1.2); +CALL test_f(1.3); +CALL test_f(1.5); +CALL test_f(1.4); +CALL test_f(0.5); +CALL test_f(2.1); +CALL test_f(2.3); +CALL test_f(2.5); +CALL test_f(3.1); +CALL test_f(4.1); +CALL test_f(5.1); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 10 +SHOW QUERY_RESPONSE_TIME; + + 0.000001 45 0.000000 + 0.000010 0 0.000000 + 0.000100 0 0.000000 + 0.001000 0 0.000000 + 0.010000 0 0.000000 + 0.100000 0 0.000000 + 1.000000 55 8.450000 + 10.000000 11 25.699999 + 100.000000 0 0.000000 + 1000.000000 0 0.000000 + 10000.000000 0 0.000000 + 100000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 45 0.000000 + 0.000010 0 0.000000 + 0.000100 0 0.000000 + 0.001000 0 0.000000 + 0.010000 0 0.000000 + 0.100000 0 0.000000 + 1.000000 55 8.450000 + 10.000000 11 25.699999 + 100.000000 0 0.000000 + 1000.000000 0 0.000000 + 10000.000000 0 0.000000 + 100000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7; FLUSH QUERY_RESPONSE_TIME; SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -test_f() -Hello, world! +CALL test_f(0.31); +CALL test_f(0.32); +CALL test_f(0.33); +CALL test_f(0.34); +CALL test_f(0.35); +CALL test_f(0.36); +CALL test_f(0.37); +CALL test_f(0.38); +CALL test_f(0.39); +CALL test_f(0.4); +CALL test_f(1.1); +CALL test_f(1.2); +CALL test_f(1.3); +CALL test_f(1.5); +CALL test_f(1.4); +CALL test_f(0.5); +CALL test_f(2.1); +CALL test_f(2.3); +CALL test_f(2.5); +CALL test_f(3.1); +CALL test_f(4.1); +CALL test_f(5.1); SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -1 1 1 1 14 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -14 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000010 - 0.000100 - 0.001000 - 0.010000 - 0.100000 - 1.000000 - 10.000000 - 100.000000 - 1000.000000 - 10000.000000 - 100000.000000 - 1000000.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 10 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 7 +SHOW QUERY_RESPONSE_TIME; + + 0.000001 45 0.000000 + 0.000008 0 0.000000 + 0.000059 0 0.000000 + 0.000416 0 0.000000 + 0.002915 0 0.000000 + 0.020408 0 0.000000 + 0.142857 44 4.400000 + 1.000000 11 4.050000 + 7.000000 11 25.699999 + 49.000000 0 0.000000 + 343.000000 0 0.000000 + 2401.000000 0 0.000000 + 16807.000000 0 0.000000 + 117649.000000 0 0.000000 + 823543.000000 0 0.000000 + 5764801.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 45 0.000000 + 0.000008 0 0.000000 + 0.000059 0 0.000000 + 0.000416 0 0.000000 + 0.002915 0 0.000000 + 0.020408 0 0.000000 + 0.142857 44 4.400000 + 1.000000 11 4.050000 + 7.000000 11 25.699999 + 49.000000 0 0.000000 + 343.000000 0 0.000000 + 2401.000000 0 0.000000 + 16807.000000 0 0.000000 + 117649.000000 0 0.000000 + 823543.000000 0 0.000000 + 5764801.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156; FLUSH QUERY_RESPONSE_TIME; SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -test_f() -Hello, world! +CALL test_f(0.31); +CALL test_f(0.32); +CALL test_f(0.33); +CALL test_f(0.34); +CALL test_f(0.35); +CALL test_f(0.36); +CALL test_f(0.37); +CALL test_f(0.38); +CALL test_f(0.39); +CALL test_f(0.4); +CALL test_f(1.1); +CALL test_f(1.2); +CALL test_f(1.3); +CALL test_f(1.5); +CALL test_f(1.4); +CALL test_f(0.5); +CALL test_f(2.1); +CALL test_f(2.3); +CALL test_f(2.5); +CALL test_f(3.1); +CALL test_f(4.1); +CALL test_f(5.1); SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -1 1 1 1 17 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -17 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000008 - 0.000059 - 0.000416 - 0.002915 - 0.020408 - 0.142857 - 1.000000 - 7.000000 - 49.000000 - 343.000000 - 2401.000000 - 16807.000000 - 117649.000000 - 823543.000000 - 5764801.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 7 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 156 +SHOW QUERY_RESPONSE_TIME; + + 0.000041 45 0.000000 + 0.006410 0 0.000000 + 1.000000 55 8.450000 + 156.000000 11 25.699999 + 24336.000000 0 0.000000 + 3796416.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000041 45 0.000000 + 0.006410 0 0.000000 + 1.000000 55 8.450000 + 156.000000 11 25.699999 + 24336.000000 0 0.000000 + 3796416.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000; FLUSH QUERY_RESPONSE_TIME; SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -test_f() -Hello, world! +CALL test_f(0.31); +CALL test_f(0.32); +CALL test_f(0.33); +CALL test_f(0.34); +CALL test_f(0.35); +CALL test_f(0.36); +CALL test_f(0.37); +CALL test_f(0.38); +CALL test_f(0.39); +CALL test_f(0.4); +CALL test_f(1.1); +CALL test_f(1.2); +CALL test_f(1.3); +CALL test_f(1.5); +CALL test_f(1.4); +CALL test_f(0.5); +CALL test_f(2.1); +CALL test_f(2.3); +CALL test_f(2.5); +CALL test_f(3.1); +CALL test_f(4.1); +CALL test_f(5.1); SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -1 1 1 1 7 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -7 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000041 - 0.006410 - 1.000000 - 156.000000 - 24336.000000 - 3796416.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 156 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 1000 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -test_f() -Hello, world! +SHOW QUERY_RESPONSE_TIME; + + 0.000001 45 0.000000 + 0.001000 0 0.000000 + 1.000000 55 8.450000 + 1000.000000 11 25.699999 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 45 0.000000 + 0.001000 0 0.000000 + 1.000000 55 8.450000 + 1000.000000 11 25.699999 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -1 1 1 1 6 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -6 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.001000 - 1.000000 - 1000.000000 - 1000000.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1001; Warnings: Warning 1292 Truncated incorrect query_response_time_range_base value: '1001' +FLUSH QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +CALL test_f(0.31); +CALL test_f(0.32); +CALL test_f(0.33); +CALL test_f(0.34); +CALL test_f(0.35); +CALL test_f(0.36); +CALL test_f(0.37); +CALL test_f(0.38); +CALL test_f(0.39); +CALL test_f(0.4); +CALL test_f(1.1); +CALL test_f(1.2); +CALL test_f(1.3); +CALL test_f(1.5); +CALL test_f(1.4); +CALL test_f(0.5); +CALL test_f(2.1); +CALL test_f(2.3); +CALL test_f(2.5); +CALL test_f(3.1); +CALL test_f(4.1); +CALL test_f(5.1); +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 1000 -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; -DROP FUNCTION test_f; -SET GLOBAL debug=default; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 45 0.000000 + 0.001000 0 0.000000 + 1.000000 55 8.450000 + 1000.000000 11 25.699999 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 45 0.000000 + 0.001000 0 0.000000 + 1.000000 55 8.450000 + 1000.000000 11 25.699999 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; +DROP PROCEDURE test_f; +DROP TABLE t; diff --git a/percona-suite/percona_query_response_time-stored.test b/percona-suite/percona_query_response_time-stored.test index e80fc3dd3c0..847ff223b3f 100644 --- a/percona-suite/percona_query_response_time-stored.test +++ b/percona-suite/percona_query_response_time-stored.test @@ -1,85 +1,36 @@ --source include/have_response_time_distribution.inc --source include/have_debug.inc -SET GLOBAL debug="d,query_exec_time_debug"; +CREATE TABLE t(a INT); -delimiter /; -CREATE FUNCTION test_f() -RETURNS CHAR(30) DETERMINISTIC +delimiter ^; +CREATE PROCEDURE test_f(t DECIMAL(3,2)) BEGIN - SET SESSION debug="+d,query_exec_time_1.1"; - RETURN 'Hello, world!'; -END/ -delimiter ;/ + SET SESSION query_exec_time=t; + INSERT INTO t VALUES(1); + SET SESSION query_exec_time=0.1; + DELETE FROM t; +END^ +delimiter ;^ -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; +--let base=1 +--source include/query_response_time-stored.inc +--let base=2 +--source include/query_response_time-stored.inc +--let base=10 +--source include/query_response_time-stored.inc +--let base=7 +--source include/query_response_time-stored.inc +--let base=156 +--source include/query_response_time-stored.inc +--let base=1000 +--source include/query_response_time-stored.inc +--let base=1001 +--source include/query_response_time-stored.inc -source include/percona_query_response_time_flush.inc; -source include/percona_query_response_time_show.inc; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -SELECT test_f(); -SELECT test_f(); -SELECT test_f(); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +DROP PROCEDURE test_f; -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; - -DROP FUNCTION test_f; - -SET GLOBAL debug=default; +DROP TABLE t; diff --git a/percona-suite/percona_query_response_time.result b/percona-suite/percona_query_response_time.result index 2243c155e39..4c4d50319c0 100644 --- a/percona-suite/percona_query_response_time.result +++ b/percona-suite/percona_query_response_time.result @@ -1,377 +1,1307 @@ -SET GLOBAL debug="d,query_exec_time_debug"; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1; Warnings: Warning 1292 Truncated incorrect query_response_time_range_base value: '1' -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 FLUSH QUERY_RESPONSE_TIME; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -44 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000003 - 0.000007 - 0.000015 - 0.000030 - 0.000061 - 0.000122 - 0.000244 - 0.000488 - 0.000976 - 0.001953 - 0.003906 - 0.007812 - 0.015625 - 0.031250 - 0.062500 - 0.125000 - 0.250000 - 0.500000 - 1.000000 - 2.000000 - 4.000000 - 8.000000 - 16.000000 - 32.000000 - 64.000000 - 128.000000 - 256.000000 - 512.000000 - 1024.000000 - 2048.000000 - 4096.000000 - 8192.000000 - 16384.000000 - 32768.000000 - 65536.000000 - 131072.000000 - 262144.000000 - 524288.000000 - 1048576.00000 - 2097152.00000 - 4194304.00000 - 8388608.00000 -TOO LONG +SHOW QUERY_RESPONSE_TIME; + + 0.000001 0 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 0 0.000000 + 0.250000 0 0.000000 + 0.500000 0 0.000000 + 1.000000 0 0.000000 + 2.000000 0 0.000000 + 4.000000 0 0.000000 + 8.000000 0 0.000000 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 0 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 0 0.000000 + 0.250000 0 0.000000 + 0.500000 0 0.000000 + 1.000000 0 0.000000 + 2.000000 0 0.000000 + 4.000000 0 0.000000 + 8.000000 0 0.000000 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION debug="+d,query_exec_time_0.31"; -SET SESSION debug="+d,query_exec_time_0.32"; -SET SESSION debug="+d,query_exec_time_0.33"; -SET SESSION debug="+d,query_exec_time_0.34"; -SET SESSION debug="+d,query_exec_time_0.35"; -SET SESSION debug="+d,query_exec_time_0.36"; -SET SESSION debug="+d,query_exec_time_0.37"; -SET SESSION debug="+d,query_exec_time_0.38"; -SET SESSION debug="+d,query_exec_time_0.39"; -SET SESSION debug="+d,query_exec_time_0.4"; -SET SESSION debug="+d,query_exec_time_1.1"; -SET SESSION debug="+d,query_exec_time_1.2"; -SET SESSION debug="+d,query_exec_time_1.3"; -SET SESSION debug="+d,query_exec_time_1.5"; -SET SESSION debug="+d,query_exec_time_1.4"; -SET SESSION debug="+d,query_exec_time_0.5"; -SET SESSION debug="+d,query_exec_time_2.1"; -SET SESSION debug="+d,query_exec_time_2.3"; -SET SESSION debug="+d,query_exec_time_2.5"; +SET SESSION query_exec_time=0.31; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.32; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.33; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.34; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.35; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.36; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.37; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.38; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.39; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.2; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=3.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=4.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=5.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.1; SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -10 19 15 4 44 -1 19 15 4 44 -5 19 15 4 44 -3 19 15 4 44 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -44 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000003 - 0.000007 - 0.000015 - 0.000030 - 0.000061 - 0.000122 - 0.000244 - 0.000488 - 0.000976 - 0.001953 - 0.003906 - 0.007812 - 0.015625 - 0.031250 - 0.062500 - 0.125000 - 0.250000 - 0.500000 - 1.000000 - 2.000000 - 4.000000 - 8.000000 - 16.000000 - 32.000000 - 64.000000 - 128.000000 - 256.000000 - 512.000000 - 1024.000000 - 2048.000000 - 4096.000000 - 8192.000000 - 16384.000000 - 32768.000000 - 65536.000000 - 131072.000000 - 262144.000000 - 524288.000000 - 1048576.00000 - 2097152.00000 - 4194304.00000 - 8388608.00000 -TOO LONG SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 2 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 24 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 0 0.000000 + 0.250000 0 0.000000 + 0.500000 10 3.550000 + 1.000000 1 0.500000 + 2.000000 5 6.500000 + 4.000000 4 10.000000 + 8.000000 2 9.199999 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 24 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 0 0.000000 + 0.250000 0 0.000000 + 0.500000 10 3.550000 + 1.000000 1 0.500000 + 2.000000 5 6.500000 + 4.000000 4 10.000000 + 8.000000 2 9.199999 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2; +FLUSH QUERY_RESPONSE_TIME; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 0 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 0 0.000000 + 0.250000 0 0.000000 + 0.500000 0 0.000000 + 1.000000 0 0.000000 + 2.000000 0 0.000000 + 4.000000 0 0.000000 + 8.000000 0 0.000000 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 0 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 0 0.000000 + 0.250000 0 0.000000 + 0.500000 0 0.000000 + 1.000000 0 0.000000 + 2.000000 0 0.000000 + 4.000000 0 0.000000 + 8.000000 0 0.000000 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time=0.31; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.32; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.33; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.34; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.35; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.36; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.37; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.38; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.39; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.2; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=3.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=4.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=5.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; +Variable_name Value +query_response_time_range_base 2 +SHOW QUERY_RESPONSE_TIME; + + 0.000001 24 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 0 0.000000 + 0.250000 0 0.000000 + 0.500000 10 3.550000 + 1.000000 1 0.500000 + 2.000000 5 6.500000 + 4.000000 4 10.000000 + 8.000000 2 9.199999 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 24 0.000000 + 0.000003 0 0.000000 + 0.000007 0 0.000000 + 0.000015 0 0.000000 + 0.000030 0 0.000000 + 0.000061 0 0.000000 + 0.000122 0 0.000000 + 0.000244 0 0.000000 + 0.000488 0 0.000000 + 0.000976 0 0.000000 + 0.001953 0 0.000000 + 0.003906 0 0.000000 + 0.007812 0 0.000000 + 0.015625 0 0.000000 + 0.031250 0 0.000000 + 0.062500 0 0.000000 + 0.125000 0 0.000000 + 0.250000 0 0.000000 + 0.500000 10 3.550000 + 1.000000 1 0.500000 + 2.000000 5 6.500000 + 4.000000 4 10.000000 + 8.000000 2 9.199999 + 16.000000 0 0.000000 + 32.000000 0 0.000000 + 64.000000 0 0.000000 + 128.000000 0 0.000000 + 256.000000 0 0.000000 + 512.000000 0 0.000000 + 1024.000000 0 0.000000 + 2048.000000 0 0.000000 + 4096.000000 0 0.000000 + 8192.000000 0 0.000000 + 16384.000000 0 0.000000 + 32768.000000 0 0.000000 + 65536.000000 0 0.000000 + 131072.000000 0 0.000000 + 262144.000000 0 0.000000 + 524288.000000 0 0.000000 + 1048576.00000 0 0.000000 + 2097152.00000 0 0.000000 + 4194304.00000 0 0.000000 + 8388608.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10; +FLUSH QUERY_RESPONSE_TIME; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 0 0.000000 + 0.000010 0 0.000000 + 0.000100 0 0.000000 + 0.001000 0 0.000000 + 0.010000 0 0.000000 + 0.100000 0 0.000000 + 1.000000 0 0.000000 + 10.000000 0 0.000000 + 100.000000 0 0.000000 + 1000.000000 0 0.000000 + 10000.000000 0 0.000000 + 100000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 0 0.000000 + 0.000010 0 0.000000 + 0.000100 0 0.000000 + 0.001000 0 0.000000 + 0.010000 0 0.000000 + 0.100000 0 0.000000 + 1.000000 0 0.000000 + 10.000000 0 0.000000 + 100.000000 0 0.000000 + 1000.000000 0 0.000000 + 10000.000000 0 0.000000 + 100000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time=0.31; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.32; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.33; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.34; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.35; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.36; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.37; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.38; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.39; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.2; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=3.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=4.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=5.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 10 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION debug="+d,query_exec_time_0.31"; -SET SESSION debug="+d,query_exec_time_0.32"; -SET SESSION debug="+d,query_exec_time_0.33"; -SET SESSION debug="+d,query_exec_time_0.34"; -SET SESSION debug="+d,query_exec_time_0.35"; -SET SESSION debug="+d,query_exec_time_0.36"; -SET SESSION debug="+d,query_exec_time_0.37"; -SET SESSION debug="+d,query_exec_time_0.38"; -SET SESSION debug="+d,query_exec_time_0.39"; -SET SESSION debug="+d,query_exec_time_0.4"; -SET SESSION debug="+d,query_exec_time_1.1"; -SET SESSION debug="+d,query_exec_time_1.2"; -SET SESSION debug="+d,query_exec_time_1.3"; -SET SESSION debug="+d,query_exec_time_1.5"; -SET SESSION debug="+d,query_exec_time_1.4"; -SET SESSION debug="+d,query_exec_time_0.5"; -SET SESSION debug="+d,query_exec_time_2.1"; -SET SESSION debug="+d,query_exec_time_2.3"; -SET SESSION debug="+d,query_exec_time_2.5"; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 24 0.000000 + 0.000010 0 0.000000 + 0.000100 0 0.000000 + 0.001000 0 0.000000 + 0.010000 0 0.000000 + 0.100000 0 0.000000 + 1.000000 11 4.050000 + 10.000000 11 25.699999 + 100.000000 0 0.000000 + 1000.000000 0 0.000000 + 10000.000000 0 0.000000 + 100000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 24 0.000000 + 0.000010 0 0.000000 + 0.000100 0 0.000000 + 0.001000 0 0.000000 + 0.010000 0 0.000000 + 0.100000 0 0.000000 + 1.000000 11 4.050000 + 10.000000 11 25.699999 + 100.000000 0 0.000000 + 1000.000000 0 0.000000 + 10000.000000 0 0.000000 + 100000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7; +FLUSH QUERY_RESPONSE_TIME; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 0 0.000000 + 0.000008 0 0.000000 + 0.000059 0 0.000000 + 0.000416 0 0.000000 + 0.002915 0 0.000000 + 0.020408 0 0.000000 + 0.142857 0 0.000000 + 1.000000 0 0.000000 + 7.000000 0 0.000000 + 49.000000 0 0.000000 + 343.000000 0 0.000000 + 2401.000000 0 0.000000 + 16807.000000 0 0.000000 + 117649.000000 0 0.000000 + 823543.000000 0 0.000000 + 5764801.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 0 0.000000 + 0.000008 0 0.000000 + 0.000059 0 0.000000 + 0.000416 0 0.000000 + 0.002915 0 0.000000 + 0.020408 0 0.000000 + 0.142857 0 0.000000 + 1.000000 0 0.000000 + 7.000000 0 0.000000 + 49.000000 0 0.000000 + 343.000000 0 0.000000 + 2401.000000 0 0.000000 + 16807.000000 0 0.000000 + 117649.000000 0 0.000000 + 823543.000000 0 0.000000 + 5764801.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time=0.31; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.32; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.33; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.34; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.35; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.36; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.37; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.38; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.39; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.2; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=3.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=4.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=5.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.1; SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -11 19 17 2 14 -8 19 17 2 14 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -14 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000010 - 0.000100 - 0.001000 - 0.010000 - 0.100000 - 1.000000 - 10.000000 - 100.000000 - 1000.000000 - 10000.000000 - 100000.000000 - 1000000.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 10 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 7 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION debug="+d,query_exec_time_0.31"; -SET SESSION debug="+d,query_exec_time_0.32"; -SET SESSION debug="+d,query_exec_time_0.33"; -SET SESSION debug="+d,query_exec_time_0.34"; -SET SESSION debug="+d,query_exec_time_0.35"; -SET SESSION debug="+d,query_exec_time_0.36"; -SET SESSION debug="+d,query_exec_time_0.37"; -SET SESSION debug="+d,query_exec_time_0.38"; -SET SESSION debug="+d,query_exec_time_0.39"; -SET SESSION debug="+d,query_exec_time_0.4"; -SET SESSION debug="+d,query_exec_time_1.1"; -SET SESSION debug="+d,query_exec_time_1.2"; -SET SESSION debug="+d,query_exec_time_1.3"; -SET SESSION debug="+d,query_exec_time_1.5"; -SET SESSION debug="+d,query_exec_time_1.4"; -SET SESSION debug="+d,query_exec_time_0.5"; -SET SESSION debug="+d,query_exec_time_2.1"; -SET SESSION debug="+d,query_exec_time_2.3"; -SET SESSION debug="+d,query_exec_time_2.5"; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 24 0.000000 + 0.000008 0 0.000000 + 0.000059 0 0.000000 + 0.000416 0 0.000000 + 0.002915 0 0.000000 + 0.020408 0 0.000000 + 0.142857 0 0.000000 + 1.000000 11 4.050000 + 7.000000 11 25.699999 + 49.000000 0 0.000000 + 343.000000 0 0.000000 + 2401.000000 0 0.000000 + 16807.000000 0 0.000000 + 117649.000000 0 0.000000 + 823543.000000 0 0.000000 + 5764801.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 24 0.000000 + 0.000008 0 0.000000 + 0.000059 0 0.000000 + 0.000416 0 0.000000 + 0.002915 0 0.000000 + 0.020408 0 0.000000 + 0.142857 0 0.000000 + 1.000000 11 4.050000 + 7.000000 11 25.699999 + 49.000000 0 0.000000 + 343.000000 0 0.000000 + 2401.000000 0 0.000000 + 16807.000000 0 0.000000 + 117649.000000 0 0.000000 + 823543.000000 0 0.000000 + 5764801.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156; +FLUSH QUERY_RESPONSE_TIME; +SHOW QUERY_RESPONSE_TIME; + + 0.000041 0 0.000000 + 0.006410 0 0.000000 + 1.000000 0 0.000000 + 156.000000 0 0.000000 + 24336.000000 0 0.000000 + 3796416.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000041 0 0.000000 + 0.006410 0 0.000000 + 1.000000 0 0.000000 + 156.000000 0 0.000000 + 24336.000000 0 0.000000 + 3796416.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time=0.31; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.32; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.33; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.34; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.35; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.36; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.37; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.38; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.39; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.2; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=3.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=4.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=5.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.1; SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -11 19 17 2 17 -8 19 17 2 17 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -17 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000008 - 0.000059 - 0.000416 - 0.002915 - 0.020408 - 0.142857 - 1.000000 - 7.000000 - 49.000000 - 343.000000 - 2401.000000 - 16807.000000 - 117649.000000 - 823543.000000 - 5764801.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 7 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 156 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION debug="+d,query_exec_time_0.31"; -SET SESSION debug="+d,query_exec_time_0.32"; -SET SESSION debug="+d,query_exec_time_0.33"; -SET SESSION debug="+d,query_exec_time_0.34"; -SET SESSION debug="+d,query_exec_time_0.35"; -SET SESSION debug="+d,query_exec_time_0.36"; -SET SESSION debug="+d,query_exec_time_0.37"; -SET SESSION debug="+d,query_exec_time_0.38"; -SET SESSION debug="+d,query_exec_time_0.39"; -SET SESSION debug="+d,query_exec_time_0.4"; -SET SESSION debug="+d,query_exec_time_1.1"; -SET SESSION debug="+d,query_exec_time_1.2"; -SET SESSION debug="+d,query_exec_time_1.3"; -SET SESSION debug="+d,query_exec_time_1.5"; -SET SESSION debug="+d,query_exec_time_1.4"; -SET SESSION debug="+d,query_exec_time_0.5"; -SET SESSION debug="+d,query_exec_time_2.1"; -SET SESSION debug="+d,query_exec_time_2.3"; -SET SESSION debug="+d,query_exec_time_2.5"; +SHOW QUERY_RESPONSE_TIME; + + 0.000041 24 0.000000 + 0.006410 0 0.000000 + 1.000000 11 4.050000 + 156.000000 11 25.699999 + 24336.000000 0 0.000000 + 3796416.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000041 24 0.000000 + 0.006410 0 0.000000 + 1.000000 11 4.050000 + 156.000000 11 25.699999 + 24336.000000 0 0.000000 + 3796416.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000; +FLUSH QUERY_RESPONSE_TIME; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 0 0.000000 + 0.001000 0 0.000000 + 1.000000 0 0.000000 + 1000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 0 0.000000 + 0.001000 0 0.000000 + 1.000000 0 0.000000 + 1000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time=0.31; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.32; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.33; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.34; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.35; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.36; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.37; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.38; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.39; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.2; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=3.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=4.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=5.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.1; SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -11 19 17 2 7 -8 19 17 2 7 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -7 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000041 - 0.006410 - 1.000000 - 156.000000 - 24336.000000 - 3796416.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 156 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 1000 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION debug="+d,query_exec_time_0.31"; -SET SESSION debug="+d,query_exec_time_0.32"; -SET SESSION debug="+d,query_exec_time_0.33"; -SET SESSION debug="+d,query_exec_time_0.34"; -SET SESSION debug="+d,query_exec_time_0.35"; -SET SESSION debug="+d,query_exec_time_0.36"; -SET SESSION debug="+d,query_exec_time_0.37"; -SET SESSION debug="+d,query_exec_time_0.38"; -SET SESSION debug="+d,query_exec_time_0.39"; -SET SESSION debug="+d,query_exec_time_0.4"; -SET SESSION debug="+d,query_exec_time_1.1"; -SET SESSION debug="+d,query_exec_time_1.2"; -SET SESSION debug="+d,query_exec_time_1.3"; -SET SESSION debug="+d,query_exec_time_1.5"; -SET SESSION debug="+d,query_exec_time_1.4"; -SET SESSION debug="+d,query_exec_time_0.5"; -SET SESSION debug="+d,query_exec_time_2.1"; -SET SESSION debug="+d,query_exec_time_2.3"; -SET SESSION debug="+d,query_exec_time_2.5"; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 24 0.000000 + 0.001000 0 0.000000 + 1.000000 11 4.050000 + 1000.000000 11 25.699999 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 24 0.000000 + 0.001000 0 0.000000 + 1.000000 11 4.050000 + 1000.000000 11 25.699999 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET SESSION query_exec_time=0.1; SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -11 19 17 2 6 -8 19 17 2 6 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -6 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.001000 - 1.000000 - 1000.000000 - 1000000.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1001; Warnings: Warning 1292 Truncated incorrect query_response_time_range_base value: '1001' +FLUSH QUERY_RESPONSE_TIME; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 0 0.000000 + 0.001000 0 0.000000 + 1.000000 0 0.000000 + 1000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 0 0.000000 + 0.001000 0 0.000000 + 1.000000 0 0.000000 + 1000.000000 0 0.000000 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; +SET SESSION query_exec_time=0.31; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.32; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.33; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.34; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.35; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.36; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.37; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.38; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.39; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.2; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=1.4; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.3; +SELECT 1; +1 +1 +SET SESSION query_exec_time=2.5; +SELECT 1; +1 +1 +SET SESSION query_exec_time=3.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=4.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=5.1; +SELECT 1; +1 +1 +SET SESSION query_exec_time=0.1; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; Variable_name Value query_response_time_range_base 1000 -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; -SET GLOBAL debug=default; +SHOW QUERY_RESPONSE_TIME; + + 0.000001 24 0.000000 + 0.001000 0 0.000000 + 1.000000 11 4.050000 + 1000.000000 11 25.699999 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +time count total + 0.000001 24 0.000000 + 0.001000 0 0.000000 + 1.000000 11 4.050000 + 1000.000000 11 25.699999 + 1000000.00000 0 0.000000 +TOO LONG 0 TOO LONG +SET SESSION query_exec_time=default; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; diff --git a/percona-suite/percona_query_response_time.test b/percona-suite/percona_query_response_time.test index f2df156b13d..d4fb9c61388 100644 --- a/percona-suite/percona_query_response_time.test +++ b/percona-suite/percona_query_response_time.test @@ -1,71 +1,20 @@ --source include/have_response_time_distribution.inc --source include/have_debug.inc -SET GLOBAL debug="d,query_exec_time_debug"; +--let base=1 +--source include/query_response_time.inc +--let base=2 +--source include/query_response_time.inc +--let base=10 +--source include/query_response_time.inc +--let base=7 +--source include/query_response_time.inc +--let base=156 +--source include/query_response_time.inc +--let base=1000 +--source include/query_response_time.inc +--let base=1001 +--source include/query_response_time.inc -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -source include/percona_query_response_time_show.inc; - -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -source include/percona_query_response_time_sleep.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -source include/percona_query_response_time_sleep.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -source include/percona_query_response_time_sleep.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -source include/percona_query_response_time_sleep.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -source include/percona_query_response_time_sleep.inc; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; - -SET GLOBAL debug=default; +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; diff --git a/percona-suite/percona_server_variables_debug.result b/percona-suite/percona_server_variables_debug.result index 1ffaa6a7704..ea1c02e7716 100644 --- a/percona-suite/percona_server_variables_debug.result +++ b/percona-suite/percona_server_variables_debug.result @@ -41,6 +41,7 @@ DIV_PRECISION_INCREMENT ENGINE_CONDITION_PUSHDOWN ERROR_COUNT EVENT_SCHEDULER +EXPAND_FAST_INDEX_CREATION EXPIRE_LOGS_DAYS EXTERNAL_USER FAST_INDEX_CREATION @@ -83,6 +84,7 @@ INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS INNODB_ADDITIONAL_MEM_POOL_SIZE INNODB_AUTOEXTEND_INCREMENT INNODB_AUTOINC_LOCK_MODE +INNODB_BLOCKING_BUFFER_POOL_RESTORE INNODB_BUFFER_POOL_INSTANCES INNODB_BUFFER_POOL_RESTORE_AT_STARTUP INNODB_BUFFER_POOL_SHM_CHECKSUM @@ -100,6 +102,7 @@ INNODB_DATA_HOME_DIR INNODB_DICT_SIZE_LIMIT INNODB_DOUBLEWRITE INNODB_DOUBLEWRITE_FILE +INNODB_FAKE_CHANGES INNODB_FAST_CHECKSUM INNODB_FAST_SHUTDOWN INNODB_FILE_FORMAT @@ -109,12 +112,15 @@ INNODB_FILE_PER_TABLE INNODB_FLUSH_LOG_AT_TRX_COMMIT INNODB_FLUSH_METHOD INNODB_FLUSH_NEIGHBOR_PAGES +INNODB_FORCE_LOAD_CORRUPTED INNODB_FORCE_RECOVERY INNODB_IBUF_ACCEL_RATE INNODB_IBUF_ACTIVE_CONTRACT INNODB_IBUF_MAX_SIZE INNODB_IMPORT_TABLE_FROM_XTRABACKUP INNODB_IO_CAPACITY +INNODB_KILL_IDLE_TRANSACTION +INNODB_LARGE_PREFIX INNODB_LAZY_DROP_TABLE INNODB_LOCKS_UNSAFE_FOR_BINLOG INNODB_LOCK_WAIT_TIMEOUT @@ -132,6 +138,7 @@ INNODB_OPEN_FILES INNODB_PAGE_SIZE INNODB_PURGE_BATCH_SIZE INNODB_PURGE_THREADS +INNODB_RANDOM_READ_AHEAD INNODB_READ_AHEAD INNODB_READ_AHEAD_THRESHOLD INNODB_READ_IO_THREADS @@ -187,6 +194,7 @@ LOG_ERROR LOG_OUTPUT LOG_QUERIES_NOT_USING_INDEXES LOG_SLAVE_UPDATES +LOG_SLOW_ADMIN_STATEMENTS LOG_SLOW_FILTER LOG_SLOW_QUERIES LOG_SLOW_RATE_LIMIT @@ -275,6 +283,7 @@ QUERY_CACHE_SIZE QUERY_CACHE_STRIP_COMMENTS QUERY_CACHE_TYPE QUERY_CACHE_WLOCK_INVALIDATE +QUERY_EXEC_TIME QUERY_PREALLOC_SIZE QUERY_RESPONSE_TIME_RANGE_BASE QUERY_RESPONSE_TIME_STATS diff --git a/percona-suite/percona_server_variables_release.result b/percona-suite/percona_server_variables_release.result index cabd69b19a6..e5965cf7e5e 100644 --- a/percona-suite/percona_server_variables_release.result +++ b/percona-suite/percona_server_variables_release.result @@ -39,6 +39,7 @@ DIV_PRECISION_INCREMENT ENGINE_CONDITION_PUSHDOWN ERROR_COUNT EVENT_SCHEDULER +EXPAND_FAST_INDEX_CREATION EXPIRE_LOGS_DAYS EXTERNAL_USER FAST_INDEX_CREATION @@ -81,6 +82,7 @@ INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS INNODB_ADDITIONAL_MEM_POOL_SIZE INNODB_AUTOEXTEND_INCREMENT INNODB_AUTOINC_LOCK_MODE +INNODB_BLOCKING_BUFFER_POOL_RESTORE INNODB_BUFFER_POOL_INSTANCES INNODB_BUFFER_POOL_RESTORE_AT_STARTUP INNODB_BUFFER_POOL_SHM_CHECKSUM @@ -97,6 +99,7 @@ INNODB_DATA_HOME_DIR INNODB_DICT_SIZE_LIMIT INNODB_DOUBLEWRITE INNODB_DOUBLEWRITE_FILE +INNODB_FAKE_CHANGES INNODB_FAST_CHECKSUM INNODB_FAST_SHUTDOWN INNODB_FILE_FORMAT @@ -106,12 +109,15 @@ INNODB_FILE_PER_TABLE INNODB_FLUSH_LOG_AT_TRX_COMMIT INNODB_FLUSH_METHOD INNODB_FLUSH_NEIGHBOR_PAGES +INNODB_FORCE_LOAD_CORRUPTED INNODB_FORCE_RECOVERY INNODB_IBUF_ACCEL_RATE INNODB_IBUF_ACTIVE_CONTRACT INNODB_IBUF_MAX_SIZE INNODB_IMPORT_TABLE_FROM_XTRABACKUP INNODB_IO_CAPACITY +INNODB_KILL_IDLE_TRANSACTION +INNODB_LARGE_PREFIX INNODB_LAZY_DROP_TABLE INNODB_LOCKS_UNSAFE_FOR_BINLOG INNODB_LOCK_WAIT_TIMEOUT @@ -129,6 +135,7 @@ INNODB_OPEN_FILES INNODB_PAGE_SIZE INNODB_PURGE_BATCH_SIZE INNODB_PURGE_THREADS +INNODB_RANDOM_READ_AHEAD INNODB_READ_AHEAD INNODB_READ_AHEAD_THRESHOLD INNODB_READ_IO_THREADS @@ -184,6 +191,7 @@ LOG_ERROR LOG_OUTPUT LOG_QUERIES_NOT_USING_INDEXES LOG_SLAVE_UPDATES +LOG_SLOW_ADMIN_STATEMENTS LOG_SLOW_FILTER LOG_SLOW_QUERIES LOG_SLOW_RATE_LIMIT diff --git a/percona-suite/percona_show_slave_status_nolock.result b/percona-suite/percona_show_slave_status_nolock.result index 1d6114a001e..b98e4a93953 100644 --- a/percona-suite/percona_show_slave_status_nolock.result +++ b/percona-suite/percona_show_slave_status_nolock.result @@ -1,21 +1,69 @@ include/master-slave.inc [connection master] +call mtr.add_suppression("Slave SQL: Request to stop slave SQL Thread received while applying a group that has non-transactional changes"); +include/rpl_connect.inc [creating slave_lock] +include/rpl_connect.inc [creating slave_nolock] +[master] DROP TABLE IF EXISTS t; CREATE TABLE t(id INT); -INSERT INTO t SELECT SLEEP(10); -STOP SLAVE; -Warnings: -Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. -master count(*) -master 1 -slave count(*) -slave 0 +[slave] +SET DEBUG_SYNC='RESET'; +SET GLOBAL DEBUG="+d,after_mysql_insert,after_show_slave_status"; +[master] +INSERT INTO t VALUES(0); +[slave] +check 'SHOW SLAVE STATUS' and 'SHOW SLAVE STATUS NOLOCK' - both should work fine + +[slave_lock] +SHOW SLAVE STATUS; +SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1'; +SIGNAL after SHOW SLAVE STATUS is 'signal.after_show_slave_status' +[slave] +SET DEBUG_SYNC='now SIGNAL signal.empty'; +[slave_nolock] SHOW SLAVE STATUS NOLOCK; +SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1'; +# should be 'signal.after_show_slave_status' +SIGNAL after SHOW SLAVE STATUS NOLOCK is 'signal.after_show_slave_status' +[slave] +SET DEBUG_SYNC='now SIGNAL signal.continue'; +[slave] +SET DEBUG_SYNC='now SIGNAL signal.empty'; + +[master] +INSERT INTO t VALUES(1); +[slave] +include/rpl_connect.inc [creating slave_stop] +[slave_stop] +STOP SLAVE; +[slave] +check 'SHOW SLAVE STATUS' and 'SHOW SLAVE STATUS NOLOCK' - just NOLOCK version should works fine + +[slave_lock] +SHOW SLAVE STATUS; +SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1'; +SIGNAL after SHOW SLAVE STATUS is 'signal.empty' +[slave] +SET DEBUG_SYNC='now SIGNAL signal.empty'; +[slave_nolock] +SHOW SLAVE STATUS NOLOCK; +SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1'; +# should be 'signal.after_show_slave_status' +SIGNAL after SHOW SLAVE STATUS NOLOCK is 'signal.after_show_slave_status' +[slave] +SET DEBUG_SYNC='now SIGNAL signal.continue'; +[slave] +SET DEBUG_SYNC='now SIGNAL signal.empty'; + +[slave_stop] include/wait_for_slave_to_stop.inc START SLAVE; include/wait_for_slave_to_start.inc -slave count(*) -slave 1 +[master] +SET DEBUG_SYNC='RESET'; +[slave] +SET GLOBAL DEBUG=''; +SET DEBUG_SYNC='RESET'; +[master] DROP TABLE t; -STOP SLAVE; -include/wait_for_slave_to_stop.inc +include/rpl_end.inc diff --git a/percona-suite/percona_show_slave_status_nolock.test b/percona-suite/percona_show_slave_status_nolock.test index d26b5332fe8..df595214ff7 100644 --- a/percona-suite/percona_show_slave_status_nolock.test +++ b/percona-suite/percona_show_slave_status_nolock.test @@ -1,53 +1,90 @@ --source include/master-slave.inc +--source include/have_debug_sync.inc --source include/have_binlog_format_statement.inc ---disable_query_log -call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. Statement:"); -call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); ---enable_query_log -connection master; - --disable_warnings - DROP TABLE IF EXISTS t; - --enable_warnings - CREATE TABLE t(id INT); - sync_slave_with_master; + +call mtr.add_suppression("Slave SQL: Request to stop slave SQL Thread received while applying a group that has non-transactional changes"); + +--let $rpl_connection_name=slave_lock +--let $rpl_server_number=2 +--source include/rpl_connect.inc + +--let $rpl_connection_name=slave_nolock +--let $rpl_server_number=2 +--source include/rpl_connect.inc + +--let $show_statement= SHOW PROCESSLIST +--let $field= Info connection master; - send INSERT INTO t SELECT SLEEP(10); - -connection slave; - sleep 15; - send STOP SLAVE; - -connection master; - reap; - - --disable_query_log - select "master",count(*) from t; - --enable_query_log - -connection slave1; - --disable_query_log - select "slave",count(*) from t; - --enable_query_log - - --disable_result_log - SHOW SLAVE STATUS NOLOCK; - --enable_result_log - -connection slave; - reap; - - --source include/wait_for_slave_to_stop.inc - START SLAVE; - --source include/wait_for_slave_to_start.inc - - --disable_query_log - select "slave",count(*) from t; - --enable_query_log - -connection master; - DROP TABLE t; +--echo [master] +--disable_warnings +DROP TABLE IF EXISTS t; +--enable_warnings +CREATE TABLE t(id INT); sync_slave_with_master; -STOP SLAVE; + +connection slave; +--echo [slave] +SET DEBUG_SYNC='RESET'; +SET GLOBAL DEBUG="+d,after_mysql_insert,after_show_slave_status"; + +connection master; +--echo [master] +INSERT INTO t VALUES(0); + +connection slave; +--echo [slave] +--let $condition= 'INSERT INTO t VALUES(0)' +--source include/wait_show_condition.inc + +--echo check 'SHOW SLAVE STATUS' and 'SHOW SLAVE STATUS NOLOCK' - both should work fine +--source include/percona_show_slave_status_nolock.inc + +connection master; +--echo [master] +INSERT INTO t VALUES(1); + +connection slave; +--echo [slave] +--let $condition= 'INSERT INTO t VALUES(1)' +--source include/wait_show_condition.inc + +--let $rpl_connection_name=slave_stop +--let $rpl_server_number=2 +--source include/rpl_connect.inc + +connection slave_stop; +--echo [slave_stop] +send STOP SLAVE; + +connection slave; +--echo [slave] +--let $condition= 'STOP SLAVE' +--source include/wait_show_condition.inc + +--echo check 'SHOW SLAVE STATUS' and 'SHOW SLAVE STATUS NOLOCK' - just NOLOCK version should works fine +--source include/percona_show_slave_status_nolock.inc + + +connection slave_stop; +--echo [slave_stop] +reap; --source include/wait_for_slave_to_stop.inc - \ No newline at end of file +START SLAVE; +--source include/wait_for_slave_to_start.inc + +connection master; +--echo [master] +SET DEBUG_SYNC='RESET'; + +connection slave; +--echo [slave] +SET GLOBAL DEBUG=''; +SET DEBUG_SYNC='RESET'; + +connection master; +--echo [master] +DROP TABLE t; +sync_slave_with_master; + +--source include/rpl_end.inc diff --git a/percona-suite/percona_status_wait_query_cache_mutex.result b/percona-suite/percona_status_wait_query_cache_mutex.result index f951428abc7..678ed685a5b 100644 --- a/percona-suite/percona_status_wait_query_cache_mutex.result +++ b/percona-suite/percona_status_wait_query_cache_mutex.result @@ -1,4 +1,4 @@ -set GLOBAL query_cache_size=1355776; +SET GLOBAL query_cache_size=1355776; flush query cache; flush query cache; reset query cache; @@ -8,20 +8,16 @@ CREATE TABLE t(id INT, number INT); INSERT INTO t VALUES (0,1); INSERT INTO t VALUES (1,2); INSERT INTO t VALUES (2,3); +SET SESSION debug="+d,status_waiting_on_query_cache_mutex_sleep"; +SET DEBUG_SYNC='status_waiting_on_query_cache_mutex SIGNAL thread_ready'; SELECT number from t where id > 0; -number -2 -3 -SET SESSION debug="+d,status_wait_query_cache_mutex_sleep"; -SELECT number from t where id > 0; -SET SESSION debug="+d,status_wait_query_cache_mutex_sleep"; -SELECT number from t where id > 0; -SET SESSION debug="+d,status_wait_query_cache_mutex_sleep"; SHOW PROCESSLIST; Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read -Id root localhost test Sleep Time NULL Rows_sent Rows_examined Rows_read -Id root localhost test Query Time Waiting on query cache mutex SELECT number from t where id > 0 Rows_sent Rows_examined Rows_read -Id root localhost test Query Time Waiting on query cache mutex SELECT number from t where id > 0 Rows_sent Rows_examined Rows_read -Id root localhost test Query Time NULL SHOW PROCESSLIST Rows_sent Rows_examined Rows_read +### root ### test Query ### NULL SHOW PROCESSLIST ### ### ### +### root ### test Query ### Waiting on query cache mutex SELECT number from t where id > 0 ### ### ### +SELECT id, info, state FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id; +id info state +### SELECT id, info, state FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id executing +### SELECT number from t where id > 0 Waiting on query cache mutex DROP TABLE t; -set GLOBAL query_cache_size=0; +SET GLOBAL query_cache_size=0; diff --git a/percona-suite/percona_status_wait_query_cache_mutex.test b/percona-suite/percona_status_wait_query_cache_mutex.test index 35e2d0ac549..1e586ca4e7a 100644 --- a/percona-suite/percona_status_wait_query_cache_mutex.test +++ b/percona-suite/percona_status_wait_query_cache_mutex.test @@ -1,6 +1,7 @@ --source include/have_query_cache.inc --source include/have_debug.inc -set GLOBAL query_cache_size=1355776; +--source include/have_debug_sync.inc +SET GLOBAL query_cache_size=1355776; --source include/percona_query_cache_with_comments_clear.inc -- disable_warnings @@ -10,28 +11,21 @@ CREATE TABLE t(id INT, number INT); INSERT INTO t VALUES (0,1); INSERT INTO t VALUES (1,2); INSERT INTO t VALUES (2,3); -SELECT number from t where id > 0; ---connect (conn0,localhost,root,,) ---connect (conn1,localhost,root,,) ---connect (conn2,localhost,root,,) ---connection conn0 ---error 0, ER_UNKNOWN_SYSTEM_VARIABLE -SET SESSION debug="+d,status_wait_query_cache_mutex_sleep"; +--connect (conn,localhost,root,,) + +--connection conn +SET SESSION debug="+d,status_waiting_on_query_cache_mutex_sleep"; +SET DEBUG_SYNC='status_waiting_on_query_cache_mutex SIGNAL thread_ready'; SEND SELECT number from t where id > 0; -SLEEP 1.0; ---connection conn1 ---error 0, ER_UNKNOWN_SYSTEM_VARIABLE -SET SESSION debug="+d,status_wait_query_cache_mutex_sleep"; -SEND SELECT number from t where id > 0; -SLEEP 1.0; - ---connection conn2 ---error 0, ER_UNKNOWN_SYSTEM_VARIABLE -SET SESSION debug="+d,status_wait_query_cache_mutex_sleep"; ---replace_column 1 Id 6 Time 9 Rows_sent 10 Rows_examined 11 Rows_read +--connection default +--replace_column 1 ### 3 ### 6 ### 9 ### 10 ### 11 ### SHOW PROCESSLIST; +--replace_column 1 ### +SELECT id, info, state FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id; + +--disconnect conn DROP TABLE t; -set GLOBAL query_cache_size=0; +SET GLOBAL query_cache_size=0; diff --git a/percona-suite/query_response_time-replication.inc b/percona-suite/query_response_time-replication.inc new file mode 100644 index 00000000000..9bd811a9a1b --- /dev/null +++ b/percona-suite/query_response_time-replication.inc @@ -0,0 +1,57 @@ +connection master; + +CREATE TABLE t(id INT); + +connection slave; +SET GLOBAL query_exec_time = 0.1; +--source include/restart_slave_sql.inc + +connection slave; + +SET SESSION query_exec_time=0.1; + +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +--eval SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base +FLUSH QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; + +connection master; + +SET SESSION query_exec_time = 0.31; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.32; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.33; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.34; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.35; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.36; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.37; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.38; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.39; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.4; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.1; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.2; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.3; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.5; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 1.4; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 0.5; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.1; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.3; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 2.5; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 3.1; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 4.1; INSERT INTO t VALUES(1); +SET SESSION query_exec_time = 5.1; INSERT INTO t VALUES(1); + +sync_slave_with_master; + +connection slave; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; +SHOW QUERY_RESPONSE_TIME; +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; + +SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; + +connection master; +DROP TABLE t; + +sync_slave_with_master; diff --git a/percona-suite/query_response_time-stored.inc b/percona-suite/query_response_time-stored.inc new file mode 100644 index 00000000000..a1fc8912aab --- /dev/null +++ b/percona-suite/query_response_time-stored.inc @@ -0,0 +1,37 @@ +SET SESSION query_exec_time=0.1; + +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base; +FLUSH QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; + +CALL test_f(0.31); +CALL test_f(0.32); +CALL test_f(0.33); +CALL test_f(0.34); +CALL test_f(0.35); +CALL test_f(0.36); +CALL test_f(0.37); +CALL test_f(0.38); +CALL test_f(0.39); +CALL test_f(0.4); +CALL test_f(1.1); +CALL test_f(1.2); +CALL test_f(1.3); +CALL test_f(1.5); +CALL test_f(1.4); +CALL test_f(0.5); +CALL test_f(2.1); +CALL test_f(2.3); +CALL test_f(2.5); +CALL test_f(3.1); +CALL test_f(4.1); +CALL test_f(5.1); + +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; + +SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; +SHOW QUERY_RESPONSE_TIME; +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; + +SET SESSION query_exec_time=default; diff --git a/percona-suite/query_response_time.inc b/percona-suite/query_response_time.inc new file mode 100644 index 00000000000..734d3f5a262 --- /dev/null +++ b/percona-suite/query_response_time.inc @@ -0,0 +1,43 @@ +SET SESSION query_exec_time=0.1; + +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; +EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base; +FLUSH QUERY_RESPONSE_TIME; +# Following two queries check works of FLUSH and +# respecting of "QUERY_RESPONSE_TIME_STATS" variable (see launchpad bug #855312) +SHOW QUERY_RESPONSE_TIME; +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; +SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; + +SET SESSION query_exec_time=0.31; SELECT 1; +SET SESSION query_exec_time=0.32; SELECT 1; +SET SESSION query_exec_time=0.33; SELECT 1; +SET SESSION query_exec_time=0.34; SELECT 1; +SET SESSION query_exec_time=0.35; SELECT 1; +SET SESSION query_exec_time=0.36; SELECT 1; +SET SESSION query_exec_time=0.37; SELECT 1; +SET SESSION query_exec_time=0.38; SELECT 1; +SET SESSION query_exec_time=0.39; SELECT 1; +SET SESSION query_exec_time=0.4; SELECT 1; +SET SESSION query_exec_time=1.1; SELECT 1; +SET SESSION query_exec_time=1.2; SELECT 1; +SET SESSION query_exec_time=1.3; SELECT 1; +SET SESSION query_exec_time=1.5; SELECT 1; +SET SESSION query_exec_time=1.4; SELECT 1; +SET SESSION query_exec_time=0.5; SELECT 1; +SET SESSION query_exec_time=2.1; SELECT 1; +SET SESSION query_exec_time=2.3; SELECT 1; +SET SESSION query_exec_time=2.5; SELECT 1; +SET SESSION query_exec_time=3.1; SELECT 1; +SET SESSION query_exec_time=4.1; SELECT 1; +SET SESSION query_exec_time=5.1; SELECT 1; + +SET SESSION query_exec_time=0.1; + +SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; + +SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; +SHOW QUERY_RESPONSE_TIME; +SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; + +SET SESSION query_exec_time=default; diff --git a/que/que0que.c b/que/que0que.c index d704e0cd1fc..0d13491f25a 100644 --- a/que/que0que.c +++ b/que/que0que.c @@ -1417,6 +1417,12 @@ que_eval_sql( ut_a(trx->error_state == DB_SUCCESS); + if (trx->fake_changes) { + /* fake_changes should not access to system tables */ + fprintf(stderr, "InnoDB: ERROR: innodb_fake_changes tried to access to system tables.\n"); + return(DB_ERROR); + } + if (reserve_dict_mutex) { mutex_enter(&dict_sys->mutex); } diff --git a/rem/rem0rec.c b/rem/rem0rec.c index 5a96e608ab5..30fc28561fa 100644 --- a/rem/rem0rec.c +++ b/rem/rem0rec.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -408,7 +408,7 @@ rec_init_offsets( do { ulint len; if (UNIV_UNLIKELY(i == n_node_ptr_field)) { - len = offs += 4; + len = offs += REC_NODE_PTR_SIZE; goto resolved; } @@ -640,7 +640,7 @@ rec_get_offsets_reverse( do { ulint len; if (UNIV_UNLIKELY(i == n_node_ptr_field)) { - len = offs += 4; + len = offs += REC_NODE_PTR_SIZE; goto resolved; } @@ -1131,9 +1131,9 @@ rec_convert_dtuple_to_rec_comp( if (UNIV_UNLIKELY(i == n_node_ptr_field)) { ut_ad(dtype_get_prtype(type) & DATA_NOT_NULL); - ut_ad(len == 4); + ut_ad(len == REC_NODE_PTR_SIZE); memcpy(end, dfield_get_data(field), len); - end += 4; + end += REC_NODE_PTR_SIZE; break; } diff --git a/row/row0ins.c b/row/row0ins.c index b4e66a16b5f..da035421ab9 100644 --- a/row/row0ins.c +++ b/row/row0ins.c @@ -118,6 +118,9 @@ ins_node_create_entry_list( node->entry_sys_heap); UT_LIST_ADD_LAST(tuple_list, node->entry_list, entry); + /* We will include all indexes (include those corrupted + secondary indexes) in the entry list. Filteration of + these corrupted index will be done in row_ins() */ index = dict_table_get_next_index(index); } } @@ -1499,6 +1502,11 @@ exit_func: if (UNIV_LIKELY_NULL(heap)) { mem_heap_free(heap); } + + if (trx->fake_changes) { + err = DB_SUCCESS; + } + return(err); } @@ -2004,7 +2012,7 @@ row_ins_index_entry_low( } btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE, - search_mode, + thr_get_trx(thr)->fake_changes ? BTR_SEARCH_LEAF : search_mode, &cursor, 0, __FILE__, __LINE__, &mtr); if (cursor.flag == BTR_CUR_INSERT_TO_IBUF) { @@ -2053,7 +2061,6 @@ row_ins_index_entry_low( mtr_start(&mtr); if (err != DB_SUCCESS) { - goto function_exit; } @@ -2065,7 +2072,7 @@ row_ins_index_entry_low( btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE, - mode | BTR_INSERT, + thr_get_trx(thr)->fake_changes ? BTR_SEARCH_LEAF : (mode | BTR_INSERT), &cursor, 0, __FILE__, __LINE__, &mtr); } @@ -2119,6 +2126,22 @@ function_exit: if (UNIV_LIKELY_NULL(big_rec)) { rec_t* rec; ulint* offsets; + + if (thr_get_trx(thr)->fake_changes) { + /* skip store extern */ + if (modify) { + dtuple_big_rec_free(big_rec); + } else { + dtuple_convert_back_big_rec(index, entry, big_rec); + } + + if (UNIV_LIKELY_NULL(heap)) { + mem_heap_free(heap); + } + + return(err); + } + mtr_start(&mtr); btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE, @@ -2403,6 +2426,13 @@ row_ins( node->index = dict_table_get_next_index(node->index); node->entry = UT_LIST_GET_NEXT(tuple_list, node->entry); + + /* Skip corrupted secondar index and its entry */ + while (node->index && dict_index_is_corrupted(node->index)) { + + node->index = dict_table_get_next_index(node->index); + node->entry = UT_LIST_GET_NEXT(tuple_list, node->entry); + } } ut_ad(node->entry == NULL); diff --git a/row/row0merge.c b/row/row0merge.c index 7d4716cb623..ed5c0abc884 100644 --- a/row/row0merge.c +++ b/row/row0merge.c @@ -56,6 +56,7 @@ Completed by Sunny Bains and Marko Makela #include "log0log.h" #include "ut0sort.h" #include "handler0alter.h" +#include "ha_prototypes.h" /* Ignore posix_fadvise() on those platforms where it does not exist */ #if defined __WIN__ @@ -2563,8 +2564,9 @@ row_merge_is_index_usable( const trx_t* trx, /*!< in: transaction */ const dict_index_t* index) /*!< in: index to check */ { - return(!trx->read_view - || read_view_sees_trx_id(trx->read_view, index->trx_id)); + return(!dict_index_is_corrupted(index) + && (!trx->read_view + || read_view_sees_trx_id(trx->read_view, index->trx_id))); } /*********************************************************************//** @@ -2672,6 +2674,9 @@ row_merge_build_indexes( } } + if (trx->mysql_thd && thd_expand_fast_index_creation(trx->mysql_thd)) + dict_update_statistics(new_table, FALSE, TRUE); + func_exit: row_merge_file_destroy_low(tmpfd); diff --git a/row/row0mysql.c b/row/row0mysql.c index d9107d942f6..7ffccf35371 100644 --- a/row/row0mysql.c +++ b/row/row0mysql.c @@ -577,6 +577,7 @@ handle_new_error: case DB_DUPLICATE_KEY: case DB_FOREIGN_DUPLICATE_KEY: case DB_TOO_BIG_RECORD: + case DB_UNDO_RECORD_TOO_BIG: case DB_ROW_IS_REFERENCED: case DB_NO_REFERENCED_ROW: case DB_CANNOT_ADD_CONSTRAINT: @@ -1245,6 +1246,7 @@ run_again: prebuilt->table->stat_n_rows--; } + if (!(trx->fake_changes)) row_update_statistics_if_needed(prebuilt->table); trx->op_info = ""; @@ -1504,6 +1506,7 @@ run_again: that changes indexed columns, UPDATEs that change only non-indexed columns would not affect statistics. */ if (node->is_delete || !(node->cmpl_info & UPD_NODE_NO_ORD_CHANGE)) { + if (!(trx->fake_changes)) row_update_statistics_if_needed(prebuilt->table); } @@ -1721,6 +1724,7 @@ run_again: srv_n_rows_updated++; } + if (!(trx->fake_changes)) row_update_statistics_if_needed(table); return(err); @@ -2026,41 +2030,13 @@ row_create_index_for_mysql( trx_start_if_not_started(trx); - /* Check that the same column does not appear twice in the index. - Starting from 4.0.14, InnoDB should be able to cope with that, but - safer not to allow them. */ - - for (i = 0; i < dict_index_get_n_fields(index); i++) { - ulint j; - - for (j = 0; j < i; j++) { - if (0 == ut_strcmp( - dict_index_get_nth_field(index, j)->name, - dict_index_get_nth_field(index, i)->name)) { - ut_print_timestamp(stderr); - - fputs(" InnoDB: Error: column ", stderr); - ut_print_name(stderr, trx, FALSE, - dict_index_get_nth_field( - index, i)->name); - fputs(" appears twice in ", stderr); - dict_index_name_print(stderr, trx, index); - fputs("\n" - "InnoDB: This is not allowed" - " in InnoDB.\n", stderr); - - err = DB_COL_APPEARS_TWICE_IN_INDEX; - - goto error_handling; - } - } - - /* Check also that prefix_len and actual length - is less than that from DICT_MAX_FIELD_LEN_BY_FORMAT() */ + for (i = 0; i < index->n_def; i++) { + /* Check that prefix_len and actual length + < DICT_MAX_INDEX_COL_LEN */ len = dict_index_get_nth_field(index, i)->prefix_len; - if (field_lengths) { + if (field_lengths && field_lengths[i]) { len = ut_max(len, field_lengths[i]); } @@ -2068,6 +2044,7 @@ row_create_index_for_mysql( if (len > (ulint) DICT_MAX_FIELD_LEN_BY_FORMAT(table)) { err = DB_TOO_BIG_INDEX_COL; + dict_mem_index_free(index); goto error_handling; } } @@ -2610,10 +2587,29 @@ row_discard_tablespace_for_mysql( err = DB_ERROR; } else { + dict_index_t* index; + /* Set the flag which tells that now it is legal to IMPORT a tablespace for this table */ table->tablespace_discarded = TRUE; table->ibd_file_missing = TRUE; + + /* check adaptive hash entries */ + index = dict_table_get_first_index(table); + while (index) { + ulint ref_count = btr_search_info_get_ref_count(index->search_info, index->id); + if (ref_count) { + fprintf(stderr, "InnoDB: Warning:" + " hash index ref_count (%lu) is not zero" + " after fil_discard_tablespace().\n" + "index: \"%s\"" + " table: \"%s\"\n", + ref_count, + index->name, + table->name); + } + index = dict_table_get_next_index(index); + } } } @@ -2962,6 +2958,19 @@ row_truncate_table_for_mysql( table->space = space; index = dict_table_get_first_index(table); do { + ulint ref_count = btr_search_info_get_ref_count(index->search_info, index->id); + /* check adaptive hash entries */ + if (ref_count) { + fprintf(stderr, "InnoDB: Warning:" + " hash index ref_count (%lu) is not zero" + " after fil_discard_tablespace().\n" + "index: \"%s\"" + " table: \"%s\"\n", + ref_count, + index->name, + table->name); + } + index->space = space; index = dict_table_get_next_index(index); } while (index); @@ -3211,7 +3220,8 @@ row_drop_table_for_mysql( ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX)); #endif /* UNIV_SYNC_DEBUG */ - table = dict_table_get_low_ignore_err(name, DICT_ERR_IGNORE_INDEX_ROOT); + table = dict_table_get_low_ignore_err( + name, DICT_ERR_IGNORE_INDEX_ROOT | DICT_ERR_IGNORE_CORRUPT); if (!table) { err = DB_TABLE_NOT_FOUND; @@ -3358,6 +3368,19 @@ check_next_foreign: "index_id CHAR;\n" "foreign_id CHAR;\n" "found INT;\n" + + "DECLARE CURSOR cur_fk IS\n" + "SELECT ID FROM SYS_FOREIGN\n" + "WHERE FOR_NAME = :table_name\n" + "AND TO_BINARY(FOR_NAME)\n" + " = TO_BINARY(:table_name)\n" + "LOCK IN SHARE MODE;\n" + + "DECLARE CURSOR cur_idx IS\n" + "SELECT ID FROM SYS_INDEXES\n" + "WHERE TABLE_ID = table_id\n" + "LOCK IN SHARE MODE;\n" + "BEGIN\n" "SELECT ID INTO table_id\n" "FROM SYS_TABLES\n" @@ -3380,13 +3403,9 @@ check_next_foreign: "IF (:table_name = 'SYS_FOREIGN_COLS') THEN\n" " found := 0;\n" "END IF;\n" + "OPEN cur_fk;\n" "WHILE found = 1 LOOP\n" - " SELECT ID INTO foreign_id\n" - " FROM SYS_FOREIGN\n" - " WHERE FOR_NAME = :table_name\n" - " AND TO_BINARY(FOR_NAME)\n" - " = TO_BINARY(:table_name)\n" - " LOCK IN SHARE MODE;\n" + " FETCH cur_fk INTO foreign_id;\n" " IF (SQL % NOTFOUND) THEN\n" " found := 0;\n" " ELSE\n" @@ -3396,12 +3415,11 @@ check_next_foreign: " WHERE ID = foreign_id;\n" " END IF;\n" "END LOOP;\n" + "CLOSE cur_fk;\n" "found := 1;\n" + "OPEN cur_idx;\n" "WHILE found = 1 LOOP\n" - " SELECT ID INTO index_id\n" - " FROM SYS_INDEXES\n" - " WHERE TABLE_ID = table_id\n" - " LOCK IN SHARE MODE;\n" + " FETCH cur_idx INTO index_id;\n" " IF (SQL % NOTFOUND) THEN\n" " found := 0;\n" " ELSE\n" @@ -3414,6 +3432,7 @@ check_next_foreign: " AND TABLE_ID = table_id;\n" " END IF;\n" "END LOOP;\n" + "CLOSE cur_idx;\n" "DELETE FROM SYS_COLUMNS\n" "WHERE TABLE_ID = table_id;\n" "DELETE FROM SYS_TABLES\n" diff --git a/row/row0purge.c b/row/row0purge.c index 83e7c9e4857..efcfdc3bac5 100644 --- a/row/row0purge.c +++ b/row/row0purge.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1997, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ @@ -469,6 +469,13 @@ row_purge_del_mark( heap = mem_heap_create(1024); while (node->index != NULL) { + /* skip corrupted secondary index */ + dict_table_skip_corrupt_index(node->index); + + if (!node->index) { + break; + } + index = node->index; /* Build the index entry */ @@ -508,7 +515,8 @@ row_purge_upd_exist_or_extern_func( ut_ad(node); - if (node->rec_type == TRX_UNDO_UPD_DEL_REC) { + if (node->rec_type == TRX_UNDO_UPD_DEL_REC + || (node->cmpl_info & UPD_NODE_NO_ORD_CHANGE)) { goto skip_secondaries; } @@ -516,6 +524,12 @@ row_purge_upd_exist_or_extern_func( heap = mem_heap_create(1024); while (node->index != NULL) { + dict_table_skip_corrupt_index(node->index); + + if (!node->index) { + break; + } + index = node->index; if (row_upd_changes_ord_field_binary(node->index, node->update, @@ -632,14 +646,14 @@ row_purge_parse_undo_rec( roll_ptr_t roll_ptr; ulint info_bits; ulint type; - ulint cmpl_info; ut_ad(node && thr); trx = thr_get_trx(thr); - ptr = trx_undo_rec_get_pars(node->undo_rec, &type, &cmpl_info, - updated_extern, &undo_no, &table_id); + ptr = trx_undo_rec_get_pars( + node->undo_rec, &type, &node->cmpl_info, + updated_extern, &undo_no, &table_id); node->rec_type = type; if (type == TRX_UNDO_UPD_DEL_REC && !(*updated_extern)) { @@ -652,7 +666,8 @@ row_purge_parse_undo_rec( node->table = NULL; if (type == TRX_UNDO_UPD_EXIST_REC - && cmpl_info & UPD_NODE_NO_ORD_CHANGE && !(*updated_extern)) { + && node->cmpl_info & UPD_NODE_NO_ORD_CHANGE + && !(*updated_extern)) { /* Purge requires no changes to indexes: we may return */ @@ -702,7 +717,7 @@ err_exit: /* Read to the partial row the fields that occur in indexes */ - if (!(cmpl_info & UPD_NODE_NO_ORD_CHANGE)) { + if (!(node->cmpl_info & UPD_NODE_NO_ORD_CHANGE)) { ptr = trx_undo_rec_get_partial_row( ptr, clust_index, &node->row, type == TRX_UNDO_UPD_DEL_REC, diff --git a/row/row0row.c b/row/row0row.c index 2882af00f30..0462f280858 100644 --- a/row/row0row.c +++ b/row/row0row.c @@ -101,12 +101,27 @@ row_build_index_entry( dfield_copy(dfield, dfield2); - if (dfield_is_null(dfield) || ind_field->prefix_len == 0) { + if (dfield_is_null(dfield)) { continue; } - /* If a column prefix index, take only the prefix. - Prefix-indexed columns may be externally stored. */ + if (ind_field->prefix_len == 0 + && (!dfield_is_ext(dfield) + || dict_index_is_clust(index))) { + /* The dfield_copy() above suffices for + columns that are stored in-page, or for + clustered index record columns that are not + part of a column prefix in the PRIMARY KEY. */ + continue; + } + + /* If the column is stored externally (off-page) in + the clustered index, it must be an ordering field in + the secondary index. In the Antelope format, only + prefix-indexed columns may be stored off-page in the + clustered index record. In the Barracuda format, also + fully indexed long CHAR or VARCHAR columns may be + stored off-page. */ ut_ad(col->ord_part); if (UNIV_LIKELY_NULL(ext)) { @@ -119,15 +134,41 @@ row_build_index_entry( } dfield_set_data(dfield, buf, len); } + + if (ind_field->prefix_len == 0) { + /* In the Barracuda format + (ROW_FORMAT=DYNAMIC or + ROW_FORMAT=COMPRESSED), we can have a + secondary index on an entire column + that is stored off-page in the + clustered index. As this is not a + prefix index (prefix_len == 0), + include the entire off-page column in + the secondary index record. */ + continue; + } } else if (dfield_is_ext(dfield)) { + /* This table is either in Antelope format + (ROW_FORMAT=REDUNDANT or ROW_FORMAT=COMPACT) + or a purge record where the ordered part of + the field is not external. + In Antelope, the maximum column prefix + index length is 767 bytes, and the clustered + index record contains a 768-byte prefix of + each off-page column. */ ut_a(len >= BTR_EXTERN_FIELD_REF_SIZE); len -= BTR_EXTERN_FIELD_REF_SIZE; + dfield_set_len(dfield, len); } - len = dtype_get_at_most_n_mbchars( - col->prtype, col->mbminmaxlen, - ind_field->prefix_len, len, dfield_get_data(dfield)); - dfield_set_len(dfield, len); + /* If a column prefix index, take only the prefix. */ + if (ind_field->prefix_len) { + len = dtype_get_at_most_n_mbchars( + col->prtype, col->mbminmaxlen, + ind_field->prefix_len, len, + dfield_get_data(dfield)); + dfield_set_len(dfield, len); + } } ut_ad(dtuple_check_typed(entry)); diff --git a/row/row0sel.c b/row/row0sel.c index 4720bdb0f1e..7079e96bb12 100644 --- a/row/row0sel.c +++ b/row/row0sel.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1997, 2011, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -99,14 +99,22 @@ row_sel_sec_rec_is_for_blob( ulint clust_len, /*!< in: length of clust_field */ const byte* sec_field, /*!< in: column in secondary index */ ulint sec_len, /*!< in: length of sec_field */ + ulint prefix_len, /*!< in: index column prefix length + in bytes */ dict_table_t* table) /*!< in: table */ { ulint len; byte buf[REC_VERSION_56_MAX_INDEX_COL_LEN]; ulint zip_size = dict_table_flags_to_zip_size(table->flags); - ulint max_prefix_len = DICT_MAX_FIELD_LEN_BY_FORMAT(table); + /* This function should never be invoked on an Antelope format + table, because they should always contain enough prefix in the + clustered index record. */ + ut_ad(dict_table_get_format(table) >= DICT_TF_FORMAT_ZIP); ut_a(clust_len >= BTR_EXTERN_FIELD_REF_SIZE); + ut_ad(prefix_len >= sec_len); + ut_ad(prefix_len > 0); + ut_a(prefix_len <= sizeof buf); if (UNIV_UNLIKELY (!memcmp(clust_field + clust_len - BTR_EXTERN_FIELD_REF_SIZE, @@ -118,7 +126,7 @@ row_sel_sec_rec_is_for_blob( return(FALSE); } - len = btr_copy_externally_stored_field_prefix(buf, max_prefix_len, + len = btr_copy_externally_stored_field_prefix(buf, prefix_len, zip_size, clust_field, clust_len); @@ -132,7 +140,7 @@ row_sel_sec_rec_is_for_blob( } len = dtype_get_at_most_n_mbchars(prtype, mbminmaxlen, - sec_len, len, (const char*) buf); + prefix_len, len, (const char*) buf); return(!cmp_data_data(mtype, prtype, buf, len, sec_field, sec_len)); } @@ -224,6 +232,7 @@ row_sel_sec_rec_is_for_clust_rec( col->mbminmaxlen, clust_field, clust_len, sec_field, sec_len, + ifield->prefix_len, clust_index->table)) { goto inequal; } @@ -493,7 +502,7 @@ sel_col_prefetch_buf_alloc( sel_buf = column->prefetch_buf + i; sel_buf->data = NULL; - + sel_buf->len = 0; sel_buf->val_buf_size = 0; } } @@ -518,6 +527,8 @@ sel_col_prefetch_buf_free( mem_free(sel_buf->data); } } + + mem_free(prefetch_buf); } /*********************************************************************//** @@ -2541,6 +2552,8 @@ row_sel_field_store_in_mysql_format( ut_ad(len != UNIV_SQL_NULL); UNIV_MEM_ASSERT_RW(data, len); + UNIV_MEM_ASSERT_W(dest, templ->mysql_col_len); + UNIV_MEM_INVALID(dest, templ->mysql_col_len); switch (templ->type) { const byte* field_end; @@ -2579,14 +2592,16 @@ row_sel_field_store_in_mysql_format( dest = row_mysql_store_true_var_len( dest, len, templ->mysql_length_bytes); + /* Copy the actual data. Leave the rest of the + buffer uninitialized. */ + memcpy(dest, data, len); + break; } /* Copy the actual data */ ut_memcpy(dest, data, len); - /* Pad with trailing spaces. We pad with spaces also the - unused end of a >= 5.0.3 true VARCHAR column, just in case - MySQL expects its contents to be deterministic. */ + /* Pad with trailing spaces. */ pad = dest + len; @@ -3112,6 +3127,39 @@ sel_restore_position_for_mysql( return(TRUE); } +/********************************************************************//** +Copies a cached field for MySQL from the fetch cache. */ +static +void +row_sel_copy_cached_field_for_mysql( +/*================================*/ + byte* buf, /*!< in/out: row buffer */ + const byte* cache, /*!< in: cached row */ + const mysql_row_templ_t*templ) /*!< in: column template */ +{ + ulint len; + + buf += templ->mysql_col_offset; + cache += templ->mysql_col_offset; + + UNIV_MEM_ASSERT_W(buf, templ->mysql_col_len); + + if (templ->mysql_type == DATA_MYSQL_TRUE_VARCHAR + && templ->type != DATA_INT) { + /* Check for != DATA_INT to make sure we do + not treat MySQL ENUM or SET as a true VARCHAR! + Find the actual length of the true VARCHAR field. */ + row_mysql_read_true_varchar( + &len, cache, templ->mysql_length_bytes); + len += templ->mysql_length_bytes; + UNIV_MEM_INVALID(buf, templ->mysql_col_len); + } else { + len = templ->mysql_col_len; + } + + ut_memcpy(buf, cache, len); +} + /********************************************************************//** Pops a cached row for MySQL from the fetch cache. */ UNIV_INLINE @@ -3124,26 +3172,22 @@ row_sel_pop_cached_row_for_mysql( { ulint i; const mysql_row_templ_t*templ; - byte* cached_rec; + const byte* cached_rec; ut_ad(prebuilt->n_fetch_cached > 0); ut_ad(prebuilt->mysql_prefix_len <= prebuilt->mysql_row_len); + UNIV_MEM_ASSERT_W(buf, prebuilt->mysql_row_len); + + cached_rec = prebuilt->fetch_cache[prebuilt->fetch_cache_first]; + if (UNIV_UNLIKELY(prebuilt->keep_other_fields_on_keyread)) { /* Copy cache record field by field, don't touch fields that are not covered by current key */ - cached_rec = prebuilt->fetch_cache[ - prebuilt->fetch_cache_first]; for (i = 0; i < prebuilt->n_template; i++) { templ = prebuilt->mysql_template + i; -#if 0 /* Some of the cached_rec may legitimately be uninitialized. */ - UNIV_MEM_ASSERT_RW(cached_rec - + templ->mysql_col_offset, - templ->mysql_col_len); -#endif - ut_memcpy(buf + templ->mysql_col_offset, - cached_rec + templ->mysql_col_offset, - templ->mysql_col_len); + row_sel_copy_cached_field_for_mysql( + buf, cached_rec, templ); /* Copy NULL bit of the current field from cached_rec to buf */ if (templ->mysql_null_bit_mask) { @@ -3153,17 +3197,24 @@ row_sel_pop_cached_row_for_mysql( & (byte)templ->mysql_null_bit_mask; } } + } else if (prebuilt->mysql_prefix_len > 63) { + /* The record is long. Copy it field by field, in case + there are some long VARCHAR column of which only a + small length is being used. */ + UNIV_MEM_INVALID(buf, prebuilt->mysql_prefix_len); + + /* First copy the NULL bits. */ + ut_memcpy(buf, cached_rec, prebuilt->null_bitmap_len); + /* Then copy the requested fields. */ + + for (i = 0; i < prebuilt->n_template; i++) { + row_sel_copy_cached_field_for_mysql( + buf, cached_rec, prebuilt->mysql_template + i); + } + } else { + ut_memcpy(buf, cached_rec, prebuilt->mysql_prefix_len); } - else { -#if 0 /* Some of the cached_rec may legitimately be uninitialized. */ - UNIV_MEM_ASSERT_RW(prebuilt->fetch_cache - [prebuilt->fetch_cache_first], - prebuilt->mysql_prefix_len); -#endif - ut_memcpy(buf, - prebuilt->fetch_cache[prebuilt->fetch_cache_first], - prebuilt->mysql_prefix_len); - } + prebuilt->n_fetch_cached--; prebuilt->fetch_cache_first++; @@ -3404,6 +3455,13 @@ row_search_for_mysql( return(DB_MISSING_HISTORY); } + if (dict_index_is_corrupted(index)) { +#ifdef UNIV_SYNC_DEBUG + ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch)); +#endif /* UNIV_SYNC_DEBUG */ + return(DB_CORRUPTION); + } + if (UNIV_UNLIKELY(prebuilt->magic_n != ROW_PREBUILT_ALLOCATED)) { fprintf(stderr, "InnoDB: Error: trying to free a corrupt\n" diff --git a/row/row0uins.c b/row/row0uins.c index d25afed3840..4fa97c9355d 100644 --- a/row/row0uins.c +++ b/row/row0uins.c @@ -328,6 +328,8 @@ row_undo_ins( node->index = dict_table_get_next_index( dict_table_get_first_index(node->table)); + dict_table_skip_corrupt_index(node->index); + while (node->index != NULL) { dtuple_t* entry; ulint err; @@ -355,7 +357,7 @@ row_undo_ins( } } - node->index = dict_table_get_next_index(node->index); + dict_table_next_uncorrupted_index(node->index); } log_free_check(); diff --git a/row/row0umod.c b/row/row0umod.c index 2188fdeff49..b86ce9eeabd 100644 --- a/row/row0umod.c +++ b/row/row0umod.c @@ -573,6 +573,14 @@ row_undo_mod_upd_del_sec( heap = mem_heap_create(1024); while (node->index != NULL) { + + /* Skip all corrupted secondary index */ + dict_table_skip_corrupt_index(node->index); + + if (!node->index) { + break; + } + index = node->index; entry = row_build_index_entry(node->row, node->ext, @@ -626,6 +634,13 @@ row_undo_mod_del_mark_sec( heap = mem_heap_create(1024); while (node->index != NULL) { + /* Skip all corrupted secondary index */ + dict_table_skip_corrupt_index(node->index); + + if (!node->index) { + break; + } + index = node->index; entry = row_build_index_entry(node->row, node->ext, @@ -677,6 +692,13 @@ row_undo_mod_upd_exist_sec( heap = mem_heap_create(1024); while (node->index != NULL) { + /* Skip all corrupted secondary index */ + dict_table_skip_corrupt_index(node->index); + + if (!node->index) { + break; + } + index = node->index; if (row_upd_changes_ord_field_binary(node->index, node->update, @@ -859,6 +881,9 @@ row_undo_mod( node->index = dict_table_get_next_index( dict_table_get_first_index(node->table)); + /* Skip all corrupted secondary index */ + dict_table_skip_corrupt_index(node->index); + if (node->rec_type == TRX_UNDO_UPD_EXIST_REC) { err = row_undo_mod_upd_exist_sec(node, thr); diff --git a/row/row0upd.c b/row/row0upd.c index 01fb44f42de..45c19b0ead0 100644 --- a/row/row0upd.c +++ b/row/row0upd.c @@ -1603,7 +1603,8 @@ row_upd_sec_index_entry( mode |= BTR_DELETE_MARK; } - search_result = row_search_index_entry(index, entry, mode, + search_result = row_search_index_entry(index, entry, + trx->fake_changes ? BTR_SEARCH_LEAF : mode, &pcur, &mtr); btr_cur = btr_pcur_get_btr_cur(&pcur); @@ -1850,9 +1851,11 @@ row_upd_clust_rec_by_insert( the previous invocation of this function. Mark the off-page columns in the entry inherited. */ + if (!(trx->fake_changes)) { change_ownership = row_upd_clust_rec_by_insert_inherit( NULL, NULL, entry, node->update); ut_a(change_ownership); + } /* fall through */ case UPD_NODE_INSERT_CLUSTERED: /* A lock wait occurred in row_ins_index_entry() in @@ -1882,7 +1885,7 @@ err_exit: delete-marked old record, mark them disowned by the old record and owned by the new entry. */ - if (rec_offs_any_extern(offsets)) { + if (rec_offs_any_extern(offsets) && !(trx->fake_changes)) { change_ownership = row_upd_clust_rec_by_insert_inherit( rec, offsets, entry, node->update); @@ -2012,7 +2015,8 @@ row_upd_clust_rec( the same transaction do not modify the record in the meantime. Therefore we can assert that the restoration of the cursor succeeds. */ - ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr)); + ut_a(btr_pcur_restore_position(thr_get_trx(thr)->fake_changes ? BTR_SEARCH_LEAF : BTR_MODIFY_TREE, + pcur, mtr)); ut_ad(!rec_get_deleted_flag(btr_pcur_get_rec(pcur), dict_table_is_comp(index->table))); @@ -2022,7 +2026,8 @@ row_upd_clust_rec( node->cmpl_info, thr, mtr); mtr_commit(mtr); - if (err == DB_SUCCESS && big_rec) { + /* skip store extern for fake_changes */ + if (err == DB_SUCCESS && big_rec && !(thr_get_trx(thr)->fake_changes)) { ulint offsets_[REC_OFFS_NORMAL_SIZE]; rec_t* rec; rec_offs_init(offsets_); @@ -2146,7 +2151,8 @@ row_upd_clust_step( ut_a(pcur->rel_pos == BTR_PCUR_ON); - success = btr_pcur_restore_position(BTR_MODIFY_LEAF, pcur, mtr); + success = btr_pcur_restore_position(thr_get_trx(thr)->fake_changes ? BTR_SEARCH_LEAF : BTR_MODIFY_LEAF, + pcur, mtr); if (!success) { err = DB_RECORD_NOT_FOUND; @@ -2323,6 +2329,13 @@ row_upd( while (node->index != NULL) { + /* Skip corrupted index */ + dict_table_skip_corrupt_index(node->index); + + if (!node->index) { + break; + } + log_free_check(); err = row_upd_sec_step(node, thr); diff --git a/srv/srv0srv.c b/srv/srv0srv.c index e2d092540ff..1efda4ef18b 100644 --- a/srv/srv0srv.c +++ b/srv/srv0srv.c @@ -87,6 +87,12 @@ Created 10/8/1995 Heikki Tuuri #include "mysql/plugin.h" #include "mysql/service_thd_wait.h" +/* prototypes of new functions added to ha_innodb.cc for kill_idle_transaction */ +ibool innobase_thd_is_idle(const void* thd); +ib_int64_t innobase_thd_get_start_time(const void* thd); +void innobase_thd_kill(ulong thd_id); +ulong innobase_thd_get_thread_id(const void* thd); + /* prototypes for new functions added to ha_innodb.cc */ ibool innobase_get_slow_log(); @@ -97,6 +103,9 @@ UNIV_INTERN ulint srv_activity_count = 0; /* The following is the maximum allowed duration of a lock wait. */ UNIV_INTERN ulint srv_fatal_semaphore_wait_threshold = 600; +/**/ +UNIV_INTERN lint srv_kill_idle_transaction = 0; + /* How much data manipulation language (DML) statements need to be delayed, in microseconds, in order to reduce the lagging of the purge thread. */ UNIV_INTERN ulint srv_dml_needed_delay = 0; @@ -234,6 +243,9 @@ UNIV_INTERN ulint srv_n_file_io_threads = ULINT_MAX; UNIV_INTERN ulint srv_n_read_io_threads = ULINT_MAX; UNIV_INTERN ulint srv_n_write_io_threads = ULINT_MAX; +/* Switch to enable random read ahead. */ +UNIV_INTERN my_bool srv_random_read_ahead = FALSE; + /* The universal page size of the database */ UNIV_INTERN ulint srv_page_size_shift = 0; UNIV_INTERN ulint srv_page_size = 0; @@ -342,6 +354,9 @@ UNIV_INTERN ulint srv_buf_pool_reads = 0; /** Time in seconds between automatic buffer pool dumps */ UNIV_INTERN uint srv_auto_lru_dump = 0; +/** Whether startup should be blocked until buffer pool is fully restored */ +UNIV_INTERN ibool srv_blocking_lru_restore; + /* structure to pass status variables to MySQL */ UNIV_INTERN export_struc export_vars; @@ -2316,6 +2331,8 @@ srv_export_innodb_status(void) export_vars.innodb_buffer_pool_pages_flushed = srv_buf_pool_flushed; export_vars.innodb_buffer_pool_pages_LRU_flushed = buf_lru_flush_page_count; export_vars.innodb_buffer_pool_reads = srv_buf_pool_reads; + export_vars.innodb_buffer_pool_read_ahead_rnd + = stat.n_ra_pages_read_rnd; export_vars.innodb_buffer_pool_read_ahead = stat.n_ra_pages_read; export_vars.innodb_buffer_pool_read_ahead_evicted @@ -2826,6 +2843,36 @@ loop: old_sema = sema; } + if (srv_kill_idle_transaction && trx_sys) { + trx_t* trx; + time_t now; +rescan_idle: + now = time(NULL); + mutex_enter(&kernel_mutex); + trx = UT_LIST_GET_FIRST(trx_sys->mysql_trx_list); + while (trx) { + if (trx->conc_state == TRX_ACTIVE + && trx->mysql_thd + && innobase_thd_is_idle(trx->mysql_thd)) { + ib_int64_t start_time = innobase_thd_get_start_time(trx->mysql_thd); + ulong thd_id = innobase_thd_get_thread_id(trx->mysql_thd); + + if (trx->last_stmt_start != start_time) { + trx->idle_start = now; + trx->last_stmt_start = start_time; + } else if (difftime(now, trx->idle_start) + > srv_kill_idle_transaction) { + /* kill the session */ + mutex_exit(&kernel_mutex); + innobase_thd_kill(thd_id); + goto rescan_idle; + } + } + trx = UT_LIST_GET_NEXT(mysql_trx_list, trx); + } + mutex_exit(&kernel_mutex); + } + /* Flush stderr so that a database user gets the output to possible MySQL error file */ @@ -2871,7 +2918,9 @@ srv_LRU_dump_restore_thread( os_thread_pf(os_thread_get_curr_id())); #endif - if (srv_auto_lru_dump) + /* If srv_blocking_lru_restore is TRUE, restore will be done + synchronously on startup. */ + if (srv_auto_lru_dump && !srv_blocking_lru_restore) buf_LRU_file_restore(); last_dump_time = time(NULL); @@ -3039,7 +3088,7 @@ srv_master_do_purge(void) ut_ad(!mutex_own(&kernel_mutex)); - ut_a(srv_n_purge_threads == 0); + ut_a(srv_n_purge_threads == 0 || (srv_shutdown_state > 0 && srv_n_threads_active[SRV_WORKER] == 0)); do { /* Check for shutdown and change in purge config. */ @@ -3536,7 +3585,7 @@ retry_flush_batch: /* Flush logs if needed */ srv_sync_log_buffer_in_background(); - if (srv_n_purge_threads == 0) { + if (srv_n_purge_threads == 0 || (srv_shutdown_state > 0 && srv_n_threads_active[SRV_WORKER] == 0)) { srv_main_thread_op_info = "master purging"; srv_master_do_purge(); @@ -3614,7 +3663,7 @@ background_loop: } } - if (srv_n_purge_threads == 0) { + if (srv_n_purge_threads == 0 || (srv_shutdown_state > 0 && srv_n_threads_active[SRV_WORKER] == 0)) { srv_main_thread_op_info = "master purging"; srv_master_do_purge(); diff --git a/srv/srv0start.c b/srv/srv0start.c index 71364cb5ded..793b70f50ce 100644 --- a/srv/srv0start.c +++ b/srv/srv0start.c @@ -87,6 +87,7 @@ Created 2/16/1996 Heikki Tuuri # include "btr0pcur.h" # include "os0sync.h" /* for INNODB_RW_LOCKS_USE_ATOMICS */ # include "zlib.h" /* for ZLIB_VERSION */ +# include "buf0lru.h" /* for buf_LRU_file_restore() */ /** Log sequence number immediately after startup */ UNIV_INTERN ib_uint64_t srv_start_lsn; @@ -1993,6 +1994,11 @@ innobase_start_or_create_for_mysql(void) os_thread_create(&srv_LRU_dump_restore_thread, NULL, thread_ids + 5 + SRV_MAX_N_IO_THREADS); + /* If srv_blocking_lru_restore is TRUE, load buffer pool contents + synchronously */ + if (srv_auto_lru_dump && srv_blocking_lru_restore) + buf_LRU_file_restore(); + srv_is_being_started = FALSE; err = dict_create_or_check_foreign_constraint_tables(); diff --git a/sync/sync0sync.c b/sync/sync0sync.c index 4b35d6db177..b38e2183b0f 100644 --- a/sync/sync0sync.c +++ b/sync/sync0sync.c @@ -1218,7 +1218,6 @@ sync_thread_add_level( case SYNC_WORK_QUEUE: case SYNC_LOG: case SYNC_LOG_FLUSH_ORDER: - case SYNC_THR_LOCAL: case SYNC_ANY_LATCH: case SYNC_OUTER_ANY_LATCH: case SYNC_FILE_FORMAT_TAG: @@ -1236,6 +1235,7 @@ sync_thread_add_level( case SYNC_DICT_HEADER: case SYNC_TRX_I_S_RWLOCK: case SYNC_TRX_I_S_LAST_READ: + case SYNC_IBUF_MUTEX: if (!sync_thread_levels_g(array, level, TRUE)) { fprintf(stderr, "InnoDB: sync_thread_levels_g(array, %lu)" @@ -1328,21 +1328,32 @@ sync_thread_add_level( || sync_thread_levels_g(array, SYNC_TREE_NODE - 1, TRUE)); break; case SYNC_TREE_NODE_NEW: - ut_a(sync_thread_levels_contain(array, SYNC_FSP_PAGE) - || sync_thread_levels_contain(array, SYNC_IBUF_MUTEX)); + ut_a(sync_thread_levels_contain(array, SYNC_FSP_PAGE)); break; case SYNC_INDEX_TREE: - if (sync_thread_levels_contain(array, SYNC_IBUF_MUTEX) - && sync_thread_levels_contain(array, SYNC_FSP)) { - ut_a(sync_thread_levels_g(array, SYNC_FSP_PAGE - 1, - TRUE)); - } else { - ut_a(sync_thread_levels_g(array, SYNC_TREE_NODE - 1, - TRUE)); - } + ut_a(sync_thread_levels_g(array, SYNC_TREE_NODE - 1, TRUE)); break; - case SYNC_IBUF_MUTEX: - ut_a(sync_thread_levels_g(array, SYNC_FSP_PAGE - 1, TRUE)); + case SYNC_IBUF_TREE_NODE: + ut_a(sync_thread_levels_contain(array, SYNC_IBUF_INDEX_TREE) + || sync_thread_levels_g(array, SYNC_IBUF_TREE_NODE - 1, + TRUE)); + break; + case SYNC_IBUF_TREE_NODE_NEW: + /* ibuf_add_free_page() allocates new pages for the + change buffer while only holding the tablespace + x-latch. These pre-allocated new pages may only be + taken in use while holding ibuf_mutex, in + btr_page_alloc_for_ibuf(). */ + ut_a(sync_thread_levels_contain(array, SYNC_IBUF_MUTEX) + || sync_thread_levels_contain(array, SYNC_FSP)); + break; + case SYNC_IBUF_INDEX_TREE: + if (sync_thread_levels_contain(array, SYNC_FSP)) { + ut_a(sync_thread_levels_g(array, level - 1, TRUE)); + } else { + ut_a(sync_thread_levels_g( + array, SYNC_IBUF_TREE_NODE - 1, TRUE)); + } break; case SYNC_IBUF_PESS_INSERT_MUTEX: ut_a(sync_thread_levels_g(array, SYNC_FSP - 1, TRUE)); diff --git a/trx/trx0rec.c b/trx/trx0rec.c index 84687c7195b..104b80f5d96 100644 --- a/trx/trx0rec.c +++ b/trx/trx0rec.c @@ -1131,13 +1131,14 @@ trx_undo_rec_get_partial_row( #endif /* !UNIV_HOTBACKUP */ /***********************************************************************//** -Erases the unused undo log page end. */ -static -void +Erases the unused undo log page end. +@return TRUE if the page contained something, FALSE if it was empty */ +static __attribute__((nonnull)) +ibool trx_undo_erase_page_end( /*====================*/ - page_t* undo_page, /*!< in: undo page whose end to erase */ - mtr_t* mtr) /*!< in: mtr */ + page_t* undo_page, /*!< in/out: undo page whose end to erase */ + mtr_t* mtr) /*!< in/out: mini-transaction */ { ulint first_free; @@ -1147,6 +1148,7 @@ trx_undo_erase_page_end( (UNIV_PAGE_SIZE - FIL_PAGE_DATA_END) - first_free); mlog_write_initial_log_record(undo_page, MLOG_UNDO_ERASE_END, mtr); + return(first_free != TRX_UNDO_PAGE_HDR + TRX_UNDO_PAGE_HDR_SIZE); } /***********************************************************//** @@ -1214,6 +1216,9 @@ trx_undo_report_row_operation( mem_heap_t* heap = NULL; ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint* offsets = offsets_; +#ifdef UNIV_DEBUG + int loop_count = 0; +#endif /* UNIV_DEBUG */ rec_offs_init(offsets_); ut_a(dict_index_is_clust(index)); @@ -1276,7 +1281,7 @@ trx_undo_report_row_operation( mtr_start(&mtr); - for (;;) { + do { buf_block_t* undo_block; page_t* undo_page; ulint offset; @@ -1305,7 +1310,31 @@ trx_undo_report_row_operation( version the replicate page constructed using the log records stays identical to the original page */ - trx_undo_erase_page_end(undo_page, &mtr); + if (!trx_undo_erase_page_end(undo_page, &mtr)) { + /* The record did not fit on an empty + undo page. Discard the freshly allocated + page and return an error. */ + + /* When we remove a page from an undo + log, this is analogous to a + pessimistic insert in a B-tree, and we + must reserve the counterpart of the + tree latch, which is the rseg + mutex. We must commit the mini-transaction + first, because it may be holding lower-level + latches, such as SYNC_FSP and SYNC_FSP_PAGE. */ + + mtr_commit(&mtr); + mtr_start(&mtr); + + mutex_enter(&rseg->mutex); + trx_undo_free_last_page(trx, undo, &mtr); + mutex_exit(&rseg->mutex); + + err = DB_UNDO_RECORD_TOO_BIG; + goto err_exit; + } + mtr_commit(&mtr); } else { /* Success */ @@ -1325,16 +1354,15 @@ trx_undo_report_row_operation( *roll_ptr = trx_undo_build_roll_ptr( op_type == TRX_UNDO_INSERT_OP, rseg->id, page_no, offset); - if (UNIV_LIKELY_NULL(heap)) { - mem_heap_free(heap); - } - return(DB_SUCCESS); + err = DB_SUCCESS; + goto func_exit; } ut_ad(page_no == undo->last_page_no); /* We have to extend the undo log by one page */ + ut_ad(++loop_count < 2); mtr_start(&mtr); /* When we add a page to an undo log, this is analogous to @@ -1346,18 +1374,19 @@ trx_undo_report_row_operation( page_no = trx_undo_add_page(trx, undo, &mtr); mutex_exit(&(rseg->mutex)); + } while (UNIV_LIKELY(page_no != FIL_NULL)); - if (UNIV_UNLIKELY(page_no == FIL_NULL)) { - /* Did not succeed: out of space */ + /* Did not succeed: out of space */ + err = DB_OUT_OF_FILE_SPACE; - mutex_exit(&(trx->undo_mutex)); - mtr_commit(&mtr); - if (UNIV_LIKELY_NULL(heap)) { - mem_heap_free(heap); - } - return(DB_OUT_OF_FILE_SPACE); - } +err_exit: + mutex_exit(&trx->undo_mutex); + mtr_commit(&mtr); +func_exit: + if (UNIV_LIKELY_NULL(heap)) { + mem_heap_free(heap); } + return(err); } /*============== BUILDING PREVIOUS VERSION OF A RECORD ===============*/ diff --git a/trx/trx0trx.c b/trx/trx0trx.c index 2145261c487..73c4e5afb80 100644 --- a/trx/trx0trx.c +++ b/trx/trx0trx.c @@ -121,6 +121,8 @@ trx_create( trx->support_xa = TRUE; + trx->fake_changes = FALSE; + trx->check_foreigns = TRUE; trx->check_unique_secondary = TRUE; @@ -143,6 +145,9 @@ trx_create( trx->mysql_relay_log_file_name = ""; trx->mysql_relay_log_pos = 0; + trx->idle_start = 0; + trx->last_stmt_start = 0; + mutex_create(trx_undo_mutex_key, &trx->undo_mutex, SYNC_TRX_UNDO); trx->rseg = NULL; diff --git a/trx/trx0undo.c b/trx/trx0undo.c index 4cb4b7b79c5..dae0637f72c 100644 --- a/trx/trx0undo.c +++ b/trx/trx0undo.c @@ -1004,29 +1004,28 @@ trx_undo_free_page( } /********************************************************************//** -Frees an undo log page when there is also the memory object for the undo -log. */ -static +Frees the last undo log page. +The caller must hold the rollback segment mutex. */ +UNIV_INTERN void -trx_undo_free_page_in_rollback( -/*===========================*/ - trx_t* trx __attribute__((unused)), /*!< in: transaction */ - trx_undo_t* undo, /*!< in: undo log memory copy */ - ulint page_no,/*!< in: page number to free: must not be the - header page */ - mtr_t* mtr) /*!< in: mtr which does not have a latch to any - undo log page; the caller must have reserved - the rollback segment mutex */ +trx_undo_free_last_page_func( +/*==========================*/ +#ifdef UNIV_DEBUG + const trx_t* trx, /*!< in: transaction */ +#endif /* UNIV_DEBUG */ + trx_undo_t* undo, /*!< in/out: undo log memory copy */ + mtr_t* mtr) /*!< in/out: mini-transaction which does not + have a latch to any undo log page or which + has allocated the undo log page */ { - ulint last_page_no; + ut_ad(mutex_own(&trx->undo_mutex)); + ut_ad(undo->hdr_page_no != undo->last_page_no); + ut_ad(undo->size > 0); - ut_ad(undo->hdr_page_no != page_no); - ut_ad(mutex_own(&(trx->undo_mutex))); + undo->last_page_no = trx_undo_free_page( + undo->rseg, FALSE, undo->space, + undo->hdr_page_no, undo->last_page_no, mtr); - last_page_no = trx_undo_free_page(undo->rseg, FALSE, undo->space, - undo->hdr_page_no, page_no, mtr); - - undo->last_page_no = last_page_no; undo->size--; } @@ -1062,9 +1061,11 @@ Truncates an undo log from the end. This function is used during a rollback to free space from an undo log. */ UNIV_INTERN void -trx_undo_truncate_end( -/*==================*/ - trx_t* trx, /*!< in: transaction whose undo log it is */ +trx_undo_truncate_end_func( +/*=======================*/ +#ifdef UNIV_DEBUG + const trx_t* trx, /*!< in: transaction whose undo log it is */ +#endif /* UNIV_DEBUG */ trx_undo_t* undo, /*!< in: undo log */ undo_no_t limit) /*!< in: all undo records with undo number >= this value should be truncated */ @@ -1090,18 +1091,7 @@ trx_undo_truncate_end( rec = trx_undo_page_get_last_rec(undo_page, undo->hdr_page_no, undo->hdr_offset); - for (;;) { - if (rec == NULL) { - if (last_page_no == undo->hdr_page_no) { - - goto function_exit; - } - - trx_undo_free_page_in_rollback( - trx, undo, last_page_no, &mtr); - break; - } - + while (rec) { if (trx_undo_rec_get_undo_no(rec) >= limit) { /* Truncate at least this record off, maybe more */ @@ -1115,6 +1105,14 @@ trx_undo_truncate_end( undo->hdr_offset); } + if (last_page_no == undo->hdr_page_no) { + + goto function_exit; + } + + ut_ad(last_page_no == undo->last_page_no); + trx_undo_free_last_page(trx, undo, &mtr); + mtr_commit(&mtr); } diff --git a/ut/ut0mem.c b/ut/ut0mem.c index 53f15029e1b..303fdd6dd44 100644 --- a/ut/ut0mem.c +++ b/ut/ut0mem.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -483,53 +483,6 @@ ut_strlcpy_rev( return(src_size); } -/**********************************************************************//** -Make a quoted copy of a NUL-terminated string. Leading and trailing -quotes will not be included; only embedded quotes will be escaped. -See also ut_strlenq() and ut_memcpyq(). -@return pointer to end of dest */ -UNIV_INTERN -char* -ut_strcpyq( -/*=======*/ - char* dest, /*!< in: output buffer */ - char q, /*!< in: the quote character */ - const char* src) /*!< in: null-terminated string */ -{ - while (*src) { - if ((*dest++ = *src++) == q) { - *dest++ = q; - } - } - - return(dest); -} - -/**********************************************************************//** -Make a quoted copy of a fixed-length string. Leading and trailing -quotes will not be included; only embedded quotes will be escaped. -See also ut_strlenq() and ut_strcpyq(). -@return pointer to end of dest */ -UNIV_INTERN -char* -ut_memcpyq( -/*=======*/ - char* dest, /*!< in: output buffer */ - char q, /*!< in: the quote character */ - const char* src, /*!< in: string to be quoted */ - ulint len) /*!< in: length of src */ -{ - const char* srcend = src + len; - - while (src < srcend) { - if ((*dest++ = *src++) == q) { - *dest++ = q; - } - } - - return(dest); -} - #ifndef UNIV_HOTBACKUP /**********************************************************************//** Return the number of times s2 occurs in s1. Overlapping instances of s2 diff --git a/ut/ut0ut.c b/ut/ut0ut.c index a9c0d381e16..f6dfb3ba0b3 100644 --- a/ut/ut0ut.c +++ b/ut/ut0ut.c @@ -674,8 +674,6 @@ ut_strerr( return("Cannot add constraint"); case DB_CORRUPTION: return("Data structure corruption"); - case DB_COL_APPEARS_TWICE_IN_INDEX: - return("Column appears twice in index"); case DB_CANNOT_DROP_CONSTRAINT: return("Cannot drop constraint"); case DB_NO_SAVEPOINT: @@ -714,6 +712,10 @@ ut_strerr( return("No index on referencing keys in referencing table"); case DB_PARENT_NO_INDEX: return("No index on referenced keys in referenced table"); + case DB_INDEX_CORRUPT: + return("Index corrupted"); + case DB_UNDO_RECORD_TOO_BIG: + return("Undo record too big"); case DB_END_OF_INDEX: return("End of index"); /* do not add default: in order to produce a warning if new code From a616e5ce648cc4b1fec7332c3d6230d7aa587a80 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 15 Dec 2011 10:34:39 +0100 Subject: [PATCH 12/20] Add file accidentally omitted in last commit --- percona-suite/percona_innodb_kill_idle_trx_show.inc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 percona-suite/percona_innodb_kill_idle_trx_show.inc diff --git a/percona-suite/percona_innodb_kill_idle_trx_show.inc b/percona-suite/percona_innodb_kill_idle_trx_show.inc new file mode 100644 index 00000000000..c85c0311c81 --- /dev/null +++ b/percona-suite/percona_innodb_kill_idle_trx_show.inc @@ -0,0 +1,2 @@ +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; From 505a6018212751b311c2ded88ffe200867729e86 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 15 Dec 2011 16:00:07 +0100 Subject: [PATCH 13/20] Fix XtraDB build on windows (avoid #ifdef inside macro invocation). --- storage/xtradb/handler/ha_innodb.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index b89fb4f9c7e..430baaf767a 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -12369,14 +12369,16 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter, "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket", NULL, NULL, 500L, 1L, ~0L, 0); +#ifdef EXTENDED_FOR_KILLIDLE +#define TMP_STR "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB." +#else +#define TMP_STR "No effect for this build." +#endif static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction, PLUGIN_VAR_RQCMDARG, -#ifdef EXTENDED_FOR_KILLIDLE - "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB.", -#else - "No effect for this build.", -#endif + TMP_STR, NULL, NULL, 0, 0, LONG_MAX, 0); +#undef TMP_STR static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR, From b86ba751daf208f38aaa98672d10733fd7173eae Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 15 Dec 2011 19:28:38 +0100 Subject: [PATCH 14/20] always use sql/sql_string.* files, never - client/sql_string.* --- client/CMakeLists.txt | 3 ++- client/{sql_string.cc => sql_string.cc.dontuse} | 0 client/{sql_string.h => sql_string.h.dontuse} | 0 libmysqld/examples/CMakeLists.txt | 1 + sql/sql_string.cc | 3 --- sql/sql_string.h | 4 ---- 6 files changed, 3 insertions(+), 8 deletions(-) rename client/{sql_string.cc => sql_string.cc.dontuse} (100%) rename client/{sql_string.h => sql_string.h.dontuse} (100%) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 18ecf2de03d..a5a73298122 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -26,7 +26,8 @@ INCLUDE_DIRECTORIES( ) ADD_DEFINITIONS(${SSL_DEFINES}) -MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) +MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc + ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) diff --git a/client/sql_string.cc b/client/sql_string.cc.dontuse similarity index 100% rename from client/sql_string.cc rename to client/sql_string.cc.dontuse diff --git a/client/sql_string.h b/client/sql_string.h.dontuse similarity index 100% rename from client/sql_string.h rename to client/sql_string.h.dontuse diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index 209e27c7870..3d67083acc9 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -16,6 +16,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libmysqld/include ${CMAKE_SOURCE_DIR}/regex + ${CMAKE_SOURCE_DIR}/sql ${MY_READLINE_INCLUDE_DIR} ) diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 47170e6c3db..683511c3da4 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -27,9 +27,6 @@ #include "sql_string.h" -#ifdef MYSQL_CLIENT -#error Attempt to use server-side sql_string on client. Use client/sql_string.cc -#endif /***************************************************************************** ** String functions *****************************************************************************/ diff --git a/sql/sql_string.h b/sql/sql_string.h index 7412022baf4..e0f9af9615b 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -26,10 +26,6 @@ #include "my_sys.h" /* alloc_root, my_free, my_realloc */ #include "m_string.h" /* TRASH */ -#ifdef MYSQL_CLIENT -#error Attempt to use server-side sql_string on client. Use client/sql_string.h -#endif - class String; typedef struct st_io_cache IO_CACHE; typedef struct st_mem_root MEM_ROOT; From 1efdd5a572ef202f64ef43d1868b021cf8c60873 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 15 Dec 2011 22:07:58 +0100 Subject: [PATCH 15/20] rename debug variable to debug_dbug, to make test pass in release builds (and to follow the naming conventons). keep old debug variable, but mark it as deprecated. --- INSTALL-SOURCE | 6 +- .../rpl_get_master_version_and_clock.test | 4 +- .../rpl_tests/rpl_stop_middle_group.test | 16 +- mysql-test/include/binlog_inject_error.inc | 4 +- mysql-test/include/check-warnings.test | 2 +- mysql-test/include/io_thd_fault_injection.inc | 6 +- mysql-test/include/maria_verify_recovery.inc | 2 +- mysql-test/mysql-test-run.pl | 6 +- mysql-test/r/archive_debug.result | 4 +- mysql-test/r/crash_commit_before.result | 2 +- mysql-test/r/drop_debug.result | 4 +- mysql-test/r/error_simulation.result | 14 +- mysql-test/r/filesort_debug.result | 4 +- .../r/information_schema_all_engines.result | 120 ++++----- mysql-test/r/innodb_mysql_sync.result | 2 +- mysql-test/r/log_tables_debug.result | 4 +- mysql-test/r/merge_debug.result | 4 +- .../r/myisam_crash_before_flush_keys.result | 2 +- mysql-test/r/myisam_debug.result | 2 +- mysql-test/r/partition_debug_sync.result | 8 +- mysql-test/r/partition_sync.result | 2 +- mysql-test/r/select_debug.result | 2 +- mysql-test/r/sp-code.result | 4 +- mysql-test/r/sp-no-code.result | 4 +- mysql-test/r/subselect_debug.result | 4 +- mysql-test/r/variables_debug.result | 66 ++--- .../r/variables_debug_notembedded.result | 6 +- mysql-test/r/warnings_debug.result | 2 +- mysql-test/suite/binlog/r/binlog_index.result | 18 +- mysql-test/suite/binlog/r/binlog_ioerr.result | 4 +- .../suite/binlog/r/binlog_write_error.result | 68 ++--- mysql-test/suite/binlog/t/binlog_index.test | 18 +- mysql-test/suite/binlog/t/binlog_ioerr.test | 4 +- .../suite/binlog/t/binlog_reset_master.test | 2 +- .../innodb/r/group_commit_binlog_pos.result | 2 +- ...ommit_binlog_pos_no_optimize_thread.result | 2 +- .../suite/innodb/r/group_commit_crash.result | 10 +- ...oup_commit_crash_no_optimize_thread.result | 10 +- .../suite/innodb/r/innodb_bug53756.result | 2 +- .../innodb/t/group_commit_binlog_pos.test | 2 +- ..._commit_binlog_pos_no_optimize_thread.test | 2 +- .../suite/innodb/t/group_commit_crash.test | 10 +- ...group_commit_crash_no_optimize_thread.test | 10 +- .../suite/innodb/t/innodb_bug53756.test | 2 +- .../maria/r/maria-recovery-bitmap.result | 6 +- .../maria/r/maria-recovery-rtree-ft.result | 12 +- .../suite/maria/r/maria-recovery.result | 18 +- .../suite/maria/r/maria-recovery2.result | 12 +- .../suite/maria/r/maria-recovery3.result | 8 +- .../suite/maria/t/maria-recovery-bitmap.test | 2 +- mysql-test/suite/maria/t/maria-recovery2.test | 2 +- mysql-test/suite/maria/t/maria-recovery3.test | 2 +- .../optimizer_unfixed_bugs/r/bug36981.result | 2 +- .../optimizer_unfixed_bugs/r/bug40992.result | 2 +- .../optimizer_unfixed_bugs/r/bug41029.result | 2 +- .../optimizer_unfixed_bugs/r/bug41996.result | 2 +- .../optimizer_unfixed_bugs/r/bug42991.result | 2 +- .../optimizer_unfixed_bugs/r/bug43249.result | 2 +- .../optimizer_unfixed_bugs/r/bug43360.result | 2 +- .../optimizer_unfixed_bugs/r/bug43448.result | 2 +- .../optimizer_unfixed_bugs/r/bug43617.result | 2 +- .../optimizer_unfixed_bugs/t/bug36981.test | 2 +- .../optimizer_unfixed_bugs/t/bug40992.test | 2 +- .../optimizer_unfixed_bugs/t/bug41029.test | 2 +- .../optimizer_unfixed_bugs/t/bug41996.test | 2 +- .../optimizer_unfixed_bugs/t/bug42991.test | 2 +- .../optimizer_unfixed_bugs/t/bug43101.test | 2 +- .../optimizer_unfixed_bugs/t/bug43249.test | 2 +- .../optimizer_unfixed_bugs/t/bug43360.test | 2 +- .../optimizer_unfixed_bugs/t/bug43448.test | 2 +- .../optimizer_unfixed_bugs/t/bug43617.test | 2 +- .../optimizer_unfixed_bugs/t/bug43618.test | 2 +- .../optimizer_unfixed_bugs/t/bug45221.test | 2 +- .../suite/parts/inc/partition_crash_add.inc | 40 +-- .../parts/inc/partition_crash_change.inc | 48 ++-- .../suite/parts/inc/partition_crash_drop.inc | 36 +-- .../suite/parts/inc/partition_fail_add.inc | 40 +-- .../suite/parts/inc/partition_fail_change.inc | 48 ++-- .../suite/parts/inc/partition_fail_drop.inc | 36 +-- .../parts/r/partition_debug_innodb.result | 248 +++++++++--------- .../parts/r/partition_debug_myisam.result | 248 +++++++++--------- mysql-test/suite/pbxt/r/mysqlshow.result | 48 ++-- .../suite/rpl/r/rpl_binlog_errors.result | 70 ++--- mysql-test/suite/rpl/r/rpl_bug26395.result | 4 +- mysql-test/suite/rpl/r/rpl_bug33931.result | 4 +- mysql-test/suite/rpl/r/rpl_bug41902.result | 16 +- mysql-test/suite/rpl/r/rpl_checksum.result | 16 +- mysql-test/suite/rpl/r/rpl_corruption.result | 28 +- .../suite/rpl/r/rpl_init_slave_errors.result | 4 +- .../suite/rpl/r/rpl_row_corruption.result | 12 +- .../suite/rpl/r/rpl_row_index_choice.result | 30 +-- .../suite/rpl/r/rpl_show_slave_running.result | 4 +- .../r/rpl_slave_load_remove_tmpfile.result | 4 +- .../rpl/r/rpl_stm_stop_middle_group.result | 16 +- mysql-test/suite/rpl/r/rpl_stop_slave.result | 8 +- mysql-test/suite/rpl/r/rpl_sync.result | 4 +- mysql-test/suite/rpl/t/rpl_binlog_errors.test | 46 ++-- mysql-test/suite/rpl/t/rpl_bug26395.test | 6 +- mysql-test/suite/rpl/t/rpl_bug33931.test | 4 +- mysql-test/suite/rpl/t/rpl_bug38694-slave.opt | 2 +- mysql-test/suite/rpl/t/rpl_bug41902.test | 16 +- mysql-test/suite/rpl/t/rpl_checksum.test | 16 +- mysql-test/suite/rpl/t/rpl_corruption.test | 28 +- .../t/rpl_get_master_version_and_clock.test | 2 +- .../suite/rpl/t/rpl_init_slave_errors.test | 4 +- .../suite/rpl/t/rpl_killed_ddl-master.opt | 2 +- .../suite/rpl/t/rpl_row_corruption.test | 12 +- .../suite/rpl/t/rpl_row_index_choice.test | 30 +-- .../suite/rpl/t/rpl_show_slave_running.test | 4 +- .../rpl/t/rpl_slave_load_remove_tmpfile.test | 6 +- mysql-test/suite/rpl/t/rpl_stop_slave.test | 8 +- mysql-test/suite/rpl/t/rpl_sync.test | 4 +- .../rpl/t/rpl_temporary_errors-slave.opt | 2 +- .../suite/sys_vars/r/debug_basic.result | 2 + .../suite/sys_vars/r/debug_dbug_basic.result | 25 ++ .../suite/sys_vars/t/debug_dbug_basic.test | 22 ++ mysql-test/t/alter_table-big.test | 8 +- mysql-test/t/archive_debug.test | 4 +- mysql-test/t/crash_commit_before.test | 2 +- mysql-test/t/create-big.test | 20 +- mysql-test/t/drop_debug.test | 4 +- mysql-test/t/error_simulation.test | 14 +- mysql-test/t/filesort_debug.test | 4 +- .../t/information_schema_all_engines.test | 1 - mysql-test/t/innodb_mysql_sync.test | 2 +- mysql-test/t/log_tables_debug.test | 4 +- mysql-test/t/merge-big.test | 4 +- mysql-test/t/merge_debug.test | 4 +- .../t/myisam_crash_before_flush_keys.test | 2 +- mysql-test/t/myisam_debug.test | 2 +- mysql-test/t/mysqldump-compat.opt | 2 +- mysql-test/t/partition_debug_sync.test | 8 +- mysql-test/t/partition_sync.test | 2 +- mysql-test/t/select_debug.test | 2 +- mysql-test/t/sp-code.test | 4 +- mysql-test/t/subselect_debug.test | 4 +- mysql-test/t/variables_debug.test | 66 ++--- mysql-test/t/variables_debug_notembedded.test | 6 +- mysql-test/t/warnings_debug.test | 2 +- mysys/md5.c | 2 +- plugin/win_auth_client/handshake_client.cc | 2 +- scripts/convert-debug-for-diff.sh | 2 +- sql/debug_sync.cc | 2 +- sql/sql_yacc.yy | 4 +- sql/sys_vars.cc | 8 +- storage/federated/ha_federated.cc | 2 +- storage/federatedx/ha_federatedx.cc | 2 +- 147 files changed, 1039 insertions(+), 985 deletions(-) create mode 100644 mysql-test/suite/sys_vars/r/debug_dbug_basic.result create mode 100644 mysql-test/suite/sys_vars/t/debug_dbug_basic.test diff --git a/INSTALL-SOURCE b/INSTALL-SOURCE index 37f0468f41e..cfcc285cf67 100644 --- a/INSTALL-SOURCE +++ b/INSTALL-SOURCE @@ -1461,7 +1461,7 @@ shell> ./configure --with-debug (http://forge.mysql.com/wiki/MySQL_Internals_Porting). As of MySQL 5.1.12, using --with-debug to configure MySQL with debugging support enables you to use the - --debug="d,parser_debug" option when you start the server. + --debug-dbug="d,parser_debug" option when you start the server. This causes the Bison parser that is used to process SQL statements to dump a parser trace to the server's standard error output. Typically, this output is written to the error @@ -4725,7 +4725,7 @@ Note the screen that may help solve the problem. The last option is to start mysqld with the --standalone and - --debug options. In this case, mysqld writes a log file + --debug-dbug options. In this case, mysqld writes a log file C:\mysqld.trace that should contain the reason why mysqld doesn't start. See MySQL Internals: Porting (http://forge.mysql.com/wiki/MySQL_Internals_Porting). @@ -7716,7 +7716,7 @@ Can't start server: Bind on unix socket... MIT-pthreads. If you cannot get mysqld to start, you can try to make a trace - file to find the problem by using the --debug option. See MySQL + file to find the problem by using the --debug-dbug option. See MySQL Internals: Porting (http://forge.mysql.com/wiki/MySQL_Internals_Porting). diff --git a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test index 01036f72785..1ef8544884d 100644 --- a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test +++ b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test @@ -42,7 +42,7 @@ if (!$debug_sync_action) # Restart slave --source include/stop_slave.inc -eval SET @@global.debug= "+d,$dbug_sync_point"; +eval SET @@global.debug_dbug= "+d,$dbug_sync_point"; --source include/start_slave.inc --echo slave is going to hang in get_master_version_and_clock @@ -71,7 +71,7 @@ source include/wait_for_slave_io_error.inc; # now to avoid restarting IO-thread to re-enter it. # There will be a new IO thread forked out with its @@session.debug # unset. -eval set @@global.debug = "-d,$dbug_sync_point"; +eval set @@global.debug_dbug= "-d,$dbug_sync_point"; --let $rpl_server_number= 1 --source include/rpl_start_server.inc diff --git a/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test b/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test index 977d93ec36d..43c561c5b85 100644 --- a/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test +++ b/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test @@ -13,7 +13,7 @@ create table tm (a int auto_increment primary key) engine=myisam; create table ti (a int auto_increment primary key) engine=innodb; sync_slave_with_master; -set @@global.debug="+d,stop_slave_middle_group"; +set @@global.debug_dbug="+d,stop_slave_middle_group"; connection master; @@ -43,7 +43,7 @@ eval SELECT "NO$error" AS Last_SQL_Error, @check as `true`; select count(*) as one from tm; select count(*) as one from ti; -set @@global.debug="-d"; +set @@global.debug_dbug="-d"; # # bug#45940 issues around rli->last_event_start_time @@ -67,8 +67,8 @@ truncate table ti; #connection slave; sync_slave_with_master; -set @@global.debug="+d,stop_slave_middle_group"; -set @@global.debug="+d,incomplete_group_in_relay_log"; +set @@global.debug_dbug="+d,stop_slave_middle_group"; +set @@global.debug_dbug="+d,incomplete_group_in_relay_log"; connection master; @@ -96,7 +96,7 @@ eval SELECT "$error" AS Last_SQL_Error, @check as `true`; select count(*) as one from tm; select count(*) as zero from ti; -set @@global.debug="-d"; +set @@global.debug_dbug="-d"; # # The mixed multi-table update @@ -109,8 +109,8 @@ connection master; #connection slave; sync_slave_with_master; -set @@global.debug="+d,stop_slave_middle_group"; -set @@global.debug="+d,incomplete_group_in_relay_log"; +set @@global.debug_dbug="+d,stop_slave_middle_group"; +set @@global.debug_dbug="+d,incomplete_group_in_relay_log"; connection master; update tm as t1, ti as t2 set t1.a=t1.a * 2, t2.a=t2.a * 2; @@ -135,7 +135,7 @@ eval SELECT "$error" AS Last_SQL_Error, @check as `true`; select max(a) as two from tm; select max(a) as one from ti; -set @@global.debug="-d"; +set @@global.debug_dbug="-d"; # # clean-up diff --git a/mysql-test/include/binlog_inject_error.inc b/mysql-test/include/binlog_inject_error.inc index 6465f7943a4..383f66ba843 100644 --- a/mysql-test/include/binlog_inject_error.inc +++ b/mysql-test/include/binlog_inject_error.inc @@ -14,9 +14,9 @@ # source include/binlog_inject_error.inc; # -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; --echo $query; --replace_regex /(errno: .*)/(errno: #)/ --error ER_ERROR_ON_WRITE --eval $query -SET GLOBAL debug=''; +SET GLOBAL debug_dbug=''; diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test index fab7fb2cff6..3a26f7eecb1 100644 --- a/mysql-test/include/check-warnings.test +++ b/mysql-test/include/check-warnings.test @@ -14,7 +14,7 @@ set SQL_LOG_BIN=0; # Turn off any debug crashes, allow the variable to be # non existent in release builds --error 0,1193 -set debug=""; +set debug_dbug=""; use mtr; diff --git a/mysql-test/include/io_thd_fault_injection.inc b/mysql-test/include/io_thd_fault_injection.inc index 7cbe055dbf6..11479b3a66c 100644 --- a/mysql-test/include/io_thd_fault_injection.inc +++ b/mysql-test/include/io_thd_fault_injection.inc @@ -8,13 +8,13 @@ SET @old_debug=@@global.debug; -- disable_warnings -- source include/stop_slave.inc -- enable_warnings --- eval SET GLOBAL debug="+d,$io_thd_injection_fault_flag" +-- eval SET GLOBAL debug_dbug="+d,$io_thd_injection_fault_flag" START SLAVE io_thread; -- source include/wait_for_slave_io_error.inc --- eval SET GLOBAL debug="-d,$io_thd_injection_fault_flag" -SET GLOBAL debug=@old_debug; +-- eval SET GLOBAL debug_dbug="-d,$io_thd_injection_fault_flag" +SET GLOBAL debug_dbug=@old_debug; # restart because slave is in bad shape --let $rpl_server_number= 2 diff --git a/mysql-test/include/maria_verify_recovery.inc b/mysql-test/include/maria_verify_recovery.inc index 71292947c80..9b56061b2b4 100644 --- a/mysql-test/include/maria_verify_recovery.inc +++ b/mysql-test/include/maria_verify_recovery.inc @@ -32,7 +32,7 @@ system echo wait-maria_verify_recovery.inc >> $MYSQLTEST_VARDIR/tmp/mysqld.1.exp # but that would implicitely commit all work, which the tester may # not want (tester may want to observe rollback happening). -eval SET SESSION debug=$mvr_debug_option; +eval SET SESSION debug_dbug=$mvr_debug_option; --echo * crashing mysqld intentionally --error 2013 eval $mvr_crash_statement; # this will crash (DBUG magic) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a8a2a515196..ad64e6e37d7 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -214,7 +214,7 @@ my $opt_cursor_protocol; my $opt_view_protocol; our $opt_debug; -my $debug_d= "d"; +my $debug_d= "d,*"; my $opt_debug_common; our $opt_debug_server; our @opt_cases; # The test cases names in argv @@ -3471,7 +3471,7 @@ sub mysql_install_db { if ( $opt_debug ) { - mtr_add_arg($args, "--debug=$debug_d:t:i:A,%s/log/bootstrap.trace", + mtr_add_arg($args, "--debug-dbug=$debug_d:t:i:A,%s/log/bootstrap.trace", $path_vardir_trace); } @@ -5383,7 +5383,7 @@ sub mysqld_start ($$) { if ( $opt_debug ) { - mtr_add_arg($args, "--debug=$debug_d:t:i:A,%s/log/%s.trace", + mtr_add_arg($args, "--debug-dbug=$debug_d:t:i:A,%s/log/%s.trace", $path_vardir_trace, $mysqld->name()); } diff --git a/mysql-test/r/archive_debug.result b/mysql-test/r/archive_debug.result index cc5a3761a99..7bc6a113217 100644 --- a/mysql-test/r/archive_debug.result +++ b/mysql-test/r/archive_debug.result @@ -4,9 +4,9 @@ # CREATE TABLE t1(a INT) ENGINE=ARCHIVE; INSERT INTO t1 VALUES(1); -SET SESSION debug='d,simulate_archive_open_failure'; +SET SESSION debug_dbug='d,simulate_archive_open_failure'; CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check error Corrupt -SET SESSION debug=DEFAULT; +SET SESSION debug_dbug=DEFAULT; DROP TABLE t1; diff --git a/mysql-test/r/crash_commit_before.result b/mysql-test/r/crash_commit_before.result index 2062754bb80..22d39e1ddbd 100644 --- a/mysql-test/r/crash_commit_before.result +++ b/mysql-test/r/crash_commit_before.result @@ -1,7 +1,7 @@ CREATE TABLE t1(a int) engine=innodb; START TRANSACTION; insert into t1 values(9); -SET GLOBAL debug="d,crash_commit_before"; +SET GLOBAL debug_dbug="d,crash_commit_before"; COMMIT; ERROR HY000: Lost connection to MySQL server during query SHOW CREATE TABLE t1; diff --git a/mysql-test/r/drop_debug.result b/mysql-test/r/drop_debug.result index f2c89034451..852b3ac2163 100644 --- a/mysql-test/r/drop_debug.result +++ b/mysql-test/r/drop_debug.result @@ -10,7 +10,7 @@ CREATE TABLE mysql_test.t1(a INT); CREATE TABLE mysql_test.t2(b INT); CREATE TABLE mysql_test.t3(c INT); -SET SESSION DEBUG = "+d,bug43138"; +SET SESSION debug_dbug= "+d,bug43138"; DROP DATABASE mysql_test; Warnings: @@ -18,7 +18,7 @@ Error 1051 Unknown table 't1' Error 1051 Unknown table 't2' Error 1051 Unknown table 't3' -SET SESSION DEBUG = "-d,bug43138"; +SET SESSION debug_dbug= "-d,bug43138"; # -- # -- End of Bug#43138. diff --git a/mysql-test/r/error_simulation.result b/mysql-test/r/error_simulation.result index b6b79cb596b..ae47527145a 100644 --- a/mysql-test/r/error_simulation.result +++ b/mysql-test/r/error_simulation.result @@ -13,7 +13,7 @@ INSERT INTO t1 VALUES ('AAAAAAAAAH','AAAAAAAAAH'), ('AAAAAAAAAI','AAAAAAAAAI'), ('AAAAAAAAAJ','AAAAAAAAAJ'), ('AAAAAAAAAK','AAAAAAAAAK'); set tmp_table_size=1024; -set session debug="d,raise_error"; +set session debug_dbug="d,raise_error"; SELECT MAX(a) FROM t1 GROUP BY a,b; ERROR 23000: Can't write; duplicate key in table 'tmp_table' set tmp_table_size=default; @@ -23,9 +23,9 @@ DROP TABLE t1; # CREATE TABLE t1 (a INT(100) NOT NULL); INSERT INTO t1 VALUES (1), (0), (2); -SET SESSION debug='+d,alter_table_only_index_change'; +SET SESSION debug_dbug='+d,alter_table_only_index_change'; ALTER TABLE t1 ADD INDEX a(a); -SET SESSION debug=DEFAULT; +SET SESSION debug_dbug=DEFAULT; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -42,10 +42,10 @@ DROP TABLE t1; # Bug#42064: low memory crash when importing hex strings, in Item_hex_string::Item_hex_string # CREATE TABLE t1(a BLOB); -SET SESSION debug="+d,bug42064_simulate_oom"; +SET SESSION debug_dbug="+d,bug42064_simulate_oom"; INSERT INTO t1 VALUES(""); Got one of the listed errors -SET SESSION debug=DEFAULT; +SET SESSION debug_dbug=DEFAULT; DROP TABLE t1; # # Bug#41660: Sort-index_merge for non-first join table may require @@ -62,7 +62,7 @@ INSERT INTO t2 VALUES (1, 1, 'data'); # re-scanned for every record in the outer table. if we used inner join, # we would need to have thousands of records and/or more columns in both # tables so that the join buffer is filled and re-scans are triggered). -SET SESSION debug = '+d,only_one_Unique_may_be_created'; +SET SESSION debug_dbug= '+d,only_one_Unique_may_be_created'; EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON ( t2.a < 10 OR t2.b < 10 ); id select_type table type possible_keys key key_len ref rows Extra @@ -80,7 +80,7 @@ a a b filler 7 1 1 data 8 1 1 data 9 1 1 data -SET SESSION debug = DEFAULT; +SET SESSION debug_dbug= DEFAULT; DROP TABLE t1, t2; # # End of 5.1 tests diff --git a/mysql-test/r/filesort_debug.result b/mysql-test/r/filesort_debug.result index c35a6753353..6759cf13502 100644 --- a/mysql-test/r/filesort_debug.result +++ b/mysql-test/r/filesort_debug.result @@ -4,11 +4,11 @@ SET @old_debug= @@session.debug; # CREATE TABLE t1(f0 int auto_increment primary key, f1 int); INSERT INTO t1(f1) VALUES (0),(1),(2),(3),(4),(5); -SET session debug= '+d,make_char_array_fail'; +SET session debug_dbug= '+d,make_char_array_fail'; CALL mtr.add_suppression("Out of sort memory"); SELECT * FROM t1 ORDER BY f1 ASC, f0; ERROR HY001: Out of sort memory, consider increasing server sort buffer size -SET session debug= @old_debug; +SET session debug_dbug= @old_debug; CREATE FUNCTION f1() RETURNS INT RETURN 1; DELETE FROM t1 ORDER BY (f1(10)) LIMIT 1; ERROR 42000: Incorrect number of arguments for FUNCTION test.f1; expected 0, got 1 diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result index e8fafccd0b2..9ea7c947100 100644 --- a/mysql-test/r/information_schema_all_engines.result +++ b/mysql-test/r/information_schema_all_engines.result @@ -36,29 +36,29 @@ TRIGGERS USER_PRIVILEGES USER_STATISTICS VIEWS -INNODB_SYS_COLUMNS +INNODB_CMPMEM_RESET +PBXT_STATISTICS +INNODB_CMPMEM INNODB_RSEG -INNODB_CMP -INNODB_TRX INNODB_SYS_TABLESTATS INNODB_LOCK_WAITS -INNODB_BUFFER_POOL_PAGES_INDEX -INNODB_LOCKS +INNODB_INDEX_STATS +INNODB_CMP INNODB_SYS_FOREIGN_COLS INNODB_CMP_RESET INNODB_BUFFER_POOL_PAGES -INNODB_SYS_TABLES -PBXT_STATISTICS -INNODB_CMPMEM +INNODB_TRX +INNODB_BUFFER_POOL_PAGES_INDEX +INNODB_LOCKS INNODB_BUFFER_POOL_PAGES_BLOB -INNODB_CMPMEM_RESET +INNODB_SYS_TABLES INNODB_SYS_FIELDS -INNODB_TABLE_STATS +INNODB_SYS_COLUMNS +INNODB_SYS_STATS INNODB_SYS_FOREIGN INNODB_SYS_INDEXES -INNODB_INDEX_STATS XTRADB_ADMIN_COMMAND -INNODB_SYS_STATS +INNODB_TABLE_STATS SELECT t.table_name, c1.column_name FROM information_schema.tables t INNER JOIN @@ -109,29 +109,29 @@ TRIGGERS TRIGGER_SCHEMA USER_PRIVILEGES GRANTEE USER_STATISTICS USER VIEWS TABLE_SCHEMA -INNODB_SYS_COLUMNS TABLE_ID +INNODB_CMPMEM_RESET page_size +PBXT_STATISTICS ID +INNODB_CMPMEM page_size INNODB_RSEG rseg_id -INNODB_CMP page_size -INNODB_TRX trx_id INNODB_SYS_TABLESTATS SCHEMA INNODB_LOCK_WAITS requesting_trx_id -INNODB_BUFFER_POOL_PAGES_INDEX index_id -INNODB_LOCKS lock_id +INNODB_INDEX_STATS table_schema +INNODB_CMP page_size INNODB_SYS_FOREIGN_COLS ID INNODB_CMP_RESET page_size INNODB_BUFFER_POOL_PAGES page_type -INNODB_SYS_TABLES SCHEMA -PBXT_STATISTICS ID -INNODB_CMPMEM page_size +INNODB_TRX trx_id +INNODB_BUFFER_POOL_PAGES_INDEX index_id +INNODB_LOCKS lock_id INNODB_BUFFER_POOL_PAGES_BLOB space_id -INNODB_CMPMEM_RESET page_size +INNODB_SYS_TABLES SCHEMA INNODB_SYS_FIELDS INDEX_ID -INNODB_TABLE_STATS table_schema +INNODB_SYS_COLUMNS TABLE_ID +INNODB_SYS_STATS INDEX_ID INNODB_SYS_FOREIGN ID INNODB_SYS_INDEXES INDEX_ID -INNODB_INDEX_STATS table_schema XTRADB_ADMIN_COMMAND result_message -INNODB_SYS_STATS INDEX_ID +INNODB_TABLE_STATS table_schema SELECT t.table_name, c1.column_name FROM information_schema.tables t INNER JOIN @@ -182,29 +182,29 @@ TRIGGERS TRIGGER_SCHEMA USER_PRIVILEGES GRANTEE USER_STATISTICS USER VIEWS TABLE_SCHEMA -INNODB_SYS_COLUMNS TABLE_ID +INNODB_CMPMEM_RESET page_size +PBXT_STATISTICS ID +INNODB_CMPMEM page_size INNODB_RSEG rseg_id -INNODB_CMP page_size -INNODB_TRX trx_id INNODB_SYS_TABLESTATS SCHEMA INNODB_LOCK_WAITS requesting_trx_id -INNODB_BUFFER_POOL_PAGES_INDEX index_id -INNODB_LOCKS lock_id +INNODB_INDEX_STATS table_schema +INNODB_CMP page_size INNODB_SYS_FOREIGN_COLS ID INNODB_CMP_RESET page_size INNODB_BUFFER_POOL_PAGES page_type -INNODB_SYS_TABLES SCHEMA -PBXT_STATISTICS ID -INNODB_CMPMEM page_size +INNODB_TRX trx_id +INNODB_BUFFER_POOL_PAGES_INDEX index_id +INNODB_LOCKS lock_id INNODB_BUFFER_POOL_PAGES_BLOB space_id -INNODB_CMPMEM_RESET page_size +INNODB_SYS_TABLES SCHEMA INNODB_SYS_FIELDS INDEX_ID -INNODB_TABLE_STATS table_schema +INNODB_SYS_COLUMNS TABLE_ID +INNODB_SYS_STATS INDEX_ID INNODB_SYS_FOREIGN ID INNODB_SYS_INDEXES INDEX_ID -INNODB_INDEX_STATS table_schema XTRADB_ADMIN_COMMAND result_message -INNODB_SYS_STATS INDEX_ID +INNODB_TABLE_STATS table_schema select 1 as f1 from information_schema.tables where "CHARACTER_SETS"= (select cast(table_name as char) from information_schema.tables order by table_name limit 1) limit 1; @@ -322,29 +322,29 @@ Database: information_schema | USER_PRIVILEGES | | USER_STATISTICS | | VIEWS | -| INNODB_SYS_COLUMNS | +| INNODB_CMPMEM_RESET | +| PBXT_STATISTICS | +| INNODB_CMPMEM | | INNODB_RSEG | -| INNODB_CMP | -| INNODB_TRX | | INNODB_SYS_TABLESTATS | | INNODB_LOCK_WAITS | -| INNODB_BUFFER_POOL_PAGES_INDEX | -| INNODB_LOCKS | +| INNODB_INDEX_STATS | +| INNODB_CMP | | INNODB_SYS_FOREIGN_COLS | | INNODB_CMP_RESET | | INNODB_BUFFER_POOL_PAGES | -| INNODB_SYS_TABLES | -| PBXT_STATISTICS | -| INNODB_CMPMEM | +| INNODB_TRX | +| INNODB_BUFFER_POOL_PAGES_INDEX | +| INNODB_LOCKS | | INNODB_BUFFER_POOL_PAGES_BLOB | -| INNODB_CMPMEM_RESET | +| INNODB_SYS_TABLES | | INNODB_SYS_FIELDS | -| INNODB_TABLE_STATS | +| INNODB_SYS_COLUMNS | +| INNODB_SYS_STATS | | INNODB_SYS_FOREIGN | | INNODB_SYS_INDEXES | -| INNODB_INDEX_STATS | | XTRADB_ADMIN_COMMAND | -| INNODB_SYS_STATS | +| INNODB_TABLE_STATS | +---------------------------------------+ Database: INFORMATION_SCHEMA +---------------------------------------+ @@ -385,29 +385,29 @@ Database: INFORMATION_SCHEMA | USER_PRIVILEGES | | USER_STATISTICS | | VIEWS | -| INNODB_SYS_COLUMNS | +| INNODB_CMPMEM_RESET | +| PBXT_STATISTICS | +| INNODB_CMPMEM | | INNODB_RSEG | -| INNODB_CMP | -| INNODB_TRX | | INNODB_SYS_TABLESTATS | | INNODB_LOCK_WAITS | -| INNODB_BUFFER_POOL_PAGES_INDEX | -| INNODB_LOCKS | +| INNODB_INDEX_STATS | +| INNODB_CMP | | INNODB_SYS_FOREIGN_COLS | | INNODB_CMP_RESET | | INNODB_BUFFER_POOL_PAGES | -| INNODB_SYS_TABLES | -| PBXT_STATISTICS | -| INNODB_CMPMEM | +| INNODB_TRX | +| INNODB_BUFFER_POOL_PAGES_INDEX | +| INNODB_LOCKS | | INNODB_BUFFER_POOL_PAGES_BLOB | -| INNODB_CMPMEM_RESET | +| INNODB_SYS_TABLES | | INNODB_SYS_FIELDS | -| INNODB_TABLE_STATS | +| INNODB_SYS_COLUMNS | +| INNODB_SYS_STATS | | INNODB_SYS_FOREIGN | | INNODB_SYS_INDEXES | -| INNODB_INDEX_STATS | | XTRADB_ADMIN_COMMAND | -| INNODB_SYS_STATS | +| INNODB_TABLE_STATS | +---------------------------------------+ Wildcard: inf_rmation_schema +--------------------+ diff --git a/mysql-test/r/innodb_mysql_sync.result b/mysql-test/r/innodb_mysql_sync.result index 605aaf4df5a..58254412c5b 100644 --- a/mysql-test/r/innodb_mysql_sync.result +++ b/mysql-test/r/innodb_mysql_sync.result @@ -173,7 +173,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL) engine=innodb; INSERT INTO t1 VALUES (1, 12345), (2, 23456); # Connection con1 -SET SESSION debug= "+d,alter_table_rollback_new_index"; +SET SESSION debug_dbug= "+d,alter_table_rollback_new_index"; ALTER TABLE t1 ADD PRIMARY KEY(a); ERROR HY000: Unknown error SELECT * FROM t1; diff --git a/mysql-test/r/log_tables_debug.result b/mysql-test/r/log_tables_debug.result index daedb8c103a..39983339572 100644 --- a/mysql-test/r/log_tables_debug.result +++ b/mysql-test/r/log_tables_debug.result @@ -8,11 +8,11 @@ SET @old_slow_query_log_file= @@global.slow_query_log_file; # SET @@global.general_log = ON; SET @@global.general_log_file = 'bug45387_general.log'; -SET SESSION debug='+d,reset_log_last_time'; +SET SESSION debug_dbug='+d,reset_log_last_time'; FLUSH LOGS; SET @@global.general_log = @old_general_log; SET @@global.general_log_file = @old_general_log_file; -SET SESSION debug='-d'; +SET SESSION debug_dbug='-d'; Bug#45387: ID match. End of 5.1 tests # diff --git a/mysql-test/r/merge_debug.result b/mysql-test/r/merge_debug.result index 869d9e7536c..ff7222ac0f3 100644 --- a/mysql-test/r/merge_debug.result +++ b/mysql-test/r/merge_debug.result @@ -10,9 +10,9 @@ INSERT INTO crashed VALUES (10); INSERT INTO t2 VALUES (20); INSERT INTO t3 VALUES (30); LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, crashed WRITE; -SET GLOBAL debug="+d,myisam_pretend_crashed_table_on_open"; +SET GLOBAL debug_dbug="+d,myisam_pretend_crashed_table_on_open"; CREATE TRIGGER t1_ai AFTER INSERT ON crashed FOR EACH ROW INSERT INTO t2 VALUES(29); -SET GLOBAL debug=@orig_debug; +SET GLOBAL debug_dbug=@orig_debug; INSERT INTO t4 VALUES (39); ERROR HY000: Table 'crashed' was not locked with LOCK TABLES INSERT INTO crashed VALUES (11); diff --git a/mysql-test/r/myisam_crash_before_flush_keys.result b/mysql-test/r/myisam_crash_before_flush_keys.result index 43eb1625409..ab7eabfa614 100644 --- a/mysql-test/r/myisam_crash_before_flush_keys.result +++ b/mysql-test/r/myisam_crash_before_flush_keys.result @@ -12,7 +12,7 @@ PRIMARY KEY(a , b), KEY(b)) ENGINE=MyISAM DELAY_KEY_WRITE = 1; INSERT INTO t1 VALUES (1,2),(2,3),(3,4),(4,5),(5,6); # Setup the mysqld to crash at certain point -SET SESSION debug="d,crash_before_flush_keys"; +SET SESSION debug_dbug="d,crash_before_flush_keys"; # Write file to make mysql-test-run.pl expect crash # Run the crashing query FLUSH TABLE t1; diff --git a/mysql-test/r/myisam_debug.result b/mysql-test/r/myisam_debug.result index 7268113552f..36a8fe6c724 100644 --- a/mysql-test/r/myisam_debug.result +++ b/mysql-test/r/myisam_debug.result @@ -13,7 +13,7 @@ KEY (id1), KEY(id) ) ENGINE=MyISAM; INSERT INTO t2 (id) VALUES (123); # Switch to insert Connection -SET SESSION debug='+d,wait_in_enable_indexes'; +SET SESSION debug_dbug='+d,wait_in_enable_indexes'; # Send insert data INSERT INTO t1(id) SELECT id FROM t2; # Switch to default Connection diff --git a/mysql-test/r/partition_debug_sync.result b/mysql-test/r/partition_debug_sync.result index 6b8c8e48acc..ad0f6df5ff2 100644 --- a/mysql-test/r/partition_debug_sync.result +++ b/mysql-test/r/partition_debug_sync.result @@ -18,7 +18,7 @@ ENGINE = MYISAM PARTITION p1 VALUES LESS THAN (20), PARTITION p2 VALUES LESS THAN (100), PARTITION p3 VALUES LESS THAN MAXVALUE ) */; -SET SESSION debug= "+d,sleep_before_create_table_no_lock"; +SET SESSION debug_dbug= "+d,sleep_before_create_table_no_lock"; SET DEBUG_SYNC= 'alter_table_before_create_table_no_lock SIGNAL removing_partitioning WAIT_FOR waiting_for_alter'; SET DEBUG_SYNC= 'alter_table_before_main_binlog SIGNAL partitioning_removed'; ALTER TABLE t1 REMOVE PARTITIONING; @@ -28,7 +28,7 @@ SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL waiting_for_alter'; SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table WAIT_FOR partitioning_removed'; DROP TABLE IF EXISTS t1; # Con 1 -SET SESSION debug= "-d,sleep_before_create_table_no_lock"; +SET SESSION debug_dbug= "-d,sleep_before_create_table_no_lock"; SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET'; # @@ -51,12 +51,12 @@ SET DEBUG_SYNC= 'alter_table_before_open_tables SIGNAL removing_partitions WAIT_ SET DEBUG_SYNC= 'alter_table_before_rename_result_table WAIT_FOR delete_done'; ALTER TABLE t2 REMOVE PARTITIONING; # Con default -SET SESSION debug= "+d,sleep_before_no_locks_delete_table"; +SET SESSION debug_dbug= "+d,sleep_before_no_locks_delete_table"; SET DEBUG_SYNC= 'now WAIT_FOR removing_partitions'; SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table SIGNAL waiting_for_alter'; SET DEBUG_SYNC= 'rm_table_no_locks_before_binlog SIGNAL delete_done'; DROP TABLE IF EXISTS t2; -SET SESSION debug= "-d,sleep_before_no_locks_delete_table"; +SET SESSION debug_dbug= "-d,sleep_before_no_locks_delete_table"; # Con 1 ERROR 42S02: Table 'test.t2' doesn't exist SET DEBUG_SYNC= 'RESET'; diff --git a/mysql-test/r/partition_sync.result b/mysql-test/r/partition_sync.result index d48362cb57c..0e8254e984e 100644 --- a/mysql-test/r/partition_sync.result +++ b/mysql-test/r/partition_sync.result @@ -41,7 +41,7 @@ i 1 # Connection 2 # Alter table, abort after prepare -set session debug="+d,abort_copy_table"; +set session debug_dbug="+d,abort_copy_table"; ALTER TABLE tbl_with_partitions ADD COLUMN f INT; ERROR HY000: Lock wait timeout exceeded; try restarting transaction # Connection 1 diff --git a/mysql-test/r/select_debug.result b/mysql-test/r/select_debug.result index 1eb8a0754fa..a056affc2cd 100644 --- a/mysql-test/r/select_debug.result +++ b/mysql-test/r/select_debug.result @@ -6,7 +6,7 @@ insert into t1 values (2,2), (1,1); create table t2 (a int); insert into t2 values (2), (3); set session join_cache_level=3; -set @@debug = 'd:t:O,/tmp/trace.out'; +set @@debug_dbug= 'd:t:O,/tmp/trace.out'; explain select t1.b from t1,t2 where t1.b=t2.a; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using where diff --git a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result index 16a43a00f04..fd2e79dff29 100644 --- a/mysql-test/r/sp-code.result +++ b/mysql-test/r/sp-code.result @@ -923,7 +923,7 @@ END; CLOSE c; SELECT a INTO @foo FROM t1 LIMIT 1; # Clear warning stack END| -SET SESSION debug="+d,bug23032_emit_warning"; +SET SESSION debug_dbug="+d,bug23032_emit_warning"; CALL p1(); Warning found! Warning found! @@ -942,6 +942,6 @@ End of Result Set found! Level Code Message Warning 1105 Unknown error Error 1329 No data - zero rows fetched, selected, or processed -SET SESSION debug="-d,bug23032_emit_warning"; +SET SESSION debug_dbug="-d,bug23032_emit_warning"; DROP PROCEDURE p1; DROP TABLE t1; diff --git a/mysql-test/r/sp-no-code.result b/mysql-test/r/sp-no-code.result index 77d2c93eaf6..762b481a7cb 100644 --- a/mysql-test/r/sp-no-code.result +++ b/mysql-test/r/sp-no-code.result @@ -1,4 +1,4 @@ show procedure code foo; -ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you need MySQL built with '--with-debug' to have it working +ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you need MariaDB built with '--with-debug' to have it working show function code foo; -ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you need MySQL built with '--with-debug' to have it working +ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you need MariaDB built with '--with-debug' to have it working diff --git a/mysql-test/r/subselect_debug.result b/mysql-test/r/subselect_debug.result index 54610d51d78..1d54369530b 100644 --- a/mysql-test/r/subselect_debug.result +++ b/mysql-test/r/subselect_debug.result @@ -2,12 +2,12 @@ CREATE TABLE t1(id INT); INSERT INTO t1 VALUES (1),(2),(3),(4); INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d; SET @orig_debug=@@debug; -SET GLOBAL debug="d,subselect_exec_fail"; +SET GLOBAL debug_dbug="d,subselect_exec_fail"; SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1; SUM(EXISTS(SELECT RAND() FROM t1)) 0 SELECT REVERSE(EXISTS(SELECT RAND() FROM t1)); REVERSE(EXISTS(SELECT RAND() FROM t1)) 0 -SET GLOBAL debug=@orig_debug; +SET GLOBAL debug_dbug=@orig_debug; DROP TABLE t1; diff --git a/mysql-test/r/variables_debug.result b/mysql-test/r/variables_debug.result index 63592b2146c..064769a562b 100644 --- a/mysql-test/r/variables_debug.result +++ b/mysql-test/r/variables_debug.result @@ -1,20 +1,20 @@ SET @old_debug = @@GLOBAL.debug; -set debug= 'T'; +set debug_dbug= 'T'; select @@debug; @@debug T -set debug= '+P'; +set debug_dbug= '+P'; select @@debug; @@debug P:T -set debug= '-P'; +set debug_dbug= '-P'; select @@debug; @@debug T SELECT @@session.debug, @@global.debug; @@session.debug @@global.debug T -SET SESSION debug = ''; +SET SESSION debug_dbug= ''; SELECT @@session.debug, @@global.debug; @@session.debug @@global.debug @@ -22,28 +22,28 @@ SELECT @@session.debug, @@global.debug; # Bug #52629: memory leak from sys_var_thd_dbug in # binlog.binlog_write_error # -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; SELECT @@global.debug; @@global.debug d,injecting_fault_writing -SET GLOBAL debug=''; +SET GLOBAL debug_dbug=''; SELECT @@global.debug; @@global.debug -SET GLOBAL debug=@old_debug; +SET GLOBAL debug_dbug=@old_debug; # # Bug #56709: Memory leaks at running the 5.1 test suite # SET @old_local_debug = @@debug; -SET @@debug='d,foo'; +SET @@debug_dbug='d,foo'; SELECT @@debug; @@debug d,foo -SET @@debug=''; +SET @@debug_dbug=''; SELECT @@debug; @@debug -SET @@debug = @old_local_debug; +SET @@debug_dbug= @old_local_debug; End of 5.1 tests # # Bug#46165 server crash in dbug @@ -51,41 +51,41 @@ End of 5.1 tests SET @old_globaldebug = @@global.debug; SET @old_sessiondebug= @@session.debug; # Test 1 - Bug test case, single connection -SET GLOBAL debug= '+O,../../log/bug46165.1.trace'; -SET SESSION debug= '-d:-t:-i'; -SET GLOBAL debug= ''; -SET SESSION debug= ''; +SET GLOBAL debug_dbug= '+O,../../log/bug46165.1.trace'; +SET SESSION debug_dbug= '-d:-t:-i'; +SET GLOBAL debug_dbug= ''; +SET SESSION debug_dbug= ''; # Test 2 - Bug test case, two connections # Connection default -SET GLOBAL debug= '+O,../../log/bug46165.2.trace'; -SET SESSION debug= '-d:-t:-i'; +SET GLOBAL debug_dbug= '+O,../../log/bug46165.2.trace'; +SET SESSION debug_dbug= '-d:-t:-i'; # Connection con1 -SET GLOBAL debug= ''; +SET GLOBAL debug_dbug= ''; # Connection default -SET SESSION debug= ''; +SET SESSION debug_dbug= ''; # Connection con1 # Connection default -SET GLOBAL debug= ''; +SET GLOBAL debug_dbug= ''; # Test 3 - Active session trace file on disconnect # Connection con1 -SET GLOBAL debug= '+O,../../log/bug46165.3.trace'; -SET SESSION debug= '-d:-t:-i'; -SET GLOBAL debug= ''; +SET GLOBAL debug_dbug= '+O,../../log/bug46165.3.trace'; +SET SESSION debug_dbug= '-d:-t:-i'; +SET GLOBAL debug_dbug= ''; # Test 4 - Active session trace file on two connections # Connection default -SET GLOBAL debug= '+O,../../log/bug46165.4.trace'; -SET SESSION debug= '-d:-t:-i'; +SET GLOBAL debug_dbug= '+O,../../log/bug46165.4.trace'; +SET SESSION debug_dbug= '-d:-t:-i'; # Connection con1 -SET SESSION debug= '-d:-t:-i'; -SET GLOBAL debug= ''; -SET SESSION debug= ''; +SET SESSION debug_dbug= '-d:-t:-i'; +SET GLOBAL debug_dbug= ''; +SET SESSION debug_dbug= ''; # Connection default -SET SESSION debug= ''; +SET SESSION debug_dbug= ''; # Connection con1 # Connection default # Test 5 - Different trace files -SET SESSION debug= '+O,../../log/bug46165.5.trace'; -SET SESSION debug= '+O,../../log/bug46165.6.trace'; -SET SESSION debug= '-O'; -SET GLOBAL debug= @old_globaldebug; -SET SESSION debug= @old_sessiondebug; +SET SESSION debug_dbug= '+O,../../log/bug46165.5.trace'; +SET SESSION debug_dbug= '+O,../../log/bug46165.6.trace'; +SET SESSION debug_dbug= '-O'; +SET GLOBAL debug_dbug= @old_globaldebug; +SET SESSION debug_dbug= @old_sessiondebug; diff --git a/mysql-test/r/variables_debug_notembedded.result b/mysql-test/r/variables_debug_notembedded.result index 410bbddda2d..81a251a85ab 100644 --- a/mysql-test/r/variables_debug_notembedded.result +++ b/mysql-test/r/variables_debug_notembedded.result @@ -1,12 +1,12 @@ -set session debug="t"; +set session debug_dbug="t"; show session variables like 'debug'; Variable_name Value debug t -set session debug="t"; +set session debug_dbug="t"; show session variables like 'debug'; Variable_name Value debug t -set session debug="d:t"; +set session debug_dbug="d:t"; show session variables like 'debug'; Variable_name Value debug d:t diff --git a/mysql-test/r/warnings_debug.result b/mysql-test/r/warnings_debug.result index 08908bf0437..4cdce7a5feb 100644 --- a/mysql-test/r/warnings_debug.result +++ b/mysql-test/r/warnings_debug.result @@ -1,6 +1,6 @@ drop table if exists t1; create table t1 (a int primary key) engine=innodb; -SET SESSION debug="+d,warn_during_ha_commit_trans"; +SET SESSION debug_dbug="+d,warn_during_ha_commit_trans"; INSERT INTO t1 VALUES (1); Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result index 21a290bfc3b..ca92cc5398b 100644 --- a/mysql-test/suite/binlog/r/binlog_index.result +++ b/mysql-test/suite/binlog/r/binlog_index.result @@ -47,7 +47,7 @@ Error 1377 Fatal error during log purge reset master; # crash_purge_before_update_index flush logs; -SET SESSION debug="+d,crash_purge_before_update_index"; +SET SESSION debug_dbug="+d,crash_purge_before_update_index"; purge binary logs TO 'master-bin.000002'; ERROR HY000: Lost connection to MySQL server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); @@ -59,7 +59,7 @@ master-bin.000003 # crash_purge_non_critical_after_update_index flush logs; -SET SESSION debug="+d,crash_purge_non_critical_after_update_index"; +SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index"; purge binary logs TO 'master-bin.000004'; ERROR HY000: Lost connection to MySQL server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); @@ -70,7 +70,7 @@ master-bin.000005 # crash_purge_critical_after_update_index flush logs; -SET SESSION debug="+d,crash_purge_critical_after_update_index"; +SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index"; purge binary logs TO 'master-bin.000006'; ERROR HY000: Lost connection to MySQL server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); @@ -80,7 +80,7 @@ master-bin.000006 master-bin.000007 # crash_create_non_critical_before_update_index -SET SESSION debug="+d,crash_create_non_critical_before_update_index"; +SET SESSION debug_dbug="+d,crash_create_non_critical_before_update_index"; flush logs; ERROR HY000: Lost connection to MySQL server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); @@ -91,7 +91,7 @@ master-bin.000007 master-bin.000008 # crash_create_critical_before_update_index -SET SESSION debug="+d,crash_create_critical_before_update_index"; +SET SESSION debug_dbug="+d,crash_create_critical_before_update_index"; flush logs; ERROR HY000: Lost connection to MySQL server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); @@ -103,7 +103,7 @@ master-bin.000008 master-bin.000009 # crash_create_after_update_index -SET SESSION debug="+d,crash_create_after_update_index"; +SET SESSION debug_dbug="+d,crash_create_after_update_index"; flush logs; ERROR HY000: Lost connection to MySQL server during query SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); @@ -132,7 +132,7 @@ master-bin.000010 master-bin.000011 # fault_injection_registering_index -SET SESSION debug="+d,fault_injection_registering_index"; +SET SESSION debug_dbug="+d,fault_injection_registering_index"; flush logs; ERROR HY000: Can't open file: 'master-bin.000012' (errno: 1) SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); @@ -157,7 +157,7 @@ master-bin.000011 master-bin.000012 # fault_injection_updating_index -SET SESSION debug="+d,fault_injection_updating_index"; +SET SESSION debug_dbug="+d,fault_injection_updating_index"; flush logs; ERROR HY000: Can't open file: 'master-bin.000013' (errno: 1) SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); @@ -183,5 +183,5 @@ master-bin.000011 master-bin.000012 master-bin.000013 -SET SESSION debug=""; +SET SESSION debug_dbug=""; End of tests diff --git a/mysql-test/suite/binlog/r/binlog_ioerr.result b/mysql-test/suite/binlog/r/binlog_ioerr.result index 04ac0340746..9dd927b9299 100644 --- a/mysql-test/suite/binlog/r/binlog_ioerr.result +++ b/mysql-test/suite/binlog/r/binlog_ioerr.result @@ -2,12 +2,12 @@ CALL mtr.add_suppression("Error writing file 'master-bin'"); RESET MASTER; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb; INSERT INTO t1 VALUES(0); -SET SESSION debug='+d,fail_binlog_write_1'; +SET SESSION debug_dbug='+d,fail_binlog_write_1'; INSERT INTO t1 VALUES(1); ERROR HY000: Error writing file 'master-bin' (errno: 28) INSERT INTO t1 VALUES(2); ERROR HY000: Error writing file 'master-bin' (errno: 28) -SET SESSION debug=''; +SET SESSION debug_dbug=''; INSERT INTO t1 VALUES(3); SELECT * FROM t1; a diff --git a/mysql-test/suite/binlog/r/binlog_write_error.result b/mysql-test/suite/binlog/r/binlog_write_error.result index dd8bdb9715a..28cffb3a8e5 100644 --- a/mysql-test/suite/binlog/r/binlog_write_error.result +++ b/mysql-test/suite/binlog/r/binlog_write_error.result @@ -12,92 +12,92 @@ DROP VIEW IF EXISTS v1, v2; # # Test injecting binlog write error when executing queries # -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT); ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; +SET GLOBAL debug_dbug=''; INSERT INTO t1 VALUES (1),(2),(3); -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; INSERT INTO t1 VALUES (4),(5),(6); INSERT INTO t1 VALUES (4),(5),(6); ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; UPDATE t1 set a=a+1; UPDATE t1 set a=a+1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; DELETE FROM t1; DELETE FROM t1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW INSERT INTO t1 VALUES (new.a + 100); CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW INSERT INTO t1 VALUES (new.a + 100); ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; DROP TRIGGER tr1; DROP TRIGGER tr1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; ALTER TABLE t1 ADD (b INT); ALTER TABLE t1 ADD (b INT); ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; CREATE VIEW v1 AS SELECT a FROM t1; CREATE VIEW v1 AS SELECT a FROM t1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; DROP VIEW v1; DROP VIEW v1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1; CREATE PROCEDURE p1(OUT rows INT) SELECT count(*) INTO rows FROM t1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; DROP PROCEDURE p1; DROP PROCEDURE p1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; DROP TABLE t1; DROP TABLE t1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; CREATE FUNCTION f1() RETURNS INT return 1; CREATE FUNCTION f1() RETURNS INT return 1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; DROP FUNCTION f1; DROP FUNCTION f1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; CREATE USER user1; CREATE USER user1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1; REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug=''; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; DROP USER user1; DROP USER user1; ERROR HY000: Error writing file 'master-bin' ((errno: #) -SET GLOBAL debug=''; +SET GLOBAL debug_dbug=''; # # Cleanup # diff --git a/mysql-test/suite/binlog/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test index 86c314e9236..a264549ce17 100644 --- a/mysql-test/suite/binlog/t/binlog_index.test +++ b/mysql-test/suite/binlog/t/binlog_index.test @@ -90,7 +90,7 @@ reset master; flush logs; --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -SET SESSION debug="+d,crash_purge_before_update_index"; +SET SESSION debug_dbug="+d,crash_purge_before_update_index"; --error 2013 purge binary logs TO 'master-bin.000002'; @@ -110,7 +110,7 @@ SELECT @index; flush logs; --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -SET SESSION debug="+d,crash_purge_non_critical_after_update_index"; +SET SESSION debug_dbug="+d,crash_purge_non_critical_after_update_index"; --error 2013 purge binary logs TO 'master-bin.000004'; @@ -133,7 +133,7 @@ SELECT @index; flush logs; --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -SET SESSION debug="+d,crash_purge_critical_after_update_index"; +SET SESSION debug_dbug="+d,crash_purge_critical_after_update_index"; --error 2013 purge binary logs TO 'master-bin.000006'; @@ -156,7 +156,7 @@ SELECT @index; --echo # crash_create_non_critical_before_update_index --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -SET SESSION debug="+d,crash_create_non_critical_before_update_index"; +SET SESSION debug_dbug="+d,crash_create_non_critical_before_update_index"; --error 2013 flush logs; @@ -174,7 +174,7 @@ SELECT @index; --echo # crash_create_critical_before_update_index --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -SET SESSION debug="+d,crash_create_critical_before_update_index"; +SET SESSION debug_dbug="+d,crash_create_critical_before_update_index"; --error 2013 flush logs; @@ -194,7 +194,7 @@ SELECT @index; --echo # crash_create_after_update_index --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -SET SESSION debug="+d,crash_create_after_update_index"; +SET SESSION debug_dbug="+d,crash_create_after_update_index"; --error 2013 flush logs; @@ -222,7 +222,7 @@ SELECT @index; SELECT @index; --echo # fault_injection_registering_index -SET SESSION debug="+d,fault_injection_registering_index"; +SET SESSION debug_dbug="+d,fault_injection_registering_index"; -- replace_regex /\.[\\\/]master/master/ -- error ER_CANT_OPEN_FILE flush logs; @@ -242,7 +242,7 @@ SELECT @index; SELECT @index; --echo # fault_injection_updating_index -SET SESSION debug="+d,fault_injection_updating_index"; +SET SESSION debug_dbug="+d,fault_injection_updating_index"; -- replace_regex /\.[\\\/]master/master/ -- error ER_CANT_OPEN_FILE flush logs; @@ -261,6 +261,6 @@ SELECT @index; -- replace_regex /\.[\\\/]master/master/ SELECT @index; -eval SET SESSION debug="$old"; +eval SET SESSION debug_dbug="$old"; --echo End of tests diff --git a/mysql-test/suite/binlog/t/binlog_ioerr.test b/mysql-test/suite/binlog/t/binlog_ioerr.test index e6f559c1a7b..f23fadfc1b4 100644 --- a/mysql-test/suite/binlog/t/binlog_ioerr.test +++ b/mysql-test/suite/binlog/t/binlog_ioerr.test @@ -9,12 +9,12 @@ RESET MASTER; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb; INSERT INTO t1 VALUES(0); -SET SESSION debug='+d,fail_binlog_write_1'; +SET SESSION debug_dbug='+d,fail_binlog_write_1'; --error ER_ERROR_ON_WRITE INSERT INTO t1 VALUES(1); --error ER_ERROR_ON_WRITE INSERT INTO t1 VALUES(2); -SET SESSION debug=''; +SET SESSION debug_dbug=''; INSERT INTO t1 VALUES(3); SELECT * FROM t1; diff --git a/mysql-test/suite/binlog/t/binlog_reset_master.test b/mysql-test/suite/binlog/t/binlog_reset_master.test index b7ad69da3ea..33b549ad357 100644 --- a/mysql-test/suite/binlog/t/binlog_reset_master.test +++ b/mysql-test/suite/binlog/t/binlog_reset_master.test @@ -15,7 +15,7 @@ # We use sleep, not debug_sync, because the sync point needs to be in # the thread shut down code after the debug sync facility has been # shut down. ---let $write_var= SET DEBUG="+d,sleep_after_lock_thread_count_before_delete_thd"; CREATE TEMPORARY TABLE test.t1 (a INT); +--let $write_var= SET debug_dbug="+d,sleep_after_lock_thread_count_before_delete_thd"; CREATE TEMPORARY TABLE test.t1 (a INT); --let $write_to_file= GENERATE --disable_query_log --source include/write_var_to_file.inc diff --git a/mysql-test/suite/innodb/r/group_commit_binlog_pos.result b/mysql-test/suite/innodb/r/group_commit_binlog_pos.result index 79ade2acec7..d28ad1fd70e 100644 --- a/mysql-test/suite/innodb/r/group_commit_binlog_pos.result +++ b/mysql-test/suite/innodb/r/group_commit_binlog_pos.result @@ -19,7 +19,7 @@ a 0 1 2 -SET SESSION debug="+d,crash_dispatch_command_before"; +SET SESSION debug_dbug="+d,crash_dispatch_command_before"; SELECT 1; Got one of the listed errors Got one of the listed errors diff --git a/mysql-test/suite/innodb/r/group_commit_binlog_pos_no_optimize_thread.result b/mysql-test/suite/innodb/r/group_commit_binlog_pos_no_optimize_thread.result index e6ea24a67bd..da8cff142b8 100644 --- a/mysql-test/suite/innodb/r/group_commit_binlog_pos_no_optimize_thread.result +++ b/mysql-test/suite/innodb/r/group_commit_binlog_pos_no_optimize_thread.result @@ -21,7 +21,7 @@ a 0 1 2 -SET SESSION debug="+d,crash_dispatch_command_before"; +SET SESSION debug_dbug="+d,crash_dispatch_command_before"; SELECT 1; Got one of the listed errors Got one of the listed errors diff --git a/mysql-test/suite/innodb/r/group_commit_crash.result b/mysql-test/suite/innodb/r/group_commit_crash.result index a55d8f29dda..333e47f38ad 100644 --- a/mysql-test/suite/innodb/r/group_commit_crash.result +++ b/mysql-test/suite/innodb/r/group_commit_crash.result @@ -8,11 +8,11 @@ create table t2 like t1; create procedure setcrash(IN i INT) begin CASE i -WHEN 1 THEN SET SESSION debug="d,crash_commit_after_prepare"; -WHEN 2 THEN SET SESSION debug="d,crash_commit_after_log"; -WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog"; -WHEN 4 THEN SET SESSION debug="d,crash_commit_after"; -WHEN 5 THEN SET SESSION debug="d,crash_commit_before"; +WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare"; +WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log"; +WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog"; +WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after"; +WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before"; ELSE BEGIN END; END CASE; end // diff --git a/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result b/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result index a55d8f29dda..333e47f38ad 100644 --- a/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result +++ b/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result @@ -8,11 +8,11 @@ create table t2 like t1; create procedure setcrash(IN i INT) begin CASE i -WHEN 1 THEN SET SESSION debug="d,crash_commit_after_prepare"; -WHEN 2 THEN SET SESSION debug="d,crash_commit_after_log"; -WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog"; -WHEN 4 THEN SET SESSION debug="d,crash_commit_after"; -WHEN 5 THEN SET SESSION debug="d,crash_commit_before"; +WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare"; +WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log"; +WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog"; +WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after"; +WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before"; ELSE BEGIN END; END CASE; end // diff --git a/mysql-test/suite/innodb/r/innodb_bug53756.result b/mysql-test/suite/innodb/r/innodb_bug53756.result index 37453be8201..2a2a30e2482 100644 --- a/mysql-test/suite/innodb/r/innodb_bug53756.result +++ b/mysql-test/suite/innodb/r/innodb_bug53756.result @@ -92,7 +92,7 @@ pk c1 # Crash server. START TRANSACTION; INSERT INTO bug_53756 VALUES (666,666); -SET SESSION debug="+d,crash_commit_before"; +SET SESSION debug_dbug="+d,crash_commit_before"; COMMIT; ERROR HY000: Lost connection to MySQL server during query diff --git a/mysql-test/suite/innodb/t/group_commit_binlog_pos.test b/mysql-test/suite/innodb/t/group_commit_binlog_pos.test index 686425353f5..5e70db68a97 100644 --- a/mysql-test/suite/innodb/t/group_commit_binlog_pos.test +++ b/mysql-test/suite/innodb/t/group_commit_binlog_pos.test @@ -58,7 +58,7 @@ reap; # Now crash the server with 1+2 in-memory committed, 3 only prepared. connection default; system echo wait-group_commit_binlog_pos.test >> $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; -SET SESSION debug="+d,crash_dispatch_command_before"; +SET SESSION debug_dbug="+d,crash_dispatch_command_before"; --error 2006,2013 SELECT 1; diff --git a/mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test b/mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test index bd6c4b721cc..dba9c0589cf 100644 --- a/mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test +++ b/mysql-test/suite/innodb/t/group_commit_binlog_pos_no_optimize_thread.test @@ -62,7 +62,7 @@ reap; # Now crash the server with 1+2 in-memory committed, 3 only prepared. connection default; system echo wait-group_commit_binlog_pos_no_optimize_thread.test >> $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; -SET SESSION debug="+d,crash_dispatch_command_before"; +SET SESSION debug_dbug="+d,crash_dispatch_command_before"; --error 2006,2013 SELECT 1; diff --git a/mysql-test/suite/innodb/t/group_commit_crash.test b/mysql-test/suite/innodb/t/group_commit_crash.test index 0d5eba6bd08..10b0e102bea 100644 --- a/mysql-test/suite/innodb/t/group_commit_crash.test +++ b/mysql-test/suite/innodb/t/group_commit_crash.test @@ -20,11 +20,11 @@ delimiter //; create procedure setcrash(IN i INT) begin CASE i - WHEN 1 THEN SET SESSION debug="d,crash_commit_after_prepare"; - WHEN 2 THEN SET SESSION debug="d,crash_commit_after_log"; - WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog"; - WHEN 4 THEN SET SESSION debug="d,crash_commit_after"; - WHEN 5 THEN SET SESSION debug="d,crash_commit_before"; + WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare"; + WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log"; + WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog"; + WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after"; + WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before"; ELSE BEGIN END; END CASE; end // diff --git a/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test b/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test index 0d5eba6bd08..10b0e102bea 100644 --- a/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test +++ b/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test @@ -20,11 +20,11 @@ delimiter //; create procedure setcrash(IN i INT) begin CASE i - WHEN 1 THEN SET SESSION debug="d,crash_commit_after_prepare"; - WHEN 2 THEN SET SESSION debug="d,crash_commit_after_log"; - WHEN 3 THEN SET SESSION debug="d,crash_commit_before_unlog"; - WHEN 4 THEN SET SESSION debug="d,crash_commit_after"; - WHEN 5 THEN SET SESSION debug="d,crash_commit_before"; + WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare"; + WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log"; + WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog"; + WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after"; + WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before"; ELSE BEGIN END; END CASE; end // diff --git a/mysql-test/suite/innodb/t/innodb_bug53756.test b/mysql-test/suite/innodb/t/innodb_bug53756.test index b0e15c1686e..ba66c9d8eb3 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53756.test +++ b/mysql-test/suite/innodb/t/innodb_bug53756.test @@ -134,7 +134,7 @@ START TRANSACTION; INSERT INTO bug_53756 VALUES (666,666); # # Request a crash on next execution of commit. -SET SESSION debug="+d,crash_commit_before"; +SET SESSION debug_dbug="+d,crash_commit_before"; # # Execute the statement that causes the crash. --error 2013 diff --git a/mysql-test/suite/maria/r/maria-recovery-bitmap.result b/mysql-test/suite/maria/r/maria-recovery-bitmap.result index 884825d4792..e3697334239 100644 --- a/mysql-test/suite/maria/r/maria-recovery-bitmap.result +++ b/mysql-test/suite/maria/r/maria-recovery-bitmap.result @@ -9,10 +9,10 @@ flush table t1; * copied t1 for comparison insert into t1 values ("bbbbbbb"); delete from t1 limit 1; -set session debug="+d,info,enter,exit,maria_over_alloc_bitmap"; +set session debug_dbug="+d,info,enter,exit,maria_over_alloc_bitmap"; insert into t1 values ("aaaaaaaaa"); set global aria_checkpoint_interval=1; -SET SESSION debug="+d,maria_crash"; +SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -29,7 +29,7 @@ flush table t1; * copied t1 for comparison lock tables t1 write; insert into t1 values (REPEAT('a', 6000)); -SET SESSION debug="+d,maria_flush_bitmap,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_bitmap,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query diff --git a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result index 778d8ba9911..030421ae06a 100644 --- a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result +++ b/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result @@ -25,7 +25,7 @@ flush table t2; * copied t2 for comparison flush table t1; * copied t1 for comparison -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -51,7 +51,7 @@ flush table t2; flush table t1; * copied t1 for comparison lock tables t1 write, t2 write; -SET SESSION debug="+d,maria_crash"; +SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -74,7 +74,7 @@ flush table t2; flush table t1; * copied t1 for comparison lock tables t1 write, t2 write; -SET SESSION debug="+d,maria_flush_whole_page_cache,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -97,7 +97,7 @@ flush table t2; flush table t1; * copied t1 for comparison lock tables t1 write, t2 write; -SET SESSION debug="+d,maria_flush_states,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_states,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -120,7 +120,7 @@ flush table t2; flush table t1; * copied t1 for comparison lock tables t1 write, t2 write; -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -138,7 +138,7 @@ mysqltest.t1 check status OK Checksum-check ok use mysqltest; -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query diff --git a/mysql-test/suite/maria/r/maria-recovery.result b/mysql-test/suite/maria/r/maria-recovery.result index 8d5da9b7269..86e756badec 100644 --- a/mysql-test/suite/maria/r/maria-recovery.result +++ b/mysql-test/suite/maria/r/maria-recovery.result @@ -9,7 +9,7 @@ create table t1 (a varchar(1000)) engine=aria; insert into t1 values ("00000000"); flush table t1; * copied t1 for comparison -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -32,7 +32,7 @@ flush table t1; * copied t1 for comparison lock tables t1 write; insert into t1 values ("aaaaaaaaa"); -SET SESSION debug="+d,maria_crash"; +SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -53,7 +53,7 @@ flush table t1; * copied t1 for comparison lock tables t1 write; insert into t1 values ("aaaaaaaaa"); -SET SESSION debug="+d,maria_flush_whole_page_cache,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -75,7 +75,7 @@ flush table t1; * copied t1 for comparison lock tables t1 write; insert into t1 values ("aaaaaaaaa"); -SET SESSION debug="+d,maria_flush_states,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_states,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -98,7 +98,7 @@ flush table t1; * copied t1 for comparison lock tables t1 write; insert into t1 values ("aaaaaaaaa"); -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -133,7 +133,7 @@ LENGTH(b) 5001 flush table t1; * copied t1 for comparison -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -163,7 +163,7 @@ insert into t1 values(null,"a"), (null,"c"), (null,"d"); delete from t1 where c="d"; flush table t1; * copied t1 for comparison -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -189,7 +189,7 @@ t1 CREATE TABLE `t1` ( update t1 set i=15 where c="a"; flush table t1; * copied t1 for comparison -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -215,7 +215,7 @@ flush table t1; * copied t1 for comparison lock tables t1 write; insert into t1 values(null, "e"); -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query diff --git a/mysql-test/suite/maria/r/maria-recovery2.result b/mysql-test/suite/maria/r/maria-recovery2.result index 1d1ede3001e..2c92bb8dace 100644 --- a/mysql-test/suite/maria/r/maria-recovery2.result +++ b/mysql-test/suite/maria/r/maria-recovery2.result @@ -14,7 +14,7 @@ flush table t1; lock tables t1 write; insert into t1 values(3); delete from t1 where a in (1,2,3); -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -28,7 +28,7 @@ ok use mysqltest; drop table t1; * TEST of checkpoint -set global debug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect"; +set global debug_dbug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect"; set global aria_checkpoint_interval=10000; create table t1(a int, b varchar(10), index(a,b)) engine=aria; insert into t1 values(1,"a"),(2,"b"),(3,"c"); @@ -45,7 +45,7 @@ Variable_name Value Aria_pagecache_blocks_not_flushed 3 set global aria_checkpoint_interval=10000; update t1 set b="i" where a=5; -SET SESSION debug="+d,maria_crash"; +SET SESSION debug_dbug="+d,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -74,7 +74,7 @@ a 1 2 3 -SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -107,7 +107,7 @@ flush table t1; lock tables t1 write, t2 read; delete from t1 limit 1; insert into t1 select * from t2; -SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -128,7 +128,7 @@ create table t_corrupted1 (a varchar(100), key(a)) engine=aria; insert into t_corrupted1 select (rand()) from t2; flush table t_corrupted1; * copied t_corrupted1 for comparison -SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash_sort_index"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash_sort_index"; * crashing mysqld intentionally optimize table t_corrupted1; ERROR HY000: Lost connection to MySQL server during query diff --git a/mysql-test/suite/maria/r/maria-recovery3.result b/mysql-test/suite/maria/r/maria-recovery3.result index 5ba9ecc8349..12c3d0ae034 100644 --- a/mysql-test/suite/maria/r/maria-recovery3.result +++ b/mysql-test/suite/maria/r/maria-recovery3.result @@ -8,11 +8,11 @@ create table t1(a int primary key) engine=aria; insert into t1 values(1); flush table t1; * copied t1 for comparison -set session debug="+d,maria_sleep_in_commit"; +set session debug_dbug="+d,maria_sleep_in_commit"; insert into t1 values(2); set global aria_checkpoint_interval=1000; delete from t1 where a=2; -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -48,7 +48,7 @@ mysqltest.t1 check status OK flush table t1; * copied t1 for comparison * compared t1 to old version -SET SESSION debug="+d,maria_flush_whole_log,maria_crash"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash"; * crashing mysqld intentionally set global aria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query @@ -71,7 +71,7 @@ truncate table t1; flush table t1; * copied t1 for comparison truncate table t1; -SET SESSION debug="+d,maria_flush_whole_log,maria_crash_create_table"; +SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash_create_table"; * crashing mysqld intentionally truncate table t1; ERROR HY000: Lost connection to MySQL server during query diff --git a/mysql-test/suite/maria/t/maria-recovery-bitmap.test b/mysql-test/suite/maria/t/maria-recovery-bitmap.test index 856785a04a8..4c7956fbc30 100644 --- a/mysql-test/suite/maria/t/maria-recovery-bitmap.test +++ b/mysql-test/suite/maria/t/maria-recovery-bitmap.test @@ -48,7 +48,7 @@ delete from t1 limit 1; # --send on the connection during aria_verify_recovery.inc, which makes that # script fail if it were to try to use that connection before --reap. connect (extra, localhost, root,,mysqltest,,); -set session debug="+d,info,enter,exit,maria_over_alloc_bitmap"; +set session debug_dbug="+d,info,enter,exit,maria_over_alloc_bitmap"; send insert into t1 values ("aaaaaaaaa"); connection admin; # Leave time for INSERT to block after modifying bitmap; diff --git a/mysql-test/suite/maria/t/maria-recovery2.test b/mysql-test/suite/maria/t/maria-recovery2.test index c1081d033ac..8d27d9aaaac 100644 --- a/mysql-test/suite/maria/t/maria-recovery2.test +++ b/mysql-test/suite/maria/t/maria-recovery2.test @@ -62,7 +62,7 @@ drop table t1; # A basic checkpoint test --echo * TEST of checkpoint # Don't take a full checkpoints, we want to test checkpoint vs dirty pages -set global debug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect"; +set global debug_dbug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect"; # restart checkpoint thread for it to notice the above set global aria_checkpoint_interval=10000; create table t1(a int, b varchar(10), index(a,b)) engine=aria; diff --git a/mysql-test/suite/maria/t/maria-recovery3.test b/mysql-test/suite/maria/t/maria-recovery3.test index a5fd55499a2..02babfccf83 100644 --- a/mysql-test/suite/maria/t/maria-recovery3.test +++ b/mysql-test/suite/maria/t/maria-recovery3.test @@ -42,7 +42,7 @@ let $mms_compare_physically=0; create table t1(a int primary key) engine=aria; insert into t1 values(1); -- source include/maria_make_snapshot_for_comparison.inc -set session debug="+d,maria_sleep_in_commit"; +set session debug_dbug="+d,maria_sleep_in_commit"; send insert into t1 values(2); sleep 1; # Now the INSERT of 2 has written a commit record diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result index 1b0a9c636e7..760d7342752 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug36981.result @@ -1,4 +1,4 @@ -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; create table `t1` (`c1` char(1) default null,`c2` char(10) default null, key (`c1`)) engine=innodb default charset=latin1; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result index 9c30b32e1e5..5e53649c538 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug40992.result @@ -1,7 +1,7 @@ # # Bug#40992 - InnoDB: Crash when engine_condition_pushdown is on # -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; CREATE TABLE t ( dummy INT PRIMARY KEY, a INT UNIQUE, diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result index d65feac5a0b..6b3025af842 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41029.result @@ -2,7 +2,7 @@ select @default_binlog_format:=@@global.binlog_format; @default_binlog_format:=@@global.binlog_format STATEMENT set global binlog_format=row; -set session debug="+d,optimizer_innodb_ds_mrr"; +set session debug_dbug="+d,optimizer_innodb_ds_mrr"; set autocommit=0; use test; drop table if exists t1; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result index e42f61376c4..bad32010c8c 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996.result @@ -1,4 +1,4 @@ -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; drop table if exists `t1`; Warnings: Note 1051 Unknown table 't1' diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result index 0daa91361c2..4586fe84d2d 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result @@ -1,4 +1,4 @@ -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result index c60a830b899..0cd801280c8 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43249.result @@ -1,4 +1,4 @@ -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 DATE, PRIMARY KEY(c1), UNIQUE INDEX(c2)) engine=innodb; INSERT INTO t1 VALUES('8:29:45',NULL,'2009-02-01'); diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result index a6f4fcd0018..33a4d5c2f30 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43360.result @@ -1,7 +1,7 @@ # # Bug#43360 - Server crash with a simple multi-table update # -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; CREATE TABLE t1 ( a CHAR(2) NOT NULL PRIMARY KEY, b VARCHAR(20) NOT NULL, diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result index 9c9d99837cc..a8f56923386 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43448.result @@ -1,7 +1,7 @@ # # Bug#43448 - Server crashes on multi table delete with Innodb # -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; CREATE TABLE t1 ( id1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY, t CHAR(12) diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result index 562fe4785d5..3c19a37c95d 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug43617.result @@ -1,7 +1,7 @@ set storage_engine=innodb; set @save_time_zone= @@time_zone; set time_zone='+03:00'; -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; CREATE TABLE t1(c1 TIMESTAMP NOT NULL, c2 TIMESTAMP NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2)); INSERT INTO t1 VALUES('98-12-31 11:30:45','98.12.31 11+30+45','98-12-31 11:30:45','98.12.31 11+30+45'),('98/12/30 11*30*45','98@12@30 11^30^45','98/12/30 11*30*45','98@12@30 11^30^45'),('98-12-29','98.12.29','98-12-29','98.12.29'),('98/12/28','98@12@28','98/12/28','98@12@28'); Warnings: diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug36981.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug36981.test index 586602c7ae8..da9de306b09 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug36981.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug36981.test @@ -4,7 +4,7 @@ --source include/have_innodb.inc # crash requires this -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; create table `t1` (`c1` char(1) default null,`c2` char(10) default null, key (`c1`)) diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug40992.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug40992.test index 36fe7c4a60f..b16f55aa951 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug40992.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug40992.test @@ -6,7 +6,7 @@ --source include/have_innodb.inc # Crash requires that we enable Index Condition Pushdown in InnoDB -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; CREATE TABLE t ( dummy INT PRIMARY KEY, diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test index ff3dd4964af..b7c0dc5332c 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test @@ -13,7 +13,7 @@ connect (con2,localhost,root,,); connection con1; # bug requires this -set session debug="+d,optimizer_innodb_ds_mrr"; +set session debug_dbug="+d,optimizer_innodb_ds_mrr"; set autocommit=0; use test; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996.test index b8040b9714a..7d6237fa536 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996.test @@ -5,7 +5,7 @@ --source include/have_innodb.inc # crash requires this -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; drop table if exists `t1`; create table `t1` (`c` bigint, key(`c`),`a` int)engine=innodb; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test index d3eb1e726a2..6c6b416df8a 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test @@ -7,7 +7,7 @@ --source include/have_innodb.inc # Valgrind errors happen only with this: -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43101.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43101.test index 7dd921806bf..186512d5e65 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43101.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43101.test @@ -4,7 +4,7 @@ --source include/have_debug.inc # Goes away with -#set session debug=+d,optimizer_no_icp; +#set session debug_dbug=+d,optimizer_no_icp; CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 DATE, PRIMARY KEY(c1), UNIQUE INDEX(c2)); diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43249.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43249.test index 827220b0a6f..6275038a650 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43249.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43249.test @@ -4,7 +4,7 @@ --source include/have_debug.inc --source include/have_innodb.inc -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 DATE, PRIMARY KEY(c1), UNIQUE INDEX(c2)) engine=innodb; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43360.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43360.test index 0d1e4740712..d8b8b1f64a3 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43360.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43360.test @@ -7,7 +7,7 @@ --source include/have_innodb.inc # crash requires this -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; CREATE TABLE t1 ( a CHAR(2) NOT NULL PRIMARY KEY, diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test index 0b1e560b58d..f7f40a6d3bf 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43448.test @@ -6,7 +6,7 @@ --source include/have_innodb.inc # crash requires ICP support in InnoDB -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; CREATE TABLE t1 ( id1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY, diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test index 2b3b65577af..4a3544958d2 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43617.test @@ -6,7 +6,7 @@ set storage_engine=innodb; set @save_time_zone= @@time_zone; set time_zone='+03:00'; -set session debug="+d,optimizer_innodb_icp"; +set session debug_dbug="+d,optimizer_innodb_icp"; ######## Running INSERT tests for TIMESTAMP ######## diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43618.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43618.test index e05ea3ee4f5..02e93cdf01a 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug43618.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug43618.test @@ -6,7 +6,7 @@ set @save_time_zone= @@time_zone; set time_zone='+03:00'; # bug goes away with -#set session debug="+d,optimizer_no_icp"; +#set session debug_dbug="+d,optimizer_no_icp"; ######## Running INSERT tests for TIMESTAMP ######## diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug45221.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug45221.test index e60c7818b19..aab93a72725 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug45221.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug45221.test @@ -4,7 +4,7 @@ --source include/have_debug.inc # bug goes away with -#set session debug="+d,optimizer_no_icp"; +#set session debug_dbug="+d,optimizer_no_icp"; # those don't remove the problem but make the result diff different: #set optimizer_switch="materialization=off"; diff --git a/mysql-test/suite/parts/inc/partition_crash_add.inc b/mysql-test/suite/parts/inc/partition_crash_add.inc index c7cec9c8791..fcd058562c0 100644 --- a/mysql-test/suite/parts/inc/partition_crash_add.inc +++ b/mysql-test/suite/parts/inc/partition_crash_add.inc @@ -1,33 +1,33 @@ # To be used with partition mgm commands like # ALTER TABLE t1 ADD PARTITION (LIST/RANGE PARTITIONING). --echo # Crash testing ADD PARTITION -SET SESSION debug="+d,crash_add_partition_1"; +SET SESSION debug_dbug="+d,crash_add_partition_1"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_add_partition_1"; -SET SESSION debug="+d,crash_add_partition_2"; +SET SESSION debug_dbug="-d,crash_add_partition_1"; +SET SESSION debug_dbug="+d,crash_add_partition_2"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_add_partition_2"; -SET SESSION debug="+d,crash_add_partition_3"; +SET SESSION debug_dbug="-d,crash_add_partition_2"; +SET SESSION debug_dbug="+d,crash_add_partition_3"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_add_partition_3"; -SET SESSION debug="+d,crash_add_partition_4"; +SET SESSION debug_dbug="-d,crash_add_partition_3"; +SET SESSION debug_dbug="+d,crash_add_partition_4"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_add_partition_4"; -SET SESSION debug="+d,crash_add_partition_5"; +SET SESSION debug_dbug="-d,crash_add_partition_4"; +SET SESSION debug_dbug="+d,crash_add_partition_5"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_add_partition_5"; -SET SESSION debug="+d,crash_add_partition_6"; +SET SESSION debug_dbug="-d,crash_add_partition_5"; +SET SESSION debug_dbug="+d,crash_add_partition_6"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_add_partition_6"; -SET SESSION debug="+d,crash_add_partition_7"; +SET SESSION debug_dbug="-d,crash_add_partition_6"; +SET SESSION debug_dbug="+d,crash_add_partition_7"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_add_partition_7"; -SET SESSION debug="+d,crash_add_partition_8"; +SET SESSION debug_dbug="-d,crash_add_partition_7"; +SET SESSION debug_dbug="+d,crash_add_partition_8"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_add_partition_8"; -SET SESSION debug="+d,crash_add_partition_9"; +SET SESSION debug_dbug="-d,crash_add_partition_8"; +SET SESSION debug_dbug="+d,crash_add_partition_9"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_add_partition_9"; -SET SESSION debug="+d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_9"; +SET SESSION debug_dbug="+d,crash_add_partition_10"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_10"; diff --git a/mysql-test/suite/parts/inc/partition_crash_change.inc b/mysql-test/suite/parts/inc/partition_crash_change.inc index 2a6630b6537..ba9dd9cbdc8 100644 --- a/mysql-test/suite/parts/inc/partition_crash_change.inc +++ b/mysql-test/suite/parts/inc/partition_crash_change.inc @@ -2,39 +2,39 @@ # ALTER TABLE t1 COALESCE/REBUILD/REORGANIZE PARTITION. --echo # Test change partition (REORGANIZE/REBUILD/COALESCE --echo # or ADD HASH PARTITION). -SET SESSION debug="+d,crash_change_partition_1"; +SET SESSION debug_dbug="+d,crash_change_partition_1"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_1"; -SET SESSION debug="+d,crash_change_partition_2"; +SET SESSION debug_dbug="-d,crash_change_partition_1"; +SET SESSION debug_dbug="+d,crash_change_partition_2"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_2"; -SET SESSION debug="+d,crash_change_partition_3"; +SET SESSION debug_dbug="-d,crash_change_partition_2"; +SET SESSION debug_dbug="+d,crash_change_partition_3"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_3"; -SET SESSION debug="+d,crash_change_partition_4"; +SET SESSION debug_dbug="-d,crash_change_partition_3"; +SET SESSION debug_dbug="+d,crash_change_partition_4"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_4"; -SET SESSION debug="+d,crash_change_partition_5"; +SET SESSION debug_dbug="-d,crash_change_partition_4"; +SET SESSION debug_dbug="+d,crash_change_partition_5"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_5"; -SET SESSION debug="+d,crash_change_partition_6"; +SET SESSION debug_dbug="-d,crash_change_partition_5"; +SET SESSION debug_dbug="+d,crash_change_partition_6"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_6"; -SET SESSION debug="+d,crash_change_partition_7"; +SET SESSION debug_dbug="-d,crash_change_partition_6"; +SET SESSION debug_dbug="+d,crash_change_partition_7"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_7"; -SET SESSION debug="+d,crash_change_partition_8"; +SET SESSION debug_dbug="-d,crash_change_partition_7"; +SET SESSION debug_dbug="+d,crash_change_partition_8"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_8"; -SET SESSION debug="+d,crash_change_partition_9"; +SET SESSION debug_dbug="-d,crash_change_partition_8"; +SET SESSION debug_dbug="+d,crash_change_partition_9"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_9"; -SET SESSION debug="+d,crash_change_partition_10"; +SET SESSION debug_dbug="-d,crash_change_partition_9"; +SET SESSION debug_dbug="+d,crash_change_partition_10"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_10"; -SET SESSION debug="+d,crash_change_partition_11"; +SET SESSION debug_dbug="-d,crash_change_partition_10"; +SET SESSION debug_dbug="+d,crash_change_partition_11"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_11"; -SET SESSION debug="+d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_11"; +SET SESSION debug_dbug="+d,crash_change_partition_12"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_12"; diff --git a/mysql-test/suite/parts/inc/partition_crash_drop.inc b/mysql-test/suite/parts/inc/partition_crash_drop.inc index 0e35e126f4e..91787cdecdc 100644 --- a/mysql-test/suite/parts/inc/partition_crash_drop.inc +++ b/mysql-test/suite/parts/inc/partition_crash_drop.inc @@ -1,30 +1,30 @@ # To be used with partition mgm commands like # ALTER TABLE t1 DROP PARTITION. --echo # Test DROP PARTITION -SET SESSION debug="+d,crash_drop_partition_1"; +SET SESSION debug_dbug="+d,crash_drop_partition_1"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_drop_partition_1"; -SET SESSION debug="+d,crash_drop_partition_2"; +SET SESSION debug_dbug="-d,crash_drop_partition_1"; +SET SESSION debug_dbug="+d,crash_drop_partition_2"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_drop_partition_2"; -SET SESSION debug="+d,crash_drop_partition_3"; +SET SESSION debug_dbug="-d,crash_drop_partition_2"; +SET SESSION debug_dbug="+d,crash_drop_partition_3"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_drop_partition_3"; -SET SESSION debug="+d,crash_drop_partition_4"; +SET SESSION debug_dbug="-d,crash_drop_partition_3"; +SET SESSION debug_dbug="+d,crash_drop_partition_4"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_drop_partition_4"; -SET SESSION debug="+d,crash_drop_partition_5"; +SET SESSION debug_dbug="-d,crash_drop_partition_4"; +SET SESSION debug_dbug="+d,crash_drop_partition_5"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_drop_partition_5"; -SET SESSION debug="+d,crash_drop_partition_6"; +SET SESSION debug_dbug="-d,crash_drop_partition_5"; +SET SESSION debug_dbug="+d,crash_drop_partition_6"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_drop_partition_6"; -SET SESSION debug="+d,crash_drop_partition_7"; +SET SESSION debug_dbug="-d,crash_drop_partition_6"; +SET SESSION debug_dbug="+d,crash_drop_partition_7"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_drop_partition_7"; -SET SESSION debug="+d,crash_drop_partition_8"; +SET SESSION debug_dbug="-d,crash_drop_partition_7"; +SET SESSION debug_dbug="+d,crash_drop_partition_8"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_drop_partition_8"; -SET SESSION debug="+d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_8"; +SET SESSION debug_dbug="+d,crash_drop_partition_9"; --source suite/parts/inc/partition_crash.inc -SET SESSION debug="-d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_9"; diff --git a/mysql-test/suite/parts/inc/partition_fail_add.inc b/mysql-test/suite/parts/inc/partition_fail_add.inc index 71d09792fd1..72978458e0b 100644 --- a/mysql-test/suite/parts/inc/partition_fail_add.inc +++ b/mysql-test/suite/parts/inc/partition_fail_add.inc @@ -1,33 +1,33 @@ # To be used with partition mgm commands like # ALTER TABLE t1 ADD PARTITION (LIST/RANGE PARTITIONING). --echo # Error recovery testing ADD PARTITION -SET SESSION debug="+d,fail_add_partition_1"; +SET SESSION debug_dbug="+d,fail_add_partition_1"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_add_partition_1"; -SET SESSION debug="+d,fail_add_partition_2"; +SET SESSION debug_dbug="-d,fail_add_partition_1"; +SET SESSION debug_dbug="+d,fail_add_partition_2"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_add_partition_2"; -SET SESSION debug="+d,fail_add_partition_3"; +SET SESSION debug_dbug="-d,fail_add_partition_2"; +SET SESSION debug_dbug="+d,fail_add_partition_3"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_add_partition_3"; -SET SESSION debug="+d,fail_add_partition_4"; +SET SESSION debug_dbug="-d,fail_add_partition_3"; +SET SESSION debug_dbug="+d,fail_add_partition_4"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_add_partition_4"; -SET SESSION debug="+d,fail_add_partition_5"; +SET SESSION debug_dbug="-d,fail_add_partition_4"; +SET SESSION debug_dbug="+d,fail_add_partition_5"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_add_partition_5"; -SET SESSION debug="+d,fail_add_partition_6"; +SET SESSION debug_dbug="-d,fail_add_partition_5"; +SET SESSION debug_dbug="+d,fail_add_partition_6"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_add_partition_6"; -SET SESSION debug="+d,fail_add_partition_7"; +SET SESSION debug_dbug="-d,fail_add_partition_6"; +SET SESSION debug_dbug="+d,fail_add_partition_7"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_add_partition_7"; -SET SESSION debug="+d,fail_add_partition_8"; +SET SESSION debug_dbug="-d,fail_add_partition_7"; +SET SESSION debug_dbug="+d,fail_add_partition_8"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_add_partition_8"; -SET SESSION debug="+d,fail_add_partition_9"; +SET SESSION debug_dbug="-d,fail_add_partition_8"; +SET SESSION debug_dbug="+d,fail_add_partition_9"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_add_partition_9"; -SET SESSION debug="+d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_9"; +SET SESSION debug_dbug="+d,fail_add_partition_10"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_10"; diff --git a/mysql-test/suite/parts/inc/partition_fail_change.inc b/mysql-test/suite/parts/inc/partition_fail_change.inc index 390dea34fab..0c576d990fe 100644 --- a/mysql-test/suite/parts/inc/partition_fail_change.inc +++ b/mysql-test/suite/parts/inc/partition_fail_change.inc @@ -2,39 +2,39 @@ # ALTER TABLE t1 COALESCE/REBUILD/REORGANIZE PARTITION. --echo # Error recovery change partition (REORGANIZE/REBUILD/COALESCE --echo # or ADD HASH PARTITION). -SET SESSION debug="+d,fail_change_partition_1"; +SET SESSION debug_dbug="+d,fail_change_partition_1"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_1"; -SET SESSION debug="+d,fail_change_partition_2"; +SET SESSION debug_dbug="-d,fail_change_partition_1"; +SET SESSION debug_dbug="+d,fail_change_partition_2"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_2"; -SET SESSION debug="+d,fail_change_partition_3"; +SET SESSION debug_dbug="-d,fail_change_partition_2"; +SET SESSION debug_dbug="+d,fail_change_partition_3"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_3"; -SET SESSION debug="+d,fail_change_partition_4"; +SET SESSION debug_dbug="-d,fail_change_partition_3"; +SET SESSION debug_dbug="+d,fail_change_partition_4"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_4"; -SET SESSION debug="+d,fail_change_partition_5"; +SET SESSION debug_dbug="-d,fail_change_partition_4"; +SET SESSION debug_dbug="+d,fail_change_partition_5"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_5"; -SET SESSION debug="+d,fail_change_partition_6"; +SET SESSION debug_dbug="-d,fail_change_partition_5"; +SET SESSION debug_dbug="+d,fail_change_partition_6"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_6"; -SET SESSION debug="+d,fail_change_partition_7"; +SET SESSION debug_dbug="-d,fail_change_partition_6"; +SET SESSION debug_dbug="+d,fail_change_partition_7"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_7"; -SET SESSION debug="+d,fail_change_partition_8"; +SET SESSION debug_dbug="-d,fail_change_partition_7"; +SET SESSION debug_dbug="+d,fail_change_partition_8"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_8"; -SET SESSION debug="+d,fail_change_partition_9"; +SET SESSION debug_dbug="-d,fail_change_partition_8"; +SET SESSION debug_dbug="+d,fail_change_partition_9"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_9"; -SET SESSION debug="+d,fail_change_partition_10"; +SET SESSION debug_dbug="-d,fail_change_partition_9"; +SET SESSION debug_dbug="+d,fail_change_partition_10"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_10"; -SET SESSION debug="+d,fail_change_partition_11"; +SET SESSION debug_dbug="-d,fail_change_partition_10"; +SET SESSION debug_dbug="+d,fail_change_partition_11"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_11"; -SET SESSION debug="+d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_11"; +SET SESSION debug_dbug="+d,fail_change_partition_12"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_12"; diff --git a/mysql-test/suite/parts/inc/partition_fail_drop.inc b/mysql-test/suite/parts/inc/partition_fail_drop.inc index 54a57ba845f..ca9bcf7d7a3 100644 --- a/mysql-test/suite/parts/inc/partition_fail_drop.inc +++ b/mysql-test/suite/parts/inc/partition_fail_drop.inc @@ -1,30 +1,30 @@ # To be used with partition mgm commands like # ALTER TABLE t1 DROP PARTITION. --echo # Error recovery DROP PARTITION -SET SESSION debug="+d,fail_drop_partition_1"; +SET SESSION debug_dbug="+d,fail_drop_partition_1"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_drop_partition_1"; -SET SESSION debug="+d,fail_drop_partition_2"; +SET SESSION debug_dbug="-d,fail_drop_partition_1"; +SET SESSION debug_dbug="+d,fail_drop_partition_2"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_drop_partition_2"; -SET SESSION debug="+d,fail_drop_partition_3"; +SET SESSION debug_dbug="-d,fail_drop_partition_2"; +SET SESSION debug_dbug="+d,fail_drop_partition_3"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_drop_partition_3"; -SET SESSION debug="+d,fail_drop_partition_4"; +SET SESSION debug_dbug="-d,fail_drop_partition_3"; +SET SESSION debug_dbug="+d,fail_drop_partition_4"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_drop_partition_4"; -SET SESSION debug="+d,fail_drop_partition_5"; +SET SESSION debug_dbug="-d,fail_drop_partition_4"; +SET SESSION debug_dbug="+d,fail_drop_partition_5"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_drop_partition_5"; -SET SESSION debug="+d,fail_drop_partition_6"; +SET SESSION debug_dbug="-d,fail_drop_partition_5"; +SET SESSION debug_dbug="+d,fail_drop_partition_6"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_drop_partition_6"; -SET SESSION debug="+d,fail_drop_partition_7"; +SET SESSION debug_dbug="-d,fail_drop_partition_6"; +SET SESSION debug_dbug="+d,fail_drop_partition_7"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_drop_partition_7"; -SET SESSION debug="+d,fail_drop_partition_8"; +SET SESSION debug_dbug="-d,fail_drop_partition_7"; +SET SESSION debug_dbug="+d,fail_drop_partition_8"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_drop_partition_8"; -SET SESSION debug="+d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_8"; +SET SESSION debug_dbug="+d,fail_drop_partition_9"; --source suite/parts/inc/partition_fail.inc -SET SESSION debug="-d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_9"; diff --git a/mysql-test/suite/parts/r/partition_debug_innodb.result b/mysql-test/suite/parts/r/partition_debug_innodb.result index 49d863bca8e..aff45690de3 100644 --- a/mysql-test/suite/parts/r/partition_debug_innodb.result +++ b/mysql-test/suite/parts/r/partition_debug_innodb.result @@ -11,7 +11,7 @@ call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table "); # Extended crash recovery testing of fast_alter_partition_table. call mtr.add_suppression("Attempting backtrace. You can use the following information to find out"); # Crash testing ADD PARTITION -SET SESSION debug="+d,crash_add_partition_1"; +SET SESSION debug_dbug="+d,crash_add_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -75,8 +75,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_1"; -SET SESSION debug="+d,crash_add_partition_2"; +SET SESSION debug_dbug="-d,crash_add_partition_1"; +SET SESSION debug_dbug="+d,crash_add_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -142,8 +142,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_2"; -SET SESSION debug="+d,crash_add_partition_3"; +SET SESSION debug_dbug="-d,crash_add_partition_2"; +SET SESSION debug_dbug="+d,crash_add_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -209,8 +209,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_3"; -SET SESSION debug="+d,crash_add_partition_4"; +SET SESSION debug_dbug="-d,crash_add_partition_3"; +SET SESSION debug_dbug="+d,crash_add_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -276,8 +276,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_4"; -SET SESSION debug="+d,crash_add_partition_5"; +SET SESSION debug_dbug="-d,crash_add_partition_4"; +SET SESSION debug_dbug="+d,crash_add_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -344,8 +344,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_5"; -SET SESSION debug="+d,crash_add_partition_6"; +SET SESSION debug_dbug="-d,crash_add_partition_5"; +SET SESSION debug_dbug="+d,crash_add_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -412,8 +412,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_6"; -SET SESSION debug="+d,crash_add_partition_7"; +SET SESSION debug_dbug="-d,crash_add_partition_6"; +SET SESSION debug_dbug="+d,crash_add_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -480,8 +480,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_7"; -SET SESSION debug="+d,crash_add_partition_8"; +SET SESSION debug_dbug="-d,crash_add_partition_7"; +SET SESSION debug_dbug="+d,crash_add_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -550,8 +550,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_8"; -SET SESSION debug="+d,crash_add_partition_9"; +SET SESSION debug_dbug="-d,crash_add_partition_8"; +SET SESSION debug_dbug="+d,crash_add_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -618,8 +618,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_9"; -SET SESSION debug="+d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_9"; +SET SESSION debug_dbug="+d,crash_add_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -686,9 +686,9 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_10"; # Error recovery testing ADD PARTITION -SET SESSION debug="+d,fail_add_partition_1"; +SET SESSION debug_dbug="+d,fail_add_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -808,8 +808,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_1"; -SET SESSION debug="+d,fail_add_partition_2"; +SET SESSION debug_dbug="-d,fail_add_partition_1"; +SET SESSION debug_dbug="+d,fail_add_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -929,8 +929,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_2"; -SET SESSION debug="+d,fail_add_partition_3"; +SET SESSION debug_dbug="-d,fail_add_partition_2"; +SET SESSION debug_dbug="+d,fail_add_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1050,8 +1050,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_3"; -SET SESSION debug="+d,fail_add_partition_4"; +SET SESSION debug_dbug="-d,fail_add_partition_3"; +SET SESSION debug_dbug="+d,fail_add_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1171,8 +1171,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_4"; -SET SESSION debug="+d,fail_add_partition_5"; +SET SESSION debug_dbug="-d,fail_add_partition_4"; +SET SESSION debug_dbug="+d,fail_add_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1292,8 +1292,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_5"; -SET SESSION debug="+d,fail_add_partition_6"; +SET SESSION debug_dbug="-d,fail_add_partition_5"; +SET SESSION debug_dbug="+d,fail_add_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1413,8 +1413,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_6"; -SET SESSION debug="+d,fail_add_partition_7"; +SET SESSION debug_dbug="-d,fail_add_partition_6"; +SET SESSION debug_dbug="+d,fail_add_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1534,8 +1534,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_7"; -SET SESSION debug="+d,fail_add_partition_8"; +SET SESSION debug_dbug="-d,fail_add_partition_7"; +SET SESSION debug_dbug="+d,fail_add_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1659,8 +1659,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_8"; -SET SESSION debug="+d,fail_add_partition_9"; +SET SESSION debug_dbug="-d,fail_add_partition_8"; +SET SESSION debug_dbug="+d,fail_add_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1784,8 +1784,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_9"; -SET SESSION debug="+d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_9"; +SET SESSION debug_dbug="+d,fail_add_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1909,9 +1909,9 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_10"; # Test DROP PARTITION -SET SESSION debug="+d,crash_drop_partition_1"; +SET SESSION debug_dbug="+d,crash_drop_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -1974,8 +1974,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_1"; -SET SESSION debug="+d,crash_drop_partition_2"; +SET SESSION debug_dbug="-d,crash_drop_partition_1"; +SET SESSION debug_dbug="+d,crash_drop_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2040,8 +2040,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_2"; -SET SESSION debug="+d,crash_drop_partition_3"; +SET SESSION debug_dbug="-d,crash_drop_partition_2"; +SET SESSION debug_dbug="+d,crash_drop_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2106,8 +2106,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_3"; -SET SESSION debug="+d,crash_drop_partition_4"; +SET SESSION debug_dbug="-d,crash_drop_partition_3"; +SET SESSION debug_dbug="+d,crash_drop_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2166,8 +2166,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_4"; -SET SESSION debug="+d,crash_drop_partition_5"; +SET SESSION debug_dbug="-d,crash_drop_partition_4"; +SET SESSION debug_dbug="+d,crash_drop_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2226,8 +2226,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_5"; -SET SESSION debug="+d,crash_drop_partition_6"; +SET SESSION debug_dbug="-d,crash_drop_partition_5"; +SET SESSION debug_dbug="+d,crash_drop_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2286,8 +2286,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_6"; -SET SESSION debug="+d,crash_drop_partition_7"; +SET SESSION debug_dbug="-d,crash_drop_partition_6"; +SET SESSION debug_dbug="+d,crash_drop_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2344,8 +2344,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_7"; -SET SESSION debug="+d,crash_drop_partition_8"; +SET SESSION debug_dbug="-d,crash_drop_partition_7"; +SET SESSION debug_dbug="+d,crash_drop_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2401,8 +2401,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_8"; -SET SESSION debug="+d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_8"; +SET SESSION debug_dbug="+d,crash_drop_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2458,9 +2458,9 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_9"; # Error recovery DROP PARTITION -SET SESSION debug="+d,fail_drop_partition_1"; +SET SESSION debug_dbug="+d,fail_drop_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2578,8 +2578,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_1"; -SET SESSION debug="+d,fail_drop_partition_2"; +SET SESSION debug_dbug="-d,fail_drop_partition_1"; +SET SESSION debug_dbug="+d,fail_drop_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2697,8 +2697,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_2"; -SET SESSION debug="+d,fail_drop_partition_3"; +SET SESSION debug_dbug="-d,fail_drop_partition_2"; +SET SESSION debug_dbug="+d,fail_drop_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2816,8 +2816,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_3"; -SET SESSION debug="+d,fail_drop_partition_4"; +SET SESSION debug_dbug="-d,fail_drop_partition_3"; +SET SESSION debug_dbug="+d,fail_drop_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -2923,8 +2923,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_4"; -SET SESSION debug="+d,fail_drop_partition_5"; +SET SESSION debug_dbug="-d,fail_drop_partition_4"; +SET SESSION debug_dbug="+d,fail_drop_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3030,8 +3030,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_5"; -SET SESSION debug="+d,fail_drop_partition_6"; +SET SESSION debug_dbug="-d,fail_drop_partition_5"; +SET SESSION debug_dbug="+d,fail_drop_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3137,8 +3137,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_6"; -SET SESSION debug="+d,fail_drop_partition_7"; +SET SESSION debug_dbug="-d,fail_drop_partition_6"; +SET SESSION debug_dbug="+d,fail_drop_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3244,8 +3244,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_7"; -SET SESSION debug="+d,fail_drop_partition_8"; +SET SESSION debug_dbug="-d,fail_drop_partition_7"; +SET SESSION debug_dbug="+d,fail_drop_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3351,8 +3351,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_8"; -SET SESSION debug="+d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_8"; +SET SESSION debug_dbug="+d,fail_drop_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3458,10 +3458,10 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_9"; # Test change partition (REORGANIZE/REBUILD/COALESCE # or ADD HASH PARTITION). -SET SESSION debug="+d,crash_change_partition_1"; +SET SESSION debug_dbug="+d,crash_change_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3526,8 +3526,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_1"; -SET SESSION debug="+d,crash_change_partition_2"; +SET SESSION debug_dbug="-d,crash_change_partition_1"; +SET SESSION debug_dbug="+d,crash_change_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3594,8 +3594,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_2"; -SET SESSION debug="+d,crash_change_partition_3"; +SET SESSION debug_dbug="-d,crash_change_partition_2"; +SET SESSION debug_dbug="+d,crash_change_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3662,8 +3662,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_3"; -SET SESSION debug="+d,crash_change_partition_4"; +SET SESSION debug_dbug="-d,crash_change_partition_3"; +SET SESSION debug_dbug="+d,crash_change_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3732,8 +3732,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_4"; -SET SESSION debug="+d,crash_change_partition_5"; +SET SESSION debug_dbug="-d,crash_change_partition_4"; +SET SESSION debug_dbug="+d,crash_change_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3802,8 +3802,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_5"; -SET SESSION debug="+d,crash_change_partition_6"; +SET SESSION debug_dbug="-d,crash_change_partition_5"; +SET SESSION debug_dbug="+d,crash_change_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3874,8 +3874,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_6"; -SET SESSION debug="+d,crash_change_partition_7"; +SET SESSION debug_dbug="-d,crash_change_partition_6"; +SET SESSION debug_dbug="+d,crash_change_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -3946,8 +3946,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_7"; -SET SESSION debug="+d,crash_change_partition_8"; +SET SESSION debug_dbug="-d,crash_change_partition_7"; +SET SESSION debug_dbug="+d,crash_change_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4016,8 +4016,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_8"; -SET SESSION debug="+d,crash_change_partition_9"; +SET SESSION debug_dbug="-d,crash_change_partition_8"; +SET SESSION debug_dbug="+d,crash_change_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4086,8 +4086,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_9"; -SET SESSION debug="+d,crash_change_partition_10"; +SET SESSION debug_dbug="-d,crash_change_partition_9"; +SET SESSION debug_dbug="+d,crash_change_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4156,8 +4156,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_10"; -SET SESSION debug="+d,crash_change_partition_11"; +SET SESSION debug_dbug="-d,crash_change_partition_10"; +SET SESSION debug_dbug="+d,crash_change_partition_11"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4225,8 +4225,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_11"; -SET SESSION debug="+d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_11"; +SET SESSION debug_dbug="+d,crash_change_partition_12"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4294,10 +4294,10 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_12"; # Error recovery change partition (REORGANIZE/REBUILD/COALESCE # or ADD HASH PARTITION). -SET SESSION debug="+d,fail_change_partition_1"; +SET SESSION debug_dbug="+d,fail_change_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4419,8 +4419,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_1"; -SET SESSION debug="+d,fail_change_partition_2"; +SET SESSION debug_dbug="-d,fail_change_partition_1"; +SET SESSION debug_dbug="+d,fail_change_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4542,8 +4542,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_2"; -SET SESSION debug="+d,fail_change_partition_3"; +SET SESSION debug_dbug="-d,fail_change_partition_2"; +SET SESSION debug_dbug="+d,fail_change_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4665,8 +4665,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_3"; -SET SESSION debug="+d,fail_change_partition_4"; +SET SESSION debug_dbug="-d,fail_change_partition_3"; +SET SESSION debug_dbug="+d,fail_change_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4788,8 +4788,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_4"; -SET SESSION debug="+d,fail_change_partition_5"; +SET SESSION debug_dbug="-d,fail_change_partition_4"; +SET SESSION debug_dbug="+d,fail_change_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -4911,8 +4911,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_5"; -SET SESSION debug="+d,fail_change_partition_6"; +SET SESSION debug_dbug="-d,fail_change_partition_5"; +SET SESSION debug_dbug="+d,fail_change_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5038,8 +5038,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_6"; -SET SESSION debug="+d,fail_change_partition_7"; +SET SESSION debug_dbug="-d,fail_change_partition_6"; +SET SESSION debug_dbug="+d,fail_change_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5165,8 +5165,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_7"; -SET SESSION debug="+d,fail_change_partition_8"; +SET SESSION debug_dbug="-d,fail_change_partition_7"; +SET SESSION debug_dbug="+d,fail_change_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5292,8 +5292,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_8"; -SET SESSION debug="+d,fail_change_partition_9"; +SET SESSION debug_dbug="-d,fail_change_partition_8"; +SET SESSION debug_dbug="+d,fail_change_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5419,8 +5419,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_9"; -SET SESSION debug="+d,fail_change_partition_10"; +SET SESSION debug_dbug="-d,fail_change_partition_9"; +SET SESSION debug_dbug="+d,fail_change_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5546,8 +5546,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_10"; -SET SESSION debug="+d,fail_change_partition_11"; +SET SESSION debug_dbug="-d,fail_change_partition_10"; +SET SESSION debug_dbug="+d,fail_change_partition_11"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5673,8 +5673,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_11"; -SET SESSION debug="+d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_11"; +SET SESSION debug_dbug="+d,fail_change_partition_12"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'InnoDB' PARTITION BY LIST (a) @@ -5800,4 +5800,4 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_12"; diff --git a/mysql-test/suite/parts/r/partition_debug_myisam.result b/mysql-test/suite/parts/r/partition_debug_myisam.result index ca3dd708972..ebd470ad6e1 100644 --- a/mysql-test/suite/parts/r/partition_debug_myisam.result +++ b/mysql-test/suite/parts/r/partition_debug_myisam.result @@ -8,7 +8,7 @@ DROP TABLE IF EXISTS t1; # Extended crash recovery testing of fast_alter_partition_table. call mtr.add_suppression("Attempting backtrace. You can use the following information to find out"); # Crash testing ADD PARTITION -SET SESSION debug="+d,crash_add_partition_1"; +SET SESSION debug_dbug="+d,crash_add_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -78,8 +78,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_1"; -SET SESSION debug="+d,crash_add_partition_2"; +SET SESSION debug_dbug="-d,crash_add_partition_1"; +SET SESSION debug_dbug="+d,crash_add_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -151,8 +151,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_2"; -SET SESSION debug="+d,crash_add_partition_3"; +SET SESSION debug_dbug="-d,crash_add_partition_2"; +SET SESSION debug_dbug="+d,crash_add_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -224,8 +224,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_3"; -SET SESSION debug="+d,crash_add_partition_4"; +SET SESSION debug_dbug="-d,crash_add_partition_3"; +SET SESSION debug_dbug="+d,crash_add_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -297,8 +297,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_4"; -SET SESSION debug="+d,crash_add_partition_5"; +SET SESSION debug_dbug="-d,crash_add_partition_4"; +SET SESSION debug_dbug="+d,crash_add_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -372,8 +372,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_5"; -SET SESSION debug="+d,crash_add_partition_6"; +SET SESSION debug_dbug="-d,crash_add_partition_5"; +SET SESSION debug_dbug="+d,crash_add_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -447,8 +447,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_6"; -SET SESSION debug="+d,crash_add_partition_7"; +SET SESSION debug_dbug="-d,crash_add_partition_6"; +SET SESSION debug_dbug="+d,crash_add_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -522,8 +522,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_7"; -SET SESSION debug="+d,crash_add_partition_8"; +SET SESSION debug_dbug="-d,crash_add_partition_7"; +SET SESSION debug_dbug="+d,crash_add_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -600,8 +600,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_8"; -SET SESSION debug="+d,crash_add_partition_9"; +SET SESSION debug_dbug="-d,crash_add_partition_8"; +SET SESSION debug_dbug="+d,crash_add_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -676,8 +676,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_9"; -SET SESSION debug="+d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_9"; +SET SESSION debug_dbug="+d,crash_add_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -752,9 +752,9 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_add_partition_10"; +SET SESSION debug_dbug="-d,crash_add_partition_10"; # Error recovery testing ADD PARTITION -SET SESSION debug="+d,fail_add_partition_1"; +SET SESSION debug_dbug="+d,fail_add_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -882,8 +882,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_1"; -SET SESSION debug="+d,fail_add_partition_2"; +SET SESSION debug_dbug="-d,fail_add_partition_1"; +SET SESSION debug_dbug="+d,fail_add_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1011,8 +1011,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_2"; -SET SESSION debug="+d,fail_add_partition_3"; +SET SESSION debug_dbug="-d,fail_add_partition_2"; +SET SESSION debug_dbug="+d,fail_add_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1140,8 +1140,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_3"; -SET SESSION debug="+d,fail_add_partition_4"; +SET SESSION debug_dbug="-d,fail_add_partition_3"; +SET SESSION debug_dbug="+d,fail_add_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1269,8 +1269,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_4"; -SET SESSION debug="+d,fail_add_partition_5"; +SET SESSION debug_dbug="-d,fail_add_partition_4"; +SET SESSION debug_dbug="+d,fail_add_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1398,8 +1398,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_5"; -SET SESSION debug="+d,fail_add_partition_6"; +SET SESSION debug_dbug="-d,fail_add_partition_5"; +SET SESSION debug_dbug="+d,fail_add_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1527,8 +1527,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_6"; -SET SESSION debug="+d,fail_add_partition_7"; +SET SESSION debug_dbug="-d,fail_add_partition_6"; +SET SESSION debug_dbug="+d,fail_add_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1656,8 +1656,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_7"; -SET SESSION debug="+d,fail_add_partition_8"; +SET SESSION debug_dbug="-d,fail_add_partition_7"; +SET SESSION debug_dbug="+d,fail_add_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1791,8 +1791,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_8"; -SET SESSION debug="+d,fail_add_partition_9"; +SET SESSION debug_dbug="-d,fail_add_partition_8"; +SET SESSION debug_dbug="+d,fail_add_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -1926,8 +1926,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_9"; -SET SESSION debug="+d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_9"; +SET SESSION debug_dbug="+d,fail_add_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2061,9 +2061,9 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_add_partition_10"; +SET SESSION debug_dbug="-d,fail_add_partition_10"; # Test DROP PARTITION -SET SESSION debug="+d,crash_drop_partition_1"; +SET SESSION debug_dbug="+d,crash_drop_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2132,8 +2132,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_1"; -SET SESSION debug="+d,crash_drop_partition_2"; +SET SESSION debug_dbug="-d,crash_drop_partition_1"; +SET SESSION debug_dbug="+d,crash_drop_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2204,8 +2204,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_2"; -SET SESSION debug="+d,crash_drop_partition_3"; +SET SESSION debug_dbug="-d,crash_drop_partition_2"; +SET SESSION debug_dbug="+d,crash_drop_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2276,8 +2276,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_3"; -SET SESSION debug="+d,crash_drop_partition_4"; +SET SESSION debug_dbug="-d,crash_drop_partition_3"; +SET SESSION debug_dbug="+d,crash_drop_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2341,8 +2341,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_4"; -SET SESSION debug="+d,crash_drop_partition_5"; +SET SESSION debug_dbug="-d,crash_drop_partition_4"; +SET SESSION debug_dbug="+d,crash_drop_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2406,8 +2406,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_5"; -SET SESSION debug="+d,crash_drop_partition_6"; +SET SESSION debug_dbug="-d,crash_drop_partition_5"; +SET SESSION debug_dbug="+d,crash_drop_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2471,8 +2471,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_6"; -SET SESSION debug="+d,crash_drop_partition_7"; +SET SESSION debug_dbug="-d,crash_drop_partition_6"; +SET SESSION debug_dbug="+d,crash_drop_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2534,8 +2534,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_7"; -SET SESSION debug="+d,crash_drop_partition_8"; +SET SESSION debug_dbug="-d,crash_drop_partition_7"; +SET SESSION debug_dbug="+d,crash_drop_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2595,8 +2595,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_8"; -SET SESSION debug="+d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_8"; +SET SESSION debug_dbug="+d,crash_drop_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2656,9 +2656,9 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_drop_partition_9"; +SET SESSION debug_dbug="-d,crash_drop_partition_9"; # Error recovery DROP PARTITION -SET SESSION debug="+d,fail_drop_partition_1"; +SET SESSION debug_dbug="+d,fail_drop_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2784,8 +2784,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_1"; -SET SESSION debug="+d,fail_drop_partition_2"; +SET SESSION debug_dbug="-d,fail_drop_partition_1"; +SET SESSION debug_dbug="+d,fail_drop_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -2911,8 +2911,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_2"; -SET SESSION debug="+d,fail_drop_partition_3"; +SET SESSION debug_dbug="-d,fail_drop_partition_2"; +SET SESSION debug_dbug="+d,fail_drop_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3038,8 +3038,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_3"; -SET SESSION debug="+d,fail_drop_partition_4"; +SET SESSION debug_dbug="-d,fail_drop_partition_3"; +SET SESSION debug_dbug="+d,fail_drop_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3151,8 +3151,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_4"; -SET SESSION debug="+d,fail_drop_partition_5"; +SET SESSION debug_dbug="-d,fail_drop_partition_4"; +SET SESSION debug_dbug="+d,fail_drop_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3264,8 +3264,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_5"; -SET SESSION debug="+d,fail_drop_partition_6"; +SET SESSION debug_dbug="-d,fail_drop_partition_5"; +SET SESSION debug_dbug="+d,fail_drop_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3377,8 +3377,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_6"; -SET SESSION debug="+d,fail_drop_partition_7"; +SET SESSION debug_dbug="-d,fail_drop_partition_6"; +SET SESSION debug_dbug="+d,fail_drop_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3490,8 +3490,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_7"; -SET SESSION debug="+d,fail_drop_partition_8"; +SET SESSION debug_dbug="-d,fail_drop_partition_7"; +SET SESSION debug_dbug="+d,fail_drop_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3603,8 +3603,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_8"; -SET SESSION debug="+d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_8"; +SET SESSION debug_dbug="+d,fail_drop_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3716,10 +3716,10 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_drop_partition_9"; +SET SESSION debug_dbug="-d,fail_drop_partition_9"; # Test change partition (REORGANIZE/REBUILD/COALESCE # or ADD HASH PARTITION). -SET SESSION debug="+d,crash_change_partition_1"; +SET SESSION debug_dbug="+d,crash_change_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3790,8 +3790,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_1"; -SET SESSION debug="+d,crash_change_partition_2"; +SET SESSION debug_dbug="-d,crash_change_partition_1"; +SET SESSION debug_dbug="+d,crash_change_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3864,8 +3864,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_2"; -SET SESSION debug="+d,crash_change_partition_3"; +SET SESSION debug_dbug="-d,crash_change_partition_2"; +SET SESSION debug_dbug="+d,crash_change_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -3938,8 +3938,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_3"; -SET SESSION debug="+d,crash_change_partition_4"; +SET SESSION debug_dbug="-d,crash_change_partition_3"; +SET SESSION debug_dbug="+d,crash_change_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4016,8 +4016,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_4"; -SET SESSION debug="+d,crash_change_partition_5"; +SET SESSION debug_dbug="-d,crash_change_partition_4"; +SET SESSION debug_dbug="+d,crash_change_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4094,8 +4094,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_5"; -SET SESSION debug="+d,crash_change_partition_6"; +SET SESSION debug_dbug="-d,crash_change_partition_5"; +SET SESSION debug_dbug="+d,crash_change_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4175,8 +4175,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_6"; -SET SESSION debug="+d,crash_change_partition_7"; +SET SESSION debug_dbug="-d,crash_change_partition_6"; +SET SESSION debug_dbug="+d,crash_change_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4256,8 +4256,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_7"; -SET SESSION debug="+d,crash_change_partition_8"; +SET SESSION debug_dbug="-d,crash_change_partition_7"; +SET SESSION debug_dbug="+d,crash_change_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4335,8 +4335,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_8"; -SET SESSION debug="+d,crash_change_partition_9"; +SET SESSION debug_dbug="-d,crash_change_partition_8"; +SET SESSION debug_dbug="+d,crash_change_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4414,8 +4414,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_9"; -SET SESSION debug="+d,crash_change_partition_10"; +SET SESSION debug_dbug="-d,crash_change_partition_9"; +SET SESSION debug_dbug="+d,crash_change_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4493,8 +4493,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_10"; -SET SESSION debug="+d,crash_change_partition_11"; +SET SESSION debug_dbug="-d,crash_change_partition_10"; +SET SESSION debug_dbug="+d,crash_change_partition_11"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4570,8 +4570,8 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_11"; -SET SESSION debug="+d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_11"; +SET SESSION debug_dbug="+d,crash_change_partition_12"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4647,10 +4647,10 @@ a b 3 Original from partition p0 4 Original from partition p0 DROP TABLE t1; -SET SESSION debug="-d,crash_change_partition_12"; +SET SESSION debug_dbug="-d,crash_change_partition_12"; # Error recovery change partition (REORGANIZE/REBUILD/COALESCE # or ADD HASH PARTITION). -SET SESSION debug="+d,fail_change_partition_1"; +SET SESSION debug_dbug="+d,fail_change_partition_1"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4780,8 +4780,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_1"; -SET SESSION debug="+d,fail_change_partition_2"; +SET SESSION debug_dbug="-d,fail_change_partition_1"; +SET SESSION debug_dbug="+d,fail_change_partition_2"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -4911,8 +4911,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_2"; -SET SESSION debug="+d,fail_change_partition_3"; +SET SESSION debug_dbug="-d,fail_change_partition_2"; +SET SESSION debug_dbug="+d,fail_change_partition_3"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5042,8 +5042,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_3"; -SET SESSION debug="+d,fail_change_partition_4"; +SET SESSION debug_dbug="-d,fail_change_partition_3"; +SET SESSION debug_dbug="+d,fail_change_partition_4"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5173,8 +5173,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_4"; -SET SESSION debug="+d,fail_change_partition_5"; +SET SESSION debug_dbug="-d,fail_change_partition_4"; +SET SESSION debug_dbug="+d,fail_change_partition_5"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5304,8 +5304,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_5"; -SET SESSION debug="+d,fail_change_partition_6"; +SET SESSION debug_dbug="-d,fail_change_partition_5"; +SET SESSION debug_dbug="+d,fail_change_partition_6"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5441,8 +5441,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_6"; -SET SESSION debug="+d,fail_change_partition_7"; +SET SESSION debug_dbug="-d,fail_change_partition_6"; +SET SESSION debug_dbug="+d,fail_change_partition_7"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5578,8 +5578,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_7"; -SET SESSION debug="+d,fail_change_partition_8"; +SET SESSION debug_dbug="-d,fail_change_partition_7"; +SET SESSION debug_dbug="+d,fail_change_partition_8"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5715,8 +5715,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_8"; -SET SESSION debug="+d,fail_change_partition_9"; +SET SESSION debug_dbug="-d,fail_change_partition_8"; +SET SESSION debug_dbug="+d,fail_change_partition_9"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5852,8 +5852,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_9"; -SET SESSION debug="+d,fail_change_partition_10"; +SET SESSION debug_dbug="-d,fail_change_partition_9"; +SET SESSION debug_dbug="+d,fail_change_partition_10"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -5989,8 +5989,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_10"; -SET SESSION debug="+d,fail_change_partition_11"; +SET SESSION debug_dbug="-d,fail_change_partition_10"; +SET SESSION debug_dbug="+d,fail_change_partition_11"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -6126,8 +6126,8 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_11"; -SET SESSION debug="+d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_11"; +SET SESSION debug_dbug="+d,fail_change_partition_12"; CREATE TABLE t1 (a INT, b VARCHAR(64)) ENGINE = 'MyISAM' PARTITION BY LIST (a) @@ -6263,4 +6263,4 @@ a b 4 Original from partition p0 UNLOCK TABLES; DROP TABLE t1; -SET SESSION debug="-d,fail_change_partition_12"; +SET SESSION debug_dbug="-d,fail_change_partition_12"; diff --git a/mysql-test/suite/pbxt/r/mysqlshow.result b/mysql-test/suite/pbxt/r/mysqlshow.result index b378b972410..a8bd5904600 100644 --- a/mysql-test/suite/pbxt/r/mysqlshow.result +++ b/mysql-test/suite/pbxt/r/mysqlshow.result @@ -114,29 +114,29 @@ Database: information_schema | USER_PRIVILEGES | | USER_STATISTICS | | VIEWS | -| INNODB_SYS_COLUMNS | +| INNODB_CMPMEM_RESET | +| PBXT_STATISTICS | +| INNODB_CMPMEM | | INNODB_RSEG | -| INNODB_CMP | -| INNODB_TRX | | INNODB_SYS_TABLESTATS | | INNODB_LOCK_WAITS | -| INNODB_BUFFER_POOL_PAGES_INDEX | -| INNODB_LOCKS | +| INNODB_INDEX_STATS | +| INNODB_CMP | | INNODB_SYS_FOREIGN_COLS | | INNODB_CMP_RESET | | INNODB_BUFFER_POOL_PAGES | -| INNODB_SYS_TABLES | -| PBXT_STATISTICS | -| INNODB_CMPMEM | +| INNODB_TRX | +| INNODB_BUFFER_POOL_PAGES_INDEX | +| INNODB_LOCKS | | INNODB_BUFFER_POOL_PAGES_BLOB | -| INNODB_CMPMEM_RESET | +| INNODB_SYS_TABLES | | INNODB_SYS_FIELDS | -| INNODB_TABLE_STATS | +| INNODB_SYS_COLUMNS | +| INNODB_SYS_STATS | | INNODB_SYS_FOREIGN | | INNODB_SYS_INDEXES | -| INNODB_INDEX_STATS | | XTRADB_ADMIN_COMMAND | -| INNODB_SYS_STATS | +| INNODB_TABLE_STATS | +---------------------------------------+ Database: INFORMATION_SCHEMA +---------------------------------------+ @@ -177,29 +177,29 @@ Database: INFORMATION_SCHEMA | USER_PRIVILEGES | | USER_STATISTICS | | VIEWS | -| INNODB_SYS_COLUMNS | +| INNODB_CMPMEM_RESET | +| PBXT_STATISTICS | +| INNODB_CMPMEM | | INNODB_RSEG | -| INNODB_CMP | -| INNODB_TRX | | INNODB_SYS_TABLESTATS | | INNODB_LOCK_WAITS | -| INNODB_BUFFER_POOL_PAGES_INDEX | -| INNODB_LOCKS | +| INNODB_INDEX_STATS | +| INNODB_CMP | | INNODB_SYS_FOREIGN_COLS | | INNODB_CMP_RESET | | INNODB_BUFFER_POOL_PAGES | -| INNODB_SYS_TABLES | -| PBXT_STATISTICS | -| INNODB_CMPMEM | +| INNODB_TRX | +| INNODB_BUFFER_POOL_PAGES_INDEX | +| INNODB_LOCKS | | INNODB_BUFFER_POOL_PAGES_BLOB | -| INNODB_CMPMEM_RESET | +| INNODB_SYS_TABLES | | INNODB_SYS_FIELDS | -| INNODB_TABLE_STATS | +| INNODB_SYS_COLUMNS | +| INNODB_SYS_STATS | | INNODB_SYS_FOREIGN | | INNODB_SYS_INDEXES | -| INNODB_INDEX_STATS | | XTRADB_ADMIN_COMMAND | -| INNODB_SYS_STATS | +| INNODB_TABLE_STATS | +---------------------------------------+ Wildcard: inf_rmation_schema +--------------------+ diff --git a/mysql-test/suite/rpl/r/rpl_binlog_errors.result b/mysql-test/suite/rpl/r/rpl_binlog_errors.result index d965686a34f..ddafbca0672 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result @@ -20,7 +20,7 @@ master-bin.000001 # master-bin.000002 # ###################### TEST #2 RESET MASTER; -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; FLUSH LOGS; ERROR HY000: Can't generate a unique log-filename master-bin.(1-999) @@ -28,7 +28,7 @@ ERROR HY000: Can't generate a unique log-filename master-bin.(1-999) show binary logs; Log_name File_size master-bin.000001 # -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; RESET MASTER; ###################### TEST #3 CREATE TABLE t1 (a INT); @@ -42,11 +42,11 @@ show binary logs; Log_name File_size master-bin.000001 # master-bin.000002 # -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; DELETE FROM t2; RESET MASTER; ###################### TEST #4 -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2; ERROR HY000: Can't generate a unique log-filename master-bin.(1-999) @@ -54,21 +54,21 @@ ERROR HY000: Can't generate a unique log-filename master-bin.(1-999) SELECT count(*) FROM t2; count(*) 1 -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; DELETE FROM t2; RESET MASTER; ###################### TEST #5 -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166-2.data' INTO TABLE t2; # assert: must show one entry SELECT count(*) FROM t2; count(*) 1 -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; DELETE FROM t2; RESET MASTER; ###################### TEST #6 -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; SET AUTOCOMMIT=0; INSERT INTO t2 VALUES ('muse'); LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2; @@ -81,11 +81,11 @@ SELECT count(*) FROM t2; count(*) 3 SET AUTOCOMMIT= 1; -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; DELETE FROM t2; RESET MASTER; ###################### TEST #7 -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; SELECT count(*) FROM t4; count(*) 0 @@ -97,14 +97,14 @@ SELECT count(*) FROM t4; count(*) 1 ### check that the incident event is written to the current log -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; show binlog events from limit 4,1; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Incident # # #1 (LOST_EVENTS) DELETE FROM t4; RESET MASTER; ###################### TEST #8 -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; # must show 0 entries SELECT count(*) FROM t4; count(*) @@ -144,9 +144,9 @@ count(*) SELECT count(*) FROM t2; count(*) 0 -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; ###################### TEST #9 -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; SET SQL_LOG_BIN=0; INSERT INTO t2 VALUES ('aaa'), ('bbb'), ('ccc'), ('ddd'); INSERT INTO t4 VALUES ('eee'), ('fff'), ('ggg'), ('hhh'); @@ -167,17 +167,17 @@ SELECT count(*) FROM t4; count(*) 0 SET SQL_LOG_BIN=1; -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; ###################### TEST #10 call mtr.add_suppression("MSYQL_BIN_LOG::open failed to sync the index file."); call mtr.add_suppression("Could not open .*"); RESET MASTER; SHOW WARNINGS; Level Code Message -SET GLOBAL debug="+d,fault_injection_registering_index"; +SET GLOBAL debug_dbug="+d,fault_injection_registering_index"; FLUSH LOGS; ERROR HY000: Can't open file: 'master-bin.000002' (errno: 1) -SET GLOBAL debug="-d,fault_injection_registering_index"; +SET GLOBAL debug_dbug="-d,fault_injection_registering_index"; SHOW BINARY LOGS; ERROR HY000: You are not using binary logging CREATE TABLE t5 (a INT); @@ -188,10 +188,10 @@ DELETE FROM t2; DROP TABLE t5; ###################### TEST #11 include/rpl_restart_server.inc [server_number=1] -SET GLOBAL debug="+d,fault_injection_openning_index"; +SET GLOBAL debug_dbug="+d,fault_injection_openning_index"; FLUSH LOGS; ERROR HY000: Can't open file: 'master-bin.index' (errno: 1) -SET GLOBAL debug="-d,fault_injection_openning_index"; +SET GLOBAL debug_dbug="-d,fault_injection_openning_index"; RESET MASTER; ERROR HY000: Binlog closed, cannot RESET MASTER CREATE TABLE t5 (a INT); @@ -202,10 +202,10 @@ DELETE FROM t2; DROP TABLE t5; include/rpl_restart_server.inc [server_number=1] ###################### TEST #12 -SET GLOBAL debug="+d,fault_injection_new_file_rotate_event"; +SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event"; FLUSH LOGS; ERROR HY000: Can't open file: 'master-bin' (errno: 2) -SET GLOBAL debug="-d,fault_injection_new_file_rotate_event"; +SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event"; RESET MASTER; ERROR HY000: Binlog closed, cannot RESET MASTER CREATE TABLE t5 (a INT); @@ -215,7 +215,7 @@ DELETE FROM t4; DELETE FROM t2; DROP TABLE t5; include/rpl_restart_server.inc [server_number=1] -SET GLOBAL debug= @old_debug; +SET GLOBAL debug_dbug= @old_debug; DROP TABLE t1, t2, t4; RESET MASTER; include/start_slave.inc @@ -231,47 +231,47 @@ call mtr.add_suppression("Can't generate a unique log-filename .*"); ###################### TEST #13 SET @old_debug=@@global.debug; include/stop_slave.inc -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; START SLAVE io_thread; include/wait_for_slave_io_error.inc [errno=1595] Last_IO_Error = 'Relay log write failure: could not queue event from master' -SET GLOBAL debug="-d,error_unique_log_filename"; -SET GLOBAL debug=@old_debug; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug=@old_debug; include/rpl_restart_server.inc [server_number=2] ###################### TEST #14 SET @old_debug=@@global.debug; include/stop_slave.inc -SET GLOBAL debug="+d,fault_injection_new_file_rotate_event"; +SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event"; START SLAVE io_thread; include/wait_for_slave_io_error.inc [errno=1595] Last_IO_Error = 'Relay log write failure: could not queue event from master' -SET GLOBAL debug="-d,fault_injection_new_file_rotate_event"; -SET GLOBAL debug=@old_debug; +SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event"; +SET GLOBAL debug_dbug=@old_debug; include/rpl_restart_server.inc [server_number=2] ###################### TEST #15 SET @old_debug=@@global.debug; include/stop_slave.inc -SET GLOBAL debug="+d,fault_injection_registering_index"; +SET GLOBAL debug_dbug="+d,fault_injection_registering_index"; START SLAVE io_thread; include/wait_for_slave_io_error.inc [errno=1595] Last_IO_Error = 'Relay log write failure: could not queue event from master' -SET GLOBAL debug="-d,fault_injection_registering_index"; -SET GLOBAL debug=@old_debug; +SET GLOBAL debug_dbug="-d,fault_injection_registering_index"; +SET GLOBAL debug_dbug=@old_debug; include/rpl_restart_server.inc [server_number=2] ###################### TEST #16 SET @old_debug=@@global.debug; include/stop_slave.inc -SET GLOBAL debug="+d,fault_injection_openning_index"; +SET GLOBAL debug_dbug="+d,fault_injection_openning_index"; START SLAVE io_thread; include/wait_for_slave_io_error.inc [errno=1595] Last_IO_Error = 'Relay log write failure: could not queue event from master' -SET GLOBAL debug="-d,fault_injection_openning_index"; -SET GLOBAL debug=@old_debug; +SET GLOBAL debug_dbug="-d,fault_injection_openning_index"; +SET GLOBAL debug_dbug=@old_debug; include/rpl_restart_server.inc [server_number=2] include/stop_slave_sql.inc Warnings: Note 1255 Slave already has been stopped -SET GLOBAL debug=@old_debug; +SET GLOBAL debug_dbug=@old_debug; RESET SLAVE; RESET MASTER; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_bug26395.result b/mysql-test/suite/rpl/r/rpl_bug26395.result index a3725f34a55..37ad6705106 100644 --- a/mysql-test/suite/rpl/r/rpl_bug26395.result +++ b/mysql-test/suite/rpl/r/rpl_bug26395.result @@ -9,7 +9,7 @@ tinnodb CREATE TABLE `tinnodb` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 set @old_debug= @@debug; -set @@debug= 'd,do_not_write_xid'; +set @@debug_dbug= 'd,do_not_write_xid'; ==== Test ==== INSERT INTO tinnodb VALUES (1); SELECT * FROM tinnodb ORDER BY a; @@ -33,7 +33,7 @@ a ==== Clean up ==== [on master] DROP TABLE tinnodb; -set @@debug= @old_debug; +set @@debug_dbug= @old_debug; [on slave] DROP TABLE tinnodb; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_bug33931.result b/mysql-test/suite/rpl/r/rpl_bug33931.result index ce8b6b169c7..e72b966ef6a 100644 --- a/mysql-test/suite/rpl/r/rpl_bug33931.result +++ b/mysql-test/suite/rpl/r/rpl_bug33931.result @@ -4,10 +4,10 @@ call mtr.add_suppression("Failed during slave I/O thread initialization"); call mtr.add_suppression("Slave SQL.*Failed during slave thread initialization.* 1593"); include/stop_slave.inc reset slave; -SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; +SET GLOBAL debug_dbug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; start slave; include/wait_for_slave_sql_error.inc [errno=1593] Last_SQL_Error = 'Failed during slave thread initialization' -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; RESET SLAVE; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_bug41902.result b/mysql-test/suite/rpl/r/rpl_bug41902.result index 5331d4334fa..026a92d854b 100644 --- a/mysql-test/suite/rpl/r/rpl_bug41902.result +++ b/mysql-test/suite/rpl/r/rpl_bug41902.result @@ -1,31 +1,31 @@ include/master-slave.inc [connection master] stop slave; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; reset slave; ERROR HY000: Target log not found in binlog index show warnings; Level Code Message Error 1373 Target log not found in binlog index Error 1371 Failed purging old relay logs: Failed during log reset -SET @@debug=""; +SET @@debug_dbug=""; reset slave; change master to master_host='dummy'; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; change master to master_host='dummy'; ERROR HY000: Target log not found in binlog index -SET @@debug=""; +SET @@debug_dbug=""; reset slave; change master to master_host='dummy'; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; reset master; ERROR HY000: Target log not found in binlog index -SET @@debug=""; +SET @@debug_dbug=""; reset master; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; purge binary logs to 'master-bin.000001'; ERROR HY000: Target log not found in binlog index -SET @@debug=""; +SET @@debug_dbug=""; purge binary logs to 'master-bin.000001'; ==== clean up ==== CHANGE MASTER TO MASTER_HOST = '127.0.0.1'; diff --git a/mysql-test/suite/rpl/r/rpl_checksum.result b/mysql-test/suite/rpl/r/rpl_checksum.result index b6b1210f05f..3297e8c2754 100644 --- a/mysql-test/suite/rpl/r/rpl_checksum.result +++ b/mysql-test/suite/rpl/r/rpl_checksum.result @@ -68,36 +68,36 @@ zero include/stop_slave.inc set @@global.binlog_checksum = CRC32; insert into t1 values (1) /* will not be applied on slave due to simulation */; -set @@global.debug='d,simulate_slave_unaware_checksum'; +set @@global.debug_dbug='d,simulate_slave_unaware_checksum'; start slave; include/wait_for_slave_io_error.inc [errno=1236] Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Slave can not handle replication events with the checksum that master is configured to log; the last event was read from 'master-bin.000010' at 245, the last byte read was read from 'master-bin.000010' at 245.'' select count(*) as zero from t1; zero 0 -set @@global.debug=''; +set @@global.debug_dbug=''; include/start_slave.inc set @@global.master_verify_checksum = 1; -set @@session.debug='d,simulate_checksum_test_failure'; +set @@session.debug_dbug='d,simulate_checksum_test_failure'; show binlog events; ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error -set @@session.debug=''; +set @@session.debug_dbug=''; set @@global.master_verify_checksum = default; include/stop_slave.inc create table t2 (a int); -set @@global.debug='d,simulate_checksum_test_failure'; +set @@global.debug_dbug='d,simulate_checksum_test_failure'; start slave io_thread; include/wait_for_slave_io_error.inc [errno=1595] Last_IO_Error = 'Relay log write failure: could not queue event from master' -set @@global.debug=''; +set @@global.debug_dbug=''; start slave io_thread; include/wait_for_slave_param.inc [Read_Master_Log_Pos] set @@global.slave_sql_verify_checksum = 1; -set @@global.debug='d,simulate_checksum_test_failure'; +set @@global.debug_dbug='d,simulate_checksum_test_failure'; start slave sql_thread; include/wait_for_slave_sql_error.inc [errno=1593] Last_SQL_Error = 'Error initializing relay log position: I/O error reading event at position 4' -set @@global.debug=''; +set @@global.debug_dbug=''; include/start_slave.inc select count(*) as 'must be zero' from t2; must be zero diff --git a/mysql-test/suite/rpl/r/rpl_corruption.result b/mysql-test/suite/rpl/r/rpl_corruption.result index a35bfbad92c..32ed3077c23 100644 --- a/mysql-test/suite/rpl/r/rpl_corruption.result +++ b/mysql-test/suite/rpl/r/rpl_corruption.result @@ -12,40 +12,40 @@ SET @old_master_verify_checksum = @@master_verify_checksum; CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10), c VARCHAR(100)); include/stop_slave.inc # 2. Corruption in master binlog and SHOW BINLOG EVENTS -SET GLOBAL debug="+d,corrupt_read_log_event_char"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event_char"; SHOW BINLOG EVENTS; ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error -SET GLOBAL debug="-d,corrupt_read_log_event_char"; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event_char"; # 3. Master read a corrupted event from binlog and send the error to slave -SET GLOBAL debug="+d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event2"; START SLAVE IO_THREAD; include/wait_for_slave_io_error.inc [errno=1236] -SET GLOBAL debug="-d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; # 4. Master read a corrupted event from binlog and send it to slave SET GLOBAL master_verify_checksum=0; -SET GLOBAL debug="+d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event2"; START SLAVE IO_THREAD; include/wait_for_slave_io_error.inc [errno=1595,1722] -SET GLOBAL debug="-d,corrupt_read_log_event2"; -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug= ""; SET GLOBAL master_verify_checksum=1; # 5. Slave. Corruption in network -SET GLOBAL debug="+d,corrupt_queue_event"; +SET GLOBAL debug_dbug="+d,corrupt_queue_event"; START SLAVE IO_THREAD; include/wait_for_slave_io_error.inc [errno=1595,1722] -SET GLOBAL debug="-d,corrupt_queue_event"; +SET GLOBAL debug_dbug="-d,corrupt_queue_event"; # 6. Slave. Corruption in relay log -SET GLOBAL debug="+d,corrupt_read_log_event_char"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event_char"; START SLAVE SQL_THREAD; include/wait_for_slave_sql_error.inc [errno=1593] -SET GLOBAL debug="-d,corrupt_read_log_event_char"; -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event_char"; +SET GLOBAL debug_dbug= ""; # 7. Seek diff for tables on master and slave include/start_slave.inc include/diff_tables.inc [master:test.t1, slave:test.t1] # 8. Clean up -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug= ""; SET GLOBAL master_verify_checksum = @old_master_verify_checksum; DROP TABLE t1; -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug= ""; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_init_slave_errors.result b/mysql-test/suite/rpl/r/rpl_init_slave_errors.result index a185afc5af2..57c0bb129fa 100644 --- a/mysql-test/suite/rpl/r/rpl_init_slave_errors.result +++ b/mysql-test/suite/rpl/r/rpl_init_slave_errors.result @@ -2,12 +2,12 @@ include/master-slave.inc [connection master] stop slave; reset slave; -SET GLOBAL debug= "d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; +SET GLOBAL debug_dbug= "d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; start slave; include/wait_for_slave_sql_error.inc [errno=1593] Last_SQL_Error = 'Failed during slave thread initialization' call mtr.add_suppression("Failed during slave.* thread initialization"); -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug= ""; reset slave; SET GLOBAL init_slave= "garbage"; start slave; diff --git a/mysql-test/suite/rpl/r/rpl_row_corruption.result b/mysql-test/suite/rpl/r/rpl_row_corruption.result index 7fd47a20f03..da4a1d17727 100644 --- a/mysql-test/suite/rpl/r/rpl_row_corruption.result +++ b/mysql-test/suite/rpl/r/rpl_row_corruption.result @@ -7,17 +7,17 @@ INSERT INTO t2_11753004 VALUES (2); call mtr.add_suppression(".*Found table map event mapping table id 0 which was already mapped but with different settings.*"); include/stop_slave.inc SET @save_debug= @@global.debug; -SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="+d,inject_tblmap_same_id_maps_diff_table"; include/start_slave.inc UPDATE t1_11753004, t2_11753004 SET t1_11753004.c1=3, t2_11753004.c1=4 WHERE t1_11753004.c1=1 OR t2_11753004.c1=2; include/wait_for_slave_sql_error.inc [errno=1593 ] include/stop_slave.inc -SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="-d,inject_tblmap_same_id_maps_diff_table"; include/start_slave.inc include/rpl_reset.inc DROP TABLE t1_11753004, t2_11753004; include/stop_slave.inc -SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="+d,inject_tblmap_same_id_maps_diff_table"; include/start_slave.inc include/rpl_reset.inc CREATE TABLE t1_11753004 (c1 INT); @@ -33,7 +33,7 @@ BINLOG ' SOgWTg8BAAAAbgAAAHIAAAAAAAQANS42LjMtbTUtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8= '/*!*/; -SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="+d,inject_tblmap_same_id_maps_diff_table"; BINLOG ' SOgWThMBAAAAKQAAAAYDAAAAAEIAAAAAAAEABHRlc3QAAnQxAAEDAAE= SOgWThMBAAAAKQAAAC8DAAAAAEMAAAAAAAEABHRlc3QAAnQyAAEDAAE= @@ -42,8 +42,8 @@ SOgWThgBAAAAKAAAAH8DAAAAAEMAAAAAAAEAAf///gEAAAD+BAAAAA== '/*!*/; ERROR HY000: Fatal error: Found table map event mapping table id 0 which was already mapped but with different settings. DROP TABLE t1,t2; -SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="-d,inject_tblmap_same_id_maps_diff_table"; DROP TABLE t1_11753004; DROP TABLE t2_11753004_ign; -SET GLOBAL debug= @save_debug; +SET GLOBAL debug_dbug= @save_debug; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_row_index_choice.result b/mysql-test/suite/rpl/r/rpl_row_index_choice.result index 2d955299e6e..a1d3c2d2c93 100644 --- a/mysql-test/suite/rpl/r/rpl_row_index_choice.result +++ b/mysql-test/suite/rpl/r/rpl_row_index_choice.result @@ -29,10 +29,10 @@ ANALYZE TABLE t2; Table Op Msg_type Msg_text test.t2 analyze status OK # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; UPDATE t2 SET d=10042 WHERE d=42; DELETE FROM t2 WHERE d=53; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); a b c d 4 1 5 10042 @@ -46,10 +46,10 @@ ANALYZE TABLE t2; Table Op Msg_type Msg_text test.t2 analyze status OK # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; UPDATE t2 SET d=10042 WHERE d=42; DELETE FROM t2 WHERE d=53; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); a b c d e 4 1 5 10042 NULL @@ -60,10 +60,10 @@ UNIQUE expected_key(d), KEY wrong_key6(c)) ENGINE=myisam; INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1; # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; UPDATE t2 SET d=10042 WHERE d=42; DELETE FROM t2 WHERE d=53; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); a b c d 4 1 5 10042 @@ -74,10 +74,10 @@ KEY wrong_key7(d), KEY wrong_key8(c)) ENGINE=myisam; INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1; # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; UPDATE t2 SET d=10042 WHERE d=42; DELETE FROM t2 WHERE d=53; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); a b c d 4 1 5 10042 @@ -88,10 +88,10 @@ KEY wrong_key10(a), PRIMARY KEY expected_key(c,b)) ENGINE=innodb; INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1; # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan,slave_crash_if_index_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan,slave_crash_if_index_scan"; UPDATE t2 SET d=10042 WHERE d=42; DELETE FROM t2 WHERE d=53; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); a b c d 4 1 5 10042 @@ -105,10 +105,10 @@ ANALYZE TABLE t2; Table Op Msg_type Msg_text test.t2 analyze status OK # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; UPDATE t2 SET d=10042 WHERE d=42; DELETE FROM t2 WHERE d=53; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); a b c d e 4 1 5 10042 NULL @@ -119,10 +119,10 @@ UNIQUE expected_key(e), KEY wrong_key14(c,b)) ENGINE=innodb; INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d, IF(d<10, d, NULL) FROM t1; # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; UPDATE t2 SET d=10042 WHERE d=42; DELETE FROM t2 WHERE d=53; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); a b c d e 4 1 5 10042 NULL @@ -136,5 +136,5 @@ a d 4 10042 DROP TABLE t2; DROP TABLE t1; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_show_slave_running.result b/mysql-test/suite/rpl/r/rpl_show_slave_running.result index 599290ac776..3e5e1882bd8 100644 --- a/mysql-test/suite/rpl/r/rpl_show_slave_running.result +++ b/mysql-test/suite/rpl/r/rpl_show_slave_running.result @@ -2,7 +2,7 @@ include/master-slave.inc [connection master] SET DEBUG_SYNC= 'RESET'; include/stop_slave.inc -set global debug= 'd,dbug.before_get_running_status_yes'; +set global debug_dbug= 'd,dbug.before_get_running_status_yes'; Slave_running, Slave_IO_Running, Slave_SQL_Running, must be OFF, NO, NO in three following queries SHOW STATUS LIKE 'Slave_running'; Variable_name Value @@ -32,7 +32,7 @@ Variable_name Value Slave_running ON Slave_IO_Running= Yes Slave_SQL_Running= Yes -set global debug= ''; +set global debug_dbug= ''; SET DEBUG_SYNC= 'RESET'; End of tests include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result index e08c066d226..0abae0bff28 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result +++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result @@ -1,6 +1,6 @@ include/master-slave.inc [connection master] -SET @@GLOBAL.DEBUG = '+d,remove_slave_load_file_before_write'; +SET @@global.debug_dbug= '+d,remove_slave_load_file_before_write'; create table t1(a int not null auto_increment, b int, primary key(a)) engine=innodb; start transaction; insert into t1(b) values (1); @@ -17,5 +17,5 @@ call mtr.add_suppression("Slave: Can't get stat of .*"); call mtr.add_suppression("Slave SQL: Error .Can.t get stat of.* Error_code: 13"); call mtr.add_suppression("Slave: File.* not found.*"); call mtr.add_suppression("Slave SQL: Error .File.* not found.* Error_code: 29"); -SET @@GLOBAL.DEBUG = ''; +SET @@global.debug_dbug= ''; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result b/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result index 0b3233437aa..e72d8a53a42 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result +++ b/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result @@ -4,7 +4,7 @@ SET @@session.binlog_direct_non_transactional_updates= FALSE; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); create table tm (a int auto_increment primary key) engine=myisam; create table ti (a int auto_increment primary key) engine=innodb; -set @@global.debug="+d,stop_slave_middle_group"; +set @@global.debug_dbug="+d,stop_slave_middle_group"; begin; insert into ti set a=null; insert into tm set a=null; @@ -23,12 +23,12 @@ one select count(*) as one from ti; one 1 -set @@global.debug="-d"; +set @@global.debug_dbug="-d"; include/start_slave.inc truncate table tm; truncate table ti; -set @@global.debug="+d,stop_slave_middle_group"; -set @@global.debug="+d,incomplete_group_in_relay_log"; +set @@global.debug_dbug="+d,stop_slave_middle_group"; +set @@global.debug_dbug="+d,incomplete_group_in_relay_log"; begin; insert into ti set a=null; insert into tm set a=null; @@ -45,12 +45,12 @@ one select count(*) as zero from ti; zero 0 -set @@global.debug="-d"; +set @@global.debug_dbug="-d"; stop slave; truncate table tm; include/start_slave.inc -set @@global.debug="+d,stop_slave_middle_group"; -set @@global.debug="+d,incomplete_group_in_relay_log"; +set @@global.debug_dbug="+d,stop_slave_middle_group"; +set @@global.debug_dbug="+d,incomplete_group_in_relay_log"; update tm as t1, ti as t2 set t1.a=t1.a * 2, t2.a=t2.a * 2; include/wait_for_slave_sql_to_stop.inc SELECT "Fatal error: ... Slave SQL Thread stopped with incomplete event group having non-transactional changes. If the group consists solely of row-based events, you can try to restart the slave with --slave-exec-mode=IDEMPOTENT, which ignores duplicate key, key not found, and similar errors (see documentation for details)." AS Last_SQL_Error, @check as `true`; @@ -62,7 +62,7 @@ two select max(a) as one from ti; one 1 -set @@global.debug="-d"; +set @@global.debug_dbug="-d"; include/rpl_reset.inc drop table tm, ti; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_stop_slave.result b/mysql-test/suite/rpl/r/rpl_stop_slave.result index 4a802432234..1d108230f0e 100644 --- a/mysql-test/suite/rpl/r/rpl_stop_slave.result +++ b/mysql-test/suite/rpl/r/rpl_stop_slave.result @@ -14,7 +14,7 @@ include/stop_slave.inc # Suspend the INSERT statement in current transaction on SQL thread. # It guarantees that SQL thread is applying the transaction when # STOP SLAVE command launchs. -SET GLOBAL debug= 'd,after_mysql_insert'; +SET GLOBAL debug_dbug= 'd,after_mysql_insert'; include/start_slave.inc # CREATE TEMPORARY TABLE with InnoDB engine @@ -75,7 +75,7 @@ START SLAVE SQL_THREAD; include/wait_for_slave_sql_to_start.inc # Test end -SET GLOBAL debug= '$debug_save'; +SET GLOBAL debug_dbug= '$debug_save'; include/restart_slave.inc call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group"); [connection master] @@ -96,7 +96,7 @@ CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB; CREATE TABLE t2 (c1 INT) ENGINE=MyISAM; INSERT INTO t1 VALUES(1, 1); [connection master] -SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid'; +SET GLOBAL debug_dbug= 'd,dump_thread_wait_before_send_xid'; [connection slave] include/restart_slave.inc BEGIN; @@ -121,5 +121,5 @@ include/wait_for_slave_to_stop.inc include/start_slave.inc [connection master] DROP TABLE t1, t2; -SET GLOBAL debug= $debug_save; +SET GLOBAL debug_dbug= $debug_save; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_sync.result b/mysql-test/suite/rpl/r/rpl_sync.result index de3506465aa..3d61fcb80cc 100644 --- a/mysql-test/suite/rpl/r/rpl_sync.result +++ b/mysql-test/suite/rpl/r/rpl_sync.result @@ -14,7 +14,7 @@ insert into t1(a) values(5); insert into t1(a) values(6); =====Removing relay log files and crashing/recoverying the slave=======; include/stop_slave_io.inc -SET SESSION debug="d,crash_before_rotate_relaylog"; +SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; FLUSH LOGS; ERROR HY000: Lost connection to MySQL server during query include/rpl_reconnect.inc @@ -27,7 +27,7 @@ FLUSH LOGS; insert into t1(a) values(7); insert into t1(a) values(8); insert into t1(a) values(9); -SET SESSION debug="d,crash_before_rotate_relaylog"; +SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; FLUSH LOGS; ERROR HY000: Lost connection to MySQL server during query include/rpl_reconnect.inc diff --git a/mysql-test/suite/rpl/t/rpl_binlog_errors.test b/mysql-test/suite/rpl/t/rpl_binlog_errors.test index 1b05e24c94e..9e4a106a5b5 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_errors.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_errors.test @@ -68,14 +68,14 @@ FLUSH LOGS; ### (should show just one binlog) RESET MASTER; -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; -- error ER_NO_UNIQUE_LOGFILE FLUSH LOGS; -- echo # assert: must show one binlog -- source include/show_binary_logs.inc ### ACTION: clean up and move to next test -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; RESET MASTER; -- echo ###################### TEST #3 @@ -100,7 +100,7 @@ RESET MASTER; -- source include/show_binary_logs.inc # clean up the table and the binlog to be used in next part of test -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; DELETE FROM t2; RESET MASTER; @@ -111,7 +111,7 @@ RESET MASTER; ### changes performed despite the fact that it reported an ### error. -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -- error ER_NO_UNIQUE_LOGFILE -- eval LOAD DATA INFILE '$load_file' INTO TABLE t2 @@ -121,7 +121,7 @@ SET GLOBAL debug="+d,error_unique_log_filename"; SELECT count(*) FROM t2; # clean up the table and the binlog to be used in next part of test -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; DELETE FROM t2; RESET MASTER; @@ -130,7 +130,7 @@ RESET MASTER; ### ASSERTION: load the small file into a transactional table and ### check that it succeeds -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -- eval LOAD DATA INFILE '$load_file2' INTO TABLE t2 @@ -139,7 +139,7 @@ SET GLOBAL debug="+d,error_unique_log_filename"; SELECT count(*) FROM t2; # clean up the table and the binlog to be used in next part of test -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; DELETE FROM t2; RESET MASTER; @@ -150,7 +150,7 @@ RESET MASTER; ### fails we get the error. Transaction is not rolledback ### because rotation happens after the commit. -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; SET AUTOCOMMIT=0; INSERT INTO t2 VALUES ('muse'); -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR @@ -165,7 +165,7 @@ SELECT count(*) FROM t2; ### ACTION: clean up and move to the next test SET AUTOCOMMIT= 1; -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; DELETE FROM t2; RESET MASTER; @@ -175,7 +175,7 @@ RESET MASTER; ### fails then an error is reported and an incident event ### is written to the current binary log. -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; SELECT count(*) FROM t4; -- replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -- error ER_NO_UNIQUE_LOGFILE @@ -185,7 +185,7 @@ SELECT count(*) FROM t4; SELECT count(*) FROM t4; -- echo ### check that the incident event is written to the current log -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; -- let $binlog_limit= 4,1 -- source include/show_binlog_events.inc @@ -198,7 +198,7 @@ RESET MASTER; ### ASSERTION: check that statements end up in error but they succeed ### on changing the data. -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; -- echo # must show 0 entries SELECT count(*) FROM t4; SELECT count(*) FROM t2; @@ -229,13 +229,13 @@ SELECT count(*) FROM t4; SELECT count(*) FROM t2; # remove fault injection -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; -- echo ###################### TEST #9 ### ASSERTION: check that if we disable binlogging, then statements ### succeed. -SET GLOBAL debug="+d,error_unique_log_filename"; +SET GLOBAL debug_dbug="+d,error_unique_log_filename"; SET SQL_LOG_BIN=0; INSERT INTO t2 VALUES ('aaa'), ('bbb'), ('ccc'), ('ddd'); INSERT INTO t4 VALUES ('eee'), ('fff'), ('ggg'), ('hhh'); @@ -248,7 +248,7 @@ DELETE FROM t4; SELECT count(*) FROM t2; SELECT count(*) FROM t4; SET SQL_LOG_BIN=1; -SET GLOBAL debug="-d,error_unique_log_filename"; +SET GLOBAL debug_dbug="-d,error_unique_log_filename"; -- echo ###################### TEST #10 @@ -263,11 +263,11 @@ RESET MASTER; SHOW WARNINGS; # +d,fault_injection_registering_index => injects fault on MYSQL_BIN_LOG::open -SET GLOBAL debug="+d,fault_injection_registering_index"; +SET GLOBAL debug_dbug="+d,fault_injection_registering_index"; -- replace_regex /\.[\\\/]master/master/ -- error ER_CANT_OPEN_FILE FLUSH LOGS; -SET GLOBAL debug="-d,fault_injection_registering_index"; +SET GLOBAL debug_dbug="-d,fault_injection_registering_index"; -- error ER_NO_BINARY_LOGGING SHOW BINARY LOGS; @@ -291,11 +291,11 @@ DROP TABLE t5; --source include/rpl_restart_server.inc # +d,fault_injection_openning_index => injects fault on MYSQL_BIN_LOG::open_index_file -SET GLOBAL debug="+d,fault_injection_openning_index"; +SET GLOBAL debug_dbug="+d,fault_injection_openning_index"; -- replace_regex /\.[\\\/]master/master/ -- error ER_CANT_OPEN_FILE FLUSH LOGS; -SET GLOBAL debug="-d,fault_injection_openning_index"; +SET GLOBAL debug_dbug="-d,fault_injection_openning_index"; -- error ER_FLUSH_MASTER_BINLOG_CLOSED RESET MASTER; @@ -319,10 +319,10 @@ DROP TABLE t5; ### file. # +d,fault_injection_new_file_rotate_event => injects fault on MYSQL_BIN_LOG::MYSQL_BIN_LOG::new_file_impl -SET GLOBAL debug="+d,fault_injection_new_file_rotate_event"; +SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event"; -- error ER_ERROR_ON_WRITE FLUSH LOGS; -SET GLOBAL debug="-d,fault_injection_new_file_rotate_event"; +SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event"; -- error ER_FLUSH_MASTER_BINLOG_CLOSED RESET MASTER; @@ -340,7 +340,7 @@ DROP TABLE t5; --source include/rpl_restart_server.inc ## clean up -SET GLOBAL debug= @old_debug; +SET GLOBAL debug_dbug= @old_debug; DROP TABLE t1, t2, t4; RESET MASTER; @@ -398,7 +398,7 @@ call mtr.add_suppression("Can't generate a unique log-filename .*"); ### clean up -- source include/stop_slave_sql.inc -SET GLOBAL debug=@old_debug; +SET GLOBAL debug_dbug=@old_debug; RESET SLAVE; RESET MASTER; --let $rpl_only_running_threads= 1 diff --git a/mysql-test/suite/rpl/t/rpl_bug26395.test b/mysql-test/suite/rpl/t/rpl_bug26395.test index aeb0da9511d..9f45db85fb7 100644 --- a/mysql-test/suite/rpl/t/rpl_bug26395.test +++ b/mysql-test/suite/rpl/t/rpl_bug26395.test @@ -12,7 +12,7 @@ # We want master to be alive so that it can replicate the statement to # the slave. So in the test case, we must not crash the # master. Instead, we fake the crash by just not writing the XID event -# to the binlog. This is done by the @@debug='d,do_not_write_xid' +# to the binlog. This is done by the @@debug_dbug='d,do_not_write_xid' # flag. This, in turn, requires us to do 'source # include/have_debug.inc' # @@ -48,7 +48,7 @@ SHOW CREATE TABLE tinnodb; # do_not_write_xid stops the master from writing an XID event. set @old_debug= @@debug; -set @@debug= 'd,do_not_write_xid'; +set @@debug_dbug= 'd,do_not_write_xid'; --echo ==== Test ==== @@ -88,7 +88,7 @@ SELECT * FROM tinnodb ORDER BY a; --echo [on master] connection master; DROP TABLE tinnodb; -set @@debug= @old_debug; +set @@debug_dbug= @old_debug; --echo [on slave] connection slave; diff --git a/mysql-test/suite/rpl/t/rpl_bug33931.test b/mysql-test/suite/rpl/t/rpl_bug33931.test index 5cc2da4a001..2273219a821 100644 --- a/mysql-test/suite/rpl/t/rpl_bug33931.test +++ b/mysql-test/suite/rpl/t/rpl_bug33931.test @@ -15,7 +15,7 @@ call mtr.add_suppression("Slave SQL.*Failed during slave thread initialization.* reset slave; # Set debug flags on slave to force errors to occur -SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; +SET GLOBAL debug_dbug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; --disable_query_log eval CHANGE MASTER TO MASTER_USER='root', @@ -39,7 +39,7 @@ start slave; # # Cleanup # -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; # Clear Last_SQL_Error RESET SLAVE; diff --git a/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt b/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt index d96e981b198..b457a7ebd4a 100644 --- a/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_bug38694-slave.opt @@ -1 +1 @@ ---loose-debug=d,simulate_slave_delay_at_terminate_bug38694 +--loose-debug-dbug=d,simulate_slave_delay_at_terminate_bug38694 diff --git a/mysql-test/suite/rpl/t/rpl_bug41902.test b/mysql-test/suite/rpl/t/rpl_bug41902.test index 12eeb903003..ad9f8d16fb3 100644 --- a/mysql-test/suite/rpl/t/rpl_bug41902.test +++ b/mysql-test/suite/rpl/t/rpl_bug41902.test @@ -16,38 +16,38 @@ source include/master-slave.inc; connection slave; stop slave; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; --error ER_UNKNOWN_TARGET_BINLOG reset slave; show warnings; -SET @@debug=""; +SET @@debug_dbug=""; reset slave; change master to master_host='dummy'; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; --error ER_UNKNOWN_TARGET_BINLOG change master to master_host='dummy'; -SET @@debug=""; +SET @@debug_dbug=""; reset slave; change master to master_host='dummy'; connection master; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; --error ER_UNKNOWN_TARGET_BINLOG reset master; -SET @@debug=""; +SET @@debug_dbug=""; reset master; -SET @@debug="d,simulate_find_log_pos_error"; +SET @@debug_dbug="d,simulate_find_log_pos_error"; --error ER_UNKNOWN_TARGET_BINLOG purge binary logs to 'master-bin.000001'; -SET @@debug=""; +SET @@debug_dbug=""; purge binary logs to 'master-bin.000001'; --disable_query_log diff --git a/mysql-test/suite/rpl/t/rpl_checksum.test b/mysql-test/suite/rpl/t/rpl_checksum.test index 237fffaf33e..68f8f41f755 100644 --- a/mysql-test/suite/rpl/t/rpl_checksum.test +++ b/mysql-test/suite/rpl/t/rpl_checksum.test @@ -100,7 +100,7 @@ insert into t1 values (1) /* will not be applied on slave due to simulation */; # instruction to the dump thread connection slave; -set @@global.debug='d,simulate_slave_unaware_checksum'; +set @@global.debug_dbug='d,simulate_slave_unaware_checksum'; start slave; --let $slave_io_errno= 1236 --let $show_slave_io_error= 1 @@ -109,7 +109,7 @@ source include/wait_for_slave_io_error.inc; select count(*) as zero from t1; ###connection master; -set @@global.debug=''; +set @@global.debug_dbug=''; connection slave; source include/start_slave.inc; @@ -121,10 +121,10 @@ source include/start_slave.inc; # C1. Failure by a client thread connection master; set @@global.master_verify_checksum = 1; -set @@session.debug='d,simulate_checksum_test_failure'; +set @@session.debug_dbug='d,simulate_checksum_test_failure'; --error ER_ERROR_WHEN_EXECUTING_COMMAND show binlog events; -set @@session.debug=''; +set @@session.debug_dbug=''; set @@global.master_verify_checksum = default; #connection master; @@ -141,12 +141,12 @@ connection slave; # C2. Failure by IO thread # instruction to io thread -set @@global.debug='d,simulate_checksum_test_failure'; +set @@global.debug_dbug='d,simulate_checksum_test_failure'; start slave io_thread; --let $slave_io_errno= 1595 --let $show_slave_io_error= 1 source include/wait_for_slave_io_error.inc; -set @@global.debug=''; +set @@global.debug_dbug=''; # to make IO thread re-read it again w/o the failure start slave io_thread; @@ -158,7 +158,7 @@ source include/wait_for_slave_param.inc; # instruction to sql thread; set @@global.slave_sql_verify_checksum = 1; -set @@global.debug='d,simulate_checksum_test_failure'; +set @@global.debug_dbug='d,simulate_checksum_test_failure'; start slave sql_thread; --let $slave_sql_errno= 1593 @@ -167,7 +167,7 @@ source include/wait_for_slave_sql_error.inc; # resuming SQL thread to parse out the event w/o the failure -set @@global.debug=''; +set @@global.debug_dbug=''; source include/start_slave.inc; connection master; diff --git a/mysql-test/suite/rpl/t/rpl_corruption.test b/mysql-test/suite/rpl/t/rpl_corruption.test index a46325bf1f4..70322197317 100644 --- a/mysql-test/suite/rpl/t/rpl_corruption.test +++ b/mysql-test/suite/rpl/t/rpl_corruption.test @@ -67,7 +67,7 @@ while ($i) { # Emulate corruption in binlog file when SHOW BINLOG EVENTS is executing --echo # 2. Corruption in master binlog and SHOW BINLOG EVENTS -SET GLOBAL debug="+d,corrupt_read_log_event_char"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event_char"; --echo SHOW BINLOG EVENTS; --disable_query_log send_eval SHOW BINLOG EVENTS FROM $pos; @@ -75,7 +75,7 @@ send_eval SHOW BINLOG EVENTS FROM $pos; --error ER_ERROR_WHEN_EXECUTING_COMMAND reap; -SET GLOBAL debug="-d,corrupt_read_log_event_char"; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event_char"; # Emulate corruption on master with crc checking on master --echo # 3. Master read a corrupted event from binlog and send the error to slave @@ -100,48 +100,48 @@ let $wait_condition= SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE command = 'Binlog Dump'; --source include/wait_condition.inc -SET GLOBAL debug="+d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event2"; --connection slave START SLAVE IO_THREAD; let $slave_io_errno= 1236; --source include/wait_for_slave_io_error.inc --connection master -SET GLOBAL debug="-d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; # Emulate corruption on master without crc checking on master --echo # 4. Master read a corrupted event from binlog and send it to slave --connection master SET GLOBAL master_verify_checksum=0; -SET GLOBAL debug="+d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event2"; --connection slave START SLAVE IO_THREAD; let $slave_io_errno= 1595,1722; --source include/wait_for_slave_io_error.inc --connection master -SET GLOBAL debug="-d,corrupt_read_log_event2"; -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event2"; +SET GLOBAL debug_dbug= ""; SET GLOBAL master_verify_checksum=1; # Emulate corruption in network --echo # 5. Slave. Corruption in network --connection slave -SET GLOBAL debug="+d,corrupt_queue_event"; +SET GLOBAL debug_dbug="+d,corrupt_queue_event"; START SLAVE IO_THREAD; let $slave_io_errno= 1595,1722; --source include/wait_for_slave_io_error.inc -SET GLOBAL debug="-d,corrupt_queue_event"; +SET GLOBAL debug_dbug="-d,corrupt_queue_event"; # Emulate corruption in relay log --echo # 6. Slave. Corruption in relay log -SET GLOBAL debug="+d,corrupt_read_log_event_char"; +SET GLOBAL debug_dbug="+d,corrupt_read_log_event_char"; START SLAVE SQL_THREAD; let $slave_sql_errno= 1593; --source include/wait_for_slave_sql_error.inc -SET GLOBAL debug="-d,corrupt_read_log_event_char"; -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug="-d,corrupt_read_log_event_char"; +SET GLOBAL debug_dbug= ""; # Start normal replication and compare same table on master # and slave @@ -156,10 +156,10 @@ let $diff_tables= master:test.t1, slave:test.t1; # Clean up --echo # 8. Clean up --connection master -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug= ""; SET GLOBAL master_verify_checksum = @old_master_verify_checksum; DROP TABLE t1; --sync_slave_with_master -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug= ""; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test index 01247fefd64..17417a55b8c 100644 --- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test +++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test @@ -40,7 +40,7 @@ let $dbug_sync_point= 'debug_lock.before_get_SERVER_ID'; let $debug_sync_action= 'now SIGNAL signal.get_server_id'; source extra/rpl_tests/rpl_get_master_version_and_clock.test; -eval set global debug= '$debug_saved'; +eval set global debug_dbug= '$debug_saved'; # cleanup diff --git a/mysql-test/suite/rpl/t/rpl_init_slave_errors.test b/mysql-test/suite/rpl/t/rpl_init_slave_errors.test index 4dab13856d4..067d21a4e46 100644 --- a/mysql-test/suite/rpl/t/rpl_init_slave_errors.test +++ b/mysql-test/suite/rpl/t/rpl_init_slave_errors.test @@ -45,7 +45,7 @@ reset slave; connection slave; # Set debug flags on slave to force errors to occur -SET GLOBAL debug= "d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; +SET GLOBAL debug_dbug= "d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; start slave; @@ -60,7 +60,7 @@ start slave; call mtr.add_suppression("Failed during slave.* thread initialization"); -SET GLOBAL debug= ""; +SET GLOBAL debug_dbug= ""; ###################################################################### # Injecting faults in the init_slave option diff --git a/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt b/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt index aaf2d8a4251..dcc136e192f 100644 --- a/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt +++ b/mysql-test/suite/rpl/t/rpl_killed_ddl-master.opt @@ -1 +1 @@ ---debug=d,debug_lock_before_query_log_event +--loose-debug-dbug=d,debug_lock_before_query_log_event diff --git a/mysql-test/suite/rpl/t/rpl_row_corruption.test b/mysql-test/suite/rpl/t/rpl_row_corruption.test index a7650c615a3..e05273a2f9c 100644 --- a/mysql-test/suite/rpl/t/rpl_row_corruption.test +++ b/mysql-test/suite/rpl/t/rpl_row_corruption.test @@ -28,7 +28,7 @@ call mtr.add_suppression(".*Found table map event mapping table id 0 which was a # stop the slave and inject corruption --source include/stop_slave.inc SET @save_debug= @@global.debug; -SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="+d,inject_tblmap_same_id_maps_diff_table"; --source include/start_slave.inc --connection master # both tables get mapped to 0 (in a way, simulating scenario @@ -42,7 +42,7 @@ SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table"; --source include/stop_slave.inc # clean up -SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="-d,inject_tblmap_same_id_maps_diff_table"; --source include/start_slave.inc --connection master --source include/rpl_reset.inc @@ -55,7 +55,7 @@ SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table"; --connection slave --source include/stop_slave.inc -SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="+d,inject_tblmap_same_id_maps_diff_table"; --source include/start_slave.inc --source include/rpl_reset.inc --connection master @@ -92,7 +92,7 @@ AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8= #110708 12:21:44 server id 1 end_log_pos 855 Update_rows: table id 66 # at 855 #110708 12:21:44 server id 1 end_log_pos 895 Update_rows: table id 67 flags: STMT_END_F -SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="+d,inject_tblmap_same_id_maps_diff_table"; --error ER_SLAVE_FATAL_ERROR BINLOG ' SOgWThMBAAAAKQAAAAYDAAAAAEIAAAAAAAEABHRlc3QAAnQxAAEDAAE= @@ -105,11 +105,11 @@ SOgWThgBAAAAKAAAAH8DAAAAAEMAAAAAAAEAAf///gEAAAD+BAAAAA== # clean up DROP TABLE t1,t2; --connection slave -SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table"; +SET GLOBAL debug_dbug="-d,inject_tblmap_same_id_maps_diff_table"; --connection master --eval DROP TABLE $t1 --eval DROP TABLE $t2_ign --sync_slave_with_master -SET GLOBAL debug= @save_debug; +SET GLOBAL debug_dbug= @save_debug; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_index_choice.test b/mysql-test/suite/rpl/t/rpl_row_index_choice.test index d393c65438a..6d4053f9737 100644 --- a/mysql-test/suite/rpl/t/rpl_row_index_choice.test +++ b/mysql-test/suite/rpl/t/rpl_row_index_choice.test @@ -47,7 +47,7 @@ sync_slave_with_master; connection slave; ANALYZE TABLE t2; --echo # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -55,7 +55,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); # Test that we don't pick a unique index with NULLS over a more selective @@ -72,7 +72,7 @@ sync_slave_with_master; connection slave; ANALYZE TABLE t2; --echo # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -80,7 +80,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -97,7 +97,7 @@ INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1; sync_slave_with_master; connection slave; --echo # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -105,7 +105,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -125,7 +125,7 @@ INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1; sync_slave_with_master; connection slave; --echo # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -133,7 +133,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -150,7 +150,7 @@ INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d FROM t1; sync_slave_with_master; connection slave; --echo # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan,slave_crash_if_index_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan,slave_crash_if_index_scan"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -158,7 +158,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -176,7 +176,7 @@ sync_slave_with_master; connection slave; ANALYZE TABLE t2; --echo # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -184,7 +184,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -204,7 +204,7 @@ INSERT INTO t2 SELECT d DIV 10, d MOD 41, d MOD 37, d, IF(d<10, d, NULL) FROM t1 sync_slave_with_master; connection slave; --echo # Slave will crash if using the wrong or no index -SET GLOBAL debug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; +SET GLOBAL debug_dbug="+d,slave_crash_if_wrong_index,slave_crash_if_table_scan"; connection master; UPDATE t2 SET d=10042 WHERE d=42; @@ -212,7 +212,7 @@ DELETE FROM t2 WHERE d=53; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; SELECT * FROM t2 WHERE d IN (10042,53); connection master; @@ -238,6 +238,6 @@ connection master; DROP TABLE t1; sync_slave_with_master; connection slave; -SET GLOBAL debug=""; +SET GLOBAL debug_dbug=""; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_show_slave_running.test b/mysql-test/suite/rpl/t/rpl_show_slave_running.test index d8c86a2aeb1..98b4a3575e8 100644 --- a/mysql-test/suite/rpl/t/rpl_show_slave_running.test +++ b/mysql-test/suite/rpl/t/rpl_show_slave_running.test @@ -12,7 +12,7 @@ connection slave; SET DEBUG_SYNC= 'RESET'; source include/stop_slave.inc; let $debug_saved= `select @@global.debug`; -set global debug= 'd,dbug.before_get_running_status_yes'; # to block due-started IO +set global debug_dbug= 'd,dbug.before_get_running_status_yes'; # to block due-started IO # Test 1. Slave is stopped @@ -77,7 +77,7 @@ echo Slave_SQL_Running= $status; connection slave; -eval set global debug= '$debug_saved'; +eval set global debug_dbug= '$debug_saved'; SET DEBUG_SYNC= 'RESET'; --echo End of tests --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test index 36327e2354a..14cf3fc00e9 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test +++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test @@ -29,8 +29,8 @@ ########################################################################## connection slave; ---let $old_debug= `SELECT @@GLOBAL.DEBUG` -SET @@GLOBAL.DEBUG = '+d,remove_slave_load_file_before_write'; +--let $old_debug= `SELECT @@global.debug_dbug` +SET @@global.debug_dbug= '+d,remove_slave_load_file_before_write'; connection master; @@ -74,7 +74,7 @@ call mtr.add_suppression("Slave: File.* not found.*"); call mtr.add_suppression("Slave SQL: Error .File.* not found.* Error_code: 29"); --let $rpl_only_running_threads= 1 -eval SET @@GLOBAL.DEBUG = '$old_debug'; +eval SET @@global.debug_dbug= '$old_debug'; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stop_slave.test index 6a1b29da676..b0eeb29bad5 100644 --- a/mysql-test/suite/rpl/t/rpl_stop_slave.test +++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test @@ -23,7 +23,7 @@ source include/stop_slave.inc; --echo # It guarantees that SQL thread is applying the transaction when --echo # STOP SLAVE command launchs. let $debug_save= `SELECT @@GLOBAL.debug`; -SET GLOBAL debug= 'd,after_mysql_insert'; +SET GLOBAL debug_dbug= 'd,after_mysql_insert'; source include/start_slave.inc; --echo @@ -44,7 +44,7 @@ source extra/rpl_tests/rpl_stop_slave.test; --echo --echo # Test end -SET GLOBAL debug= '$debug_save'; +SET GLOBAL debug_dbug= '$debug_save'; source include/restart_slave_sql.inc; connection slave; @@ -76,7 +76,7 @@ sync_slave_with_master; --source include/rpl_connection_master.inc let $debug_save= `SELECT @@GLOBAL.debug`; -SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid'; +SET GLOBAL debug_dbug= 'd,dump_thread_wait_before_send_xid'; --source include/rpl_connection_slave.inc source include/restart_slave_sql.inc; @@ -116,5 +116,5 @@ source include/start_slave.inc; --source include/rpl_connection_master.inc DROP TABLE t1, t2; -SET GLOBAL debug= $debug_save; +SET GLOBAL debug_dbug= $debug_save; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_sync.test b/mysql-test/suite/rpl/t/rpl_sync.test index e1750be0ff6..859f0465654 100644 --- a/mysql-test/suite/rpl/t/rpl_sync.test +++ b/mysql-test/suite/rpl/t/rpl_sync.test @@ -74,7 +74,7 @@ close ($file); EOF --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect -SET SESSION debug="d,crash_before_rotate_relaylog"; +SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; --error 2013 FLUSH LOGS; @@ -122,7 +122,7 @@ close FILE; EOF --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect -SET SESSION debug="d,crash_before_rotate_relaylog"; +SET SESSION debug_dbug="d,crash_before_rotate_relaylog"; --error 2013 FLUSH LOGS; diff --git a/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt b/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt index b37427aa2cd..3d37b7041fb 100644 --- a/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt @@ -1,2 +1,2 @@ ---loose-debug="+d,all_errors_are_temporary_errors" --slave-transaction-retries=2 +--loose-debug-dbug="+d,all_errors_are_temporary_errors" --slave-transaction-retries=2 --force-restart diff --git a/mysql-test/suite/sys_vars/r/debug_basic.result b/mysql-test/suite/sys_vars/r/debug_basic.result index 5a77446d036..1ab970ad24f 100644 --- a/mysql-test/suite/sys_vars/r/debug_basic.result +++ b/mysql-test/suite/sys_vars/r/debug_basic.result @@ -1,4 +1,6 @@ set session debug="L"; +Warnings: +Warning 1287 The syntax '@@debug' is deprecated and will be removed in MariaDB 5.6. Please use '@@debug_dbug' instead select @@global.debug="1"; @@global.debug="1" 0 diff --git a/mysql-test/suite/sys_vars/r/debug_dbug_basic.result b/mysql-test/suite/sys_vars/r/debug_dbug_basic.result new file mode 100644 index 00000000000..ad2fbc5a738 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/debug_dbug_basic.result @@ -0,0 +1,25 @@ +set session debug_dbug="L"; +select @@global.debug_dbug="1"; +@@global.debug_dbug="1" +0 +select @@session.debug; +@@session.debug +L +show global variables like 'debug'; +Variable_name Value +debug # +show session variables like 'debug'; +Variable_name Value +debug L +select * from information_schema.global_variables where variable_name="debug"; +VARIABLE_NAME VARIABLE_VALUE +DEBUG # +select * from information_schema.session_variables where variable_name="debug"; +VARIABLE_NAME VARIABLE_VALUE +DEBUG L +set @@global.debug_dbug=1; +ERROR 42000: Incorrect argument type to variable 'debug_dbug' +set @@global.debug_dbug=1.1; +ERROR 42000: Incorrect argument type to variable 'debug_dbug' +set @@global.debug_dbug=1e1; +ERROR 42000: Incorrect argument type to variable 'debug_dbug' diff --git a/mysql-test/suite/sys_vars/t/debug_dbug_basic.test b/mysql-test/suite/sys_vars/t/debug_dbug_basic.test new file mode 100644 index 00000000000..44471bf193d --- /dev/null +++ b/mysql-test/suite/sys_vars/t/debug_dbug_basic.test @@ -0,0 +1,22 @@ +--source include/have_debug.inc +# +# exists both as global and session +# +set session debug_dbug="L"; + +select @@global.debug_dbug="1"; # just to show that global.debug exists +select @@session.debug; # here we know the value and can display it +--replace_column 2 # +show global variables like 'debug'; +show session variables like 'debug'; +--replace_column 2 # +select * from information_schema.global_variables where variable_name="debug"; +select * from information_schema.session_variables where variable_name="debug"; + +--error ER_WRONG_TYPE_FOR_VAR +set @@global.debug_dbug=1; +--error ER_WRONG_TYPE_FOR_VAR +set @@global.debug_dbug=1.1; +--error ER_WRONG_TYPE_FOR_VAR +set @@global.debug_dbug=1e1; + diff --git a/mysql-test/t/alter_table-big.test b/mysql-test/t/alter_table-big.test index e007a3a55e0..cc7b8ea02b4 100644 --- a/mysql-test/t/alter_table-big.test +++ b/mysql-test/t/alter_table-big.test @@ -38,7 +38,7 @@ insert into t1 values (RAND()*1000, RAND()*1000, RAND()*1000); # Later we use binlog to check the order in which statements are # executed so let us reset it first. reset master; -set session debug="+d,sleep_alter_enable_indexes"; +set session debug_dbug="+d,sleep_alter_enable_indexes"; --send alter table t1 enable keys; connection addconroot; --sleep 2 @@ -50,7 +50,7 @@ insert into t2 values (1); insert into t1 values (1, 1, 1); connection default; --reap -set session debug="-d,sleep_alter_enable_indexes"; +set session debug_dbug="-d,sleep_alter_enable_indexes"; # Check that statements were executed/binlogged in correct order. source include/show_binlog_events.inc; @@ -75,7 +75,7 @@ drop table if exists t1, t2, t3; create table t1 (i int); # We are going to check that statements are logged in correct order reset master; -set session debug="+d,sleep_alter_before_main_binlog"; +set session debug_dbug="+d,sleep_alter_before_main_binlog"; --send alter table t1 change i c char(10) default 'Test1'; connect (addconroot, localhost, root,,); connection addconroot; @@ -109,7 +109,7 @@ connection default; --reap disconnect addconroot; drop table t3; -set session debug="-d,sleep_alter_before_main_binlog"; +set session debug_dbug="-d,sleep_alter_before_main_binlog"; # Check that all statements were logged in correct order source include/show_binlog_events.inc; diff --git a/mysql-test/t/archive_debug.test b/mysql-test/t/archive_debug.test index 9cece254140..b107826784b 100644 --- a/mysql-test/t/archive_debug.test +++ b/mysql-test/t/archive_debug.test @@ -7,7 +7,7 @@ --echo # CREATE TABLE t1(a INT) ENGINE=ARCHIVE; INSERT INTO t1 VALUES(1); -SET SESSION debug='d,simulate_archive_open_failure'; +SET SESSION debug_dbug='d,simulate_archive_open_failure'; CHECK TABLE t1; -SET SESSION debug=DEFAULT; +SET SESSION debug_dbug=DEFAULT; DROP TABLE t1; diff --git a/mysql-test/t/crash_commit_before.test b/mysql-test/t/crash_commit_before.test index f99690777c9..93b96de6e53 100644 --- a/mysql-test/t/crash_commit_before.test +++ b/mysql-test/t/crash_commit_before.test @@ -14,7 +14,7 @@ START TRANSACTION; insert into t1 values(9); # Setup the mysqld to crash at certain point -SET GLOBAL debug="d,crash_commit_before"; +SET GLOBAL debug_dbug="d,crash_commit_before"; # Write file to make mysql-test-run.pl expect crash and restart --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect diff --git a/mysql-test/t/create-big.test b/mysql-test/t/create-big.test index e1dfbbd4ac4..65273df3d1d 100644 --- a/mysql-test/t/create-big.test +++ b/mysql-test/t/create-big.test @@ -34,7 +34,7 @@ drop table if exists t1,t2,t3,t4,t5; # What happens in situation when other statement messes with # table to be created before it is created ? # Concurrent CREATE TABLE -set session debug="+d,sleep_create_select_before_create"; +set session debug_dbug="+d,sleep_create_select_before_create"; --send create table t1 select 1 as i; connection addconroot1; --sleep 2 @@ -97,7 +97,7 @@ show create table t1; drop table t1, t3; # What happens if other statement sneaks in after the table # creation but before its opening ? -set session debug="-d,sleep_create_select_before_create:+d,sleep_create_select_before_open"; +set session debug_dbug="-d,sleep_create_select_before_create:+d,sleep_create_select_before_open"; # Concurrent DROP TABLE --send create table t1 select 1 as i; connection addconroot1; @@ -141,7 +141,7 @@ connection default; select @a; drop table t1; # Okay, now the same tests for the potential gap between open and lock -set session debug="-d,sleep_create_select_before_open:+d,sleep_create_select_before_lock"; +set session debug_dbug="-d,sleep_create_select_before_open:+d,sleep_create_select_before_lock"; # Concurrent DROP TABLE --send create table t1 select 1 as i; connection addconroot1; @@ -185,7 +185,7 @@ connection default; select @a; drop table t1; # Some tests for case with existing table -set session debug="-d,sleep_create_select_before_lock:+d,sleep_create_select_before_check_if_exists"; +set session debug_dbug="-d,sleep_create_select_before_lock:+d,sleep_create_select_before_check_if_exists"; create table t1 (i int); # Concurrent DROP TABLE --send create table if not exists t1 select 1 as i; @@ -206,7 +206,7 @@ connection default; select @a; select * from t1; drop table t1; -set session debug="-d,sleep_create_select_before_check_if_exists"; +set session debug_dbug="-d,sleep_create_select_before_check_if_exists"; # Test for some details of CREATE TABLE ... SELECT implementation. @@ -290,7 +290,7 @@ drop table if exists t1,t2; # What happens if some statements sneak in right after we have # opened source table ? create table t1 (i int); -set session debug="+d,sleep_create_like_before_check_if_exists"; +set session debug_dbug="+d,sleep_create_like_before_check_if_exists"; # Reset binlog to have clear start reset master; --send create table t2 like t1; @@ -310,7 +310,7 @@ source include/show_binlog_events.inc; # Now let us check the gap between check for target table # existance and copying of .frm file. create table t1 (i int); -set session debug="-d,sleep_create_like_before_check_if_exists:+d,sleep_create_like_before_copy"; +set session debug_dbug="-d,sleep_create_like_before_check_if_exists:+d,sleep_create_like_before_copy"; # It should be impossible to create target table concurrently --send create table t2 like t1; connection addconroot1; @@ -333,7 +333,7 @@ source include/show_binlog_events.inc; # And now he gap between copying of .frm file and ha_create_table() call. create table t1 (i int); -set session debug="-d,sleep_create_like_before_copy:+d,sleep_create_like_before_ha_create"; +set session debug_dbug="-d,sleep_create_like_before_copy:+d,sleep_create_like_before_ha_create"; # Both DML and DDL on target table should wait till operation completes reset master; --send create table t2 like t1; @@ -361,7 +361,7 @@ source include/show_binlog_events.inc; # Finally we check the gap between ha_create_table() and binlogging create table t1 (i int); -set session debug="-d,sleep_create_like_before_ha_create:+d,sleep_create_like_before_binlogging"; +set session debug_dbug="-d,sleep_create_like_before_ha_create:+d,sleep_create_like_before_binlogging"; reset master; --send create table t2 like t1; connection addconroot1; @@ -385,4 +385,4 @@ connection default; drop table t2; source include/show_binlog_events.inc; -set session debug="-d,sleep_create_like_before_binlogging"; +set session debug_dbug="-d,sleep_create_like_before_binlogging"; diff --git a/mysql-test/t/drop_debug.test b/mysql-test/t/drop_debug.test index 63c85d9246b..21069b57285 100644 --- a/mysql-test/t/drop_debug.test +++ b/mysql-test/t/drop_debug.test @@ -21,14 +21,14 @@ CREATE TABLE mysql_test.t2(b INT); CREATE TABLE mysql_test.t3(c INT); --echo -SET SESSION DEBUG = "+d,bug43138"; +SET SESSION debug_dbug= "+d,bug43138"; --echo --sorted_result DROP DATABASE mysql_test; --echo -SET SESSION DEBUG = "-d,bug43138"; +SET SESSION debug_dbug= "-d,bug43138"; --echo --echo # -- diff --git a/mysql-test/t/error_simulation.test b/mysql-test/t/error_simulation.test index a60eccad3d8..d4de4a9502d 100644 --- a/mysql-test/t/error_simulation.test +++ b/mysql-test/t/error_simulation.test @@ -23,7 +23,7 @@ set tmp_table_size=1024; # Set debug flag so an error is returned when # tmp table in query is converted from heap to myisam -set session debug="d,raise_error"; +set session debug_dbug="d,raise_error"; --replace_regex /in table '[^']+'/in table 'tmp_table'/ --error ER_DUP_KEY @@ -38,9 +38,9 @@ DROP TABLE t1; --echo # CREATE TABLE t1 (a INT(100) NOT NULL); INSERT INTO t1 VALUES (1), (0), (2); -SET SESSION debug='+d,alter_table_only_index_change'; +SET SESSION debug_dbug='+d,alter_table_only_index_change'; ALTER TABLE t1 ADD INDEX a(a); -SET SESSION debug=DEFAULT; +SET SESSION debug_dbug=DEFAULT; SHOW CREATE TABLE t1; SELECT * FROM t1; DROP TABLE t1; @@ -51,11 +51,11 @@ DROP TABLE t1; CREATE TABLE t1(a BLOB); -SET SESSION debug="+d,bug42064_simulate_oom"; +SET SESSION debug_dbug="+d,bug42064_simulate_oom"; # May fail with either ER_OUT_OF_RESOURCES or EE_OUTOFMEMORY --error ER_OUT_OF_RESOURCES, 5 INSERT INTO t1 VALUES(""); -SET SESSION debug=DEFAULT; +SET SESSION debug_dbug=DEFAULT; DROP TABLE t1; @@ -78,14 +78,14 @@ INSERT INTO t2 VALUES (1, 1, 'data'); --echo # we would need to have thousands of records and/or more columns in both --echo # tables so that the join buffer is filled and re-scans are triggered). -SET SESSION debug = '+d,only_one_Unique_may_be_created'; +SET SESSION debug_dbug= '+d,only_one_Unique_may_be_created'; --replace_column 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON ( t2.a < 10 OR t2.b < 10 ); SELECT * FROM t1 LEFT JOIN t2 ON ( t2.a < 10 OR t2.b < 10 ); -SET SESSION debug = DEFAULT; +SET SESSION debug_dbug= DEFAULT; DROP TABLE t1, t2; diff --git a/mysql-test/t/filesort_debug.test b/mysql-test/t/filesort_debug.test index 724ebc90368..88d957e47c3 100644 --- a/mysql-test/t/filesort_debug.test +++ b/mysql-test/t/filesort_debug.test @@ -11,11 +11,11 @@ SET @old_debug= @@session.debug; CREATE TABLE t1(f0 int auto_increment primary key, f1 int); INSERT INTO t1(f1) VALUES (0),(1),(2),(3),(4),(5); -SET session debug= '+d,make_char_array_fail'; +SET session debug_dbug= '+d,make_char_array_fail'; CALL mtr.add_suppression("Out of sort memory"); --error ER_OUT_OF_SORTMEMORY SELECT * FROM t1 ORDER BY f1 ASC, f0; -SET session debug= @old_debug; +SET session debug_dbug= @old_debug; CREATE FUNCTION f1() RETURNS INT RETURN 1; --error ER_SP_WRONG_NO_OF_ARGS diff --git a/mysql-test/t/information_schema_all_engines.test b/mysql-test/t/information_schema_all_engines.test index 97065803169..036dd944cc3 100644 --- a/mysql-test/t/information_schema_all_engines.test +++ b/mysql-test/t/information_schema_all_engines.test @@ -8,7 +8,6 @@ --source include/not_staging.inc use INFORMATION_SCHEMA; ---replace_result Tables_in_INFORMATION_SCHEMA Tables_in_information_schema show tables; # diff --git a/mysql-test/t/innodb_mysql_sync.test b/mysql-test/t/innodb_mysql_sync.test index ec8fa55fc5c..2f3bd643837 100644 --- a/mysql-test/t/innodb_mysql_sync.test +++ b/mysql-test/t/innodb_mysql_sync.test @@ -292,7 +292,7 @@ INSERT INTO t1 VALUES (1, 12345), (2, 23456); --echo # Connection con1 --connect (con1,localhost,root) -SET SESSION debug= "+d,alter_table_rollback_new_index"; +SET SESSION debug_dbug= "+d,alter_table_rollback_new_index"; --error ER_UNKNOWN_ERROR ALTER TABLE t1 ADD PRIMARY KEY(a); SELECT * FROM t1; diff --git a/mysql-test/t/log_tables_debug.test b/mysql-test/t/log_tables_debug.test index 78a1289b689..971c11d458f 100644 --- a/mysql-test/t/log_tables_debug.test +++ b/mysql-test/t/log_tables_debug.test @@ -30,7 +30,7 @@ SET @@global.general_log = ON; SET @@global.general_log_file = 'bug45387_general.log'; # turn on output of timestamps on all log file entries -SET SESSION debug='+d,reset_log_last_time'; +SET SESSION debug_dbug='+d,reset_log_last_time'; let CONN_ID= `SELECT CONNECTION_ID()`; FLUSH LOGS; @@ -38,7 +38,7 @@ FLUSH LOGS; # reset log settings SET @@global.general_log = @old_general_log; SET @@global.general_log_file = @old_general_log_file; -SET SESSION debug='-d'; +SET SESSION debug_dbug='-d'; perl; # get the relevant info from the surrounding perl invocation diff --git a/mysql-test/t/merge-big.test b/mysql-test/t/merge-big.test index e39bd98bd38..78c3e8c00ac 100644 --- a/mysql-test/t/merge-big.test +++ b/mysql-test/t/merge-big.test @@ -44,7 +44,7 @@ LOCK TABLE t1 WRITE; connect (con1,localhost,root,,); let $con1_id= `SELECT CONNECTION_ID()`; SET @orig_debug=@@debug; - SET GLOBAL debug="+d,sleep_open_and_lock_after_open"; + SET GLOBAL debug_dbug="+d,sleep_open_and_lock_after_open"; send INSERT INTO t1 VALUES (1); --echo # connection default connection default; @@ -75,7 +75,7 @@ UNLOCK TABLES; --echo # connection con1 connection con1; reap; - SET GLOBAL debug=@orig_debug; + SET GLOBAL debug_dbug=@orig_debug; disconnect con1; --echo # connection default connection default; diff --git a/mysql-test/t/merge_debug.test b/mysql-test/t/merge_debug.test index 5bf01468b89..78c91ec8f25 100644 --- a/mysql-test/t/merge_debug.test +++ b/mysql-test/t/merge_debug.test @@ -26,11 +26,11 @@ INSERT INTO t2 VALUES (20); INSERT INTO t3 VALUES (30); LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, crashed WRITE; -SET GLOBAL debug="+d,myisam_pretend_crashed_table_on_open"; +SET GLOBAL debug_dbug="+d,myisam_pretend_crashed_table_on_open"; --disable_warnings CREATE TRIGGER t1_ai AFTER INSERT ON crashed FOR EACH ROW INSERT INTO t2 VALUES(29); --enable_warnings -SET GLOBAL debug=@orig_debug; +SET GLOBAL debug_dbug=@orig_debug; --error ER_TABLE_NOT_LOCKED INSERT INTO t4 VALUES (39); --error ER_TABLE_NOT_LOCKED diff --git a/mysql-test/t/myisam_crash_before_flush_keys.test b/mysql-test/t/myisam_crash_before_flush_keys.test index a9f36f40d10..2447ba1e229 100644 --- a/mysql-test/t/myisam_crash_before_flush_keys.test +++ b/mysql-test/t/myisam_crash_before_flush_keys.test @@ -22,7 +22,7 @@ CREATE TABLE t1(a INT, INSERT INTO t1 VALUES (1,2),(2,3),(3,4),(4,5),(5,6); --echo # Setup the mysqld to crash at certain point -SET SESSION debug="d,crash_before_flush_keys"; +SET SESSION debug_dbug="d,crash_before_flush_keys"; --echo # Write file to make mysql-test-run.pl expect crash --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect diff --git a/mysql-test/t/myisam_debug.test b/mysql-test/t/myisam_debug.test index 43b5143441e..5b5d006bd22 100644 --- a/mysql-test/t/myisam_debug.test +++ b/mysql-test/t/myisam_debug.test @@ -36,7 +36,7 @@ commit; --echo # Switch to insert Connection CONNECTION insertConn; -SET SESSION debug='+d,wait_in_enable_indexes'; +SET SESSION debug_dbug='+d,wait_in_enable_indexes'; --echo # Send insert data SEND INSERT INTO t1(id) SELECT id FROM t2; diff --git a/mysql-test/t/mysqldump-compat.opt b/mysql-test/t/mysqldump-compat.opt index 40d4ac738a6..ac3d0509f2c 100644 --- a/mysql-test/t/mysqldump-compat.opt +++ b/mysql-test/t/mysqldump-compat.opt @@ -1 +1 @@ ---loose-debug=d,4x_server_emul +--loose-debug-dbug=d,4x_server_emul diff --git a/mysql-test/t/partition_debug_sync.test b/mysql-test/t/partition_debug_sync.test index 448cec652d7..027a4bd19a7 100644 --- a/mysql-test/t/partition_debug_sync.test +++ b/mysql-test/t/partition_debug_sync.test @@ -30,7 +30,7 @@ ENGINE = MYISAM PARTITION p1 VALUES LESS THAN (20), PARTITION p2 VALUES LESS THAN (100), PARTITION p3 VALUES LESS THAN MAXVALUE ) */; -SET SESSION debug= "+d,sleep_before_create_table_no_lock"; +SET SESSION debug_dbug= "+d,sleep_before_create_table_no_lock"; SET DEBUG_SYNC= 'alter_table_before_create_table_no_lock SIGNAL removing_partitioning WAIT_FOR waiting_for_alter'; SET DEBUG_SYNC= 'alter_table_before_main_binlog SIGNAL partitioning_removed'; --send ALTER TABLE t1 REMOVE PARTITIONING @@ -43,7 +43,7 @@ DROP TABLE IF EXISTS t1; --echo # Con 1 connection con1; --reap -SET SESSION debug= "-d,sleep_before_create_table_no_lock"; +SET SESSION debug_dbug= "-d,sleep_before_create_table_no_lock"; connection default; SET DEBUG_SYNC= 'RESET'; connection con1; @@ -70,12 +70,12 @@ SET DEBUG_SYNC= 'alter_table_before_rename_result_table WAIT_FOR delete_done'; --send ALTER TABLE t2 REMOVE PARTITIONING connection default; --echo # Con default -SET SESSION debug= "+d,sleep_before_no_locks_delete_table"; +SET SESSION debug_dbug= "+d,sleep_before_no_locks_delete_table"; SET DEBUG_SYNC= 'now WAIT_FOR removing_partitions'; SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table SIGNAL waiting_for_alter'; SET DEBUG_SYNC= 'rm_table_no_locks_before_binlog SIGNAL delete_done'; DROP TABLE IF EXISTS t2; -SET SESSION debug= "-d,sleep_before_no_locks_delete_table"; +SET SESSION debug_dbug= "-d,sleep_before_no_locks_delete_table"; --echo # Con 1 connection con1; --error ER_NO_SUCH_TABLE diff --git a/mysql-test/t/partition_sync.test b/mysql-test/t/partition_sync.test index 85eb33ebb6b..d5d60c176c5 100644 --- a/mysql-test/t/partition_sync.test +++ b/mysql-test/t/partition_sync.test @@ -66,7 +66,7 @@ SELECT * FROM tbl_with_partitions; --echo # Connection 2 --echo # Alter table, abort after prepare connection con2; -set session debug="+d,abort_copy_table"; +set session debug_dbug="+d,abort_copy_table"; --error ER_LOCK_WAIT_TIMEOUT ALTER TABLE tbl_with_partitions ADD COLUMN f INT; diff --git a/mysql-test/t/select_debug.test b/mysql-test/t/select_debug.test index 16e8425efc4..4b77f9fd047 100644 --- a/mysql-test/t/select_debug.test +++ b/mysql-test/t/select_debug.test @@ -10,7 +10,7 @@ create table t2 (a int); insert into t2 values (2), (3); set session join_cache_level=3; -set @@debug = 'd:t:O,/tmp/trace.out'; +set @@debug_dbug= 'd:t:O,/tmp/trace.out'; explain select t1.b from t1,t2 where t1.b=t2.a; select t1.b from t1,t2 where t1.b=t2.a; diff --git a/mysql-test/t/sp-code.test b/mysql-test/t/sp-code.test index 90b4c18895a..4c1b287769d 100644 --- a/mysql-test/t/sp-code.test +++ b/mysql-test/t/sp-code.test @@ -696,9 +696,9 @@ END| delimiter ;| -SET SESSION debug="+d,bug23032_emit_warning"; +SET SESSION debug_dbug="+d,bug23032_emit_warning"; CALL p1(); -SET SESSION debug="-d,bug23032_emit_warning"; +SET SESSION debug_dbug="-d,bug23032_emit_warning"; DROP PROCEDURE p1; DROP TABLE t1; diff --git a/mysql-test/t/subselect_debug.test b/mysql-test/t/subselect_debug.test index ee515733afa..101311beb5c 100644 --- a/mysql-test/t/subselect_debug.test +++ b/mysql-test/t/subselect_debug.test @@ -10,8 +10,8 @@ INSERT INTO t1 VALUES (1),(2),(3),(4); INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d; # Setup the mysqld to crash at certain point SET @orig_debug=@@debug; -SET GLOBAL debug="d,subselect_exec_fail"; +SET GLOBAL debug_dbug="d,subselect_exec_fail"; SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1; SELECT REVERSE(EXISTS(SELECT RAND() FROM t1)); -SET GLOBAL debug=@orig_debug; +SET GLOBAL debug_dbug=@orig_debug; DROP TABLE t1; diff --git a/mysql-test/t/variables_debug.test b/mysql-test/t/variables_debug.test index 6a3bc749b2a..b57ff812ef5 100644 --- a/mysql-test/t/variables_debug.test +++ b/mysql-test/t/variables_debug.test @@ -6,11 +6,11 @@ SET @old_debug = @@GLOBAL.debug; # Bug#34678 @@debug variable's incremental mode # -set debug= 'T'; +set debug_dbug= 'T'; select @@debug; -set debug= '+P'; +set debug_dbug= '+P'; select @@debug; -set debug= '-P'; +set debug_dbug= '-P'; select @@debug; # @@ -19,7 +19,7 @@ select @@debug; SELECT @@session.debug, @@global.debug; -SET SESSION debug = ''; +SET SESSION debug_dbug= ''; SELECT @@session.debug, @@global.debug; @@ -28,12 +28,12 @@ SELECT @@session.debug, @@global.debug; --echo # binlog.binlog_write_error --echo # -SET GLOBAL debug='d,injecting_fault_writing'; +SET GLOBAL debug_dbug='d,injecting_fault_writing'; SELECT @@global.debug; -SET GLOBAL debug=''; +SET GLOBAL debug_dbug=''; SELECT @@global.debug; -SET GLOBAL debug=@old_debug; +SET GLOBAL debug_dbug=@old_debug; --echo # --echo # Bug #56709: Memory leaks at running the 5.1 test suite @@ -41,12 +41,12 @@ SET GLOBAL debug=@old_debug; SET @old_local_debug = @@debug; -SET @@debug='d,foo'; +SET @@debug_dbug='d,foo'; SELECT @@debug; -SET @@debug=''; +SET @@debug_dbug=''; SELECT @@debug; -SET @@debug = @old_local_debug; +SET @@debug_dbug= @old_local_debug; --echo End of 5.1 tests @@ -59,57 +59,57 @@ SET @old_globaldebug = @@global.debug; SET @old_sessiondebug= @@session.debug; --echo # Test 1 - Bug test case, single connection -SET GLOBAL debug= '+O,../../log/bug46165.1.trace'; -SET SESSION debug= '-d:-t:-i'; +SET GLOBAL debug_dbug= '+O,../../log/bug46165.1.trace'; +SET SESSION debug_dbug= '-d:-t:-i'; -SET GLOBAL debug= ''; -SET SESSION debug= ''; +SET GLOBAL debug_dbug= ''; +SET SESSION debug_dbug= ''; --echo # Test 2 - Bug test case, two connections --echo # Connection default connection default; -SET GLOBAL debug= '+O,../../log/bug46165.2.trace'; -SET SESSION debug= '-d:-t:-i'; +SET GLOBAL debug_dbug= '+O,../../log/bug46165.2.trace'; +SET SESSION debug_dbug= '-d:-t:-i'; --echo # Connection con1 connect (con1, localhost, root); -SET GLOBAL debug= ''; +SET GLOBAL debug_dbug= ''; --echo # Connection default connection default; -SET SESSION debug= ''; +SET SESSION debug_dbug= ''; --echo # Connection con1 connection con1; disconnect con1; --source include/wait_until_disconnected.inc --echo # Connection default connection default; -SET GLOBAL debug= ''; +SET GLOBAL debug_dbug= ''; --echo # Test 3 - Active session trace file on disconnect --echo # Connection con1 connect (con1, localhost, root); -SET GLOBAL debug= '+O,../../log/bug46165.3.trace'; -SET SESSION debug= '-d:-t:-i'; -SET GLOBAL debug= ''; +SET GLOBAL debug_dbug= '+O,../../log/bug46165.3.trace'; +SET SESSION debug_dbug= '-d:-t:-i'; +SET GLOBAL debug_dbug= ''; disconnect con1; --source include/wait_until_disconnected.inc --echo # Test 4 - Active session trace file on two connections --echo # Connection default connection default; -SET GLOBAL debug= '+O,../../log/bug46165.4.trace'; -SET SESSION debug= '-d:-t:-i'; +SET GLOBAL debug_dbug= '+O,../../log/bug46165.4.trace'; +SET SESSION debug_dbug= '-d:-t:-i'; --echo # Connection con1 connect (con1, localhost, root); -SET SESSION debug= '-d:-t:-i'; -SET GLOBAL debug= ''; -SET SESSION debug= ''; +SET SESSION debug_dbug= '-d:-t:-i'; +SET GLOBAL debug_dbug= ''; +SET SESSION debug_dbug= ''; --echo # Connection default connection default; -SET SESSION debug= ''; +SET SESSION debug_dbug= ''; --echo # Connection con1 connection con1; disconnect con1; @@ -118,9 +118,9 @@ disconnect con1; connection default; --echo # Test 5 - Different trace files -SET SESSION debug= '+O,../../log/bug46165.5.trace'; -SET SESSION debug= '+O,../../log/bug46165.6.trace'; -SET SESSION debug= '-O'; +SET SESSION debug_dbug= '+O,../../log/bug46165.5.trace'; +SET SESSION debug_dbug= '+O,../../log/bug46165.6.trace'; +SET SESSION debug_dbug= '-O'; -SET GLOBAL debug= @old_globaldebug; -SET SESSION debug= @old_sessiondebug; +SET GLOBAL debug_dbug= @old_globaldebug; +SET SESSION debug_dbug= @old_sessiondebug; diff --git a/mysql-test/t/variables_debug_notembedded.test b/mysql-test/t/variables_debug_notembedded.test index 2d6b53b16ab..cb3797465a7 100644 --- a/mysql-test/t/variables_debug_notembedded.test +++ b/mysql-test/t/variables_debug_notembedded.test @@ -13,15 +13,15 @@ connect(con2,localhost,root,,test,,); # makes output independant of current debug status connection con1; -set session debug="t"; +set session debug_dbug="t"; show session variables like 'debug'; connection con2; -set session debug="t"; +set session debug_dbug="t"; show session variables like 'debug'; # checks influence one session debug variable on another connection con1; -set session debug="d:t"; +set session debug_dbug="d:t"; show session variables like 'debug'; connection con2; show session variables like 'debug'; diff --git a/mysql-test/t/warnings_debug.test b/mysql-test/t/warnings_debug.test index 99d02330960..3055e3894e5 100644 --- a/mysql-test/t/warnings_debug.test +++ b/mysql-test/t/warnings_debug.test @@ -9,7 +9,7 @@ create table t1 (a int primary key) engine=innodb; # Test that warnings produced during autocommit (after calling # set_ok_status()) are still reported to the client. -SET SESSION debug="+d,warn_during_ha_commit_trans"; +SET SESSION debug_dbug="+d,warn_during_ha_commit_trans"; INSERT INTO t1 VALUES (1); # The warning will be shown automatically by mysqltest; there was a bug where # this didn't happen because the warning was not counted when sending result diff --git a/mysys/md5.c b/mysys/md5.c index 2388cebedc4..22a5e409a09 100644 --- a/mysys/md5.c +++ b/mysys/md5.c @@ -176,7 +176,7 @@ my_MD5Final (unsigned char digest[16], my_MD5Context *ctx) putu32(ctx->buf[1], digest + 4); putu32(ctx->buf[2], digest + 8); putu32(ctx->buf[3], digest + 12); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } #ifndef ASM_MD5 diff --git a/plugin/win_auth_client/handshake_client.cc b/plugin/win_auth_client/handshake_client.cc index 02e5483da29..609589e9ef4 100644 --- a/plugin/win_auth_client/handshake_client.cc +++ b/plugin/win_auth_client/handshake_client.cc @@ -241,7 +241,7 @@ Blob Handshake_client::process_data(const Blob &data) This code is executed if debug flag "winauth_first_packet_test" is set, e.g. using client option: - --debug="d,winauth_first_packet_test" + --debug-dbug="d,winauth_first_packet_test" The same debug flag must be enabled in the server, e.g. using statement: diff --git a/scripts/convert-debug-for-diff.sh b/scripts/convert-debug-for-diff.sh index b6c837504cb..5b3ce05b815 100755 --- a/scripts/convert-debug-for-diff.sh +++ b/scripts/convert-debug-for-diff.sh @@ -1,7 +1,7 @@ #!/usr/bin/perl -i # # This script converts all numbers that look like addresses or memory sizes, -# in a debug files generated by --debug (like mysqld --debug), to #. +# in a debug files generated by --debug (like mysqld --debug-dbug), to #. # The script also deletes all thread id's from the start of the line. # This allows you to easily compare the files (for example with diff) diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc index 2f356122687..95f512983da 100644 --- a/sql/debug_sync.cc +++ b/sql/debug_sync.cc @@ -290,7 +290,7 @@ === Co-work with the DBUG facility === - When running the MySQL test suite with the --debug command line + When running the MySQL test suite with the --debug-dbug command line option, the Debug Sync Facility writes trace messages to the DBUG trace. The following shell commands proved very useful in extracting relevant information: diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 64aa42fa337..6ee5f874f22 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -205,9 +205,9 @@ void turn_parser_debug_on() The syntax to run with bison traces is as follows : - Starting a server manually : - mysqld --debug="d,parser_debug" ... + mysqld --debug-dbug="d,parser_debug" ... - Running a test : - mysql-test-run.pl --mysqld="--debug=d,parser_debug" ... + mysql-test-run.pl --mysqld="--debug-dbug=d,parser_debug" ... The result will be in the process stderr (var/log/master.err) */ diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index d2dcbb1b629..c070f0ecf7c 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -565,7 +565,13 @@ static Sys_var_charptr Sys_datadir( #ifndef DBUG_OFF static Sys_var_dbug Sys_dbug( - "debug", "Debug log", sys_var::SESSION, + "debug", "Built-in DBUG debugger", sys_var::SESSION, + CMD_LINE(OPT_ARG, '#'), DEFAULT(""), NO_MUTEX_GUARD, NOT_IN_BINLOG, + ON_CHECK(check_has_super), ON_UPDATE(0), + DEPRECATED(50600, "'@@debug_dbug'")); + +static Sys_var_dbug Sys_debug_dbug( + "debug_dbug", "Built-in DBUG debugger", sys_var::SESSION, CMD_LINE(OPT_ARG, '#'), DEFAULT(""), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_has_super)); #endif diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index b083900e7b7..a7c1c9904bb 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -251,7 +251,7 @@ gdb ./mysqld Then, withn the (gdb) prompt: - (gdb) run --gdb --port=5554 --socket=/tmp/mysqld.5554 --skip-innodb --debug + (gdb) run --gdb --port=5554 --socket=/tmp/mysqld.5554 --skip-innodb --debug-dbug Next, I open several windows for each: diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 80d6b103e4c..a10285a81aa 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -261,7 +261,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. gdb ./mysqld Then, withn the (gdb) prompt: - (gdb) run --gdb --port=5554 --socket=/tmp/mysqld.5554 --skip-innodb --debug + (gdb) run --gdb --port=5554 --socket=/tmp/mysqld.5554 --skip-innodb --debug-dbug Next, I open several windows for each: From 2573f03a05ac3d1f99f8542feff9a0ce4a63c017 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 15 Dec 2011 22:08:42 +0100 Subject: [PATCH 16/20] * remove WITH_DEBUG from CMakeLists.txt * MYSQL_MAINTAINER_MODE and SAFEMALLOC take values ON/OFF/AUTO (in all builds, in none, only in debug and platform dependent) * ./configure prefers RelWithDebInfo unless the user overrides --- BUILD-CMAKE | 2 +- CMakeLists.txt | 137 ++++++++++++++++--------------------- cmake/character_sets.cmake | 2 +- cmake/configure.pl | 5 ++ cmake/install_layout.cmake | 2 +- cmake/maintainer.cmake | 8 +-- cmake/ssl.cmake | 2 +- mysys/CMakeLists.txt | 22 ++---- 8 files changed, 76 insertions(+), 104 deletions(-) diff --git a/BUILD-CMAKE b/BUILD-CMAKE index 2f46a4581f9..060d2481241 100644 --- a/BUILD-CMAKE +++ b/BUILD-CMAKE @@ -134,7 +134,7 @@ as cmake-gui. It is less user-friendly compared to cmake-gui but works also on exotic Unixes like HPUX, AIX or Solaris. Besides storage engines, probably the most important parameter from a -developer's point of view is WITH_DEBUG (this allows to build server with +developer's point of view is CMAKE_BUILD_TYPE (this allows to build server with dbug tracing library and with debug compile flags). After changing the configuration, recompile using diff --git a/CMakeLists.txt b/CMakeLists.txt index b6f771544a7..3cae2e95e3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,19 +22,6 @@ endif() SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) -# First, decide about build type (debug or release) -# If custom compiler flags are set or cmake is invoked with -DCMAKE_BUILD_TYPE, -# respect user wishes and do not (re)define CMAKE_BUILD_TYPE. If WITH_DEBUG{_FULL} -# is given, set CMAKE_BUILD_TYPE = Debug. Otherwise, use Relwithdebinfo. - - -IF(DEFINED CMAKE_BUILD_TYPE) - SET(HAVE_CMAKE_BUILD_TYPE TRUE) -ENDIF() -SET(CUSTOM_C_FLAGS $ENV{CFLAGS}) - -OPTION(WITH_DEBUG "Use dbug/safemutex" OFF) - # Distinguish between community and non-community builds, with the # default being a community build. This does not impact the feature # set that will be compiled in; it's merely provided as a hint to @@ -42,44 +29,34 @@ OPTION(WITH_DEBUG "Use dbug/safemutex" OFF) OPTION(COMMUNITY_BUILD "Set to true if this is a community build" ON) # Use a default manufacturer if no manufacturer was identified. -SET(MANUFACTURER_DOCSTRING - "Set the entity that appears as the manufacturer of packages that support a manufacturer field.") IF(NOT DEFINED MANUFACTURER) - SET(MANUFACTURER "Built from Source" CACHE STRING ${MANUFACTURER_DOCSTRING}) + SET(MANUFACTURER "Built from Source" CACHE STRING + "Set the entity that appears as the manufacturer of packages that support a manufacturer field.") MARK_AS_ADVANCED(MANUFACTURER) ENDIF() -# We choose to provide WITH_DEBUG as alias to standard CMAKE_BUILD_TYPE=Debug -# which turns out to be not trivial, as this involves synchronization -# between CMAKE_BUILD_TYPE and WITH_DEBUG. Besides, we have to deal with cases -# where WITH_DEBUG is reset from ON to OFF and here we need to reset -# CMAKE_BUILD_TYPE to either none or default RelWithDebInfo +SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING + "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel") -SET(BUILDTYPE_DOCSTRING - "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or - CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel") - -IF(WITH_DEBUG) - SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE) - SET(MYSQL_MAINTAINER_MODE ON CACHE BOOL - "MySQL maintainer-specific development environment") - IF(UNIX AND NOT APPLE) - # Compiling with PIC speeds up embedded build, on PIC sensitive systems - # Predefine it to ON, in case user chooses to build embedded. - SET(WITH_PIC ON CACHE BOOL "Compile with PIC") + + +IF(UNIX AND NOT APPLE) + # Note, that generally one should not change settings depending + # on CMAKE_BUILD_TYPE, because VS and Xcode configure once (with + # the empty CMAKE_BUILD_TYPE) and the build many times for + # different build types without re-running cmake! + # But we only care about WITH_PIC on Unix, where the check for + # CMAKE_BUILD_TYPE hapen to work. + IF (CMAKE_BUILD_TYPE MATCHES "Debug") + SET(WITH_PIC_DEFAULT ON) + ELSE() + SET(WITH_PIC_DEFAULT OFF) ENDIF() - SET(OLD_WITH_DEBUG 1 CACHE INTERNAL "" FORCE) -ELSEIF(NOT HAVE_CMAKE_BUILD_TYPE OR OLD_WITH_DEBUG) - IF(CUSTOM_C_FLAGS) - SET(CMAKE_BUILD_TYPE "" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE) - ELSE(CMAKE_BUILD_TYPE MATCHES "Debug" OR NOT HAVE_CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING - ${BUILDTYPE_DOCSTRING} FORCE) - ENDIF() - SET(OLD_WITH_DEBUG 0 CACHE INTERNAL "" FORCE) + # Compiling with PIC speeds up embedded build, on PIC sensitive systems + # Predefine it to OFF in release builds, because of the performance penalty + SET(WITH_PIC ${WITH_PIC_DEFAULT} CACHE BOOL "Compile with PIC.") ENDIF() - PROJECT(MySQL) IF(BUILD_CONFIG) INCLUDE( @@ -117,23 +94,21 @@ ENDIF() # INCLUDE(maintainer) -OPTION(MYSQL_MAINTAINER_MODE - "MySQL maintainer-specific development environment" OFF) +SET(MYSQL_MAINTAINER_MODE "AUTO" CACHE STRING "MySQL maintainer-specific development environment. Options are: ON OFF AUTO.") +MARK_AS_ADVANCED(MYSQL_MAINTAINER_MODE) # Whether the maintainer mode compiler options should be enabled. -IF(MYSQL_MAINTAINER_MODE) - IF(CMAKE_C_COMPILER_ID MATCHES "GNU") - SET_MYSQL_MAINTAINER_GNU_C_OPTIONS() - ENDIF() - IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU") - SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS() - ENDIF() - IF(CMAKE_C_COMPILER_ID MATCHES "Intel") - SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS() - ENDIF() - IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel") - SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS() - ENDIF() +IF(CMAKE_C_COMPILER_ID MATCHES "GNU") + SET_MYSQL_MAINTAINER_GNU_C_OPTIONS() +ENDIF() +IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS() +ENDIF() +IF(CMAKE_C_COMPILER_ID MATCHES "Intel") + SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS() +ENDIF() +IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel") + SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS() ENDIF() # Add macros @@ -191,8 +166,11 @@ MARK_AS_ADVANCED(WITH_FAST_MUTEXES) # Set DBUG_OFF and other optional release-only flags for non-debug project types FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL) FOREACH(LANG C CXX) - SET(CMAKE_${LANG}_FLAGS_${BUILD_TYPE} - "${CMAKE_${LANG}_FLAGS_${BUILD_TYPE}} -DDBUG_OFF") + IF (NOT CMAKE_${LANG}_FLAGS_${BUILD_TYPE} MATCHES "DDBUG_" AND + NOT CMAKE_${LANG}_FLAGS MATCHES "DDBUG_") + SET(CMAKE_${LANG}_FLAGS_${BUILD_TYPE} + "${CMAKE_${LANG}_FLAGS_${BUILD_TYPE}} -DDBUG_OFF") + ENDIF() IF(WITH_FAST_MUTEXES) SET(CMAKE_${LANG}_FLAGS_${BUILD_TYPE} "${CMAKE_${LANG}_FLAGS_${BUILD_TYPE}} -DMY_PTHREAD_FASTMUTEX=1") @@ -200,27 +178,28 @@ FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL) ENDFOREACH() ENDFOREACH() -IF(NOT CMAKE_BUILD_TYPE - AND NOT CMAKE_GENERATOR MATCHES "Visual Studio" - AND NOT CMAKE_GENERATOR MATCHES "Xcode") - # This is the case of no CMAKE_BUILD_TYPE choosen, typical for VS and Xcode - # or if custom C flags are set. In VS and Xcode for non-Debug configurations - # DBUG_OFF is already correctly set. Use DBUG_OFF for Makefile based projects - # without build type too, unless user specifically requests DBUG. - IF(NOT CMAKE_C_FLAGS MATCHES "-DDBUG_ON") - ADD_DEFINITIONS(-DDBUG_OFF) - ENDIF() -ENDIF() - # Add safemutex for debug configurations, except on Windows # (safemutex has never worked on Windows) -IF(WITH_DEBUG AND NOT WIN32) +IF(NOT WIN32) FOREACH(LANG C CXX) - SET(CMAKE_${LANG}_FLAGS_DEBUG - "${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFE_MUTEX") + SET(CMAKE_${LANG}_FLAGS_DEBUG "${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFE_MUTEX") ENDFOREACH() ENDIF() +# safemalloc can be enabled and disabled independently +SET(WITH_SAFEMALLOC "AUTO" CACHE STRING "Use safemalloc memory debugger. Will result in slower execution. Options are: ON OFF AUTO.") + +# force -DUSE_MYSYS_NEW unless already done by HAVE_CXX_NEW +IF(HAVE_CXX_NEW) + SET(DUSE_MYSYS_NEW "-DUSE_MYSYS_NEW") +ENDIF() + +IF(WITH_SAFEMALLOC MATCHES "ON") + ADD_DEFINITIONS( -DSAFEMALLOC ${DUSE_MYSYS_NEW}) +ELSEIF(WITH_SAFEMALLOC MATCHES "AUTO" AND NOT WIN32) + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC ${DUSE_MYSYS_NEW}") +ENDIF() # Set commonly used variables IF(WIN32) @@ -263,12 +242,12 @@ MYSQL_CHECK_READLINE() # not run with the warning options as to not perturb fragile checks # (i.e. do not make warnings into errors). # -IF(MYSQL_MAINTAINER_MODE) - # Set compiler flags required under maintainer mode. - #MESSAGE(STATUS "C warning options: ${MY_MAINTAINER_C_WARNINGS}") +IF(MYSQL_MAINTAINER_MODE MATCHES "ON") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_MAINTAINER_C_WARNINGS}") - #MESSAGE(STATUS "C++ warning options: ${MY_MAINTAINER_CXX_WARNINGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_MAINTAINER_CXX_WARNINGS}") +ELSEIF(MYSQL_MAINTAINER_MODE MATCHES "AUTO") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${MY_MAINTAINER_C_WARNINGS}") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MY_MAINTAINER_CXX_WARNINGS}") ENDIF() IF(WITH_UNIT_TESTS) diff --git a/cmake/character_sets.cmake b/cmake/character_sets.cmake index 1cf63ed1462..74a39e09cac 100644 --- a/cmake/character_sets.cmake +++ b/cmake/character_sets.cmake @@ -37,7 +37,7 @@ sjis swe7 tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32) SET (EXTRA_CHARSETS "all") SET(WITH_EXTRA_CHARSETS ${EXTRA_CHARSETS} CACHE - STRING "Options are: none, complex, all") + STRING "Options are: none complex all") IF(WITH_EXTRA_CHARSETS MATCHES "complex") diff --git a/cmake/configure.pl b/cmake/configure.pl index 565de571452..69f973c41fb 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -149,6 +149,11 @@ foreach my $option (@ARGV) $cmakeargs = $cmakeargs." -DWITH_SSL=yes"; next; } + if($option =~ /with-debug/) + { + $cmakeargs = $cmakeargs." -DCMAKE_BUILD_TYPE=Debug"; + next; + } if($option =~ /with-ssl/) { $cmakeargs = $cmakeargs." -DWITH_SSL=bundled"; diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 9f9dc7dc9a3..23c787a7c97 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -68,7 +68,7 @@ IF(NOT INSTALL_LAYOUT) ENDIF() SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}" -CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer), RPM, DEB, SVR4") +CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) RPM DEB SVR4") IF(UNIX) IF(INSTALL_LAYOUT MATCHES "RPM") diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake index 357fbd97263..cf9b1882715 100644 --- a/cmake/maintainer.cmake +++ b/cmake/maintainer.cmake @@ -27,7 +27,7 @@ MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS) ENDIF() SET(MY_MAINTAINER_C_WARNINGS "${MY_MAINTAINER_WARNINGS} ${MY_MAINTAINER_DECLARATION_AFTER_STATEMENT}" - CACHE STRING "C warning options used in maintainer builds.") + CACHE INTERNAL "C warning options used in maintainer builds.") # Do not make warnings in checks into errors. SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wno-error") ENDMACRO() @@ -36,19 +36,19 @@ ENDMACRO() MACRO(SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS) SET(MY_MAINTAINER_CXX_WARNINGS "${MY_MAINTAINER_WARNINGS} -Wno-unused-parameter -Woverloaded-virtual" - CACHE STRING "C++ warning options used in maintainer builds.") + CACHE INTERNAL "C++ warning options used in maintainer builds.") ENDMACRO() # Setup ICC (Intel C Compiler) warning options. MACRO(SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS) SET(MY_MAINTAINER_WARNINGS "-Wcheck") SET(MY_MAINTAINER_C_WARNINGS "${MY_MAINTAINER_WARNINGS}" - CACHE STRING "C warning options used in maintainer builds.") + CACHE INTERNAL "C warning options used in maintainer builds.") ENDMACRO() # Setup ICPC (Intel C++ Compiler) warning options. MACRO(SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS) SET(MY_MAINTAINER_CXX_WARNINGS "${MY_MAINTAINER_WARNINGS}" - CACHE STRING "C++ warning options used in maintainer builds.") + CACHE INTERNAL "C++ warning options used in maintainer builds.") ENDMACRO() diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 9b16bf09394..001be69e62f 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -14,7 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA MACRO (CHANGE_SSL_SETTINGS string) - SET(WITH_SSL ${string} CACHE STRING "Options are : no, bundled, yes (prefer os library if present otherwise use bundled), system (use os library)" FORCE) + SET(WITH_SSL ${string} CACHE STRING "Options are: no bundled yes(prefer os library if present otherwise use bundled) system(use os library)" FORCE) ENDMACRO() MACRO (MYSQL_USE_BUNDLED_SSL) diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index ec73140a42e..3b42e20c78c 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -33,7 +33,7 @@ SET(MYSYS_SOURCES array.c charset-def.c charset.c checksum.c default.c rijndael.c sha1.c string.c thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c tree.c typelib.c base64.c my_memmem.c my_getpagesize.c lf_alloc-pin.c lf_dynarray.c lf_hash.c - my_addr_resolve.c safemalloc.c + my_addr_resolve.c safemalloc.c my_new.cc my_atomic.c my_getncpus.c my_safehash.c my_chmod.c my_rnd.c my_uuid.c wqueue.c waiting_threads.c ma_dyncol.c my_rdtsc.c) @@ -42,26 +42,14 @@ IF (WIN32) SET (MYSYS_SOURCES ${MYSYS_SOURCES} my_winthread.c my_wincond.c my_winerr.c my_winfile.c my_windac.c my_conio.c) ENDIF() +IF(NOT HAVE_CXX_NEW) + ADD_DEFINITIONS( -DUSE_MYSYS_NEW) +ENDIF() + IF(HAVE_ALARM) SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_alarm.c) ENDIF() -IF(WIN32) - SET(DEFAULT_SAFEMALLOC OFF) -ELSE() - SET(DEFAULT_SAFEMALLOC ON) -ENDIF() -OPTION(WITH_SAFEMALLOC "Use safemalloc for debug builds. Will result in slower execution." ${DEFAULT_SAFEMALLOC}) - -IF(WITH_SAFEMALLOC) - ADD_DEFINITIONS( -DSAFEMALLOC) -ENDIF() - -IF(NOT HAVE_CXX_NEW OR WITH_SAFEMALLOC) - SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_new.cc) - ADD_DEFINITIONS( -DUSE_MYSYS_NEW) -ENDIF() - IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro") # Inline assembly template for rdtsc SET_SOURCE_FILES_PROPERTIES(my_rdtsc.c From 61e0b38f7fa3daae893eeeae85b1710bdb141e61 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 16 Dec 2011 14:13:27 +0100 Subject: [PATCH 17/20] Restore some fixes for slow xtradb shutdown that were lost in the 5.5 merge. --- storage/xtradb/srv/srv0srv.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c index 43da8f867a6..8d1dd9827eb 100644 --- a/storage/xtradb/srv/srv0srv.c +++ b/storage/xtradb/srv/srv0srv.c @@ -2929,7 +2929,7 @@ srv_LRU_dump_restore_thread( last_dump_time = time(NULL); loop: - os_thread_sleep(5000000); + os_event_wait_time_low(srv_shutdown_event, 5000000, 0); if (srv_shutdown_state >= SRV_SHUTDOWN_CLEANUP) { goto exit_func; @@ -3240,9 +3240,11 @@ loop: /* Get sleep interval in micro seconds. We use ut_min() to avoid long sleep in case of wrap around. */ - os_thread_sleep(ut_min(1000000, - (next_itr_time - cur_time) - * 1000)); + os_event_wait_time_low(srv_shutdown_event, + ut_min(1000000, + (next_itr_time - cur_time) + * 1000), + 0); srv_main_sleeps++; /* @@ -3835,6 +3837,7 @@ srv_purge_thread( ulint retries = 0; ulint n_total_purged = ULINT_UNDEFINED; ulint next_itr_time; + ib_int64_t sig_count; ut_a(srv_n_purge_threads == 1); @@ -3909,12 +3912,13 @@ srv_purge_thread( srv_sync_log_buffer_in_background(); cur_time = ut_time_ms(); - os_event_reset(srv_shutdown_event); + sig_count = os_event_reset(srv_shutdown_event); if (next_itr_time > cur_time) { - os_event_wait_time(srv_shutdown_event, - ut_min(1000000, - (next_itr_time - cur_time) - * 1000)); + os_event_wait_time_low(srv_shutdown_event, + ut_min(1000000, + (next_itr_time - cur_time) + * 1000), + sig_count); next_itr_time = ut_time_ms() + 1000; } else { next_itr_time = cur_time + 1000; From c03deada6c0caa1b919608c3c4bdb4115d735cd7 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 21 Dec 2011 02:44:50 +0100 Subject: [PATCH 18/20] fix 64 bit Windows build --- cmake/os/WindowsCache.cmake | 1 + storage/xtradb/handler/ha_innodb.cc | 2 +- storage/xtradb/include/srv0srv.h | 2 +- storage/xtradb/srv/srv0srv.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index b6a2c8b22fe..b0dc2c04250 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -20,6 +20,7 @@ # different results. IF(MSVC) +SET(BFD_H_EXISTS 0 CACHE INTERNAL "") SET(HAVE_ACCESS 1 CACHE INTERNAL "") SET(HAVE_AIO_H CACHE INTERNAL "") SET(HAVE_AIO_READ CACHE INTERNAL "") diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 430baaf767a..f3f2100389c 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -12374,7 +12374,7 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter, #else #define TMP_STR "No effect for this build." #endif -static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction, +static MYSQL_SYSVAR_ULONG(kill_idle_transaction, srv_kill_idle_transaction, PLUGIN_VAR_RQCMDARG, TMP_STR, NULL, NULL, 0, 0, LONG_MAX, 0); diff --git a/storage/xtradb/include/srv0srv.h b/storage/xtradb/include/srv0srv.h index daa0fc3b428..0c864a265e0 100644 --- a/storage/xtradb/include/srv0srv.h +++ b/storage/xtradb/include/srv0srv.h @@ -299,7 +299,7 @@ extern ibool srv_print_latch_waits; extern ulint srv_activity_count; extern ulint srv_fatal_semaphore_wait_threshold; extern ulint srv_dml_needed_delay; -extern lint srv_kill_idle_transaction; +extern ulong srv_kill_idle_transaction; extern mutex_t* kernel_mutex_temp;/* mutex protecting the server, trx structs, query threads, and lock table: we allocate diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c index 8d1dd9827eb..589f632ff5b 100644 --- a/storage/xtradb/srv/srv0srv.c +++ b/storage/xtradb/srv/srv0srv.c @@ -104,7 +104,7 @@ UNIV_INTERN ulint srv_activity_count = 0; UNIV_INTERN ulint srv_fatal_semaphore_wait_threshold = 600; /**/ -UNIV_INTERN lint srv_kill_idle_transaction = 0; +UNIV_INTERN ulong srv_kill_idle_transaction = 0; /* How much data manipulation language (DML) statements need to be delayed, in microseconds, in order to reduce the lagging of the purge thread. */ From b43ee49b4e8674102669ac841f29f66283d193d5 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 21 Dec 2011 23:40:26 +0100 Subject: [PATCH 19/20] keycache sysvars used to pass incorrect offset into the parent constructor, that caused the default value to be written into an arbitrary location inside global_system_variables --- sql/sys_vars.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/sys_vars.h b/sql/sys_vars.h index e7c03bbf552..272506ff1b5 100644 --- a/sql/sys_vars.h +++ b/sql/sys_vars.h @@ -669,7 +669,7 @@ public: }; #endif -#define KEYCACHE_VAR(X) sys_var::GLOBAL,offsetof(KEY_CACHE, X), sizeof(((KEY_CACHE *)0)->X) +#define KEYCACHE_VAR(X) GLOBAL_VAR(dflt_key_cache_var.X) #define keycache_var_ptr(KC, OFF) (((uchar*)(KC))+(OFF)) #define keycache_var(KC, OFF) (*(ulonglong*)keycache_var_ptr(KC, OFF)) typedef bool (*keycache_update_function)(THD *, KEY_CACHE *, ptrdiff_t, ulonglong); @@ -706,7 +706,8 @@ public: { option.var_type|= GET_ASK_ADDR; option.value= (uchar**)1; // crash me, please - keycache_var(dflt_key_cache, off)= def_val; + // fix an offset from global_system_variables to be an offset in KEY_CACHE + offset= global_var_ptr() - (uchar*)dflt_key_cache; SYSVAR_ASSERT(scope() == GLOBAL); } bool global_update(THD *thd, set_var *var) From 8e6cfaf736de92429e5fcc3977529ec2311442c5 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 26 Dec 2011 15:24:54 +0100 Subject: [PATCH 20/20] use ADD_CONVENIENCE_LIBRARY when building libservices, because it is a static library that links with shared libraries, so strictly speaking it should have -fPIC or equivalent flags. Also, it must always build as static no matter whether BUILD_SHARED_LIBS is set. --- libservices/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libservices/CMakeLists.txt b/libservices/CMakeLists.txt index a2189de370a..ee6a7c73abe 100644 --- a/libservices/CMakeLists.txt +++ b/libservices/CMakeLists.txt @@ -22,5 +22,5 @@ SET(MYSQLSERVICES_SOURCES my_thread_scheduler_service.c progress_report_service.c) -ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) +ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)