diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-21 12:28:00 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-21 12:28:00 +0200 |
| commit | 1ee0144db7a38bf1cb768505b606fb407f097110 (patch) | |
| tree | 3041da9db2ab6138c88de406120ecacb89fb8fe6 /mysql-test/main | |
| parent | ae2004c616e2955a7978a0e7b876836ef9d8ee33 (diff) | |
| parent | d07a6e33dd8738d7521e376ca55d5ae3062eb3cf (diff) | |
| download | mariadb-git-1ee0144db7a38bf1cb768505b606fb407f097110.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/information_schema.test | 4 | ||||
| -rw-r--r-- | mysql-test/main/invisible_field_debug.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/invisible_field_debug.test | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/main/information_schema.test b/mysql-test/main/information_schema.test index 1f72d0b6129..2b318f5f1aa 100644 --- a/mysql-test/main/information_schema.test +++ b/mysql-test/main/information_schema.test @@ -8,6 +8,10 @@ # on the presence of the log tables (which are CSV-based). --source include/have_csv.inc +# Without aria_used_for_temp_tables some I_S tables will be MyISAM, +# while the test expects them to be Aria +-- source include/have_aria_used_for_temp_tables.inc + -- source include/have_innodb.inc # Save the initial number of concurrent sessions diff --git a/mysql-test/main/invisible_field_debug.result b/mysql-test/main/invisible_field_debug.result index b3c84d18333..0ea8ab12de8 100644 --- a/mysql-test/main/invisible_field_debug.result +++ b/mysql-test/main/invisible_field_debug.result @@ -17,6 +17,8 @@ a invisible 1 9 insert into t1(a, invisible) values(99,99); ERROR 42S22: Unknown column 'invisible' in 'field list' +select default(invisible) from t1; +ERROR 42S22: Unknown column 'invisible' in 'field list' insert into t1(invisible) values(99); ERROR 42S22: Unknown column 'invisible' in 'field list' insert into t_tmp select a, invisible from t1; diff --git a/mysql-test/main/invisible_field_debug.test b/mysql-test/main/invisible_field_debug.test index c1d6899d16e..86252512386 100644 --- a/mysql-test/main/invisible_field_debug.test +++ b/mysql-test/main/invisible_field_debug.test @@ -13,6 +13,8 @@ select a , invisible from t1; --error ER_BAD_FIELD_ERROR insert into t1(a, invisible) values(99,99); --error ER_BAD_FIELD_ERROR +select default(invisible) from t1; +--error ER_BAD_FIELD_ERROR insert into t1(invisible) values(99); insert into t_tmp select a, invisible from t1; --error ER_WRONG_VALUE_COUNT_ON_ROW |