diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 20:52:47 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 20:52:47 +0100 |
| commit | c4f97d3cfa46a7f1b283926dd7fedb648566283f (patch) | |
| tree | d28e2ef33cd64ce35ce9a4cd92fdee720a9d5e82 /mysql-test | |
| parent | 8c2f3e0c16a4b9c2961a474f399b88be5ec330d1 (diff) | |
| parent | eff71f39ddc117d09da5465f7ea9fe007ed89009 (diff) | |
| download | mariadb-git-c4f97d3cfa46a7f1b283926dd7fedb648566283f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/r/mysql.result | 26 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 22 |
3 files changed, 49 insertions, 0 deletions
diff --git a/mysql-test/disabled.def b/mysql-test/disabled.def index 17bc921ab66..9292081b45e 100644 --- a/mysql-test/disabled.def +++ b/mysql-test/disabled.def @@ -19,3 +19,4 @@ ssl_crl : broken upstream ssl_crl_clrpath : broken upstream file_contents : MDEV-6526 these files are not installed anymore lowercase_fs_on : lower_case_table_names=0 is not an error until 10.1 +partition_open_files_limit : open_files_limit check broken by MDEV-18360 diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 8a24128daa2..ffa5d020153 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -587,3 +587,29 @@ a 2 drop table "a1\""b1"; set sql_mode=default; +create table t1 (a text); +select count(*) from t1; +count(*) +41 +truncate table t1; +select count(*) from t1; +count(*) +41 +truncate table t1; +select count(*) from t1; +count(*) +0 +truncate table t1; +select count(*) from t1; +count(*) +0 +truncate table t1; +select count(*) from t1; +count(*) +41 +truncate table t1; +select count(*) from t1; +count(*) +0 +truncate table t1; +drop table t1; diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 60dc16bfac7..a8e0a0094e4 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -656,3 +656,25 @@ show create table "a1\""b1"; select * from "a1\""b1"; drop table "a1\""b1"; set sql_mode=default; + +# +# mysql --local-infile +# +--let $ldli = load data local infile '$MYSQLTEST_VARDIR/tmp/bug.sql' into table test.t1; +create table t1 (a text); +--exec $MYSQL -e "$ldli" +select count(*) from t1; truncate table t1; +--exec $MYSQL --enable-local-infile -e "$ldli" +select count(*) from t1; truncate table t1; +--error 1 +--exec $MYSQL --disable-local-infile -e "$ldli" +select count(*) from t1; truncate table t1; +--error 1 +--exec $MYSQL -e "/*q*/$ldli" +select count(*) from t1; truncate table t1; +--exec $MYSQL --enable-local-infile -e "/*q*/$ldli" +select count(*) from t1; truncate table t1; +--error 1 +--exec $MYSQL --disable-local-infile -e "/*q*/$ldli" +select count(*) from t1; truncate table t1; +drop table t1; |