diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-17 19:39:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-17 19:39:05 +0200 |
| commit | 94b45787045677c106a25ebb5aaf1273040b2ff6 (patch) | |
| tree | 4231461f1f43bc3dd1335c7f7738cd85d2957621 /plugin | |
| parent | 66b8edf8a57c106b15ef1de2b25ce3e992540b71 (diff) | |
| parent | 16388f393c63b3e2158db1efec8dd9625a0a295e (diff) | |
| download | mariadb-git-94b45787045677c106a25ebb5aaf1273040b2ff6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/feedback/sender_thread.cc | 2 | ||||
| -rw-r--r-- | plugin/type_inet/mysql-test/type_inet/type_inet6_partition.result | 2 | ||||
| -rw-r--r-- | plugin/type_inet/mysql-test/type_inet/type_inet6_partition.test | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc index 19b68b70650..73b1bc67e79 100644 --- a/plugin/feedback/sender_thread.cc +++ b/plugin/feedback/sender_thread.cc @@ -47,7 +47,7 @@ static int table_to_string(TABLE *table, String *result) res= table->file->ha_rnd_init(1); - dbug_tmp_use_all_columns(table, table->read_set); + dbug_tmp_use_all_columns(table, &table->read_set); while(!res && !table->file->ha_rnd_next(table->record[0])) { diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_partition.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_partition.result index 1b98078a91d..48f10a39989 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_partition.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_partition.result @@ -13,7 +13,7 @@ ERROR HY000: Partition column values of incorrect type CREATE TABLE t1 (a INET6) PARTITION BY LIST COLUMNS(a) (PARTITION p00 VALUES IN ('€')); -ERROR HY000: This partition function is not allowed +ERROR 22007: Incorrect inet6 value: '€' CREATE TABLE t1 (a INET6) PARTITION BY LIST COLUMNS(a) (PARTITION p00 VALUES IN ('::'), diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_partition.test b/plugin/type_inet/mysql-test/type_inet/type_inet6_partition.test index 95aec533506..76ab24781f0 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_partition.test +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_partition.test @@ -16,7 +16,7 @@ CREATE TABLE t1 (a INET6) PARTITION BY LIST COLUMNS(a) (PARTITION p00 VALUES IN (TIME'10:20:30')); ---error ER_PARTITION_FUNCTION_IS_NOT_ALLOWED +--error ER_TRUNCATED_WRONG_VALUE CREATE TABLE t1 (a INET6) PARTITION BY LIST COLUMNS(a) (PARTITION p00 VALUES IN ('€')); |