database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-16708: fixed issue with handling of the directive --enable-prepared-warnings in mysqltest

Browse Source
This commit is contained in:
Dmitry Shulga
2021-06-07 00:39:15 +07:00
committed by Sergei Golubchik
parent fc71746a6a
commit b126c3f3fa
50 changed files with 141 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/ctype_numconv.inc
View File

@@ -1043,7 +1043,7 @@ update t1 set a= a + 0.1;
select a, hex(a) from t1;
drop table t1;
--enable_prepare_warnings
#
# Columns
#
@@ -1203,7 +1203,6 @@ create table t2 as select concat(a) from t1;
show create table t2;
drop table t1, t2;
#
# create view with string functions with numeric input
#
@@ -1517,6 +1516,7 @@ select hex(a) from v1;
drop table t1;
drop view v1;
--disable_prepare_warnings
#
# User defined function returning numeric result
#

4
mysql-test/include/explain_utils.inc
View File

@@ -28,9 +28,11 @@
--echo #
if ($select) {
--enable_prepare_warnings
--disable_query_log
--eval $select INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/before_explain.txt'
--enable_query_log
--disable_prepare_warnings
}
if ($innodb) {
@@ -122,7 +124,9 @@ if ($validation) {
--disable_query_log
if ($select) {
--enable_prepare_warnings
--eval $select INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/after_explain.txt'
--disable_prepare_warnings
--diff_files '$MYSQLTEST_VARDIR/tmp/before_explain.txt' '$MYSQLTEST_VARDIR/tmp/after_explain.txt'
--remove_file '$MYSQLTEST_VARDIR/tmp/before_explain.txt'
--remove_file '$MYSQLTEST_VARDIR/tmp/after_explain.txt'