diff options
| author | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2021-06-10 11:12:27 +0700 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-06-17 19:30:24 +0200 |
| commit | 97e8d27bed097e6be2c2924077d6f4fd16f94280 (patch) | |
| tree | 3b8d82f8ce62467729dc15a01bb6ac0a4a2d3f42 /mysql-test/suite/perfschema | |
| parent | fe784950532e96812d06f1bcd6b977435154b15c (diff) | |
| download | mariadb-git-97e8d27bed097e6be2c2924077d6f4fd16f94280.tar.gz | |
MDEV-16708: fix in test failures(added --enable_prepared_warnings/--disable_prepared_warnings)
Diffstat (limited to 'mysql-test/suite/perfschema')
| -rw-r--r-- | mysql-test/suite/perfschema/t/alter_table_progress.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/dml_handler.test | 5 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/selects.test | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/suite/perfschema/t/alter_table_progress.test b/mysql-test/suite/perfschema/t/alter_table_progress.test index d0a4055ad0e..d4933ac9006 100644 --- a/mysql-test/suite/perfschema/t/alter_table_progress.test +++ b/mysql-test/suite/perfschema/t/alter_table_progress.test @@ -52,8 +52,10 @@ SET DEBUG_SYNC='copy_data_between_tables_before SIGNAL found_row WAIT_FOR wait_r SET DEBUG_SYNC='now WAIT_FOR found_row'; # Find the statement id of the ALTER TABLE +--enable_prepare_warnings select event_id from performance_schema.events_statements_current where thread_id = @con1_thread_id into @con1_stmt_id; +--disable_prepare_warnings # completed 0 select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED diff --git a/mysql-test/suite/perfschema/t/dml_handler.test b/mysql-test/suite/perfschema/t/dml_handler.test index 16810fcba82..d289d89ce50 100644 --- a/mysql-test/suite/perfschema/t/dml_handler.test +++ b/mysql-test/suite/perfschema/t/dml_handler.test @@ -21,6 +21,8 @@ CREATE TEMPORARY TABLE table_list (id INT AUTO_INCREMENT, PRIMARY KEY (id)) AS WHERE TABLE_SCHEMA='performance_schema' ORDER BY TABLE_NAME; +--enable_prepare_warnings + SELECT COUNT(*) FROM table_list INTO @table_count; let $count=`SELECT @table_count`; @@ -39,5 +41,6 @@ while ($count > 0) dec $count; } -DROP TEMPORARY TABLE table_list; +--disable_prepare_warnings +DROP TEMPORARY TABLE table_list; diff --git a/mysql-test/suite/perfschema/t/selects.test b/mysql-test/suite/perfschema/t/selects.test index d2d447bd77e..c67cb4b286c 100644 --- a/mysql-test/suite/perfschema/t/selects.test +++ b/mysql-test/suite/perfschema/t/selects.test @@ -126,6 +126,7 @@ DROP TRIGGER t_ps_trigger; --disable_warnings DROP PROCEDURE IF EXISTS t_ps_proc; --enable_warnings +--enable_prepare_warnings delimiter |; CREATE PROCEDURE t_ps_proc(IN conid INT, OUT pid INT) @@ -140,6 +141,7 @@ delimiter ;| CALL t_ps_proc(connection_id(), @p_id); +--disable_prepare_warnings # FUNCTION --disable_warnings |