summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-12-18 09:15:41 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-12-18 09:15:41 +0200
commit45531949ae115f2ba7b9450cc2386653483211ba (patch)
tree22809f3919c711d5030d2d0e55be969a7bc67e84
parent36b7f8f4b0e46e06cfcc29c221430a5b998e3b3f (diff)
parented13a0d221256028299df4167280e97860ba2edc (diff)
downloadmariadb-git-45531949ae115f2ba7b9450cc2386653483211ba.tar.gz
Merge 10.2 into 10.3
-rw-r--r--extra/innochecksum.cc11
-rw-r--r--extra/mariabackup/backup_copy.cc6
-rw-r--r--extra/mariabackup/fil_cur.cc11
-rw-r--r--extra/mariabackup/xtrabackup.cc170
-rw-r--r--mysql-test/include/innodb_encrypt_tables.combinations4
-rw-r--r--mysql-test/main/alter_table.result6
-rw-r--r--mysql-test/main/create.result6
-rw-r--r--mysql-test/main/ctype_big5.result128
-rw-r--r--mysql-test/main/ctype_cp932_binlog_stm.result128
-rw-r--r--mysql-test/main/ctype_eucjpms.result128
-rw-r--r--mysql-test/main/ctype_euckr.result140
-rw-r--r--mysql-test/main/ctype_gb2312.result128
-rw-r--r--mysql-test/main/ctype_gbk.result454
-rw-r--r--mysql-test/main/ctype_latin1.result8
-rw-r--r--mysql-test/main/ctype_many.result4
-rw-r--r--mysql-test/main/ctype_recoding.result4
-rw-r--r--mysql-test/main/ctype_sjis.result128
-rw-r--r--mysql-test/main/ctype_uca.result40
-rw-r--r--mysql-test/main/ctype_uca_innodb.result28
-rw-r--r--mysql-test/main/ctype_ucs.result2
-rw-r--r--mysql-test/main/ctype_ujis.result128
-rw-r--r--mysql-test/main/ctype_ujis_ucs2.result150
-rw-r--r--mysql-test/main/ctype_utf16.result4
-rw-r--r--mysql-test/main/ctype_utf16le.result4
-rw-r--r--mysql-test/main/ctype_utf32.result18
-rw-r--r--mysql-test/main/ctype_utf8.result86
-rw-r--r--mysql-test/main/ctype_utf8mb4.result52
-rw-r--r--mysql-test/main/ctype_utf8mb4_heap.result14
-rw-r--r--mysql-test/main/ctype_utf8mb4_innodb.result16
-rw-r--r--mysql-test/main/ctype_utf8mb4_myisam.result16
-rw-r--r--mysql-test/main/custom_aggregate_functions.result2
-rw-r--r--mysql-test/main/delayed.result4
-rw-r--r--mysql-test/main/events_bugs.result2
-rw-r--r--mysql-test/main/fulltext.result8
-rw-r--r--mysql-test/main/func_set.result4
-rw-r--r--mysql-test/main/gis.result2
-rw-r--r--mysql-test/main/gis2.result4
-rw-r--r--mysql-test/main/innodb_icp.result2
-rw-r--r--mysql-test/main/insert.result32
-rw-r--r--mysql-test/main/loaddata.result6
-rw-r--r--mysql-test/main/myisam_icp.result2
-rw-r--r--mysql-test/main/outfile_loaddata.result4
-rw-r--r--mysql-test/main/partition_innodb.result2
-rw-r--r--mysql-test/main/processlist.result2
-rw-r--r--mysql-test/main/ps.result6
-rw-r--r--mysql-test/main/range.result10
-rw-r--r--mysql-test/main/range_mrr_icp.result10
-rw-r--r--mysql-test/main/sp-cursor.result2
-rw-r--r--mysql-test/main/sp-error.result2
-rw-r--r--mysql-test/main/sp-vars.result8
-rw-r--r--mysql-test/main/sp.result6
-rw-r--r--mysql-test/main/strict.result184
-rw-r--r--mysql-test/main/subselect_mat.result4
-rw-r--r--mysql-test/main/subselect_sj_mat.result4
-rw-r--r--mysql-test/main/trigger.result2
-rw-r--r--mysql-test/main/type_date.result22
-rw-r--r--mysql-test/main/type_datetime.result8
-rw-r--r--mysql-test/main/type_decimal.result4
-rw-r--r--mysql-test/main/type_float.result2
-rw-r--r--mysql-test/main/type_newdecimal.result2
-rw-r--r--mysql-test/main/type_newdecimal.test1
-rw-r--r--mysql-test/main/type_num.result168
-rw-r--r--mysql-test/main/type_time.result22
-rw-r--r--mysql-test/main/type_timestamp.result4
-rw-r--r--mysql-test/main/view.result4
-rw-r--r--mysql-test/main/warnings.result68
-rw-r--r--mysql-test/main/win.result13
-rw-r--r--mysql-test/main/win.test11
-rw-r--r--mysql-test/suite/compat/oracle/r/sp-cursor.result2
-rw-r--r--mysql-test/suite/encryption/r/innodb-force-corrupt.result3
-rw-r--r--mysql-test/suite/encryption/t/innodb-force-corrupt.test9
-rw-r--r--mysql-test/suite/engines/funcs/r/in_number_boundary_error.result12
-rw-r--r--mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result8
-rw-r--r--mysql-test/suite/engines/iuds/r/insert_decimal.result12
-rw-r--r--mysql-test/suite/engines/iuds/r/insert_number.result204
-rw-r--r--mysql-test/suite/engines/iuds/r/insert_year.result16
-rw-r--r--mysql-test/suite/engines/iuds/r/update_decimal.result4
-rw-r--r--mysql-test/suite/funcs_1/r/innodb_func_view.result72
-rw-r--r--mysql-test/suite/funcs_1/r/is_columns_innodb.result4
-rw-r--r--mysql-test/suite/funcs_1/r/memory_func_view.result72
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_func_view.result72
-rw-r--r--mysql-test/suite/funcs_1/r/storedproc.result6
-rw-r--r--mysql-test/suite/galera/r/galera_defaults.result1
-rw-r--r--mysql-test/suite/galera/r/galera_prepared_statement.result2
-rw-r--r--mysql-test/suite/galera/t/galera_defaults.test23
-rw-r--r--mysql-test/suite/gcol/r/innodb_virtual_index.result2
-rw-r--r--mysql-test/suite/innodb/r/innodb-online-alter-gis.result2
-rw-r--r--mysql-test/suite/innodb/r/innodb-update-insert.result4
-rw-r--r--mysql-test/suite/innodb_fts/r/create.result4
-rw-r--r--mysql-test/suite/innodb_gis/r/1.result4
-rw-r--r--mysql-test/suite/innodb_gis/r/alter_spatial_index.result4
-rw-r--r--mysql-test/suite/innodb_gis/r/gis.result4
-rw-r--r--mysql-test/suite/maria/icp.result2
-rw-r--r--mysql-test/suite/mariabackup/backup_grants.result5
-rw-r--r--mysql-test/suite/mariabackup/backup_grants.test30
-rw-r--r--mysql-test/suite/plugins/r/sql_error_log.result4
-rw-r--r--mysql-test/suite/rpl/r/rpl_bug31076.result2
-rw-r--r--mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result2
-rw-r--r--mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result2
-rw-r--r--mysql-test/suite/rpl/r/rpl_rewrt_db.result6
-rw-r--r--sql/field.cc33
-rw-r--r--sql/item.cc15
-rw-r--r--sql/item.h1
-rw-r--r--sql/item_create.cc2
-rw-r--r--sql/item_func.cc3
-rw-r--r--sql/item_strfunc.cc6
-rw-r--r--sql/item_timefunc.cc8
-rw-r--r--sql/share/errmsg-utf8.txt4
-rw-r--r--sql/sql_class.cc9
-rw-r--r--sql/sql_select.cc2
-rw-r--r--sql/sql_table.cc21
-rw-r--r--sql/sql_time.cc44
-rw-r--r--sql/sql_time.h15
-rw-r--r--storage/connect/mysql-test/connect/r/dir.result2
-rw-r--r--storage/connect/mysql-test/connect/r/xml2.result2
-rw-r--r--storage/innobase/buf/buf0buf.cc43
-rw-r--r--storage/innobase/buf/buf0dblwr.cc41
-rw-r--r--storage/innobase/fil/fil0crypt.cc199
-rw-r--r--storage/innobase/ibuf/ibuf0ibuf.cc14
-rw-r--r--storage/innobase/include/buf0buf.h11
-rw-r--r--storage/innobase/include/fil0crypt.h11
-rw-r--r--storage/innobase/row/row0import.cc4
-rw-r--r--storage/innobase/row/row0merge.cc64
-rw-r--r--storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_strict_sql_mode_out_of_range.result2
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result2
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result4
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result4
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result14
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/r/type_bool.result4
-rw-r--r--storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result2
-rw-r--r--storage/tokudb/mysql-test/tokudb/r/type_date.result6
-rw-r--r--storage/tokudb/mysql-test/tokudb/r/type_datetime.result4
-rw-r--r--storage/tokudb/mysql-test/tokudb/r/type_decimal.result4
-rw-r--r--storage/tokudb/mysql-test/tokudb/r/type_float.result2
-rw-r--r--storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result2
135 files changed, 2022 insertions, 1846 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index e4b81dff34c..5c6cf74fd8e 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -524,7 +524,16 @@ is_page_corrupted(
normal method. */
if (is_encrypted && key_version != 0) {
is_corrupted = !fil_space_verify_crypt_checksum(buf,
- page_size, space_id, (ulint)cur_page_num);
+ page_size);
+ if (is_corrupted && log_file) {
+ fprintf(log_file,
+ "Page " ULINTPF ":%llu may be corrupted;"
+ " key_version=%u\n",
+ space_id, cur_page_num,
+ mach_read_from_4(
+ FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION
+ + buf));
+ }
} else {
is_corrupted = true;
}
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
index 1e2d57626e1..4573c1977e7 100644
--- a/extra/mariabackup/backup_copy.cc
+++ b/extra/mariabackup/backup_copy.cc
@@ -1395,7 +1395,9 @@ static lsn_t get_current_lsn(MYSQL *connection)
"SHOW ENGINE INNODB STATUS",
true, false)) {
if (MYSQL_ROW row = mysql_fetch_row(res)) {
- if (const char *p = strstr(row[2], lsn_prefix)) {
+ const char *p= strstr(row[2], lsn_prefix);
+ DBUG_ASSERT(p);
+ if (p) {
p += sizeof lsn_prefix - 1;
lsn = lsn_t(strtoll(p, NULL, 10));
}
@@ -1483,7 +1485,7 @@ bool backup_start()
write_binlog_info(mysql_connection);
}
- if (have_flush_engine_logs) {
+ if (have_flush_engine_logs && !opt_no_lock) {
msg_ts("Executing FLUSH NO_WRITE_TO_BINLOG ENGINE LOGS...\n");
xb_mysql_query(mysql_connection,
"FLUSH NO_WRITE_TO_BINLOG ENGINE LOGS", false);
diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc
index 258317bec05..27d957693ed 100644
--- a/extra/mariabackup/fil_cur.cc
+++ b/extra/mariabackup/fil_cur.cc
@@ -361,9 +361,14 @@ read_retry:
page_no >= FSP_EXTENT_SIZE &&
page_no < FSP_EXTENT_SIZE * 3) {
/* We ignore the doublewrite buffer pages */
- } else if (fil_space_verify_crypt_checksum(
- page, cursor->page_size,
- space->id, page_no)) {
+ } else if (mach_read_from_4(
+ page
+ + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION)
+ && space->crypt_data
+ && space->crypt_data->type
+ != CRYPT_SCHEME_UNENCRYPTED
+ && fil_space_verify_crypt_checksum(
+ page, cursor->page_size)) {
ut_ad(mach_read_from_4(page + FIL_PAGE_SPACE_ID)
== space->id);
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 59426b51127..75760ad352b 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -301,6 +301,7 @@ my_bool opt_decompress = FALSE;
my_bool opt_remove_original;
my_bool opt_lock_ddl_per_table = FALSE;
+static my_bool opt_check_privileges;
extern const char *innodb_checksum_algorithm_names[];
extern TYPELIB innodb_checksum_algorithm_typelib;
@@ -832,7 +833,8 @@ enum options_xtrabackup
OPT_PROTOCOL,
OPT_LOCK_DDL_PER_TABLE,
OPT_ROCKSDB_DATADIR,
- OPT_BACKUP_ROCKSDB
+ OPT_BACKUP_ROCKSDB,
+ OPT_XTRA_CHECK_PRIVILEGES
};
struct my_option xb_client_options[] =
@@ -1385,6 +1387,10 @@ struct my_option xb_server_options[] =
&xb_backup_rocksdb, &xb_backup_rocksdb,
0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0 },
+ {"check-privileges", OPT_XTRA_CHECK_PRIVILEGES, "Check database user "
+ "privileges fro the backup user",
+ &opt_check_privileges, &opt_check_privileges,
+ 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
@@ -5649,6 +5655,164 @@ append_defaults_group(const char *group, const char *default_groups[],
ut_a(appended);
}
+static const char*
+normalize_privilege_target_name(const char* name)
+{
+ if (strcmp(name, "*") == 0) {
+ return "\\*";
+ }
+ else {
+ /* should have no regex special characters. */
+ ut_ad(strpbrk(name, ".()[]*+?") == 0);
+ }
+ return name;
+}
+
+/******************************************************************//**
+Check if specific privilege is granted.
+Uses regexp magic to check if requested privilege is granted for given
+database.table or database.* or *.*
+or if user has 'ALL PRIVILEGES' granted.
+@return true if requested privilege is granted, false otherwise. */
+static bool
+has_privilege(const std::list<std::string> &granted,
+ const char* required,
+ const char* db_name,
+ const char* table_name)
+{
+ char buffer[1000];
+ regex_t priv_re;
+ regmatch_t tables_regmatch[1];
+ bool result = false;
+
+ db_name = normalize_privilege_target_name(db_name);
+ table_name = normalize_privilege_target_name(table_name);
+
+ int written = snprintf(buffer, sizeof(buffer),
+ "GRANT .*(%s)|(ALL PRIVILEGES).* ON (\\*|`%s`)\\.(\\*|`%s`)",
+ required, db_name, table_name);
+ if (written < 0 || written == sizeof(buffer)
+ || regcomp(&priv_re, buffer, REG_EXTENDED)) {
+ exit(EXIT_FAILURE);
+ }
+
+ typedef std::list<std::string>::const_iterator string_iter;
+ for (string_iter i = granted.begin(), e = granted.end(); i != e; ++i) {
+ int res = regexec(&priv_re, i->c_str(),
+ 1, tables_regmatch, 0);
+
+ if (res != REG_NOMATCH) {
+ result = true;
+ break;
+ }
+ }
+
+ xb_regfree(&priv_re);
+ return result;
+}
+
+enum {
+ PRIVILEGE_OK = 0,
+ PRIVILEGE_WARNING = 1,
+ PRIVILEGE_ERROR = 2,
+};
+
+/******************************************************************//**
+Check if specific privilege is granted.
+Prints error message if required privilege is missing.
+@return PRIVILEGE_OK if requested privilege is granted, error otherwise. */
+static
+int check_privilege(
+ const std::list<std::string> &granted_priv, /* in: list of
+ granted privileges*/
+ const char* required, /* in: required privilege name */
+ const char* target_database, /* in: required privilege target
+ database name */
+ const char* target_table, /* in: required privilege target
+ table name */
+ int error = PRIVILEGE_ERROR) /* in: return value if privilege
+ is not granted */
+{
+ if (!has_privilege(granted_priv,
+ required, target_database, target_table)) {
+ msg("%s: missing required privilege %s on %s.%s\n",
+ (error == PRIVILEGE_ERROR ? "Error" : "Warning"),
+ required, target_database, target_table);
+ return error;
+ }
+ return PRIVILEGE_OK;
+}
+
+
+/******************************************************************//**
+Check DB user privileges according to the intended actions.
+
+Fetches DB user privileges, determines intended actions based on
+command-line arguments and prints missing privileges.
+May terminate application with EXIT_FAILURE exit code.*/
+static void
+check_all_privileges()
+{
+ if (!mysql_connection) {
+ /* Not connected, no queries is going to be executed. */
+ return;
+ }
+
+ /* Fetch effective privileges. */
+ std::list<std::string> granted_privileges;
+ MYSQL_ROW row = 0;
+ MYSQL_RES* result = xb_mysql_query(mysql_connection, "SHOW GRANTS",
+ true);
+ while ((row = mysql_fetch_row(result))) {
+ granted_privileges.push_back(*row);
+ }
+ mysql_free_result(result);
+
+ int check_result = PRIVILEGE_OK;
+ bool reload_checked = false;
+
+ /* FLUSH TABLES WITH READ LOCK */
+ if (!opt_no_lock)
+ {
+ check_result |= check_privilege(
+ granted_privileges,
+ "RELOAD", "*", "*");
+ reload_checked = true;
+ }
+
+ if (!opt_no_lock)
+ {
+ check_result |= check_privilege(
+ granted_privileges,
+ "PROCESS", "*", "*");
+ }
+
+ /* KILL ... */
+ if ((!opt_no_lock && (opt_kill_long_queries_timeout || opt_lock_ddl_per_table))
+ /* START SLAVE SQL_THREAD */
+ /* STOP SLAVE SQL_THREAD */
+ || opt_safe_slave_backup) {
+ check_result |= check_privilege(
+ granted_privileges,
+ "SUPER", "*", "*",
+ PRIVILEGE_WARNING);
+ }
+
+ /* SHOW MASTER STATUS */
+ /* SHOW SLAVE STATUS */
+ if (opt_galera_info || opt_slave_info
+ || (opt_no_lock && opt_safe_slave_backup)) {
+ check_result |= check_privilege(granted_privileges,
+ "REPLICATION CLIENT", "*", "*",
+ PRIVILEGE_WARNING);
+ }
+
+ if (check_result & PRIVILEGE_ERROR) {
+ mysql_close(mysql_connection);
+ exit(EXIT_FAILURE);
+ }
+}
+
bool
xb_init()
{
@@ -5713,7 +5877,9 @@ xb_init()
if (!get_mysql_vars(mysql_connection)) {
return(false);
}
-
+ if (opt_check_privileges) {
+ check_all_privileges();
+ }
history_start_time = time(NULL);
}
diff --git a/mysql-test/include/innodb_encrypt_tables.combinations b/mysql-test/include/innodb_encrypt_tables.combinations
index cb32fea998a..4ca9b672119 100644
--- a/mysql-test/include/innodb_encrypt_tables.combinations
+++ b/mysql-test/include/innodb_encrypt_tables.combinations
@@ -3,12 +3,12 @@ innodb_encrypt_tables=ON
plugin-load-add=$FILE_KEY_MANAGEMENT_SO
loose-file-key-management
loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt
-file-key-management-encryption-algorithm=aes_ctr
+file-key-management-encryption-algorithm=aes_cbc
[clear]
innodb_encrypt_tables=OFF
plugin-load-add=$FILE_KEY_MANAGEMENT_SO
loose-file-key-management
loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt
-file-key-management-encryption-algorithm=aes_ctr
+file-key-management-encryption-algorithm=aes_cbc
diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result
index 8e54e882979..a896d24d510 100644
--- a/mysql-test/main/alter_table.result
+++ b/mysql-test/main/alter_table.result
@@ -751,12 +751,12 @@ create table t1(f1 int);
alter table t1 add column f2 datetime not null, add column f21 date not null;
insert into t1 values(1,'2000-01-01','2000-01-01');
alter table t1 add column f3 datetime not null;
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'f3' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`f3` at row 1
alter table t1 add column f3 date not null;
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'f3' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`f3` at row 1
alter table t1 add column f4 datetime not null default '2002-02-02',
add column f41 date not null;
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'f41' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`f41` at row 1
alter table t1 add column f4 datetime not null default '2002-02-02',
add column f41 date not null default '2002-02-02';
select * from t1;
diff --git a/mysql-test/main/create.result b/mysql-test/main/create.result
index dc34185ad2e..fd017c0967b 100644
--- a/mysql-test/main/create.result
+++ b/mysql-test/main/create.result
@@ -1249,7 +1249,7 @@ INSERT INTO t3 VALUES (0);
SET sql_mode = TRADITIONAL;
ALTER TABLE t3 ADD INDEX(c1);
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'c1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t3`.`c1` at row 1
# -- Cleanup.
SET sql_mode = '';
@@ -1807,12 +1807,12 @@ NULL 0000-00-00 0000-00-00
drop table t1;
set @@session.sql_mode='STRICT_ALL_TABLES';
create table if not exists t1 (a int, b date, c date) select 1 as b, 2 as c;
-ERROR 22007: Incorrect date value: '1' for column 'b' at row 1
+ERROR 22007: Incorrect date value: '1' for column `test`.`t1`.`b` at row 1
select * from t1;
ERROR 42S02: Table 'test.t1' doesn't exist
create table if not exists t1 (a int, b date, c date)
replace select 1 as b, 2 as c;
-ERROR 22007: Incorrect date value: '1' for column 'b' at row 1
+ERROR 22007: Incorrect date value: '1' for column `test`.`t1`.`b` at row 1
select * from t1;
ERROR 42S02: Table 'test.t1' doesn't exist
create table if not exists t1 (a int, b date, c date)
diff --git a/mysql-test/main/ctype_big5.result b/mysql-test/main/ctype_big5.result
index 2db4da51667..f61fc4c8400 100644
--- a/mysql-test/main/ctype_big5.result
+++ b/mysql-test/main/ctype_big5.result
@@ -565,70 +565,70 @@ COUNT(*)
28672
UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
Warnings:
-Warning 1366 Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\x80!' for column 'a' at row 2
-Warning 1366 Incorrect string value: '\x80"' for column 'a' at row 3
-Warning 1366 Incorrect string value: '\x80#' for column 'a' at row 4
-Warning 1366 Incorrect string value: '\x80$' for column 'a' at row 5
-Warning 1366 Incorrect string value: '\x80%' for column 'a' at row 6
-Warning 1366 Incorrect string value: '\x80&' for column 'a' at row 7
-Warning 1366 Incorrect string value: '\x80'' for column 'a' at row 8
-Warning 1366 Incorrect string value: '\x80(' for column 'a' at row 9
-Warning 1366 Incorrect string value: '\x80)' for column 'a' at row 10
-Warning 1366 Incorrect string value: '\x80*' for column 'a' at row 11
-Warning 1366 Incorrect string value: '\x80+' for column 'a' at row 12
-Warning 1366 Incorrect string value: '\x80,' for column 'a' at row 13
-Warning 1366 Incorrect string value: '\x80-' for column 'a' at row 14
-Warning 1366 Incorrect string value: '\x80.' for column 'a' at row 15
-Warning 1366 Incorrect string value: '\x80/' for column 'a' at row 16
-Warning 1366 Incorrect string value: '\x800' for column 'a' at row 17
-Warning 1366 Incorrect string value: '\x801' for column 'a' at row 18
-Warning 1366 Incorrect string value: '\x802' for column 'a' at row 19
-Warning 1366 Incorrect string value: '\x803' for column 'a' at row 20
-Warning 1366 Incorrect string value: '\x804' for column 'a' at row 21
-Warning 1366 Incorrect string value: '\x805' for column 'a' at row 22
-Warning 1366 Incorrect string value: '\x806' for column 'a' at row 23
-Warning 1366 Incorrect string value: '\x807' for column 'a' at row 24
-Warning 1366 Incorrect string value: '\x808' for column 'a' at row 25
-Warning 1366 Incorrect string value: '\x809' for column 'a' at row 26
-Warning 1366 Incorrect string value: '\x80:' for column 'a' at row 27
-Warning 1366 Incorrect string value: '\x80;' for column 'a' at row 28
-Warning 1366 Incorrect string value: '\x80<' for column 'a' at row 29
-Warning 1366 Incorrect string value: '\x80=' for column 'a' at row 30
-Warning 1366 Incorrect string value: '\x80>' for column 'a' at row 31
-Warning 1366 Incorrect string value: '\x80?' for column 'a' at row 32
-Warning 1366 Incorrect string value: '\x80@' for column 'a' at row 33
-Warning 1366 Incorrect string value: '\x80A' for column 'a' at row 34
-Warning 1366 Incorrect string value: '\x80B' for column 'a' at row 35
-Warning 1366 Incorrect string value: '\x80C' for column 'a' at row 36
-Warning 1366 Incorrect string value: '\x80D' for column 'a' at row 37
-Warning 1366 Incorrect string value: '\x80E' for column 'a' at row 38
-Warning 1366 Incorrect string value: '\x80F' for column 'a' at row 39
-Warning 1366 Incorrect string value: '\x80G' for column 'a' at row 40
-Warning 1366 Incorrect string value: '\x80H' for column 'a' at row 41
-Warning 1366 Incorrect string value: '\x80I' for column 'a' at row 42
-Warning 1366 Incorrect string value: '\x80J' for column 'a' at row 43
-Warning 1366 Incorrect string value: '\x80K' for column 'a' at row 44
-Warning 1366 Incorrect string value: '\x80L' for column 'a' at row 45
-Warning 1366 Incorrect string value: '\x80M' for column 'a' at row 46
-Warning 1366 Incorrect string value: '\x80N' for column 'a' at row 47
-Warning 1366 Incorrect string value: '\x80O' for column 'a' at row 48
-Warning 1366 Incorrect string value: '\x80P' for column 'a' at row 49
-Warning 1366 Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning 1366 Incorrect string value: '\x80R' for column 'a' at row 51
-Warning 1366 Incorrect string value: '\x80S' for column 'a' at row 52
-Warning 1366 Incorrect string value: '\x80T' for column 'a' at row 53
-Warning 1366 Incorrect string value: '\x80U' for column 'a' at row 54
-Warning 1366 Incorrect string value: '\x80V' for column 'a' at row 55
-Warning 1366 Incorrect string value: '\x80W' for column 'a' at row 56
-Warning 1366 Incorrect string value: '\x80X' for column 'a' at row 57
-Warning 1366 Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning 1366 Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning 1366 Incorrect string value: '\x80[' for column 'a' at row 60
-Warning 1366 Incorrect string value: '\x80\' for column 'a' at row 61
-Warning 1366 Incorrect string value: '\x80]' for column 'a' at row 62
-Warning 1366 Incorrect string value: '\x80^' for column 'a' at row 63
-Warning 1366 Incorrect string value: '\x80_' for column 'a' at row 64
+Warning 1366 Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning 1366 Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning 1366 Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning 1366 Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning 1366 Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning 1366 Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning 1366 Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning 1366 Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning 1366 Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning 1366 Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning 1366 Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning 1366 Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning 1366 Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning 1366 Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning 1366 Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning 1366 Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning 1366 Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning 1366 Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning 1366 Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning 1366 Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning 1366 Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning 1366 Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning 1366 Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning 1366 Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning 1366 Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning 1366 Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning 1366 Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning 1366 Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning 1366 Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning 1366 Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning 1366 Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning 1366 Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning 1366 Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning 1366 Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning 1366 Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning 1366 Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning 1366 Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning 1366 Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning 1366 Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning 1366 Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning 1366 Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning 1366 Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning 1366 Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning 1366 Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning 1366 Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning 1366 Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning 1366 Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning 1366 Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning 1366 Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning 1366 Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning 1366 Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning 1366 Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning 1366 Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning 1366 Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning 1366 Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning 1366 Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning 1366 Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning 1366 Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
SELECT COUNT(*) FROM t1 WHERE a<>'?';
COUNT(*)
13973
diff --git a/mysql-test/main/ctype_cp932_binlog_stm.result b/mysql-test/main/ctype_cp932_binlog_stm.result
index f49400b63ff..089820d628a 100644
--- a/mysql-test/main/ctype_cp932_binlog_stm.result
+++ b/mysql-test/main/ctype_cp932_binlog_stm.result
@@ -98,70 +98,70 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
Warnings:
-Warning 1366 Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\x80!' for column 'a' at row 2
-Warning 1366 Incorrect string value: '\x80"' for column 'a' at row 3
-Warning 1366 Incorrect string value: '\x80#' for column 'a' at row 4
-Warning 1366 Incorrect string value: '\x80$' for column 'a' at row 5
-Warning 1366 Incorrect string value: '\x80%' for column 'a' at row 6
-Warning 1366 Incorrect string value: '\x80&' for column 'a' at row 7
-Warning 1366 Incorrect string value: '\x80'' for column 'a' at row 8
-Warning 1366 Incorrect string value: '\x80(' for column 'a' at row 9
-Warning 1366 Incorrect string value: '\x80)' for column 'a' at row 10
-Warning 1366 Incorrect string value: '\x80*' for column 'a' at row 11
-Warning 1366 Incorrect string value: '\x80+' for column 'a' at row 12
-Warning 1366 Incorrect string value: '\x80,' for column 'a' at row 13
-Warning 1366 Incorrect string value: '\x80-' for column 'a' at row 14
-Warning 1366 Incorrect string value: '\x80.' for column 'a' at row 15
-Warning 1366 Incorrect string value: '\x80/' for column 'a' at row 16
-Warning 1366 Incorrect string value: '\x800' for column 'a' at row 17
-Warning 1366 Incorrect string value: '\x801' for column 'a' at row 18
-Warning 1366 Incorrect string value: '\x802' for column 'a' at row 19
-Warning 1366 Incorrect string value: '\x803' for column 'a' at row 20
-Warning 1366 Incorrect string value: '\x804' for column 'a' at row 21
-Warning 1366 Incorrect string value: '\x805' for column 'a' at row 22
-Warning 1366 Incorrect string value: '\x806' for column 'a' at row 23
-Warning 1366 Incorrect string value: '\x807' for column 'a' at row 24
-Warning 1366 Incorrect string value: '\x808' for column 'a' at row 25
-Warning 1366 Incorrect string value: '\x809' for column 'a' at row 26
-Warning 1366 Incorrect string value: '\x80:' for column 'a' at row 27
-Warning 1366 Incorrect string value: '\x80;' for column 'a' at row 28
-Warning 1366 Incorrect string value: '\x80<' for column 'a' at row 29
-Warning 1366 Incorrect string value: '\x80=' for column 'a' at row 30
-Warning 1366 Incorrect string value: '\x80>' for column 'a' at row 31
-Warning 1366 Incorrect string value: '\x80?' for column 'a' at row 32
-Warning 1366 Incorrect string value: '\x80@' for column 'a' at row 33
-Warning 1366 Incorrect string value: '\x80A' for column 'a' at row 34
-Warning 1366 Incorrect string value: '\x80B' for column 'a' at row 35
-Warning 1366 Incorrect string value: '\x80C' for column 'a' at row 36
-Warning 1366 Incorrect string value: '\x80D' for column 'a' at row 37
-Warning 1366 Incorrect string value: '\x80E' for column 'a' at row 38
-Warning 1366 Incorrect string value: '\x80F' for column 'a' at row 39
-Warning 1366 Incorrect string value: '\x80G' for column 'a' at row 40
-Warning 1366 Incorrect string value: '\x80H' for column 'a' at row 41
-Warning 1366 Incorrect string value: '\x80I' for column 'a' at row 42
-Warning 1366 Incorrect string value: '\x80J' for column 'a' at row 43
-Warning 1366 Incorrect string value: '\x80K' for column 'a' at row 44
-Warning 1366 Incorrect string value: '\x80L' for column 'a' at row 45
-Warning 1366 Incorrect string value: '\x80M' for column 'a' at row 46
-Warning 1366 Incorrect string value: '\x80N' for column 'a' at row 47
-Warning 1366 Incorrect string value: '\x80O' for column 'a' at row 48
-Warning 1366 Incorrect string value: '\x80P' for column 'a' at row 49
-Warning 1366 Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning 1366 Incorrect string value: '\x80R' for column 'a' at row 51
-Warning 1366 Incorrect string value: '\x80S' for column 'a' at row 52
-Warning 1366 Incorrect string value: '\x80T' for column 'a' at row 53
-Warning 1366 Incorrect string value: '\x80U' for column 'a' at row 54
-Warning 1366 Incorrect string value: '\x80V' for column 'a' at row 55
-Warning 1366 Incorrect string value: '\x80W' for column 'a' at row 56
-Warning 1366 Incorrect string value: '\x80X' for column 'a' at row 57
-Warning 1366 Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning 1366 Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning 1366 Incorrect string value: '\x80[' for column 'a' at row 60
-Warning 1366 Incorrect string value: '\x80\' for column 'a' at row 61
-Warning 1366 Incorrect string value: '\x80]' for column 'a' at row 62
-Warning 1366 Incorrect string value: '\x80^' for column 'a' at row 63
-Warning 1366 Incorrect string value: '\x80_' for column 'a' at row 64
+Warning 1366 Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning 1366 Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning 1366 Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning 1366 Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning 1366 Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning 1366 Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning 1366 Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning 1366 Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning 1366 Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning 1366 Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning 1366 Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning 1366 Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning 1366 Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning 1366 Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning 1366 Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning 1366 Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning 1366 Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning 1366 Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning 1366 Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning 1366 Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning 1366 Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning 1366 Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning 1366 Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning 1366 Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning 1366 Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning 1366 Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning 1366 Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning 1366 Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning 1366 Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning 1366 Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning 1366 Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning 1366 Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning 1366 Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning 1366 Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning 1366 Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning 1366 Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning 1366 Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning 1366 Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning 1366 Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning 1366 Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning 1366 Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning 1366 Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning 1366 Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning 1366 Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning 1366 Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning 1366 Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning 1366 Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning 1366 Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning 1366 Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning 1366 Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning 1366 Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning 1366 Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning 1366 Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning 1366 Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning 1366 Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning 1366 Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning 1366 Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning 1366 Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
SELECT COUNT(*) FROM t1;
COUNT(*)
14623
diff --git a/mysql-test/main/ctype_eucjpms.result b/mysql-test/main/ctype_eucjpms.result
index 507d0021a1f..be341cc7e68 100644
--- a/mysql-test/main/ctype_eucjpms.result
+++ b/mysql-test/main/ctype_eucjpms.result
@@ -10042,70 +10042,70 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
Warnings:
-Warning 1366 Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\x80!' for column 'a' at row 2
-Warning 1366 Incorrect string value: '\x80"' for column 'a' at row 3
-Warning 1366 Incorrect string value: '\x80#' for column 'a' at row 4
-Warning 1366 Incorrect string value: '\x80$' for column 'a' at row 5
-Warning 1366 Incorrect string value: '\x80%' for column 'a' at row 6
-Warning 1366 Incorrect string value: '\x80&' for column 'a' at row 7
-Warning 1366 Incorrect string value: '\x80'' for column 'a' at row 8
-Warning 1366 Incorrect string value: '\x80(' for column 'a' at row 9
-Warning 1366 Incorrect string value: '\x80)' for column 'a' at row 10
-Warning 1366 Incorrect string value: '\x80*' for column 'a' at row 11
-Warning 1366 Incorrect string value: '\x80+' for column 'a' at row 12
-Warning 1366 Incorrect string value: '\x80,' for column 'a' at row 13
-Warning 1366 Incorrect string value: '\x80-' for column 'a' at row 14
-Warning 1366 Incorrect string value: '\x80.' for column 'a' at row 15
-Warning 1366 Incorrect string value: '\x80/' for column 'a' at row 16
-Warning 1366 Incorrect string value: '\x800' for column 'a' at row 17
-Warning 1366 Incorrect string value: '\x801' for column 'a' at row 18
-Warning 1366 Incorrect string value: '\x802' for column 'a' at row 19
-Warning 1366 Incorrect string value: '\x803' for column 'a' at row 20
-Warning 1366 Incorrect string value: '\x804' for column 'a' at row 21
-Warning 1366 Incorrect string value: '\x805' for column 'a' at row 22
-Warning 1366 Incorrect string value: '\x806' for column 'a' at row 23
-Warning 1366 Incorrect string value: '\x807' for column 'a' at row 24
-Warning 1366 Incorrect string value: '\x808' for column 'a' at row 25
-Warning 1366 Incorrect string value: '\x809' for column 'a' at row 26
-Warning 1366 Incorrect string value: '\x80:' for column 'a' at row 27
-Warning 1366 Incorrect string value: '\x80;' for column 'a' at row 28
-Warning 1366 Incorrect string value: '\x80<' for column 'a' at row 29
-Warning 1366 Incorrect string value: '\x80=' for column 'a' at row 30
-Warning 1366 Incorrect string value: '\x80>' for column 'a' at row 31
-Warning 1366 Incorrect string value: '\x80?' for column 'a' at row 32
-Warning 1366 Incorrect string value: '\x80@' for column 'a' at row 33
-Warning 1366 Incorrect string value: '\x80A' for column 'a' at row 34
-Warning 1366 Incorrect string value: '\x80B' for column 'a' at row 35
-Warning 1366 Incorrect string value: '\x80C' for column 'a' at row 36
-Warning 1366 Incorrect string value: '\x80D' for column 'a' at row 37
-Warning 1366 Incorrect string value: '\x80E' for column 'a' at row 38
-Warning 1366 Incorrect string value: '\x80F' for column 'a' at row 39
-Warning 1366 Incorrect string value: '\x80G' for column 'a' at row 40
-Warning 1366 Incorrect string value: '\x80H' for column 'a' at row 41
-Warning 1366 Incorrect string value: '\x80I' for column 'a' at row 42
-Warning 1366 Incorrect string value: '\x80J' for column 'a' at row 43
-Warning 1366 Incorrect string value: '\x80K' for column 'a' at row 44
-Warning 1366 Incorrect string value: '\x80L' for column 'a' at row 45
-Warning 1366 Incorrect string value: '\x80M' for column 'a' at row 46
-Warning 1366 Incorrect string value: '\x80N' for column 'a' at row 47
-Warning 1366 Incorrect string value: '\x80O' for column 'a' at row 48
-Warning 1366 Incorrect string value: '\x80P' for column 'a' at row 49
-Warning 1366 Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning 1366 Incorrect string value: '\x80R' for column 'a' at row 51
-Warning 1366 Incorrect string value: '\x80S' for column 'a' at row 52
-Warning 1366 Incorrect string value: '\x80T' for column 'a' at row 53
-Warning 1366 Incorrect string value: '\x80U' for column 'a' at row 54
-Warning 1366 Incorrect string value: '\x80V' for column 'a' at row 55
-Warning 1366 Incorrect string value: '\x80W' for column 'a' at row 56
-Warning 1366 Incorrect string value: '\x80X' for column 'a' at row 57
-Warning 1366 Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning 1366 Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning 1366 Incorrect string value: '\x80[' for column 'a' at row 60
-Warning 1366 Incorrect string value: '\x80\' for column 'a' at row 61
-Warning 1366 Incorrect string value: '\x80]' for column 'a' at row 62
-Warning 1366 Incorrect string value: '\x80^' for column 'a' at row 63
-Warning 1366 Incorrect string value: '\x80_' for column 'a' at row 64
+Warning 1366 Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning 1366 Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning 1366 Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning 1366 Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning 1366 Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning 1366 Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning 1366 Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning 1366 Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning 1366 Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning 1366 Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning 1366 Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning 1366 Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning 1366 Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning 1366 Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning 1366 Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning 1366 Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning 1366 Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning 1366 Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning 1366 Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning 1366 Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning 1366 Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning 1366 Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning 1366 Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning 1366 Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning 1366 Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning 1366 Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning 1366 Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning 1366 Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning 1366 Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning 1366 Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning 1366 Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning 1366 Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning 1366 Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning 1366 Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning 1366 Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning 1366 Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning 1366 Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning 1366 Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning 1366 Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning 1366 Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning 1366 Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning 1366 Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning 1366 Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning 1366 Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning 1366 Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning 1366 Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning 1366 Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning 1366 Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning 1366 Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning 1366 Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning 1366 Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning 1366 Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning 1366 Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning 1366 Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning 1366 Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning 1366 Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning 1366 Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning 1366 Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
SELECT COUNT(*) FROM t1;
COUNT(*)
56959
diff --git a/mysql-test/main/ctype_euckr.result b/mysql-test/main/ctype_euckr.result
index cc50ddd20be..3006e77412a 100644
--- a/mysql-test/main/ctype_euckr.result
+++ b/mysql-test/main/ctype_euckr.result
@@ -389,22 +389,22 @@ insert into t1 values (0xA181);
insert into t1 values (0xA1FE);
insert ignore into t1 values (0xA140);
Warnings:
-Warning 1366 Incorrect string value: '\xA1@' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xA1@' for column `test`.`t1`.`s1` at row 1
insert ignore into t1 values (0xA15B);
Warnings:
-Warning 1366 Incorrect string value: '\xA1[' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xA1[' for column `test`.`t1`.`s1` at row 1
insert ignore into t1 values (0xA160);
Warnings:
-Warning 1366 Incorrect string value: '\xA1`' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xA1`' for column `test`.`t1`.`s1` at row 1
insert ignore into t1 values (0xA17B);
Warnings:
-Warning 1366 Incorrect string value: '\xA1{' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xA1{' for column `test`.`t1`.`s1` at row 1
insert ignore into t1 values (0xA180);
Warnings:
-Warning 1366 Incorrect string value: '\xA1\x80' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xA1\x80' for column `test`.`t1`.`s1` at row 1
insert ignore into t1 values (0xA1FF);
Warnings:
-Warning 1366 Incorrect string value: '\xA1\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xA1\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1), hex(convert(s1 using utf8)) from t1 order by binary s1;
hex(s1) hex(convert(s1 using utf8))
3F3F 3F3F
@@ -24428,70 +24428,70 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
Warnings:
-Warning 1366 Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\x80!' for column 'a' at row 2
-Warning 1366 Incorrect string value: '\x80"' for column 'a' at row 3
-Warning 1366 Incorrect string value: '\x80#' for column 'a' at row 4
-Warning 1366 Incorrect string value: '\x80$' for column 'a' at row 5
-Warning 1366 Incorrect string value: '\x80%' for column 'a' at row 6
-Warning 1366 Incorrect string value: '\x80&' for column 'a' at row 7
-Warning 1366 Incorrect string value: '\x80'' for column 'a' at row 8
-Warning 1366 Incorrect string value: '\x80(' for column 'a' at row 9
-Warning 1366 Incorrect string value: '\x80)' for column 'a' at row 10
-Warning 1366 Incorrect string value: '\x80*' for column 'a' at row 11
-Warning 1366 Incorrect string value: '\x80+' for column 'a' at row 12
-Warning 1366 Incorrect string value: '\x80,' for column 'a' at row 13
-Warning 1366 Incorrect string value: '\x80-' for column 'a' at row 14
-Warning 1366 Incorrect string value: '\x80.' for column 'a' at row 15
-Warning 1366 Incorrect string value: '\x80/' for column 'a' at row 16
-Warning 1366 Incorrect string value: '\x800' for column 'a' at row 17
-Warning 1366 Incorrect string value: '\x801' for column 'a' at row 18
-Warning 1366 Incorrect string value: '\x802' for column 'a' at row 19
-Warning 1366 Incorrect string value: '\x803' for column 'a' at row 20
-Warning 1366 Incorrect string value: '\x804' for column 'a' at row 21
-Warning 1366 Incorrect string value: '\x805' for column 'a' at row 22
-Warning 1366 Incorrect string value: '\x806' for column 'a' at row 23
-Warning 1366 Incorrect string value: '\x807' for column 'a' at row 24
-Warning 1366 Incorrect string value: '\x808' for column 'a' at row 25
-Warning 1366 Incorrect string value: '\x809' for column 'a' at row 26
-Warning 1366 Incorrect string value: '\x80:' for column 'a' at row 27
-Warning 1366 Incorrect string value: '\x80;' for column 'a' at row 28
-Warning 1366 Incorrect string value: '\x80<' for column 'a' at row 29
-Warning 1366 Incorrect string value: '\x80=' for column 'a' at row 30
-Warning 1366 Incorrect string value: '\x80>' for column 'a' at row 31
-Warning 1366 Incorrect string value: '\x80?' for column 'a' at row 32
-Warning 1366 Incorrect string value: '\x80@' for column 'a' at row 33
-Warning 1366 Incorrect string value: '\x80A' for column 'a' at row 34
-Warning 1366 Incorrect string value: '\x80B' for column 'a' at row 35
-Warning 1366 Incorrect string value: '\x80C' for column 'a' at row 36
-Warning 1366 Incorrect string value: '\x80D' for column 'a' at row 37
-Warning 1366 Incorrect string value: '\x80E' for column 'a' at row 38
-Warning 1366 Incorrect string value: '\x80F' for column 'a' at row 39
-Warning 1366 Incorrect string value: '\x80G' for column 'a' at row 40
-Warning 1366 Incorrect string value: '\x80H' for column 'a' at row 41
-Warning 1366 Incorrect string value: '\x80I' for column 'a' at row 42
-Warning 1366 Incorrect string value: '\x80J' for column 'a' at row 43
-Warning 1366 Incorrect string value: '\x80K' for column 'a' at row 44
-Warning 1366 Incorrect string value: '\x80L' for column 'a' at row 45
-Warning 1366 Incorrect string value: '\x80M' for column 'a' at row 46
-Warning 1366 Incorrect string value: '\x80N' for column 'a' at row 47
-Warning 1366 Incorrect string value: '\x80O' for column 'a' at row 48
-Warning 1366 Incorrect string value: '\x80P' for column 'a' at row 49
-Warning 1366 Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning 1366 Incorrect string value: '\x80R' for column 'a' at row 51
-Warning 1366 Incorrect string value: '\x80S' for column 'a' at row 52
-Warning 1366 Incorrect string value: '\x80T' for column 'a' at row 53
-Warning 1366 Incorrect string value: '\x80U' for column 'a' at row 54
-Warning 1366 Incorrect string value: '\x80V' for column 'a' at row 55
-Warning 1366 Incorrect string value: '\x80W' for column 'a' at row 56
-Warning 1366 Incorrect string value: '\x80X' for column 'a' at row 57
-Warning 1366 Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning 1366 Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning 1366 Incorrect string value: '\x80[' for column 'a' at row 60
-Warning 1366 Incorrect string value: '\x80\' for column 'a' at row 61
-Warning 1366 Incorrect string value: '\x80]' for column 'a' at row 62
-Warning 1366 Incorrect string value: '\x80^' for column 'a' at row 63
-Warning 1366 Incorrect string value: '\x80_' for column 'a' at row 64
+Warning 1366 Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning 1366 Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning 1366 Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning 1366 Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning 1366 Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning 1366 Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning 1366 Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning 1366 Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning 1366 Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning 1366 Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning 1366 Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning 1366 Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning 1366 Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning 1366 Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning 1366 Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning 1366 Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning 1366 Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning 1366 Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning 1366 Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning 1366 Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning 1366 Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning 1366 Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning 1366 Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning 1366 Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning 1366 Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning 1366 Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning 1366 Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning 1366 Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning 1366 Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning 1366 Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning 1366 Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning 1366 Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning 1366 Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning 1366 Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning 1366 Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning 1366 Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning 1366 Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning 1366 Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning 1366 Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning 1366 Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning 1366 Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning 1366 Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning 1366 Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning 1366 Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning 1366 Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning 1366 Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning 1366 Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning 1366 Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning 1366 Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning 1366 Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning 1366 Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning 1366 Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning 1366 Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning 1366 Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning 1366 Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning 1366 Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning 1366 Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning 1366 Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
SELECT COUNT(*) FROM t1 WHERE a<>'?';
COUNT(*)
22428
diff --git a/mysql-test/main/ctype_gb2312.result b/mysql-test/main/ctype_gb2312.result
index c3c2eee9b1c..8a0950caea8 100644
--- a/mysql-test/main/ctype_gb2312.result
+++ b/mysql-test/main/ctype_gb2312.result
@@ -489,70 +489,70 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
Warnings:
-Warning 1366 Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\x80!' for column 'a' at row 2
-Warning 1366 Incorrect string value: '\x80"' for column 'a' at row 3
-Warning 1366 Incorrect string value: '\x80#' for column 'a' at row 4
-Warning 1366 Incorrect string value: '\x80$' for column 'a' at row 5
-Warning 1366 Incorrect string value: '\x80%' for column 'a' at row 6
-Warning 1366 Incorrect string value: '\x80&' for column 'a' at row 7
-Warning 1366 Incorrect string value: '\x80'' for column 'a' at row 8
-Warning 1366 Incorrect string value: '\x80(' for column 'a' at row 9
-Warning 1366 Incorrect string value: '\x80)' for column 'a' at row 10
-Warning 1366 Incorrect string value: '\x80*' for column 'a' at row 11
-Warning 1366 Incorrect string value: '\x80+' for column 'a' at row 12
-Warning 1366 Incorrect string value: '\x80,' for column 'a' at row 13
-Warning 1366 Incorrect string value: '\x80-' for column 'a' at row 14
-Warning 1366 Incorrect string value: '\x80.' for column 'a' at row 15
-Warning 1366 Incorrect string value: '\x80/' for column 'a' at row 16
-Warning 1366 Incorrect string value: '\x800' for column 'a' at row 17
-Warning 1366 Incorrect string value: '\x801' for column 'a' at row 18
-Warning 1366 Incorrect string value: '\x802' for column 'a' at row 19
-Warning 1366 Incorrect string value: '\x803' for column 'a' at row 20
-Warning 1366 Incorrect string value: '\x804' for column 'a' at row 21
-Warning 1366 Incorrect string value: '\x805' for column 'a' at row 22
-Warning 1366 Incorrect string value: '\x806' for column 'a' at row 23
-Warning 1366 Incorrect string value: '\x807' for column 'a' at row 24
-Warning 1366 Incorrect string value: '\x808' for column 'a' at row 25
-Warning 1366 Incorrect string value: '\x809' for column 'a' at row 26
-Warning 1366 Incorrect string value: '\x80:' for column 'a' at row 27
-Warning 1366 Incorrect string value: '\x80;' for column 'a' at row 28
-Warning 1366 Incorrect string value: '\x80<' for column 'a' at row 29
-Warning 1366 Incorrect string value: '\x80=' for column 'a' at row 30
-Warning 1366 Incorrect string value: '\x80>' for column 'a' at row 31
-Warning 1366 Incorrect string value: '\x80?' for column 'a' at row 32
-Warning 1366 Incorrect string value: '\x80@' for column 'a' at row 33
-Warning 1366 Incorrect string value: '\x80A' for column 'a' at row 34
-Warning 1366 Incorrect string value: '\x80B' for column 'a' at row 35
-Warning 1366 Incorrect string value: '\x80C' for column 'a' at row 36
-Warning 1366 Incorrect string value: '\x80D' for column 'a' at row 37
-Warning 1366 Incorrect string value: '\x80E' for column 'a' at row 38
-Warning 1366 Incorrect string value: '\x80F' for column 'a' at row 39
-Warning 1366 Incorrect string value: '\x80G' for column 'a' at row 40
-Warning 1366 Incorrect string value: '\x80H' for column 'a' at row 41
-Warning 1366 Incorrect string value: '\x80I' for column 'a' at row 42
-Warning 1366 Incorrect string value: '\x80J' for column 'a' at row 43
-Warning 1366 Incorrect string value: '\x80K' for column 'a' at row 44
-Warning 1366 Incorrect string value: '\x80L' for column 'a' at row 45
-Warning 1366 Incorrect string value: '\x80M' for column 'a' at row 46
-Warning 1366 Incorrect string value: '\x80N' for column 'a' at row 47
-Warning 1366 Incorrect string value: '\x80O' for column 'a' at row 48
-Warning 1366 Incorrect string value: '\x80P' for column 'a' at row 49
-Warning 1366 Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning 1366 Incorrect string value: '\x80R' for column 'a' at row 51
-Warning 1366 Incorrect string value: '\x80S' for column 'a' at row 52
-Warning 1366 Incorrect string value: '\x80T' for column 'a' at row 53
-Warning 1366 Incorrect string value: '\x80U' for column 'a' at row 54
-Warning 1366 Incorrect string value: '\x80V' for column 'a' at row 55
-Warning 1366 Incorrect string value: '\x80W' for column 'a' at row 56
-Warning 1366 Incorrect string value: '\x80X' for column 'a' at row 57
-Warning 1366 Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning 1366 Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning 1366 Incorrect string value: '\x80[' for column 'a' at row 60
-Warning 1366 Incorrect string value: '\x80\' for column 'a' at row 61
-Warning 1366 Incorrect string value: '\x80]' for column 'a' at row 62
-Warning 1366 Incorrect string value: '\x80^' for column 'a' at row 63
-Warning 1366 Incorrect string value: '\x80_' for column 'a' at row 64
+Warning 1366 Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning 1366 Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning 1366 Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning 1366 Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning 1366 Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning 1366 Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning 1366 Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning 1366 Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning 1366 Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning 1366 Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning 1366 Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning 1366 Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning 1366 Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning 1366 Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning 1366 Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning 1366 Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning 1366 Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning 1366 Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning 1366 Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning 1366 Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning 1366 Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning 1366 Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning 1366 Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning 1366 Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning 1366 Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning 1366 Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning 1366 Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning 1366 Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning 1366 Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning 1366 Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning 1366 Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning 1366 Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning 1366 Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning 1366 Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning 1366 Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning 1366 Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning 1366 Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning 1366 Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning 1366 Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning 1366 Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning 1366 Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning 1366 Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning 1366 Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning 1366 Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning 1366 Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning 1366 Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning 1366 Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning 1366 Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning 1366 Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning 1366 Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning 1366 Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning 1366 Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning 1366 Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning 1366 Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning 1366 Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning 1366 Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning 1366 Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning 1366 Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
SELECT COUNT(*) FROM t1 WHERE a<>'?';
COUNT(*)
8178
diff --git a/mysql-test/main/ctype_gbk.result b/mysql-test/main/ctype_gbk.result
index 4e5c9695415..de056dffe2a 100644
--- a/mysql-test/main/ctype_gbk.result
+++ b/mysql-test/main/ctype_gbk.result
@@ -511,70 +511,70 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
Warnings:
-Warning 1366 Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\x80!' for column 'a' at row 2
-Warning 1366 Incorrect string value: '\x80"' for column 'a' at row 3
-Warning 1366 Incorrect string value: '\x80#' for column 'a' at row 4
-Warning 1366 Incorrect string value: '\x80$' for column 'a' at row 5
-Warning 1366 Incorrect string value: '\x80%' for column 'a' at row 6
-Warning 1366 Incorrect string value: '\x80&' for column 'a' at row 7
-Warning 1366 Incorrect string value: '\x80'' for column 'a' at row 8
-Warning 1366 Incorrect string value: '\x80(' for column 'a' at row 9
-Warning 1366 Incorrect string value: '\x80)' for column 'a' at row 10
-Warning 1366 Incorrect string value: '\x80*' for column 'a' at row 11
-Warning 1366 Incorrect string value: '\x80+' for column 'a' at row 12
-Warning 1366 Incorrect string value: '\x80,' for column 'a' at row 13
-Warning 1366 Incorrect string value: '\x80-' for column 'a' at row 14
-Warning 1366 Incorrect string value: '\x80.' for column 'a' at row 15
-Warning 1366 Incorrect string value: '\x80/' for column 'a' at row 16
-Warning 1366 Incorrect string value: '\x800' for column 'a' at row 17
-Warning 1366 Incorrect string value: '\x801' for column 'a' at row 18
-Warning 1366 Incorrect string value: '\x802' for column 'a' at row 19
-Warning 1366 Incorrect string value: '\x803' for column 'a' at row 20
-Warning 1366 Incorrect string value: '\x804' for column 'a' at row 21
-Warning 1366 Incorrect string value: '\x805' for column 'a' at row 22
-Warning 1366 Incorrect string value: '\x806' for column 'a' at row 23
-Warning 1366 Incorrect string value: '\x807' for column 'a' at row 24
-Warning 1366 Incorrect string value: '\x808' for column 'a' at row 25
-Warning 1366 Incorrect string value: '\x809' for column 'a' at row 26
-Warning 1366 Incorrect string value: '\x80:' for column 'a' at row 27
-Warning 1366 Incorrect string value: '\x80;' for column 'a' at row 28
-Warning 1366 Incorrect string value: '\x80<' for column 'a' at row 29
-Warning 1366 Incorrect string value: '\x80=' for column 'a' at row 30
-Warning 1366 Incorrect string value: '\x80>' for column 'a' at row 31
-Warning 1366 Incorrect string value: '\x80?' for column 'a' at row 32
-Warning 1366 Incorrect string value: '\x80@' for column 'a' at row 33
-Warning 1366 Incorrect string value: '\x80A' for column 'a' at row 34
-Warning 1366 Incorrect string value: '\x80B' for column 'a' at row 35
-Warning 1366 Incorrect string value: '\x80C' for column 'a' at row 36
-Warning 1366 Incorrect string value: '\x80D' for column 'a' at row 37
-Warning 1366 Incorrect string value: '\x80E' for column 'a' at row 38
-Warning 1366 Incorrect string value: '\x80F' for column 'a' at row 39
-Warning 1366 Incorrect string value: '\x80G' for column 'a' at row 40
-Warning 1366 Incorrect string value: '\x80H' for column 'a' at row 41
-Warning 1366 Incorrect string value: '\x80I' for column 'a' at row 42
-Warning 1366 Incorrect string value: '\x80J' for column 'a' at row 43
-Warning 1366 Incorrect string value: '\x80K' for column 'a' at row 44
-Warning 1366 Incorrect string value: '\x80L' for column 'a' at row 45
-Warning 1366 Incorrect string value: '\x80M' for column 'a' at row 46
-Warning 1366 Incorrect string value: '\x80N' for column 'a' at row 47
-Warning 1366 Incorrect string value: '\x80O' for column 'a' at row 48
-Warning 1366 Incorrect string value: '\x80P' for column 'a' at row 49
-Warning 1366 Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning 1366 Incorrect string value: '\x80R' for column 'a' at row 51
-Warning 1366 Incorrect string value: '\x80S' for column 'a' at row 52
-Warning 1366 Incorrect string value: '\x80T' for column 'a' at row 53
-Warning 1366 Incorrect string value: '\x80U' for column 'a' at row 54
-Warning 1366 Incorrect string value: '\x80V' for column 'a' at row 55
-Warning 1366 Incorrect string value: '\x80W' for column 'a' at row 56
-Warning 1366 Incorrect string value: '\x80X' for column 'a' at row 57
-Warning 1366 Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning 1366 Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning 1366 Incorrect string value: '\x80[' for column 'a' at row 60
-Warning 1366 Incorrect string value: '\x80\' for column 'a' at row 61
-Warning 1366 Incorrect string value: '\x80]' for column 'a' at row 62
-Warning 1366 Incorrect string value: '\x80^' for column 'a' at row 63
-Warning 1366 Incorrect string value: '\x80_' for column 'a' at row 64
+Warning 1366 Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning 1366 Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning 1366 Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning 1366 Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning 1366 Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning 1366 Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning 1366 Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning 1366 Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning 1366 Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning 1366 Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning 1366 Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning 1366 Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning 1366 Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning 1366 Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning 1366 Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning 1366 Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning 1366 Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning 1366 Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning 1366 Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning 1366 Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning 1366 Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning 1366 Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning 1366 Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning 1366 Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning 1366 Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning 1366 Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning 1366 Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning 1366 Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning 1366 Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning 1366 Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning 1366 Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning 1366 Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning 1366 Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning 1366 Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning 1366 Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning 1366 Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning 1366 Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning 1366 Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning 1366 Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning 1366 Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning 1366 Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning 1366 Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning 1366 Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning 1366 Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning 1366 Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning 1366 Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning 1366 Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning 1366 Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning 1366 Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning 1366 Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning 1366 Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning 1366 Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning 1366 Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning 1366 Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning 1366 Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning 1366 Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning 1366 Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning 1366 Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
SELECT COUNT(*) FROM t1 WHERE a<>'?';
COUNT(*)
23940
@@ -5192,25 +5192,25 @@ INSERT IGNORE INTO t3 (b,c,comment) SELECT b,b,comment FROM t2
WHERE type1='tail' OR type1='bad' OR type2='bad'
ORDER BY b;
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 'c' at row 1
-Warning 1366 Incorrect string value: '\x80@' for column 'c' at row 2
-Warning 1366 Incorrect string value: '\x80\x80' for column 'c' at row 3
-Warning 1366 Incorrect string value: '\x80\x81' for column 'c' at row 4
-Warning 1366 Incorrect string value: '\x80\xA1@' for column 'c' at row 5
-Warning 1366 Incorrect string value: '\x80\xA1\xA3' for column 'c' at row 6
-Warning 1366 Incorrect string value: '\x80\xFE@' for column 'c' at row 7
-Warning 1366 Incorrect string value: '\x80\xFF' for column 'c' at row 8
-Warning 1366 Incorrect string value: '\x81\xFF' for column 'c' at row 9
-Warning 1366 Incorrect string value: '\xFF' for column 'c' at row 10
-Warning 1366 Incorrect string value: '\xFF' for column 'c' at row 11
-Warning 1366 Incorrect string value: '\xFF' for column 'c' at row 12
-Warning 1366 Incorrect string value: '\xFF@' for column 'c' at row 13
-Warning 1366 Incorrect string value: '\xFF\x80' for column 'c' at row 14
-Warning 1366 Incorrect string value: '\xFF\x81' for column 'c' at row 15
-Warning 1366 Incorrect string value: '\xFF\xA1@' for column 'c' at row 16
-Warning 1366 Incorrect string value: '\xFF\xA1\xA3' for column 'c' at row 17
-Warning 1366 Incorrect string value: '\xFF\xFE@' for column 'c' at row 18
-Warning 1366 Incorrect string value: '\xFF\xFF' for column 'c' at row 19
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 1
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t3`.`c` at row 2
+Warning 1366 Incorrect string value: '\x80\x80' for column `test`.`t3`.`c` at row 3
+Warning 1366 Incorrect string value: '\x80\x81' for column `test`.`t3`.`c` at row 4
+Warning 1366 Incorrect string value: '\x80\xA1@' for column `test`.`t3`.`c` at row 5
+Warning 1366 Incorrect string value: '\x80\xA1\xA3' for column `test`.`t3`.`c` at row 6
+Warning 1366 Incorrect string value: '\x80\xFE@' for column `test`.`t3`.`c` at row 7
+Warning 1366 Incorrect string value: '\x80\xFF' for column `test`.`t3`.`c` at row 8
+Warning 1366 Incorrect string value: '\x81\xFF' for column `test`.`t3`.`c` at row 9
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 10
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 11
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 12
+Warning 1366 Incorrect string value: '\xFF@' for column `test`.`t3`.`c` at row 13
+Warning 1366 Incorrect string value: '\xFF\x80' for column `test`.`t3`.`c` at row 14
+Warning 1366 Incorrect string value: '\xFF\x81' for column `test`.`t3`.`c` at row 15
+Warning 1366 Incorrect string value: '\xFF\xA1@' for column `test`.`t3`.`c` at row 16
+Warning 1366 Incorrect string value: '\xFF\xA1\xA3' for column `test`.`t3`.`c` at row 17
+Warning 1366 Incorrect string value: '\xFF\xFE@' for column `test`.`t3`.`c` at row 18
+Warning 1366 Incorrect string value: '\xFF\xFF' for column `test`.`t3`.`c` at row 19
SELECT COUNT(*) FROM t3;
COUNT(*)
19
@@ -5248,14 +5248,14 @@ WHERE (FIND_IN_SET('mb2',type1) OR FIND_IN_SET('ascii',type1))
AND (FIND_IN_SET('tail',type2) AND NOT FIND_IN_SET('ascii',type2))
ORDER BY b;
Warnings:
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 1
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 2
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 3
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 4
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 5
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 6
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 7
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 8
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 1
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 2
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 3
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 4
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 5
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 6
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 7
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 8
SELECT COUNT(*) FROM t3;
COUNT(*)
8
@@ -5278,7 +5278,7 @@ DELETE FROM t3;
#
INSERT INTO t3 (b,c,comment) SELECT b,b,comment FROM t2 ORDER BY b;
Warnings:
-Warning 1366 Incorrect string value: '\xA3' for column 'c' at row 5
+Warning 1366 Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 5
SELECT COUNT(*) FROM t3;
COUNT(*)
6
@@ -5401,70 +5401,70 @@ INSERT IGNORE INTO t3 (b,c,comment) SELECT b,b,comment FROM t2
WHERE type1='tail' OR type1='bad' OR type2='bad' OR type3='bad'
ORDER BY b;
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 'c' at row 1
-Warning 1366 Incorrect string value: '\x80\xFF' for column 'c' at row 2
-Warning 1366 Incorrect string value: '\x81\xFF' for column 'c' at row 3
-Warning 1366 Incorrect string value: '\xFF' for column 'c' at row 4
-Warning 1366 Incorrect string value: '\xFF' for column 'c' at row 5
-Warning 1366 Incorrect string value: '\xFF' for column 'c' at row 6
-Warning 1366 Incorrect string value: '\xFF@' for column 'c' at row 7
-Warning 1366 Incorrect string value: '\xFF\x80' for column 'c' at row 8
-Warning 1366 Incorrect string value: '\xFF\x81' for column 'c' at row 9
-Warning 1366 Incorrect string value: '\xFF\xA1@' for column 'c' at row 10
-Warning 1366 Incorrect string value: '\xFF\xA1\xA3' for column 'c' at row 11
-Warning 1366 Incorrect string value: '\xFF\xFE@' for column 'c' at row 12
-Warning 1366 Incorrect string value: '\xFF\xFF' for column 'c' at row 13
-Warning 1366 Incorrect string value: '\x80@@' for column 'c' at row 14
-Warning 1366 Incorrect string value: '\x80@\x80' for column 'c' at row 15
-Warning 1366 Incorrect string value: '\x80@\x81' for column 'c' at row 16
-Warning 1366 Incorrect string value: '\x80@\xA1@' for column 'c' at row 17
-Warning 1366 Incorrect string value: '\x80@\xA1\xA3' for column 'c' at row 18
-Warning 1366 Incorrect string value: '\x80@\xFE@' for column 'c' at row 19
-Warning 1366 Incorrect string value: '\x80@\xFF' for column 'c' at row 20
-Warning 1366 Incorrect string value: '\x80\x80@' for column 'c' at row 21
-Warning 1366 Incorrect string value: '\x80\x80\x80' for column 'c' at row 22
-Warning 1366 Incorrect string value: '\x80\x80\x81' for column 'c' at row 23
-Warning 1366 Incorrect string value: '\x80\x80\xA1@' for column 'c' at row 24
-Warning 1366 Incorrect string value: '\x80\x80\xA1\xA3' for column 'c' at row 25
-Warning 1366 Incorrect string value: '\x80\x80\xFE@' for column 'c' at row 26
-Warning 1366 Incorrect string value: '\x80\x80\xFF' for column 'c' at row 27
-Warning 1366 Incorrect string value: '\x80\x81@' for column 'c' at row 28
-Warning 1366 Incorrect string value: '\x80\x81\x80' for column 'c' at row 29
-Warning 1366 Incorrect string value: '\x80\x81\x81' for column 'c' at row 30
-Warning 1366 Incorrect string value: '\x80\x81\xA1@' for column 'c' at row 31
-Warning 1366 Incorrect string value: '\x80\x81\xA1\xA3' for column 'c' at row 32
-Warning 1366 Incorrect string value: '\x80\x81\xFE@' for column 'c' at row 33
-Warning 1366 Incorrect string value: '\x80\x81\xFF' for column 'c' at row 34
-Warning 1366 Incorrect string value: '\x80\xA1@@' for column 'c' at row 35
-Warning 1366 Incorrect string value: '\x80\xA1@\x80' for column 'c' at row 36
-Warning 1366 Incorrect string value: '\x80\xA1@\x81' for column 'c' at row 37
-Warning 1366 Incorrect string value: '\x80\xA1@\xA1@' for column 'c' at row 38
-Warning 1366 Incorrect string value: '\x80\xA1@\xA1\xA3' for column 'c' at row 39
-Warning 1366 Incorrect string value: '\x80\xA1@\xFE@' for column 'c' at row 40
-Warning 1366 Incorrect string value: '\x80\xA1@\xFF' for column 'c' at row 41
-Warning 1366 Incorrect string value: '\x80\xA1\xA3@' for column 'c' at row 42
-Warning 1366 Incorrect string value: '\x80\xA1\xA3\x80' for column 'c' at row 43
-Warning 1366 Incorrect string value: '\x80\xA1\xA3\x81' for column 'c' at row 44
-Warning 1366 Incorrect string value: '\x80\xA1\xA3\xA1@' for column 'c' at row 45
-Warning 1366 Incorrect string value: '\x80\xA1\xA3\xA1\xA3' for column 'c' at row 46
-Warning 1366 Incorrect string value: '\x80\xA1\xA3\xFE@' for column 'c' at row 47
-Warning 1366 Incorrect string value: '\x80\xA1\xA3\xFF' for column 'c' at row 48
-Warning 1366 Incorrect string value: '\x80\xFE@@' for column 'c' at row 49
-Warning 1366 Incorrect string value: '\x80\xFE@\x80' for column 'c' at row 50
-Warning 1366 Incorrect string value: '\x80\xFE@\x81' for column 'c' at row 51
-Warning 1366 Incorrect string value: '\x80\xFE@\xA1@' for column 'c' at row 52
-Warning 1366 Incorrect string value: '\x80\xFE@\xA1\xA3' for column 'c' at row 53
-Warning 1366 Incorrect string value: '\x80\xFE@\xFE@' for column 'c' at row 54
-Warning 1366 Incorrect string value: '\x80\xFE@\xFF' for column 'c' at row 55
-Warning 1366 Incorrect string value: '\x80\xFF@' for column 'c' at row 56
-Warning 1366 Incorrect string value: '\x80\xFF\x80' for column 'c' at row 57
-Warning 1366 Incorrect string value: '\x80\xFF\x81' for column 'c' at row 58
-Warning 1366 Incorrect string value: '\x80\xFF\xA1@' for column 'c' at row 59
-Warning 1366 Incorrect string value: '\x80\xFF\xA1\xA3' for column 'c' at row 60
-Warning 1366 Incorrect string value: '\x80\xFF\xFE@' for column 'c' at row 61
-Warning 1366 Incorrect string value: '\x80\xFF\xFF' for column 'c' at row 62
-Warning 1366 Incorrect string value: '\xFF' for column 'c' at row 63
-Warning 1366 Incorrect string value: '\xFF' for column 'c' at row 64
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 1
+Warning 1366 Incorrect string value: '\x80\xFF' for column `test`.`t3`.`c` at row 2
+Warning 1366 Incorrect string value: '\x81\xFF' for column `test`.`t3`.`c` at row 3
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 4
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 5
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 6
+Warning 1366 Incorrect string value: '\xFF@' for column `test`.`t3`.`c` at row 7
+Warning 1366 Incorrect string value: '\xFF\x80' for column `test`.`t3`.`c` at row 8
+Warning 1366 Incorrect string value: '\xFF\x81' for column `test`.`t3`.`c` at row 9
+Warning 1366 Incorrect string value: '\xFF\xA1@' for column `test`.`t3`.`c` at row 10
+Warning 1366 Incorrect string value: '\xFF\xA1\xA3' for column `test`.`t3`.`c` at row 11
+Warning 1366 Incorrect string value: '\xFF\xFE@' for column `test`.`t3`.`c` at row 12
+Warning 1366 Incorrect string value: '\xFF\xFF' for column `test`.`t3`.`c` at row 13
+Warning 1366 Incorrect string value: '\x80@@' for column `test`.`t3`.`c` at row 14
+Warning 1366 Incorrect string value: '\x80@\x80' for column `test`.`t3`.`c` at row 15
+Warning 1366 Incorrect string value: '\x80@\x81' for column `test`.`t3`.`c` at row 16
+Warning 1366 Incorrect string value: '\x80@\xA1@' for column `test`.`t3`.`c` at row 17
+Warning 1366 Incorrect string value: '\x80@\xA1\xA3' for column `test`.`t3`.`c` at row 18
+Warning 1366 Incorrect string value: '\x80@\xFE@' for column `test`.`t3`.`c` at row 19
+Warning 1366 Incorrect string value: '\x80@\xFF' for column `test`.`t3`.`c` at row 20
+Warning 1366 Incorrect string value: '\x80\x80@' for column `test`.`t3`.`c` at row 21
+Warning 1366 Incorrect string value: '\x80\x80\x80' for column `test`.`t3`.`c` at row 22
+Warning 1366 Incorrect string value: '\x80\x80\x81' for column `test`.`t3`.`c` at row 23
+Warning 1366 Incorrect string value: '\x80\x80\xA1@' for column `test`.`t3`.`c` at row 24
+Warning 1366 Incorrect string value: '\x80\x80\xA1\xA3' for column `test`.`t3`.`c` at row 25
+Warning 1366 Incorrect string value: '\x80\x80\xFE@' for column `test`.`t3`.`c` at row 26
+Warning 1366 Incorrect string value: '\x80\x80\xFF' for column `test`.`t3`.`c` at row 27
+Warning 1366 Incorrect string value: '\x80\x81@' for column `test`.`t3`.`c` at row 28
+Warning 1366 Incorrect string value: '\x80\x81\x80' for column `test`.`t3`.`c` at row 29
+Warning 1366 Incorrect string value: '\x80\x81\x81' for column `test`.`t3`.`c` at row 30
+Warning 1366 Incorrect string value: '\x80\x81\xA1@' for column `test`.`t3`.`c` at row 31
+Warning 1366 Incorrect string value: '\x80\x81\xA1\xA3' for column `test`.`t3`.`c` at row 32
+Warning 1366 Incorrect string value: '\x80\x81\xFE@' for column `test`.`t3`.`c` at row 33
+Warning 1366 Incorrect string value: '\x80\x81\xFF' for column `test`.`t3`.`c` at row 34
+Warning 1366 Incorrect string value: '\x80\xA1@@' for column `test`.`t3`.`c` at row 35
+Warning 1366 Incorrect string value: '\x80\xA1@\x80' for column `test`.`t3`.`c` at row 36
+Warning 1366 Incorrect string value: '\x80\xA1@\x81' for column `test`.`t3`.`c` at row 37
+Warning 1366 Incorrect string value: '\x80\xA1@\xA1@' for column `test`.`t3`.`c` at row 38
+Warning 1366 Incorrect string value: '\x80\xA1@\xA1\xA3' for column `test`.`t3`.`c` at row 39
+Warning 1366 Incorrect string value: '\x80\xA1@\xFE@' for column `test`.`t3`.`c` at row 40
+Warning 1366 Incorrect string value: '\x80\xA1@\xFF' for column `test`.`t3`.`c` at row 41
+Warning 1366 Incorrect string value: '\x80\xA1\xA3@' for column `test`.`t3`.`c` at row 42
+Warning 1366 Incorrect string value: '\x80\xA1\xA3\x80' for column `test`.`t3`.`c` at row 43
+Warning 1366 Incorrect string value: '\x80\xA1\xA3\x81' for column `test`.`t3`.`c` at row 44
+Warning 1366 Incorrect string value: '\x80\xA1\xA3\xA1@' for column `test`.`t3`.`c` at row 45
+Warning 1366 Incorrect string value: '\x80\xA1\xA3\xA1\xA3' for column `test`.`t3`.`c` at row 46
+Warning 1366 Incorrect string value: '\x80\xA1\xA3\xFE@' for column `test`.`t3`.`c` at row 47
+Warning 1366 Incorrect string value: '\x80\xA1\xA3\xFF' for column `test`.`t3`.`c` at row 48
+Warning 1366 Incorrect string value: '\x80\xFE@@' for column `test`.`t3`.`c` at row 49
+Warning 1366 Incorrect string value: '\x80\xFE@\x80' for column `test`.`t3`.`c` at row 50
+Warning 1366 Incorrect string value: '\x80\xFE@\x81' for column `test`.`t3`.`c` at row 51
+Warning 1366 Incorrect string value: '\x80\xFE@\xA1@' for column `test`.`t3`.`c` at row 52
+Warning 1366 Incorrect string value: '\x80\xFE@\xA1\xA3' for column `test`.`t3`.`c` at row 53
+Warning 1366 Incorrect string value: '\x80\xFE@\xFE@' for column `test`.`t3`.`c` at row 54
+Warning 1366 Incorrect string value: '\x80\xFE@\xFF' for column `test`.`t3`.`c` at row 55
+Warning 1366 Incorrect string value: '\x80\xFF@' for column `test`.`t3`.`c` at row 56
+Warning 1366 Incorrect string value: '\x80\xFF\x80' for column `test`.`t3`.`c` at row 57
+Warning 1366 Incorrect string value: '\x80\xFF\x81' for column `test`.`t3`.`c` at row 58
+Warning 1366 Incorrect string value: '\x80\xFF\xA1@' for column `test`.`t3`.`c` at row 59
+Warning 1366 Incorrect string value: '\x80\xFF\xA1\xA3' for column `test`.`t3`.`c` at row 60
+Warning 1366 Incorrect string value: '\x80\xFF\xFE@' for column `test`.`t3`.`c` at row 61
+Warning 1366 Incorrect string value: '\x80\xFF\xFF' for column `test`.`t3`.`c` at row 62
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 63
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 64
SELECT COUNT(*) FROM t3;
COUNT(*)
163
@@ -5646,30 +5646,30 @@ WHERE (FIND_IN_SET('mb2',type1) OR FIND_IN_SET('ascii',type1))
AND type2='tail'
ORDER BY b;
Warnings:
-Warning 1366 Incorrect string value: '\x80@' for column 'c' at row 1
-Warning 1366 Incorrect string value: '\x80\x80' for column 'c' at row 2
-Warning 1366 Incorrect string value: '\x80\x81' for column 'c' at row 3
-Warning 1366 Incorrect string value: '\x80\xA1@' for column 'c' at row 4
-Warning 1366 Incorrect string value: '\x80\xA1\xA3' for column 'c' at row 5
-Warning 1366 Incorrect string value: '\x80\xFE@' for column 'c' at row 6
-Warning 1366 Incorrect string value: '\x80@' for column 'c' at row 7
-Warning 1366 Incorrect string value: '\x80\x80' for column 'c' at row 8
-Warning 1366 Incorrect string value: '\x80\x81' for column 'c' at row 9
-Warning 1366 Incorrect string value: '\x80\xA1@' for column 'c' at row 10
-Warning 1366 Incorrect string value: '\x80\xA1\xA3' for column 'c' at row 11
-Warning 1366 Incorrect string value: '\x80\xFE@' for column 'c' at row 12
-Warning 1366 Incorrect string value: '\x80@' for column 'c' at row 13
-Warning 1366 Incorrect string value: '\x80\x80' for column 'c' at row 14
-Warning 1366 Incorrect string value: '\x80\x81' for column 'c' at row 15
-Warning 1366 Incorrect string value: '\x80\xA1@' for column 'c' at row 16
-Warning 1366 Incorrect string value: '\x80\xA1\xA3' for column 'c' at row 17
-Warning 1366 Incorrect string value: '\x80\xFE@' for column 'c' at row 18
-Warning 1366 Incorrect string value: '\x80@' for column 'c' at row 19
-Warning 1366 Incorrect string value: '\x80\x80' for column 'c' at row 20
-Warning 1366 Incorrect string value: '\x80\x81' for column 'c' at row 21
-Warning 1366 Incorrect string value: '\x80\xA1@' for column 'c' at row 22
-Warning 1366 Incorrect string value: '\x80\xA1\xA3' for column 'c' at row 23
-Warning 1366 Incorrect string value: '\x80\xFE@' for column 'c' at row 24
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t3`.`c` at row 1
+Warning 1366 Incorrect string value: '\x80\x80' for column `test`.`t3`.`c` at row 2
+Warning 1366 Incorrect string value: '\x80\x81' for column `test`.`t3`.`c` at row 3
+Warning 1366 Incorrect string value: '\x80\xA1@' for column `test`.`t3`.`c` at row 4
+Warning 1366 Incorrect string value: '\x80\xA1\xA3' for column `test`.`t3`.`c` at row 5
+Warning 1366 Incorrect string value: '\x80\xFE@' for column `test`.`t3`.`c` at row 6
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t3`.`c` at row 7
+Warning 1366 Incorrect string value: '\x80\x80' for column `test`.`t3`.`c` at row 8
+Warning 1366 Incorrect string value: '\x80\x81' for column `test`.`t3`.`c` at row 9
+Warning 1366 Incorrect string value: '\x80\xA1@' for column `test`.`t3`.`c` at row 10
+Warning 1366 Incorrect string value: '\x80\xA1\xA3' for column `test`.`t3`.`c` at row 11
+Warning 1366 Incorrect string value: '\x80\xFE@' for column `test`.`t3`.`c` at row 12
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t3`.`c` at row 13
+Warning 1366 Incorrect string value: '\x80\x80' for column `test`.`t3`.`c` at row 14
+Warning 1366 Incorrect string value: '\x80\x81' for column `test`.`t3`.`c` at row 15
+Warning 1366 Incorrect string value: '\x80\xA1@' for column `test`.`t3`.`c` at row 16
+Warning 1366 Incorrect string value: '\x80\xA1\xA3' for column `test`.`t3`.`c` at row 17
+Warning 1366 Incorrect string value: '\x80\xFE@' for column `test`.`t3`.`c` at row 18
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t3`.`c` at row 19
+Warning 1366 Incorrect string value: '\x80\x80' for column `test`.`t3`.`c` at row 20
+Warning 1366 Incorrect string value: '\x80\x81' for column `test`.`t3`.`c` at row 21
+Warning 1366 Incorrect string value: '\x80\xA1@' for column `test`.`t3`.`c` at row 22
+Warning 1366 Incorrect string value: '\x80\xA1\xA3' for column `test`.`t3`.`c` at row 23
+Warning 1366 Incorrect string value: '\x80\xFE@' for column `test`.`t3`.`c` at row 24
SELECT COUNT(*) FROM t3;
COUNT(*)
24
@@ -5713,22 +5713,22 @@ WHERE (FIND_IN_SET('mb2',type1) OR FIND_IN_SET('ascii',type1)) AND
type3='tail'
ORDER BY b;
Warnings:
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 1
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 2
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 3
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 4
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 5
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 6
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 7
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 8
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 9
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 10
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 11
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 12
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 13
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 14
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 15
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 16
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 1
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 2
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 3
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 4
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 5
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 6
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 7
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 8
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 9
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 10
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 11
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 12
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 13
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 14
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 15
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 16
SELECT COUNT(*) FROM t3;
COUNT(*)
16
@@ -5764,15 +5764,15 @@ AND NOT FIND_IN_SET('ascii',type3)
AND NOT FIND_IN_SET('mb2',type3)
ORDER BY b;
Warnings:
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 1
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 2
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 3
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 4
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 5
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 6
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 7
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 8
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 9
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 1
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 2
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 3
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 4
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 5
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 6
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 7
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 8
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 9
SELECT COUNT(*) FROM t3;
COUNT(*)
9
@@ -5848,28 +5848,28 @@ DELETE FROM t2 WHERE b IN (SELECT b FROM t3);
DELETE FROM t3;
INSERT IGNORE INTO t3 (b,c,comment) SELECT b,b,comment FROM t2 ORDER BY b;
Warnings:
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 1
-Warning 1366 Incorrect string value: '\xA3' for column 'c' at row 3
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 5
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 6
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 7
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 9
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 10
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 12
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 13
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 15
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 16
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 18
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 19
-Warning 1366 Incorrect string value: '\xA3' for column 'c' at row 27
-Warning 1366 Incorrect string value: '\x80' for column 'c' at row 30
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 31
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 35
-Warning 1366 Incorrect string value: '\xA3' for column 'c' at row 37
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 39
-Warning 1366 Incorrect string value: '\xA3' for column 'c' at row 41
-Warning 1366 Incorrect string value: '\x81' for column 'c' at row 43
-Warning 1366 Incorrect string value: '\xA3' for column 'c' at row 45
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 1
+Warning 1366 Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 3
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 5
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 6
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 7
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 9
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 10
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 12
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 13
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 15
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 16
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 18
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 19
+Warning 1366 Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 27
+Warning 1366 Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 30
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 31
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 35
+Warning 1366 Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 37
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 39
+Warning 1366 Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 41
+Warning 1366 Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 43
+Warning 1366 Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 45
SELECT COUNT(*) FROM t3;
COUNT(*)
46
diff --git a/mysql-test/main/ctype_latin1.result b/mysql-test/main/ctype_latin1.result
index 233fd85a2c4..705c719405b 100644
--- a/mysql-test/main/ctype_latin1.result
+++ b/mysql-test/main/ctype_latin1.result
@@ -7987,12 +7987,12 @@ SET NAMES utf8;
CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1);
INSERT IGNORE INTO t1 VALUES (''),('#');
Warnings:
-Warning 1366 Incorrect string value: '\xC2' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\xC2#' for column 'a' at row 2
+Warning 1366 Incorrect string value: '\xC2' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\xC2#' for column `test`.`t1`.`a` at row 2
SHOW WARNINGS;
Level Code Message
-Warning 1366 Incorrect string value: '\xC2' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\xC2#' for column 'a' at row 2
+Warning 1366 Incorrect string value: '\xC2' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\xC2#' for column `test`.`t1`.`a` at row 2
SELECT HEX(a),a FROM t1;
HEX(a) a
3F ?
diff --git a/mysql-test/main/ctype_many.result b/mysql-test/main/ctype_many.result
index d73a478b0c0..25802af4b5d 100644
--- a/mysql-test/main/ctype_many.result
+++ b/mysql-test/main/ctype_many.result
@@ -1767,8 +1767,8 @@ CREATE TABLE t2 (a VARCHAR(10) CHARACTER SET ucs2);
INSERT INTO t1 VALUES (0x10082), (0x12345);
INSERT IGNORE INTO t2 SELECT * FROM t1;
Warnings:
-Warning 1366 Incorrect string value: '\x00\x01\x00\x82' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\x00\x01\x23\x45' for column 'a' at row 2
+Warning 1366 Incorrect string value: '\x00\x01\x00\x82' for column `test`.`t2`.`a` at row 1
+Warning 1366 Incorrect string value: '\x00\x01\x23\x45' for column `test`.`t2`.`a` at row 2
SELECT HEX(a) FROM t2;
HEX(a)
003F
diff --git a/mysql-test/main/ctype_recoding.result b/mysql-test/main/ctype_recoding.result
index 806d9dc6997..4668ddf9684 100644
--- a/mysql-test/main/ctype_recoding.result
+++ b/mysql-test/main/ctype_recoding.result
@@ -171,8 +171,8 @@ create table t1 (a char(10) character set koi8r, b text character set koi8r);
insert into t1 values ('test','test');
insert ignore into t1 values ('','');
Warnings:
-Warning 1366 Incorrect string value: '\xCA\xC3\xD5\xCB' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\xCA\xC3\xD5\xCB' for column 'b' at row 1
+Warning 1366 Incorrect string value: '\xCA\xC3\xD5\xCB' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\xCA\xC3\xD5\xCB' for column `test`.`t1`.`b` at row 1
drop table t1;
set names koi8r;
create table t1 (a char(10) character set cp1251);
diff --git a/mysql-test/main/ctype_sjis.result b/mysql-test/main/ctype_sjis.result
index c19a0008e11..090bb12fc42 100644
--- a/mysql-test/main/ctype_sjis.result
+++ b/mysql-test/main/ctype_sjis.result
@@ -412,70 +412,70 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
Warnings:
-Warning 1366 Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\x80!' for column 'a' at row 2
-Warning 1366 Incorrect string value: '\x80"' for column 'a' at row 3
-Warning 1366 Incorrect string value: '\x80#' for column 'a' at row 4
-Warning 1366 Incorrect string value: '\x80$' for column 'a' at row 5
-Warning 1366 Incorrect string value: '\x80%' for column 'a' at row 6
-Warning 1366 Incorrect string value: '\x80&' for column 'a' at row 7
-Warning 1366 Incorrect string value: '\x80'' for column 'a' at row 8
-Warning 1366 Incorrect string value: '\x80(' for column 'a' at row 9
-Warning 1366 Incorrect string value: '\x80)' for column 'a' at row 10
-Warning 1366 Incorrect string value: '\x80*' for column 'a' at row 11
-Warning 1366 Incorrect string value: '\x80+' for column 'a' at row 12
-Warning 1366 Incorrect string value: '\x80,' for column 'a' at row 13
-Warning 1366 Incorrect string value: '\x80-' for column 'a' at row 14
-Warning 1366 Incorrect string value: '\x80.' for column 'a' at row 15
-Warning 1366 Incorrect string value: '\x80/' for column 'a' at row 16
-Warning 1366 Incorrect string value: '\x800' for column 'a' at row 17
-Warning 1366 Incorrect string value: '\x801' for column 'a' at row 18
-Warning 1366 Incorrect string value: '\x802' for column 'a' at row 19
-Warning 1366 Incorrect string value: '\x803' for column 'a' at row 20
-Warning 1366 Incorrect string value: '\x804' for column 'a' at row 21
-Warning 1366 Incorrect string value: '\x805' for column 'a' at row 22
-Warning 1366 Incorrect string value: '\x806' for column 'a' at row 23
-Warning 1366 Incorrect string value: '\x807' for column 'a' at row 24
-Warning 1366 Incorrect string value: '\x808' for column 'a' at row 25
-Warning 1366 Incorrect string value: '\x809' for column 'a' at row 26
-Warning 1366 Incorrect string value: '\x80:' for column 'a' at row 27
-Warning 1366 Incorrect string value: '\x80;' for column 'a' at row 28
-Warning 1366 Incorrect string value: '\x80<' for column 'a' at row 29
-Warning 1366 Incorrect string value: '\x80=' for column 'a' at row 30
-Warning 1366 Incorrect string value: '\x80>' for column 'a' at row 31
-Warning 1366 Incorrect string value: '\x80?' for column 'a' at row 32
-Warning 1366 Incorrect string value: '\x80@' for column 'a' at row 33
-Warning 1366 Incorrect string value: '\x80A' for column 'a' at row 34
-Warning 1366 Incorrect string value: '\x80B' for column 'a' at row 35
-Warning 1366 Incorrect string value: '\x80C' for column 'a' at row 36
-Warning 1366 Incorrect string value: '\x80D' for column 'a' at row 37
-Warning 1366 Incorrect string value: '\x80E' for column 'a' at row 38
-Warning 1366 Incorrect string value: '\x80F' for column 'a' at row 39
-Warning 1366 Incorrect string value: '\x80G' for column 'a' at row 40
-Warning 1366 Incorrect string value: '\x80H' for column 'a' at row 41
-Warning 1366 Incorrect string value: '\x80I' for column 'a' at row 42
-Warning 1366 Incorrect string value: '\x80J' for column 'a' at row 43
-Warning 1366 Incorrect string value: '\x80K' for column 'a' at row 44
-Warning 1366 Incorrect string value: '\x80L' for column 'a' at row 45
-Warning 1366 Incorrect string value: '\x80M' for column 'a' at row 46
-Warning 1366 Incorrect string value: '\x80N' for column 'a' at row 47
-Warning 1366 Incorrect string value: '\x80O' for column 'a' at row 48
-Warning 1366 Incorrect string value: '\x80P' for column 'a' at row 49
-Warning 1366 Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning 1366 Incorrect string value: '\x80R' for column 'a' at row 51
-Warning 1366 Incorrect string value: '\x80S' for column 'a' at row 52
-Warning 1366 Incorrect string value: '\x80T' for column 'a' at row 53
-Warning 1366 Incorrect string value: '\x80U' for column 'a' at row 54
-Warning 1366 Incorrect string value: '\x80V' for column 'a' at row 55
-Warning 1366 Incorrect string value: '\x80W' for column 'a' at row 56
-Warning 1366 Incorrect string value: '\x80X' for column 'a' at row 57
-Warning 1366 Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning 1366 Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning 1366 Incorrect string value: '\x80[' for column 'a' at row 60
-Warning 1366 Incorrect string value: '\x80\' for column 'a' at row 61
-Warning 1366 Incorrect string value: '\x80]' for column 'a' at row 62
-Warning 1366 Incorrect string value: '\x80^' for column 'a' at row 63
-Warning 1366 Incorrect string value: '\x80_' for column 'a' at row 64
+Warning 1366 Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning 1366 Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning 1366 Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning 1366 Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning 1366 Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning 1366 Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning 1366 Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning 1366 Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning 1366 Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning 1366 Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning 1366 Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning 1366 Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning 1366 Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning 1366 Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning 1366 Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning 1366 Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning 1366 Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning 1366 Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning 1366 Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning 1366 Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning 1366 Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning 1366 Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning 1366 Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning 1366 Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning 1366 Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning 1366 Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning 1366 Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning 1366 Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning 1366 Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning 1366 Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning 1366 Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning 1366 Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning 1366 Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning 1366 Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning 1366 Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning 1366 Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning 1366 Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning 1366 Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning 1366 Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning 1366 Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning 1366 Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning 1366 Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning 1366 Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning 1366 Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning 1366 Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning 1366 Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning 1366 Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning 1366 Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning 1366 Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning 1366 Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning 1366 Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning 1366 Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning 1366 Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning 1366 Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning 1366 Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning 1366 Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning 1366 Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning 1366 Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
SELECT COUNT(*) FROM t1;
COUNT(*)
14623
diff --git a/mysql-test/main/ctype_uca.result b/mysql-test/main/ctype_uca.result
index 88fba0b3973..7394ec82924 100644
--- a/mysql-test/main/ctype_uca.result
+++ b/mysql-test/main/ctype_uca.result
@@ -6743,13 +6743,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
SELECT ch FROM t1 WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
ch
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
DELETE FROM t1;
INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -6766,21 +6766,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
ch
a
@@ -6824,7 +6824,7 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
ch
a
@@ -6845,13 +6845,13 @@ az
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
ch
a
@@ -6872,7 +6872,7 @@ az
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
ch
z
@@ -6884,23 +6884,23 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
ch
z
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
ch
z
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
ALTER TABLE t1 DROP KEY ch;
# 0xD18F would be a good 2-byte character, 0xD1 is an incomplete sequence
SET @query=CONCAT('SELECT ch FROM t1 WHERE ch=''a', 0xD1,'''');
@@ -6987,13 +6987,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
SELECT ch FROM t1 WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
ch
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
DELETE FROM t1;
INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -7010,21 +7010,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
ch
a
diff --git a/mysql-test/main/ctype_uca_innodb.result b/mysql-test/main/ctype_uca_innodb.result
index c04a99c8cd3..bd6f3b8a21f 100644
--- a/mysql-test/main/ctype_uca_innodb.result
+++ b/mysql-test/main/ctype_uca_innodb.result
@@ -24,13 +24,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
SELECT ch FROM t1 WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
ch
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
DELETE FROM t1;
INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -47,21 +47,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
ch
a
@@ -105,7 +105,7 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
ch
a
@@ -126,13 +126,13 @@ az
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
ch
a
@@ -153,7 +153,7 @@ az
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
ch
z
@@ -165,23 +165,23 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
ch
z
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
ch
z
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
ALTER TABLE t1 DROP KEY ch;
# 0xD18F would be a good 2-byte character, 0xD1 is an incomplete sequence
SET @query=CONCAT('SELECT ch FROM t1 WHERE ch=''a', 0xD1,'''');
diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result
index bfcb8b73245..dee9da3ce87 100644
--- a/mysql-test/main/ctype_ucs.result
+++ b/mysql-test/main/ctype_ucs.result
@@ -5405,7 +5405,7 @@ ERROR 22003: Out of range value for column 'a' at row 1
SET sql_mode=DEFAULT;
INSERT IGNORE INTO t1 VALUES (CONVERT('aaa' USING ucs2));
Warnings:
-Warning 1366 Incorrect decimal value: 'aaa' for column 'a' at row 1
+Warning 1366 Incorrect decimal value: 'aaa' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
#
# End of 5.6 tests
diff --git a/mysql-test/main/ctype_ujis.result b/mysql-test/main/ctype_ujis.result
index 0b1cf606f0b..a1fcce33bbb 100644
--- a/mysql-test/main/ctype_ujis.result
+++ b/mysql-test/main/ctype_ujis.result
@@ -2571,70 +2571,70 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
Warnings:
-Warning 1366 Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\x80!' for column 'a' at row 2
-Warning 1366 Incorrect string value: '\x80"' for column 'a' at row 3
-Warning 1366 Incorrect string value: '\x80#' for column 'a' at row 4
-Warning 1366 Incorrect string value: '\x80$' for column 'a' at row 5
-Warning 1366 Incorrect string value: '\x80%' for column 'a' at row 6
-Warning 1366 Incorrect string value: '\x80&' for column 'a' at row 7
-Warning 1366 Incorrect string value: '\x80'' for column 'a' at row 8
-Warning 1366 Incorrect string value: '\x80(' for column 'a' at row 9
-Warning 1366 Incorrect string value: '\x80)' for column 'a' at row 10
-Warning 1366 Incorrect string value: '\x80*' for column 'a' at row 11
-Warning 1366 Incorrect string value: '\x80+' for column 'a' at row 12
-Warning 1366 Incorrect string value: '\x80,' for column 'a' at row 13
-Warning 1366 Incorrect string value: '\x80-' for column 'a' at row 14
-Warning 1366 Incorrect string value: '\x80.' for column 'a' at row 15
-Warning 1366 Incorrect string value: '\x80/' for column 'a' at row 16
-Warning 1366 Incorrect string value: '\x800' for column 'a' at row 17
-Warning 1366 Incorrect string value: '\x801' for column 'a' at row 18
-Warning 1366 Incorrect string value: '\x802' for column 'a' at row 19
-Warning 1366 Incorrect string value: '\x803' for column 'a' at row 20
-Warning 1366 Incorrect string value: '\x804' for column 'a' at row 21
-Warning 1366 Incorrect string value: '\x805' for column 'a' at row 22
-Warning 1366 Incorrect string value: '\x806' for column 'a' at row 23
-Warning 1366 Incorrect string value: '\x807' for column 'a' at row 24
-Warning 1366 Incorrect string value: '\x808' for column 'a' at row 25
-Warning 1366 Incorrect string value: '\x809' for column 'a' at row 26
-Warning 1366 Incorrect string value: '\x80:' for column 'a' at row 27
-Warning 1366 Incorrect string value: '\x80;' for column 'a' at row 28
-Warning 1366 Incorrect string value: '\x80<' for column 'a' at row 29
-Warning 1366 Incorrect string value: '\x80=' for column 'a' at row 30
-Warning 1366 Incorrect string value: '\x80>' for column 'a' at row 31
-Warning 1366 Incorrect string value: '\x80?' for column 'a' at row 32
-Warning 1366 Incorrect string value: '\x80@' for column 'a' at row 33
-Warning 1366 Incorrect string value: '\x80A' for column 'a' at row 34
-Warning 1366 Incorrect string value: '\x80B' for column 'a' at row 35
-Warning 1366 Incorrect string value: '\x80C' for column 'a' at row 36
-Warning 1366 Incorrect string value: '\x80D' for column 'a' at row 37
-Warning 1366 Incorrect string value: '\x80E' for column 'a' at row 38
-Warning 1366 Incorrect string value: '\x80F' for column 'a' at row 39
-Warning 1366 Incorrect string value: '\x80G' for column 'a' at row 40
-Warning 1366 Incorrect string value: '\x80H' for column 'a' at row 41
-Warning 1366 Incorrect string value: '\x80I' for column 'a' at row 42
-Warning 1366 Incorrect string value: '\x80J' for column 'a' at row 43
-Warning 1366 Incorrect string value: '\x80K' for column 'a' at row 44
-Warning 1366 Incorrect string value: '\x80L' for column 'a' at row 45
-Warning 1366 Incorrect string value: '\x80M' for column 'a' at row 46
-Warning 1366 Incorrect string value: '\x80N' for column 'a' at row 47
-Warning 1366 Incorrect string value: '\x80O' for column 'a' at row 48
-Warning 1366 Incorrect string value: '\x80P' for column 'a' at row 49
-Warning 1366 Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning 1366 Incorrect string value: '\x80R' for column 'a' at row 51
-Warning 1366 Incorrect string value: '\x80S' for column 'a' at row 52
-Warning 1366 Incorrect string value: '\x80T' for column 'a' at row 53
-Warning 1366 Incorrect string value: '\x80U' for column 'a' at row 54
-Warning 1366 Incorrect string value: '\x80V' for column 'a' at row 55
-Warning 1366 Incorrect string value: '\x80W' for column 'a' at row 56
-Warning 1366 Incorrect string value: '\x80X' for column 'a' at row 57
-Warning 1366 Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning 1366 Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning 1366 Incorrect string value: '\x80[' for column 'a' at row 60
-Warning 1366 Incorrect string value: '\x80\' for column 'a' at row 61
-Warning 1366 Incorrect string value: '\x80]' for column 'a' at row 62
-Warning 1366 Incorrect string value: '\x80^' for column 'a' at row 63
-Warning 1366 Incorrect string value: '\x80_' for column 'a' at row 64
+Warning 1366 Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning 1366 Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning 1366 Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning 1366 Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning 1366 Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning 1366 Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning 1366 Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning 1366 Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning 1366 Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning 1366 Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning 1366 Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning 1366 Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning 1366 Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning 1366 Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning 1366 Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning 1366 Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning 1366 Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning 1366 Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning 1366 Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning 1366 Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning 1366 Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning 1366 Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning 1366 Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning 1366 Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning 1366 Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning 1366 Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning 1366 Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning 1366 Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning 1366 Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning 1366 Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning 1366 Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning 1366 Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning 1366 Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning 1366 Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning 1366 Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning 1366 Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning 1366 Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning 1366 Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning 1366 Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning 1366 Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning 1366 Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning 1366 Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning 1366 Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning 1366 Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning 1366 Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning 1366 Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning 1366 Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning 1366 Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning 1366 Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning 1366 Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning 1366 Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning 1366 Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning 1366 Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning 1366 Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning 1366 Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning 1366 Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning 1366 Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning 1366 Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning 1366 Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
SELECT COUNT(*) FROM t1;
COUNT(*)
44671
diff --git a/mysql-test/main/ctype_ujis_ucs2.result b/mysql-test/main/ctype_ujis_ucs2.result
index 77961046346..cb501fd065f 100644
--- a/mysql-test/main/ctype_ujis_ucs2.result
+++ b/mysql-test/main/ctype_ujis_ucs2.result
@@ -1140,70 +1140,70 @@ update t1 set name='User defined range #2' where ujis >= 0x8FF5A1 and ujis <= 0x
update t1 set name='UNASSIGNED' where name='';
update ignore t1 set ucs2=ujis, ujis2=ucs2;
Warnings:
-Warning 1366 Incorrect string value: '\xA2\xAF' for column 'ucs2' at row 237
-Warning 1366 Incorrect string value: '\xA2\xB0' for column 'ucs2' at row 238
-Warning 1366 Incorrect string value: '\xA2\xB1' for column 'ucs2' at row 239
-Warning 1366 Incorrect string value: '\xA2\xB2' for column 'ucs2' at row 240
-Warning 1366 Incorrect string value: '\xA2\xB3' for column 'ucs2' at row 241
-Warning 1366 Incorrect string value: '\xA2\xB4' for column 'ucs2' at row 242
-Warning 1366 Incorrect string value: '\xA2\xB5' for column 'ucs2' at row 243
-Warning 1366 Incorrect string value: '\xA2\xB6' for column 'ucs2' at row 244
-Warning 1366 Incorrect string value: '\xA2\xB7' for column 'ucs2' at row 245
-Warning 1366 Incorrect string value: '\xA2\xB8' for column 'ucs2' at row 246
-Warning 1366 Incorrect string value: '\xA2\xB9' for column 'ucs2' at row 247
-Warning 1366 Incorrect string value: '\xA2\xC2' for column 'ucs2' at row 256
-Warning 1366 Incorrect string value: '\xA2\xC3' for column 'ucs2' at row 257
-Warning 1366 Incorrect string value: '\xA2\xC4' for column 'ucs2' at row 258
-Warning 1366 Incorrect string value: '\xA2\xC5' for column 'ucs2' at row 259
-Warning 1366 Incorrect string value: '\xA2\xC6' for column 'ucs2' at row 260
-Warning 1366 Incorrect string value: '\xA2\xC7' for column 'ucs2' at row 261
-Warning 1366 Incorrect string value: '\xA2\xC8' for column 'ucs2' at row 262
-Warning 1366 Incorrect string value: '\xA2\xC9' for column 'ucs2' at row 263
-Warning 1366 Incorrect string value: '\xA2\xD1' for column 'ucs2' at row 271
-Warning 1366 Incorrect string value: '\xA2\xD2' for column 'ucs2' at row 272
-Warning 1366 Incorrect string value: '\xA2\xD3' for column 'ucs2' at row 273
-Warning 1366 Incorrect string value: '\xA2\xD4' for column 'ucs2' at row 274
-Warning 1366 Incorrect string value: '\xA2\xD5' for column 'ucs2' at row 275
-Warning 1366 Incorrect string value: '\xA2\xD6' for column 'ucs2' at row 276
-Warning 1366 Incorrect string value: '\xA2\xD7' for column 'ucs2' at row 277
-Warning 1366 Incorrect string value: '\xA2\xD8' for column 'ucs2' at row 278
-Warning 1366 Incorrect string value: '\xA2\xD9' for column 'ucs2' at row 279
-Warning 1366 Incorrect string value: '\xA2\xDA' for column 'ucs2' at row 280
-Warning 1366 Incorrect string value: '\xA2\xDB' for column 'ucs2' at row 281
-Warning 1366 Incorrect string value: '\xA2\xEB' for column 'ucs2' at row 297
-Warning 1366 Incorrect string value: '\xA2\xEC' for column 'ucs2' at row 298
-Warning 1366 Incorrect string value: '\xA2\xED' for column 'ucs2' at row 299
-Warning 1366 Incorrect string value: '\xA2\xEE' for column 'ucs2' at row 300
-Warning 1366 Incorrect string value: '\xA2\xEF' for column 'ucs2' at row 301
-Warning 1366 Incorrect string value: '\xA2\xF0' for column 'ucs2' at row 302
-Warning 1366 Incorrect string value: '\xA2\xF1' for column 'ucs2' at row 303
-Warning 1366 Incorrect string value: '\xA2\xFA' for column 'ucs2' at row 312
-Warning 1366 Incorrect string value: '\xA2\xFB' for column 'ucs2' at row 313
-Warning 1366 Incorrect string value: '\xA2\xFC' for column 'ucs2' at row 314
-Warning 1366 Incorrect string value: '\xA2\xFD' for column 'ucs2' at row 315
-Warning 1366 Incorrect string value: '\xA3\xA1' for column 'ucs2' at row 317
-Warning 1366 Incorrect string value: '\xA3\xA2' for column 'ucs2' at row 318
-Warning 1366 Incorrect string value: '\xA3\xA3' for column 'ucs2' at row 319
-Warning 1366 Incorrect string value: '\xA3\xA4' for column 'ucs2' at row 320
-Warning 1366 Incorrect string value: '\xA3\xA5' for column 'ucs2' at row 321
-Warning 1366 Incorrect string value: '\xA3\xA6' for column 'ucs2' at row 322
-Warning 1366 Incorrect string value: '\xA3\xA7' for column 'ucs2' at row 323
-Warning 1366 Incorrect string value: '\xA3\xA8' for column 'ucs2' at row 324
-Warning 1366 Incorrect string value: '\xA3\xA9' for column 'ucs2' at row 325
-Warning 1366 Incorrect string value: '\xA3\xAA' for column 'ucs2' at row 326
-Warning 1366 Incorrect string value: '\xA3\xAB' for column 'ucs2' at row 327
-Warning 1366 Incorrect string value: '\xA3\xAC' for column 'ucs2' at row 328
-Warning 1366 Incorrect string value: '\xA3\xAD' for column 'ucs2' at row 329
-Warning 1366 Incorrect string value: '\xA3\xAE' for column 'ucs2' at row 330
-Warning 1366 Incorrect string value: '\xA3\xAF' for column 'ucs2' at row 331
-Warning 1366 Incorrect string value: '\xA3\xBA' for column 'ucs2' at row 342
-Warning 1366 Incorrect string value: '\xA3\xBB' for column 'ucs2' at row 343
-Warning 1366 Incorrect string value: '\xA3\xBC' for column 'ucs2' at row 344
-Warning 1366 Incorrect string value: '\xA3\xBD' for column 'ucs2' at row 345
-Warning 1366 Incorrect string value: '\xA3\xBE' for column 'ucs2' at row 346
-Warning 1366 Incorrect string value: '\xA3\xBF' for column 'ucs2' at row 347
-Warning 1366 Incorrect string value: '\xA3\xC0' for column 'ucs2' at row 348
-Warning 1366 Incorrect string value: '\xA3\xDB' for column 'ucs2' at row 375
+Warning 1366 Incorrect string value: '\xA2\xAF' for column `test`.`t1`.`ucs2` at row 237
+Warning 1366 Incorrect string value: '\xA2\xB0' for column `test`.`t1`.`ucs2` at row 238
+Warning 1366 Incorrect string value: '\xA2\xB1' for column `test`.`t1`.`ucs2` at row 239
+Warning 1366 Incorrect string value: '\xA2\xB2' for column `test`.`t1`.`ucs2` at row 240
+Warning 1366 Incorrect string value: '\xA2\xB3' for column `test`.`t1`.`ucs2` at row 241
+Warning 1366 Incorrect string value: '\xA2\xB4' for column `test`.`t1`.`ucs2` at row 242
+Warning 1366 Incorrect string value: '\xA2\xB5' for column `test`.`t1`.`ucs2` at row 243
+Warning 1366 Incorrect string value: '\xA2\xB6' for column `test`.`t1`.`ucs2` at row 244
+Warning 1366 Incorrect string value: '\xA2\xB7' for column `test`.`t1`.`ucs2` at row 245
+Warning 1366 Incorrect string value: '\xA2\xB8' for column `test`.`t1`.`ucs2` at row 246
+Warning 1366 Incorrect string value: '\xA2\xB9' for column `test`.`t1`.`ucs2` at row 247
+Warning 1366 Incorrect string value: '\xA2\xC2' for column `test`.`t1`.`ucs2` at row 256
+Warning 1366 Incorrect string value: '\xA2\xC3' for column `test`.`t1`.`ucs2` at row 257
+Warning 1366 Incorrect string value: '\xA2\xC4' for column `test`.`t1`.`ucs2` at row 258
+Warning 1366 Incorrect string value: '\xA2\xC5' for column `test`.`t1`.`ucs2` at row 259
+Warning 1366 Incorrect string value: '\xA2\xC6' for column `test`.`t1`.`ucs2` at row 260
+Warning 1366 Incorrect string value: '\xA2\xC7' for column `test`.`t1`.`ucs2` at row 261
+Warning 1366 Incorrect string value: '\xA2\xC8' for column `test`.`t1`.`ucs2` at row 262
+Warning 1366 Incorrect string value: '\xA2\xC9' for column `test`.`t1`.`ucs2` at row 263
+Warning 1366 Incorrect string value: '\xA2\xD1' for column `test`.`t1`.`ucs2` at row 271
+Warning 1366 Incorrect string value: '\xA2\xD2' for column `test`.`t1`.`ucs2` at row 272
+Warning 1366 Incorrect string value: '\xA2\xD3' for column `test`.`t1`.`ucs2` at row 273
+Warning 1366 Incorrect string value: '\xA2\xD4' for column `test`.`t1`.`ucs2` at row 274
+Warning 1366 Incorrect string value: '\xA2\xD5' for column `test`.`t1`.`ucs2` at row 275
+Warning 1366 Incorrect string value: '\xA2\xD6' for column `test`.`t1`.`ucs2` at row 276
+Warning 1366 Incorrect string value: '\xA2\xD7' for column `test`.`t1`.`ucs2` at row 277
+Warning 1366 Incorrect string value: '\xA2\xD8' for column `test`.`t1`.`ucs2` at row 278
+Warning 1366 Incorrect string value: '\xA2\xD9' for column `test`.`t1`.`ucs2` at row 279
+Warning 1366 Incorrect string value: '\xA2\xDA' for column `test`.`t1`.`ucs2` at row 280
+Warning 1366 Incorrect string value: '\xA2\xDB' for column `test`.`t1`.`ucs2` at row 281
+Warning 1366 Incorrect string value: '\xA2\xEB' for column `test`.`t1`.`ucs2` at row 297
+Warning 1366 Incorrect string value: '\xA2\xEC' for column `test`.`t1`.`ucs2` at row 298
+Warning 1366 Incorrect string value: '\xA2\xED' for column `test`.`t1`.`ucs2` at row 299
+Warning 1366 Incorrect string value: '\xA2\xEE' for column `test`.`t1`.`ucs2` at row 300
+Warning 1366 Incorrect string value: '\xA2\xEF' for column `test`.`t1`.`ucs2` at row 301
+Warning 1366 Incorrect string value: '\xA2\xF0' for column `test`.`t1`.`ucs2` at row 302
+Warning 1366 Incorrect string value: '\xA2\xF1' for column `test`.`t1`.`ucs2` at row 303
+Warning 1366 Incorrect string value: '\xA2\xFA' for column `test`.`t1`.`ucs2` at row 312
+Warning 1366 Incorrect string value: '\xA2\xFB' for column `test`.`t1`.`ucs2` at row 313
+Warning 1366 Incorrect string value: '\xA2\xFC' for column `test`.`t1`.`ucs2` at row 314
+Warning 1366 Incorrect string value: '\xA2\xFD' for column `test`.`t1`.`ucs2` at row 315
+Warning 1366 Incorrect string value: '\xA3\xA1' for column `test`.`t1`.`ucs2` at row 317
+Warning 1366 Incorrect string value: '\xA3\xA2' for column `test`.`t1`.`ucs2` at row 318
+Warning 1366 Incorrect string value: '\xA3\xA3' for column `test`.`t1`.`ucs2` at row 319
+Warning 1366 Incorrect string value: '\xA3\xA4' for column `test`.`t1`.`ucs2` at row 320
+Warning 1366 Incorrect string value: '\xA3\xA5' for column `test`.`t1`.`ucs2` at row 321
+Warning 1366 Incorrect string value: '\xA3\xA6' for column `test`.`t1`.`ucs2` at row 322
+Warning 1366 Incorrect string value: '\xA3\xA7' for column `test`.`t1`.`ucs2` at row 323
+Warning 1366 Incorrect string value: '\xA3\xA8' for column `test`.`t1`.`ucs2` at row 324
+Warning 1366 Incorrect string value: '\xA3\xA9' for column `test`.`t1`.`ucs2` at row 325
+Warning 1366 Incorrect string value: '\xA3\xAA' for column `test`.`t1`.`ucs2` at row 326
+Warning 1366 Incorrect string value: '\xA3\xAB' for column `test`.`t1`.`ucs2` at row 327
+Warning 1366 Incorrect string value: '\xA3\xAC' for column `test`.`t1`.`ucs2` at row 328
+Warning 1366 Incorrect string value: '\xA3\xAD' for column `test`.`t1`.`ucs2` at row 329
+Warning 1366 Incorrect string value: '\xA3\xAE' for column `test`.`t1`.`ucs2` at row 330
+Warning 1366 Incorrect string value: '\xA3\xAF' for column `test`.`t1`.`ucs2` at row 331
+Warning 1366 Incorrect string value: '\xA3\xBA' for column `test`.`t1`.`ucs2` at row 342
+Warning 1366 Incorrect string value: '\xA3\xBB' for column `test`.`t1`.`ucs2` at row 343
+Warning 1366 Incorrect string value: '\xA3\xBC' for column `test`.`t1`.`ucs2` at row 344
+Warning 1366 Incorrect string value: '\xA3\xBD' for column `test`.`t1`.`ucs2` at row 345
+Warning 1366 Incorrect string value: '\xA3\xBE' for column `test`.`t1`.`ucs2` at row 346
+Warning 1366 Incorrect string value: '\xA3\xBF' for column `test`.`t1`.`ucs2` at row 347
+Warning 1366 Incorrect string value: '\xA3\xC0' for column `test`.`t1`.`ucs2` at row 348
+Warning 1366 Incorrect string value: '\xA3\xDB' for column `test`.`t1`.`ucs2` at row 375
Characters with safe Unicode round trip
select hex(ujis), hex(ucs2), hex(ujis2), name from t1 where ujis=ujis2 order by ujis;
hex(ujis) hex(ucs2) hex(ujis2) name
@@ -19131,17 +19131,17 @@ insert into t1 (ucs2,name) values (0xFFE2,'U+FFE2 FULLWIDTH NOT SIGN');
insert into t1 (ucs2,name) values (0xFFE4,'U+FFE4 FULLWIDTH BROKEN BAR');
update ignore t1 set ujis=ucs2;
Warnings:
-Warning 1366 Incorrect string value: '\x00\xA5' for column 'ujis' at row 1
-Warning 1366 Incorrect string value: '\x20\x14' for column 'ujis' at row 2
-Warning 1366 Incorrect string value: '\x20\x3E' for column 'ujis' at row 3
-Warning 1366 Incorrect string value: '\x22\x25' for column 'ujis' at row 4
-Warning 1366 Incorrect string value: '\xFF\x0D' for column 'ujis' at row 5
-Warning 1366 Incorrect string value: '\xFF\x3C' for column 'ujis' at row 6
-Warning 1366 Incorrect string value: '\xFF\x5E' for column 'ujis' at row 7
-Warning 1366 Incorrect string value: '\xFF\xE0' for column 'ujis' at row 8
-Warning 1366 Incorrect string value: '\xFF\xE1' for column 'ujis' at row 9
-Warning 1366 Incorrect string value: '\xFF\xE2' for column 'ujis' at row 10
-Warning 1366 Incorrect string value: '\xFF\xE4' for column 'ujis' at row 11
+Warning 1366 Incorrect string value: '\x00\xA5' for column `test`.`t1`.`ujis` at row 1
+Warning 1366 Incorrect string value: '\x20\x14' for column `test`.`t1`.`ujis` at row 2
+Warning 1366 Incorrect string value: '\x20\x3E' for column `test`.`t1`.`ujis` at row 3
+Warning 1366 Incorrect string value: '\x22\x25' for column `test`.`t1`.`ujis` at row 4
+Warning 1366 Incorrect string value: '\xFF\x0D' for column `test`.`t1`.`ujis` at row 5
+Warning 1366 Incorrect string value: '\xFF\x3C' for column `test`.`t1`.`ujis` at row 6
+Warning 1366 Incorrect string value: '\xFF\x5E' for column `test`.`t1`.`ujis` at row 7
+Warning 1366 Incorrect string value: '\xFF\xE0' for column `test`.`t1`.`ujis` at row 8
+Warning 1366 Incorrect string value: '\xFF\xE1' for column `test`.`t1`.`ujis` at row 9
+Warning 1366 Incorrect string value: '\xFF\xE2' for column `test`.`t1`.`ujis` at row 10
+Warning 1366 Incorrect string value: '\xFF\xE4' for column `test`.`t1`.`ujis` at row 11
select hex(ucs2),hex(ujis),name from t1 order by name;
hex(ucs2) hex(ujis) name
00A5 3F U+00A5 YEN SIGN
diff --git a/mysql-test/main/ctype_utf16.result b/mysql-test/main/ctype_utf16.result
index a105017b726..fb7ae1f62bb 100644
--- a/mysql-test/main/ctype_utf16.result
+++ b/mysql-test/main/ctype_utf16.result
@@ -1015,7 +1015,7 @@ insert into t1 values (0xdf84);
SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
alter table t1 modify column s1 varchar(50) character set utf16;
Warnings:
-Warning 1366 Incorrect string value: '\xDF\x84' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xDF\x84' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
003F
@@ -1024,7 +1024,7 @@ create table t1 (s1 varchar(5) character set ucs2, s2 varchar(5) character set u
insert into t1 (s1) values (0xdf84);
update ignore t1 set s2 = s1;
Warnings:
-Warning 1366 Incorrect string value: '\xDF\x84' for column 's2' at row 1
+Warning 1366 Incorrect string value: '\xDF\x84' for column `test`.`t1`.`s2` at row 1
select hex(s2) from t1;
hex(s2)
003F
diff --git a/mysql-test/main/ctype_utf16le.result b/mysql-test/main/ctype_utf16le.result
index 6d8d7ddca2a..ba7a2383671 100644
--- a/mysql-test/main/ctype_utf16le.result
+++ b/mysql-test/main/ctype_utf16le.result
@@ -1124,7 +1124,7 @@ INSERT INTO t1 VALUES (0xDF84);
SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
ALTER TABLE t1 MODIFY column s1 VARCHAR(50) CHARACTER SET utf16le;
Warnings:
-Warning 1366 Incorrect string value: '\xDF\x84' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xDF\x84' for column `test`.`t1`.`s1` at row 1
SELECT HEX(s1) FROM t1;
HEX(s1)
3F00
@@ -1136,7 +1136,7 @@ CREATE TABLE t1 (s1 VARCHAR(5) CHARACTER SET ucs2, s2 VARCHAR(5) CHARACTER SET u
INSERT INTO t1 (s1) VALUES (0xdf84);
UPDATE IGNORE t1 set s2 = s1;
Warnings:
-Warning 1366 Incorrect string value: '\xDF\x84' for column 's2' at row 1
+Warning 1366 Incorrect string value: '\xDF\x84' for column `test`.`t1`.`s2` at row 1
SELECT HEX(s2) FROM t1;
HEX(s2)
3F00
diff --git a/mysql-test/main/ctype_utf32.result b/mysql-test/main/ctype_utf32.result
index 28b9caf6ffe..47e739df290 100644
--- a/mysql-test/main/ctype_utf32.result
+++ b/mysql-test/main/ctype_utf32.result
@@ -985,31 +985,31 @@ create table t1 (utf32 varchar(2) character set utf32);
Wrong character with pad
insert ignore into t1 values (0x110000);
Warnings:
-Warning 1366 Incorrect string value: '\x11\x00\x00' for column 'utf32' at row 1
+Warning 1366 Incorrect string value: '\x11\x00\x00' for column `test`.`t1`.`utf32` at row 1
Wrong chsaracter without pad
insert ignore into t1 values (0x00110000);
Warnings:
-Warning 1366 Incorrect string value: '\x00\x11\x00\x00' for column 'utf32' at row 1
+Warning 1366 Incorrect string value: '\x00\x11\x00\x00' for column `test`.`t1`.`utf32` at row 1
Wrong character with pad followed by another wrong character
insert ignore into t1 values (0x11000000110000);
Warnings:
-Warning 1366 Incorrect string value: '\x11\x00\x00\x00\x11\x00...' for column 'utf32' at row 1
+Warning 1366 Incorrect string value: '\x11\x00\x00\x00\x11\x00...' for column `test`.`t1`.`utf32` at row 1
Good character with pad followed by bad character
insert ignore into t1 values (0x10000000110000);
Warnings:
-Warning 1366 Incorrect string value: '\x00\x11\x00\x00' for column 'utf32' at row 1
+Warning 1366 Incorrect string value: '\x00\x11\x00\x00' for column `test`.`t1`.`utf32` at row 1
Good character without pad followed by bad character
insert ignore into t1 values (0x0010000000110000);
Warnings:
-Warning 1366 Incorrect string value: '\x00\x11\x00\x00' for column 'utf32' at row 1
+Warning 1366 Incorrect string value: '\x00\x11\x00\x00' for column `test`.`t1`.`utf32` at row 1
Wrong character with the second byte higher than 0x10
insert ignore into t1 values (0x00800037);
Warnings:
-Warning 1366 Incorrect string value: '\x00\x80\x007' for column 'utf32' at row 1
+Warning 1366 Incorrect string value: '\x00\x80\x007' for column `test`.`t1`.`utf32` at row 1
Wrong character with pad with the second byte higher than 0x10
insert ignore into t1 values (0x00800037);
Warnings:
-Warning 1366 Incorrect string value: '\x00\x80\x007' for column 'utf32' at row 1
+Warning 1366 Incorrect string value: '\x00\x80\x007' for column `test`.`t1`.`utf32` at row 1
drop table t1;
select _utf32'a' collate utf32_general_ci = 0xfffd;
_utf32'a' collate utf32_general_ci = 0xfffd
@@ -1561,12 +1561,12 @@ CREATE TABLE t1 (utf32 CHAR(5) CHARACTER SET utf32, latin1 CHAR(5) CHARACTER SET
INSERT INTO t1 (utf32) VALUES (0xc581);
UPDATE IGNORE t1 SET latin1 = utf32;
Warnings:
-Warning 1366 Incorrect string value: '\x00\x00\xC5\x81' for column 'latin1' at row 1
+Warning 1366 Incorrect string value: '\x00\x00\xC5\x81' for column `test`.`t1`.`latin1` at row 1
DELETE FROM t1;
INSERT INTO t1 (utf32) VALUES (0x100cc);
UPDATE IGNORE t1 SET latin1 = utf32;
Warnings:
-Warning 1366 Incorrect string value: '\x00\x01\x00\xCC' for column 'latin1' at row 1
+Warning 1366 Incorrect string value: '\x00\x01\x00\xCC' for column `test`.`t1`.`latin1` at row 1
DROP TABLE t1;
#
# Bug#55912 FORMAT with locale set fails for numbers < 1000
diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result
index d696ff78831..9c2fcb84765 100644
--- a/mysql-test/main/ctype_utf8.result
+++ b/mysql-test/main/ctype_utf8.result
@@ -222,7 +222,7 @@ drop table t1;
create table t1 (s1 char(10) character set utf8);
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -230,7 +230,7 @@ drop table t1;
create table t1 (s1 varchar(10) character set utf8);
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -238,7 +238,7 @@ drop table t1;
create table t1 (s1 text character set utf8);
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -5456,13 +5456,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
SELECT ch FROM t1 WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
ch
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
DELETE FROM t1;
INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -5479,21 +5479,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
ch
a
@@ -5537,7 +5537,7 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
ch
a
@@ -5558,13 +5558,13 @@ az
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
ch
a
@@ -5585,7 +5585,7 @@ az
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
ch
z
@@ -5597,23 +5597,23 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
ch
z
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
ch
z
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
ALTER TABLE t1 DROP KEY ch;
# 0xD18F would be a good 2-byte character, 0xD1 is an incomplete sequence
SET @query=CONCAT('SELECT ch FROM t1 WHERE ch=''a', 0xD1,'''');
@@ -5700,13 +5700,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
SELECT ch FROM t1 WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
ch
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
DELETE FROM t1;
INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -5723,21 +5723,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
ch
a
@@ -5781,7 +5781,7 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
ch
a
@@ -5802,13 +5802,13 @@ az
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
ch
a
@@ -5829,7 +5829,7 @@ az
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
ch
z
@@ -5841,23 +5841,23 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
ch
z
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ch ch 183 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
ch
z
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
ALTER TABLE t1 DROP KEY ch;
# 0xD18F would be a good 2-byte character, 0xD1 is an incomplete sequence
SET @query=CONCAT('SELECT ch FROM t1 WHERE ch=''a', 0xD1,'''');
@@ -5944,13 +5944,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
SELECT ch FROM t1 WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
ch
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
DELETE FROM t1;
INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -5967,21 +5967,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
EXPLAIN
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL # Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
ch
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
ch
a
@@ -10611,11 +10611,11 @@ DROP TABLE t1;
CREATE TABLE t1 (a TEXT CHARACTER SET utf8);
LOAD DATA INFILE '../../std_data/loaddata/mdev9823.utf8mb4.txt' IGNORE INTO TABLE t1 CHARACTER SET utf8 IGNORE 4 LINES;
Warnings:
-Warning 1366 Incorrect string value: '\xD0' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\xE1\x80' for column 'a' at row 3
-Warning 1366 Incorrect string value: '\xF0\x9F\x98' for column 'a' at row 5
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x8E' for column 'a' at row 7
-Warning 1366 Incorrect string value: '\xF0\x9F\x98' for column 'a' at row 8
+Warning 1366 Incorrect string value: '\xD0' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\xE1\x80' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect string value: '\xF0\x9F\x98' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x8E' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect string value: '\xF0\x9F\x98' for column `test`.`t1`.`a` at row 8
SELECT HEX(a) FROM t1;
HEX(a)
3F
@@ -10633,7 +10633,7 @@ DROP TABLE t1;
CREATE TABLE t1 (a TEXT CHARACTER SET utf8);
LOAD XML INFILE '../../std_data/loaddata/mdev9874.xml' IGNORE INTO TABLE t1 CHARACTER SET utf8 ROWS IDENTIFIED BY '<row>';
Warnings:
-Warning 1366 Incorrect string value: '\xD0' for column 'a' at row 1
+Warning 1366 Incorrect string value: '\xD0' for column `test`.`t1`.`a` at row 1
SELECT HEX(a) FROM t1;
HEX(a)
613F
diff --git a/mysql-test/main/ctype_utf8mb4.result b/mysql-test/main/ctype_utf8mb4.result
index 27ffd5552fa..fac15a5a2cd 100644
--- a/mysql-test/main/ctype_utf8mb4.result
+++ b/mysql-test/main/ctype_utf8mb4.result
@@ -222,7 +222,7 @@ drop table t1;
create table t1 (s1 char(10) character set utf8mb4);
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -230,7 +230,7 @@ drop table t1;
create table t1 (s1 varchar(10) character set utf8mb4);
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -238,7 +238,7 @@ drop table t1;
create table t1 (s1 text character set utf8mb4);
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -2328,7 +2328,7 @@ insert into t1 values (0xF0908080);
insert into t1 values (0xF0BFBFBF);
insert ignore into t1 values (0xF08F8080);
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x8F\x80\x80' for column 'utf8mb4' at row 1
+Warning 1366 Incorrect string value: '\xF0\x8F\x80\x80' for column `test`.`t1`.`utf8mb4` at row 1
select hex(utf8mb4) from t1 order by binary utf8mb4;
hex(utf8mb4)
3F
@@ -2348,7 +2348,7 @@ insert into t1 values (0xF4808080);
insert into t1 values (0xF48F8080);
insert ignore into t1 values (0xF4908080);
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x90\x80\x80' for column 'utf8mb4' at row 1
+Warning 1366 Incorrect string value: '\xF4\x90\x80\x80' for column `test`.`t1`.`utf8mb4` at row 1
select hex(utf8mb4) from t1 order by binary utf8mb4;
hex(utf8mb4)
3F
@@ -2442,7 +2442,7 @@ u_decimal hex(utf8mb4_encoding)
119070 F09D849EF09D859EF09D859EF09D8480F09D859FF09D859FF09D859FF09D85A0F09D85A0F09D8480
INSERT IGNORE INTO t1 VALUES (1114111, x'f5808080');
Warnings:
-Warning 1366 Incorrect string value: '\xF5\x80\x80\x80' for column 'utf8mb4_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF5\x80\x80\x80' for column `test`.`t1`.`utf8mb4_encoding` at row 1
SELECT character_maximum_length, character_octet_length FROM information_schema.columns WHERE
table_name= 't1' AND column_name= 'utf8mb4_encoding';
character_maximum_length character_octet_length
@@ -2456,14 +2456,14 @@ INSERT INTO t2 VALUES (42856, x'ea9da8');
INSERT INTO t2 VALUES (65131, x'efb9ab');
INSERT IGNORE INTO t2 VALUES (1114111, x'f48fbfbf');
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBF' for column 'utf8mb3_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBF' for column `test`.`t2`.`utf8mb3_encoding` at row 1
SELECT character_maximum_length, character_octet_length FROM information_schema.columns WHERE
table_name= 't2' AND column_name= 'utf8mb3_encoding';
character_maximum_length character_octet_length
10 30
UPDATE IGNORE t2 SET utf8mb3_encoding= x'f48fbfbd' where u_decimal= 42856;
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBD' for column 'utf8mb3_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBD' for column `test`.`t2`.`utf8mb3_encoding` at row 1
UPDATE t2 SET utf8mb3_encoding= _utf8mb4 x'ea9da8' where u_decimal= 42856;
SELECT HEX(CONCAT(utf8mb4_encoding, _utf8 x'ea9da8')) FROM t1;
HEX(CONCAT(utf8mb4_encoding, _utf8 x'ea9da8'))
@@ -2524,17 +2524,17 @@ count(*)
SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
ALTER TABLE t1 CONVERT TO CHARACTER SET utf8;
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9D\x84\x80' for column 'utf8mb4_encoding' at row 1
-Warning 1366 Incorrect string value: '\xF0\x9D\x84\x9E' for column 'utf8mb4_encoding' at row 2
-Warning 1366 Incorrect string value: '\xF0\x9D\x85\x9E' for column 'utf8mb4_encoding' at row 3
-Warning 1366 Incorrect string value: '\xF0\x9D\x87\x8F' for column 'utf8mb4_encoding' at row 4
-Warning 1366 Incorrect string value: '\xF0\x9D\x9C\x9F' for column 'utf8mb4_encoding' at row 5
-Warning 1366 Incorrect string value: '\xF0\x9D\x9E\x9F' for column 'utf8mb4_encoding' at row 6
-Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBF' for column 'utf8mb4_encoding' at row 7
-Warning 1366 Incorrect string value: '\xF3\xA0\x87\xAF' for column 'utf8mb4_encoding' at row 8
-Warning 1366 Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column 'utf8mb4_encoding' at row 9
-Warning 1366 Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column 'utf8mb4_encoding' at row 10
-Warning 1366 Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column 'utf8mb4_encoding' at row 11
+Warning 1366 Incorrect string value: '\xF0\x9D\x84\x80' for column `test`.`t1`.`utf8mb4_encoding` at row 1
+Warning 1366 Incorrect string value: '\xF0\x9D\x84\x9E' for column `test`.`t1`.`utf8mb4_encoding` at row 2
+Warning 1366 Incorrect string value: '\xF0\x9D\x85\x9E' for column `test`.`t1`.`utf8mb4_encoding` at row 3
+Warning 1366 Incorrect string value: '\xF0\x9D\x87\x8F' for column `test`.`t1`.`utf8mb4_encoding` at row 4
+Warning 1366 Incorrect string value: '\xF0\x9D\x9C\x9F' for column `test`.`t1`.`utf8mb4_encoding` at row 5
+Warning 1366 Incorrect string value: '\xF0\x9D\x9E\x9F' for column `test`.`t1`.`utf8mb4_encoding` at row 6
+Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBF' for column `test`.`t1`.`utf8mb4_encoding` at row 7
+Warning 1366 Incorrect string value: '\xF3\xA0\x87\xAF' for column `test`.`t1`.`utf8mb4_encoding` at row 8
+Warning 1366 Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column `test`.`t1`.`utf8mb4_encoding` at row 9
+Warning 1366 Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column `test`.`t1`.`utf8mb4_encoding` at row 10
+Warning 1366 Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column `test`.`t1`.`utf8mb4_encoding` at row 11
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
@@ -3427,8 +3427,8 @@ b VARCHAR(32) CHARACTER SET utf8
);
INSERT IGNORE INTO t1 SELECT 'a 😁 b', 'a 😁 b';
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81 b' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81 b' for column 'b' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81 b' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81 b' for column `test`.`t1`.`b` at row 1
SELECT * FROM t1;
a b
a ???? b a ???? b
@@ -3447,7 +3447,7 @@ b VARCHAR(32) CHARACTER SET utf8
);
INSERT IGNORE INTO t1 SELECT 'a 😁 b', 'a 😁 b';
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81 b' for column 'b' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81 b' for column `test`.`t1`.`b` at row 1
SELECT * FROM t1;
a b
a 😁 b a ? b
@@ -3539,10 +3539,10 @@ DROP FUNCTION f1;
CREATE TABLE t1 (a TEXT CHARACTER SET utf8mb4);
LOAD DATA INFILE '../../std_data/loaddata/mdev9823.utf8mb4.txt' IGNORE INTO TABLE t1 CHARACTER SET utf8mb4 IGNORE 4 LINES;
Warnings:
-Warning 1366 Incorrect string value: '\xD0' for column 'a' at row 1
-Warning 1366 Incorrect string value: '\xE1\x80' for column 'a' at row 3
-Warning 1366 Incorrect string value: '\xF0\x9F\x98' for column 'a' at row 5
-Warning 1366 Incorrect string value: '\xF0\x9F\x98' for column 'a' at row 8
+Warning 1366 Incorrect string value: '\xD0' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect string value: '\xE1\x80' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect string value: '\xF0\x9F\x98' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect string value: '\xF0\x9F\x98' for column `test`.`t1`.`a` at row 8
SELECT HEX(a) FROM t1;
HEX(a)
3F
diff --git a/mysql-test/main/ctype_utf8mb4_heap.result b/mysql-test/main/ctype_utf8mb4_heap.result
index d82ed89be9c..85668451181 100644
--- a/mysql-test/main/ctype_utf8mb4_heap.result
+++ b/mysql-test/main/ctype_utf8mb4_heap.result
@@ -222,7 +222,7 @@ drop table t1;
create table t1 (s1 char(10) character set utf8mb4) engine heap;
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -230,7 +230,7 @@ drop table t1;
create table t1 (s1 varchar(10) character set utf8mb4) engine heap;
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -2160,7 +2160,7 @@ insert into t1 values (0xF0908080);
insert into t1 values (0xF0BFBFBF);
insert ignore into t1 values (0xF08F8080);
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x8F\x80\x80' for column 'utf8mb4' at row 1
+Warning 1366 Incorrect string value: '\xF0\x8F\x80\x80' for column `test`.`t1`.`utf8mb4` at row 1
select hex(utf8mb4) from t1;
hex(utf8mb4)
3F
@@ -2180,7 +2180,7 @@ insert into t1 values (0xF4808080);
insert into t1 values (0xF48F8080);
insert ignore into t1 values (0xF4908080);
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x90\x80\x80' for column 'utf8mb4' at row 1
+Warning 1366 Incorrect string value: '\xF4\x90\x80\x80' for column `test`.`t1`.`utf8mb4` at row 1
select hex(utf8mb4) from t1;
hex(utf8mb4)
3F
@@ -2255,7 +2255,7 @@ u_decimal hex(utf8mb4_encoding)
917999 F3A087AF
INSERT IGNORE INTO t1 VALUES (1114111, x'f5808080');
Warnings:
-Warning 1366 Incorrect string value: '\xF5\x80\x80\x80' for column 'utf8mb4_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF5\x80\x80\x80' for column `test`.`t1`.`utf8mb4_encoding` at row 1
SELECT character_maximum_length, character_octet_length FROM information_schema.columns WHERE
table_name= 't1' AND column_name= 'utf8mb4_encoding';
character_maximum_length character_octet_length
@@ -2269,14 +2269,14 @@ INSERT INTO t2 VALUES (42856, x'ea9da8');
INSERT INTO t2 VALUES (65131, x'efb9ab');
INSERT IGNORE INTO t2 VALUES (1114111, x'f48fbfbf');
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBF' for column 'utf8mb3_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBF' for column `test`.`t2`.`utf8mb3_encoding` at row 1
SELECT character_maximum_length, character_octet_length FROM information_schema.columns WHERE
table_name= 't2' AND column_name= 'utf8mb3_encoding';
character_maximum_length character_octet_length
10 30
UPDATE IGNORE t2 SET utf8mb3_encoding= x'f48fbfbd' where u_decimal= 42856;
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBD' for column 'utf8mb3_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBD' for column `test`.`t2`.`utf8mb3_encoding` at row 1
UPDATE t2 SET utf8mb3_encoding= _utf8mb4 x'ea9da8' where u_decimal= 42856;
SELECT HEX(CONCAT(utf8mb4_encoding, _utf8 x'ea9da8')) FROM t1;
HEX(CONCAT(utf8mb4_encoding, _utf8 x'ea9da8'))
diff --git a/mysql-test/main/ctype_utf8mb4_innodb.result b/mysql-test/main/ctype_utf8mb4_innodb.result
index 956b2f83d9e..82f0ddff1c4 100644
--- a/mysql-test/main/ctype_utf8mb4_innodb.result
+++ b/mysql-test/main/ctype_utf8mb4_innodb.result
@@ -222,7 +222,7 @@ drop table t1;
create table t1 (s1 char(10) character set utf8mb4) engine InnoDB;
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -230,7 +230,7 @@ drop table t1;
create table t1 (s1 varchar(10) character set utf8mb4) engine InnoDB;
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -238,7 +238,7 @@ drop table t1;
create table t1 (s1 text character set utf8mb4) engine InnoDB;
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -2286,7 +2286,7 @@ insert into t1 values (0xF0908080);
insert into t1 values (0xF0BFBFBF);
insert ignore into t1 values (0xF08F8080);
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x8F\x80\x80' for column 'utf8mb4' at row 1
+Warning 1366 Incorrect string value: '\xF0\x8F\x80\x80' for column `test`.`t1`.`utf8mb4` at row 1
select hex(utf8mb4) from t1;
hex(utf8mb4)
3F
@@ -2306,7 +2306,7 @@ insert into t1 values (0xF4808080);
insert into t1 values (0xF48F8080);
insert ignore into t1 values (0xF4908080);
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x90\x80\x80' for column 'utf8mb4' at row 1
+Warning 1366 Incorrect string value: '\xF4\x90\x80\x80' for column `test`.`t1`.`utf8mb4` at row 1
select hex(utf8mb4) from t1;
hex(utf8mb4)
3F
@@ -2398,7 +2398,7 @@ u_decimal hex(utf8mb4_encoding)
917999 F3A087AF
INSERT IGNORE INTO t1 VALUES (1114111, x'f5808080');
Warnings:
-Warning 1366 Incorrect string value: '\xF5\x80\x80\x80' for column 'utf8mb4_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF5\x80\x80\x80' for column `test`.`t1`.`utf8mb4_encoding` at row 1
SELECT character_maximum_length, character_octet_length FROM information_schema.columns WHERE
table_name= 't1' AND column_name= 'utf8mb4_encoding';
character_maximum_length character_octet_length
@@ -2412,14 +2412,14 @@ INSERT INTO t2 VALUES (42856, x'ea9da8');
INSERT INTO t2 VALUES (65131, x'efb9ab');
INSERT IGNORE INTO t2 VALUES (1114111, x'f48fbfbf');
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBF' for column 'utf8mb3_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBF' for column `test`.`t2`.`utf8mb3_encoding` at row 1
SELECT character_maximum_length, character_octet_length FROM information_schema.columns WHERE
table_name= 't2' AND column_name= 'utf8mb3_encoding';
character_maximum_length character_octet_length
10 30
UPDATE IGNORE t2 SET utf8mb3_encoding= x'f48fbfbd' where u_decimal= 42856;
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBD' for column 'utf8mb3_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBD' for column `test`.`t2`.`utf8mb3_encoding` at row 1
UPDATE t2 SET utf8mb3_encoding= _utf8mb4 x'ea9da8' where u_decimal= 42856;
SELECT HEX(CONCAT(utf8mb4_encoding, _utf8 x'ea9da8')) FROM t1;
HEX(CONCAT(utf8mb4_encoding, _utf8 x'ea9da8'))
diff --git a/mysql-test/main/ctype_utf8mb4_myisam.result b/mysql-test/main/ctype_utf8mb4_myisam.result
index fd58e12542c..0bd13ef0282 100644
--- a/mysql-test/main/ctype_utf8mb4_myisam.result
+++ b/mysql-test/main/ctype_utf8mb4_myisam.result
@@ -222,7 +222,7 @@ drop table t1;
create table t1 (s1 char(10) character set utf8mb4) engine MyISAM;
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -230,7 +230,7 @@ drop table t1;
create table t1 (s1 varchar(10) character set utf8mb4) engine MyISAM;
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -238,7 +238,7 @@ drop table t1;
create table t1 (s1 text character set utf8mb4) engine MyISAM;
insert ignore into t1 values (0x41FF);
Warnings:
-Warning 1366 Incorrect string value: '\xFF' for column 's1' at row 1
+Warning 1366 Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
select hex(s1) from t1;
hex(s1)
413F
@@ -2293,7 +2293,7 @@ insert into t1 values (0xF0908080);
insert into t1 values (0xF0BFBFBF);
insert ignore into t1 values (0xF08F8080);
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x8F\x80\x80' for column 'utf8mb4' at row 1
+Warning 1366 Incorrect string value: '\xF0\x8F\x80\x80' for column `test`.`t1`.`utf8mb4` at row 1
select hex(utf8mb4) from t1;
hex(utf8mb4)
3F
@@ -2313,7 +2313,7 @@ insert into t1 values (0xF4808080);
insert into t1 values (0xF48F8080);
insert ignore into t1 values (0xF4908080);
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x90\x80\x80' for column 'utf8mb4' at row 1
+Warning 1366 Incorrect string value: '\xF4\x90\x80\x80' for column `test`.`t1`.`utf8mb4` at row 1
select hex(utf8mb4) from t1;
hex(utf8mb4)
3F
@@ -2407,7 +2407,7 @@ u_decimal hex(utf8mb4_encoding)
917999 F3A087AF
INSERT IGNORE INTO t1 VALUES (1114111, x'f5808080');
Warnings:
-Warning 1366 Incorrect string value: '\xF5\x80\x80\x80' for column 'utf8mb4_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF5\x80\x80\x80' for column `test`.`t1`.`utf8mb4_encoding` at row 1
SELECT character_maximum_length, character_octet_length FROM information_schema.columns WHERE
table_name= 't1' AND column_name= 'utf8mb4_encoding';
character_maximum_length character_octet_length
@@ -2421,14 +2421,14 @@ INSERT INTO t2 VALUES (42856, x'ea9da8');
INSERT INTO t2 VALUES (65131, x'efb9ab');
INSERT IGNORE INTO t2 VALUES (1114111, x'f48fbfbf');
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBF' for column 'utf8mb3_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBF' for column `test`.`t2`.`utf8mb3_encoding` at row 1
SELECT character_maximum_length, character_octet_length FROM information_schema.columns WHERE
table_name= 't2' AND column_name= 'utf8mb3_encoding';
character_maximum_length character_octet_length
10 30
UPDATE IGNORE t2 SET utf8mb3_encoding= x'f48fbfbd' where u_decimal= 42856;
Warnings:
-Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBD' for column 'utf8mb3_encoding' at row 1
+Warning 1366 Incorrect string value: '\xF4\x8F\xBF\xBD' for column `test`.`t2`.`utf8mb3_encoding` at row 1
UPDATE t2 SET utf8mb3_encoding= _utf8mb4 x'ea9da8' where u_decimal= 42856;
SELECT HEX(CONCAT(utf8mb4_encoding, _utf8 x'ea9da8')) FROM t1;
HEX(CONCAT(utf8mb4_encoding, _utf8 x'ea9da8'))
diff --git a/mysql-test/main/custom_aggregate_functions.result b/mysql-test/main/custom_aggregate_functions.result
index 4060d6665f6..0a27334f58e 100644
--- a/mysql-test/main/custom_aggregate_functions.result
+++ b/mysql-test/main/custom_aggregate_functions.result
@@ -573,7 +573,7 @@ select f3(sal) from t1;
f3(sal)
1000
select f2(val) from t1;
-ERROR 22007: Incorrect integer value: 'ab' for column 'x' at row 1
+ERROR 22007: Incorrect integer value: 'ab' for column ``.``.`x` at row 1
select val, id, c from (select f1(sal) as c from t2) as t1, t2;
val id c
10 2 17000
diff --git a/mysql-test/main/delayed.result b/mysql-test/main/delayed.result
index d10f4ae22cf..613e214751e 100644
--- a/mysql-test/main/delayed.result
+++ b/mysql-test/main/delayed.result
@@ -284,9 +284,9 @@ CREATE TABLE t2 (
);
SET SQL_MODE='NO_ZERO_DATE,STRICT_ALL_TABLES,NO_ZERO_IN_DATE';
INSERT DELAYED INTO t2 VALUES (0,'0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'f1' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t2`.`f1` at row 1
INSERT DELAYED INTO t2 VALUES (0,'2007-00-00');
-ERROR 22007: Incorrect date value: '2007-00-00' for column 'f1' at row 1
+ERROR 22007: Incorrect date value: '2007-00-00' for column `test`.`t2`.`f1` at row 1
DROP TABLE t1,t2;
set @old_delayed_updates = @@global.low_priority_updates;
set global low_priority_updates = 1;
diff --git a/mysql-test/main/events_bugs.result b/mysql-test/main/events_bugs.result
index b56912dea7e..3e770451735 100644
--- a/mysql-test/main/events_bugs.result
+++ b/mysql-test/main/events_bugs.result
@@ -96,7 +96,7 @@ select release_lock('ee_16407_2');
insert into events_test.events_smode_test values('ee_16407_2','1980-19-02');
end|
insert into events_test.events_smode_test values ('test','1980-19-02')|
-ERROR 22007: Incorrect date value: '1980-19-02' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '1980-19-02' for column `events_test`.`events_smode_test`.`a` at row 1
"This is ok"
create event ee_16407_3 on schedule every 60 second do
begin
diff --git a/mysql-test/main/fulltext.result b/mysql-test/main/fulltext.result
index 308d1d7fcb9..3f4223eee07 100644
--- a/mysql-test/main/fulltext.result
+++ b/mysql-test/main/fulltext.result
@@ -382,10 +382,10 @@ aus Osnabrck utf8_general_ci 1.591140
SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
alter table t1 modify t varchar(200) collate latin1_german2_ci not null;
Warnings:
-Warning 1366 Incorrect string value: '\xD0\xAD\xD1\x82\xD0\xBE...' for column 't' at row 3
-Warning 1366 Incorrect string value: '\xD0\x9E\xD1\x82\xD0\xBB...' for column 't' at row 4
-Warning 1366 Incorrect string value: '\xD0\x9D\xD0\xB5 \xD0...' for column 't' at row 5
-Warning 1366 Incorrect string value: '\xD0\xB8 \xD0\xB1\xD1...' for column 't' at row 6
+Warning 1366 Incorrect string value: '\xD0\xAD\xD1\x82\xD0\xBE...' for column `test`.`t1`.`t` at row 3
+Warning 1366 Incorrect string value: '\xD0\x9E\xD1\x82\xD0\xBB...' for column `test`.`t1`.`t` at row 4
+Warning 1366 Incorrect string value: '\xD0\x9D\xD0\xB5 \xD0...' for column `test`.`t1`.`t` at row 5
+Warning 1366 Incorrect string value: '\xD0\xB8 \xD0\xB1\xD1...' for column `test`.`t1`.`t` at row 6
SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrck');
t collation(t)
aus Osnabrck latin1_german2_ci
diff --git a/mysql-test/main/func_set.result b/mysql-test/main/func_set.result
index 73e121f5f2b..3bd9f5e0c9a 100644
--- a/mysql-test/main/func_set.result
+++ b/mysql-test/main/func_set.result
@@ -172,8 +172,8 @@ INTERVAL( 9, 1, DATE_ADD( pk, INTERVAL pk MINUTE_SECOND ), 9, 8, 3, 5, 2, 1 )
8
8
Warnings:
-Warning 1292 Incorrect datetime value: '10' for column 'pk' at row 1
-Warning 1292 Incorrect datetime value: '11' for column 'pk' at row 2
+Warning 1292 Incorrect datetime value: '10' for column `test`.`t1`.`pk` at row 1
+Warning 1292 Incorrect datetime value: '11' for column `test`.`t1`.`pk` at row 2
DROP TABLE t1;
#
# End of 5.3 tests
diff --git a/mysql-test/main/gis.result b/mysql-test/main/gis.result
index be70d0d3b72..0ee502d8f87 100644
--- a/mysql-test/main/gis.result
+++ b/mysql-test/main/gis.result
@@ -1679,7 +1679,7 @@ NULL
#
create table t1 (pt point);
insert into t1 values(Geomfromtext('POLYGON((1 1, 2 2, 2 1, 1 1))'));
-ERROR 22007: Incorrect POINT value: 'POLYGON' for column 'pt' at row 1
+ERROR 22007: Incorrect POINT value: 'POLYGON' for column `test`.`t1`.`pt` at row 1
drop table t1;
SELECT st_astext(ST_Buffer(ST_PolygonFromText('POLYGON((3 5, 2 4, 2 5, 3 5))'), -100));
st_astext(ST_Buffer(ST_PolygonFromText('POLYGON((3 5, 2 4, 2 5, 3 5))'), -100))
diff --git a/mysql-test/main/gis2.result b/mysql-test/main/gis2.result
index c0b476e080b..cb919ecdeb1 100644
--- a/mysql-test/main/gis2.result
+++ b/mysql-test/main/gis2.result
@@ -27,12 +27,12 @@ drop table t1;
create table t1 (p point not null default if(unix_timestamp()>10,POINT(1,1),LineString(Point(0,0),Point(1,1))));
set timestamp=10;
insert into t1 values(default);
-ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column 'p' at row 1
+ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column `test`.`t1`.`p` at row 1
drop table t1;
SET timestamp=default;
create table t1 (p point not null default if(unix_timestamp()>10,POINT(1,1),LineString(Point(0,0),Point(1,1))));
set timestamp=10;
alter table t1 add column i int;
-ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column 'p' at row 1
+ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column `test`.`(temporary)`.`p` at row 1
drop table t1;
SET timestamp=default;
diff --git a/mysql-test/main/innodb_icp.result b/mysql-test/main/innodb_icp.result
index 8a58a769ed9..9ba98ba5b13 100644
--- a/mysql-test/main/innodb_icp.result
+++ b/mysql-test/main/innodb_icp.result
@@ -851,7 +851,7 @@ DROP TABLE t1;
create table t1 (a int,b char(5),primary key (a), key (b(1)));
insert ignore into t1 values ('a','b');
Warnings:
-Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`a` at row 1
select 1 from t1 where a and b >= 'aa';
1
drop table t1;
diff --git a/mysql-test/main/insert.result b/mysql-test/main/insert.result
index 736aa917cae..4aea81262d2 100644
--- a/mysql-test/main/insert.result
+++ b/mysql-test/main/insert.result
@@ -92,14 +92,14 @@ create table t1(number int auto_increment primary key, original_value varchar(50
set @value= "aa";
insert ignore into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
Warnings:
-Warning 1366 Incorrect double value: 'aa' for column 'f_double' at row 1
-Warning 1366 Incorrect double value: 'aa' for column 'f_float' at row 1
-Warning 1366 Incorrect double value: 'aa' for column 'f_double_7_2' at row 1
-Warning 1366 Incorrect double value: 'aa' for column 'f_float_4_3' at row 1
-Warning 1366 Incorrect double value: 'aa' for column 'f_double_u' at row 1
-Warning 1366 Incorrect double value: 'aa' for column 'f_float_u' at row 1
-Warning 1366 Incorrect double value: 'aa' for column 'f_double_15_1_u' at row 1
-Warning 1366 Incorrect double value: 'aa' for column 'f_float_3_1_u' at row 1
+Warning 1366 Incorrect double value: 'aa' for column `test`.`t1`.`f_double` at row 1
+Warning 1366 Incorrect double value: 'aa' for column `test`.`t1`.`f_float` at row 1
+Warning 1366 Incorrect double value: 'aa' for column `test`.`t1`.`f_double_7_2` at row 1
+Warning 1366 Incorrect double value: 'aa' for column `test`.`t1`.`f_float_4_3` at row 1
+Warning 1366 Incorrect double value: 'aa' for column `test`.`t1`.`f_double_u` at row 1
+Warning 1366 Incorrect double value: 'aa' for column `test`.`t1`.`f_float_u` at row 1
+Warning 1366 Incorrect double value: 'aa' for column `test`.`t1`.`f_double_15_1_u` at row 1
+Warning 1366 Incorrect double value: 'aa' for column `test`.`t1`.`f_float_3_1_u` at row 1
select * from t1 where number =last_insert_id();
number 1
original_value aa
@@ -136,14 +136,14 @@ f_float_3_1_u 1.0
set @value= "aa1";
insert ignore into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
Warnings:
-Warning 1366 Incorrect double value: 'aa1' for column 'f_double' at row 1
-Warning 1366 Incorrect double value: 'aa1' for column 'f_float' at row 1
-Warning 1366 Incorrect double value: 'aa1' for column 'f_double_7_2' at row 1
-Warning 1366 Incorrect double value: 'aa1' for column 'f_float_4_3' at row 1
-Warning 1366 Incorrect double value: 'aa1' for column 'f_double_u' at row 1
-Warning 1366 Incorrect double value: 'aa1' for column 'f_float_u' at row 1
-Warning 1366 Incorrect double value: 'aa1' for column 'f_double_15_1_u' at row 1
-Warning 1366 Incorrect double value: 'aa1' for column 'f_float_3_1_u' at row 1
+Warning 1366 Incorrect double value: 'aa1' for column `test`.`t1`.`f_double` at row 1
+Warning 1366 Incorrect double value: 'aa1' for column `test`.`t1`.`f_float` at row 1
+Warning 1366 Incorrect double value: 'aa1' for column `test`.`t1`.`f_double_7_2` at row 1
+Warning 1366 Incorrect double value: 'aa1' for column `test`.`t1`.`f_float_4_3` at row 1
+Warning 1366 Incorrect double value: 'aa1' for column `test`.`t1`.`f_double_u` at row 1
+Warning 1366 Incorrect double value: 'aa1' for column `test`.`t1`.`f_float_u` at row 1
+Warning 1366 Incorrect double value: 'aa1' for column `test`.`t1`.`f_double_15_1_u` at row 1
+Warning 1366 Incorrect double value: 'aa1' for column `test`.`t1`.`f_float_3_1_u` at row 1
select * from t1 where number =last_insert_id();
number 3
original_value aa1
diff --git a/mysql-test/main/loaddata.result b/mysql-test/main/loaddata.result
index 98b8f2de4a5..4c5cee0aa25 100644
--- a/mysql-test/main/loaddata.result
+++ b/mysql-test/main/loaddata.result
@@ -45,10 +45,10 @@ load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated
Warnings:
Note 1265 Data truncated for column 'a' at row 1
Note 1265 Data truncated for column 'a' at row 2
-Warning 1366 Incorrect integer value: 'error ' for column 'a' at row 3
+Warning 1366 Incorrect integer value: 'error ' for column `test`.`t1`.`a` at row 3
Warning 1262 Row 3 was truncated; it contained more data than there were input columns
Note 1265 Data truncated for column 'a' at row 4
-Warning 1366 Incorrect integer value: 'wrong end ' for column 'a' at row 5
+Warning 1366 Incorrect integer value: 'wrong end ' for column `test`.`t1`.`a` at row 5
Warning 1262 Row 5 was truncated; it contained more data than there were input columns
select * from t1;
a b
@@ -64,7 +64,7 @@ Note 1265 Data truncated for column 'a' at row 1
Note 1265 Data truncated for column 'a' at row 2
Note 1265 Data truncated for column 'a' at row 3
Warning 1366 Incorrect integer value: '
-' for column 'a' at row 4
+' for column `test`.`t1`.`a` at row 4
Warning 1261 Row 4 doesn't contain data for all columns
select * from t1;
a b
diff --git a/mysql-test/main/myisam_icp.result b/mysql-test/main/myisam_icp.result
index 6a70521cd72..2048205528d 100644
--- a/mysql-test/main/myisam_icp.result
+++ b/mysql-test/main/myisam_icp.result
@@ -849,7 +849,7 @@ DROP TABLE t1;
create table t1 (a int,b char(5),primary key (a), key (b(1)));
insert ignore into t1 values ('a','b');
Warnings:
-Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`a` at row 1
select 1 from t1 where a and b >= 'aa';
1
drop table t1;
diff --git a/mysql-test/main/outfile_loaddata.result b/mysql-test/main/outfile_loaddata.result
index ca3a42c087c..1449cb19453 100644
--- a/mysql-test/main/outfile_loaddata.result
+++ b/mysql-test/main/outfile_loaddata.result
@@ -206,7 +206,7 @@ a b c
# latin1 charset (INTO OUTFILE warning is expected):
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' CHARACTER SET latin1 FROM t1;
Warnings:
-Warning 1366 Incorrect string value: '\xE1\xE2\xF7' for column 'b' at row 1
+Warning 1366 Data truncated for column 'b' at row 1
##################################################
1 ABC-??? DEF-
2 \N \N
@@ -221,7 +221,7 @@ a b c
# KOI8-R charset (INTO OUTFILE warning is expected):
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' CHARACTER SET koi8r FROM t1;
Warnings:
-Warning 1366 Incorrect string value: '\xC2\xC3\xC4' for column 'c' at row 1
+Warning 1366 Data truncated for column 'c' at row 1
##################################################
1 ABC- DEF-???
2 \N \N
diff --git a/mysql-test/main/partition_innodb.result b/mysql-test/main/partition_innodb.result
index 6dedf8e915c..3d8d2040a48 100644
--- a/mysql-test/main/partition_innodb.result
+++ b/mysql-test/main/partition_innodb.result
@@ -910,7 +910,7 @@ CREATE ALGORITHM = MERGE VIEW v AS SELECT a, b FROM t1 STRAIGHT_JOIN t2 WHERE b
INSERT INTO t1 VALUES (1),(2);
INSERT IGNORE INTO t2 VALUES (2,2),('three',3),(4,4);
Warnings:
-Warning 1366 Incorrect integer value: 'three' for column 'b' at row 2
+Warning 1366 Incorrect integer value: 'three' for column `test`.`t2`.`b` at row 2
UPDATE v SET a = NULL;
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'foo'
diff --git a/mysql-test/main/processlist.result b/mysql-test/main/processlist.result
index b8e2271530d..ab518d961ef 100644
--- a/mysql-test/main/processlist.result
+++ b/mysql-test/main/processlist.result
@@ -39,7 +39,7 @@ utf8mb4_string xxx😎yyy
Warnings:
Level Warning
Code 1366
-Message Incorrect string value: '\xF0\x9F\x98\x8Eyy...' for column 'INFO' at row 1
+Message Incorrect string value: '\xF0\x9F\x98\x8Eyy...' for column `information_schema`.`(temporary)`.`INFO` at row 1
#
# End of 10.1 tests
#
diff --git a/mysql-test/main/ps.result b/mysql-test/main/ps.result
index 34a960005ad..b0c7c7d9847 100644
--- a/mysql-test/main/ps.result
+++ b/mysql-test/main/ps.result
@@ -5144,13 +5144,13 @@ DECLARE a DATETIME;
CALL p1(a);
END;
$$
-ERROR 22007: Incorrect datetime value: '10' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1
BEGIN NOT ATOMIC
DECLARE a DATETIME;
EXECUTE IMMEDIATE 'CALL p1(?)' USING a;
END;
$$
-ERROR 22007: Incorrect datetime value: '10' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1
BEGIN NOT ATOMIC
DECLARE a DATETIME;
PREPARE stmt FROM 'CALL p1(?)';
@@ -5158,7 +5158,7 @@ EXECUTE stmt USING a;
DEALLOCATE PREPARE stmt;
END;
$$
-ERROR 22007: Incorrect datetime value: '10' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1
DROP PROCEDURE p1;
#
# MDEV-14454 Binary protocol returns wrong collation ID for SP OUT parameters
diff --git a/mysql-test/main/range.result b/mysql-test/main/range.result
index 464c0bf031a..32e0cf2868c 100644
--- a/mysql-test/main/range.result
+++ b/mysql-test/main/range.result
@@ -2056,22 +2056,22 @@ SELECT * FROM t1 WHERE fd='😁';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
SELECT * FROM t1 WHERE fd='😁';
id fd
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
# The following must not use range access:
explain select count(*) from t1 where fd <'😁';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ix_fd ix_fd 63 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
select count(*) from t1 where fd <'😁';
count(*)
40960
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
select count(*) from t1 ignore index (ix_fd) where fd <'😁';
count(*)
40960
@@ -2293,7 +2293,7 @@ EXPLAIN SELECT * FROM t1 WHERE a<=>'😎';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x8E' for column 'a' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x8E' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
#
# MDEV-10185: Assertion `tree1->keys[key_no] && tree2->keys[key_no]' failed in
diff --git a/mysql-test/main/range_mrr_icp.result b/mysql-test/main/range_mrr_icp.result
index b132e63b732..6b5bf33239f 100644
--- a/mysql-test/main/range_mrr_icp.result
+++ b/mysql-test/main/range_mrr_icp.result
@@ -2058,22 +2058,22 @@ SELECT * FROM t1 WHERE fd='😁';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
SELECT * FROM t1 WHERE fd='😁';
id fd
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
# The following must not use range access:
explain select count(*) from t1 where fd <'😁';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index ix_fd ix_fd 63 NULL # Using where; Using index
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
select count(*) from t1 where fd <'😁';
count(*)
40960
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
select count(*) from t1 ignore index (ix_fd) where fd <'😁';
count(*)
40960
@@ -2295,7 +2295,7 @@ EXPLAIN SELECT * FROM t1 WHERE a<=>'😎';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x98\x8E' for column 'a' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x98\x8E' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
#
# MDEV-10185: Assertion `tree1->keys[key_no] && tree2->keys[key_no]' failed in
diff --git a/mysql-test/main/sp-cursor.result b/mysql-test/main/sp-cursor.result
index 42952be16e2..2656ef8821d 100644
--- a/mysql-test/main/sp-cursor.result
+++ b/mysql-test/main/sp-cursor.result
@@ -172,7 +172,7 @@ CALL p1('b1');
v_a
0
Warnings:
-Warning 1366 Incorrect integer value: 'b1' for column 'p_a' at row 1
+Warning 1366 Incorrect integer value: 'b1' for column ``.``.`p_a` at row 1
DROP PROCEDURE p1;
SET sql_mode=DEFAULT;
#
diff --git a/mysql-test/main/sp-error.result b/mysql-test/main/sp-error.result
index fc43bdf17e9..1a32665c886 100644
--- a/mysql-test/main/sp-error.result
+++ b/mysql-test/main/sp-error.result
@@ -2786,7 +2786,7 @@ END|
CALL p1()|
Warnings:
-Warning 1366 Incorrect integer value: 'string' for column 'var1' at row 1
+Warning 1366 Incorrect integer value: 'string' for column ``.``.`var1` at row 1
SET sql_mode = DEFAULT;
CREATE PROCEDURE p2()
diff --git a/mysql-test/main/sp-vars.result b/mysql-test/main/sp-vars.result
index 0d4d18c577d..236695a6c0f 100644
--- a/mysql-test/main/sp-vars.result
+++ b/mysql-test/main/sp-vars.result
@@ -140,7 +140,7 @@ SELECT sp_vars_check_ret3();
sp_vars_check_ret3()
0
Warnings:
-Warning 1366 Incorrect integer value: 'Hello, world' for column 'sp_vars_check_ret3()' at row 1
+Warning 1366 Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1
SELECT sp_vars_check_ret4();
sp_vars_check_ret4()
154.12
@@ -195,7 +195,7 @@ SELECT sp_vars_check_ret3();
sp_vars_check_ret3()
0
Warnings:
-Warning 1366 Incorrect integer value: 'Hello, world' for column 'sp_vars_check_ret3()' at row 1
+Warning 1366 Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1
SELECT sp_vars_check_ret4();
sp_vars_check_ret4()
154.12
@@ -314,7 +314,7 @@ ERROR 22003: Out of range value for column 'sp_vars_check_ret1()' at row 1
SELECT sp_vars_check_ret2();
ERROR 22003: Out of range value for column 'sp_vars_check_ret2()' at row 1
SELECT sp_vars_check_ret3();
-ERROR 22007: Incorrect integer value: 'Hello, world' for column 'sp_vars_check_ret3()' at row 1
+ERROR 22007: Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1
SELECT sp_vars_check_ret4();
sp_vars_check_ret4()
154.12
@@ -896,7 +896,7 @@ sp_var
@user_var
0
Warnings:
-Warning 1366 Incorrect integer value: 'Hello, world!' for column 'sp_var' at row 1
+Warning 1366 Incorrect integer value: 'Hello, world!' for column ``.``.`sp_var` at row 1
DROP PROCEDURE p1;
DROP TABLE t1;
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result
index 128dccc58eb..64668e0c8ec 100644
--- a/mysql-test/main/sp.result
+++ b/mysql-test/main/sp.result
@@ -4613,7 +4613,7 @@ call bug15231_3()|
Result
Missed it (correct)
Level Code Message
-Warning 1366 Incorrect decimal value: 'zap' for column 'x' at row 1
+Warning 1366 Incorrect decimal value: 'zap' for column ``.``.`x` at row 1
Result
Caught it (correct)
call bug15231_5()|
@@ -6476,7 +6476,7 @@ DROP TABLE t1;
CALL p2('text');
Warnings:
-Warning 1366 Incorrect integer value: 'text' for column 'v' at row 1
+Warning 1366 Incorrect integer value: 'text' for column ``.``.`v` at row 1
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
@@ -8397,7 +8397,7 @@ FETCH c INTO a;
CLOSE c;
END;
$$
-ERROR 22007: Incorrect integer value: 'y' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: 'y' for column ``.``.`a` at row 1
DROP TABLE t1;
SET sql_mode=DEFAULT;
#
diff --git a/mysql-test/main/strict.result b/mysql-test/main/strict.result
index 315bb9dc1b5..b9db4166398 100644
--- a/mysql-test/main/strict.result
+++ b/mysql-test/main/strict.result
@@ -8,43 +8,43 @@ CREATE TABLE t1 (col1 date);
INSERT INTO t1 VALUES('2004-01-01'),('2004-02-29');
INSERT INTO t1 VALUES('0000-10-31');
INSERT INTO t1 VALUES('2004-0-31');
-ERROR 22007: Incorrect date value: '2004-0-31' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-0-31' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-01-02'),('2004-0-31');
-ERROR 22007: Incorrect date value: '2004-0-31' for column 'col1' at row 2
+ERROR 22007: Incorrect date value: '2004-0-31' for column `test`.`t1`.`col1` at row 2
INSERT INTO t1 VALUES('2004-10-0');
-ERROR 22007: Incorrect date value: '2004-10-0' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-10-0' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-09-31');
-ERROR 22007: Incorrect date value: '2004-09-31' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-09-31' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-10-32');
-ERROR 22007: Incorrect date value: '2004-10-32' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-10-32' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2003-02-29');
-ERROR 22007: Incorrect date value: '2003-02-29' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2003-02-29' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-13-15');
-ERROR 22007: Incorrect date value: '2004-13-15' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-13-15' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES ('59');
-ERROR 22007: Incorrect date value: '59' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '59' for column `test`.`t1`.`col1` at row 1
set @@sql_mode='STRICT_ALL_TABLES';
INSERT INTO t1 VALUES('2004-01-03'),('2004-0-31');
set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_IN_DATE';
INSERT INTO t1 VALUES('2004-0-30');
-ERROR 22007: Incorrect date value: '2004-0-30' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-0-30' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-01-04'),('2004-0-31'),('2004-01-05');
-ERROR 22007: Incorrect date value: '2004-0-31' for column 'col1' at row 2
+ERROR 22007: Incorrect date value: '2004-0-31' for column `test`.`t1`.`col1` at row 2
INSERT INTO t1 VALUES('0000-00-00');
INSERT IGNORE INTO t1 VALUES('2004-0-29');
Warnings:
Warning 1265 Data truncated for column 'col1' at row 1
set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_DATE';
INSERT INTO t1 VALUES('0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`col1` at row 1
INSERT IGNORE INTO t1 VALUES('0000-00-00');
Warnings:
Warning 1264 Out of range value for column 'col1' at row 1
INSERT INTO t1 VALUES ('2004-0-30');
INSERT INTO t1 VALUES ('2004-2-30');
-ERROR 22007: Incorrect date value: '2004-2-30' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-2-30' for column `test`.`t1`.`col1` at row 1
set @@sql_mode='STRICT_ALL_TABLES,ALLOW_INVALID_DATES';
INSERT INTO t1 VALUES ('2004-2-30');
set @@sql_mode='ansi,traditional';
@@ -73,7 +73,7 @@ drop table t1;
set @@sql_mode='strict_trans_tables';
CREATE TABLE t1 (col1 date) engine=myisam;
INSERT INTO t1 VALUES('2004-13-31'),('2004-1-1');
-ERROR 22007: Incorrect date value: '2004-13-31' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-13-31' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES ('2004-1-2'), ('2004-13-31'),('2004-1-3');
Warnings:
Warning 1265 Data truncated for column 'col1' at row 2
@@ -81,7 +81,7 @@ INSERT IGNORE INTO t1 VALUES('2004-13-31'),('2004-1-4');
Warnings:
Warning 1265 Data truncated for column 'col1' at row 1
INSERT INTO t1 VALUES ('2003-02-29');
-ERROR 22007: Incorrect date value: '2003-02-29' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2003-02-29' for column `test`.`t1`.`col1` at row 1
INSERT ignore INTO t1 VALUES('2003-02-30');
Warnings:
Warning 1265 Data truncated for column 'col1' at row 1
@@ -100,14 +100,14 @@ drop table t1;
set @@sql_mode='strict_trans_tables';
CREATE TABLE t1 (col1 date) engine=innodb;
INSERT INTO t1 VALUES('2004-13-31'),('2004-1-1');
-ERROR 22007: Incorrect date value: '2004-13-31' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-13-31' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES ('2004-1-2'), ('2004-13-31'),('2004-1-3');
-ERROR 22007: Incorrect date value: '2004-13-31' for column 'col1' at row 2
+ERROR 22007: Incorrect date value: '2004-13-31' for column `test`.`t1`.`col1` at row 2
INSERT IGNORE INTO t1 VALUES('2004-13-31'),('2004-1-4');
Warnings:
Warning 1265 Data truncated for column 'col1' at row 1
INSERT INTO t1 VALUES ('2003-02-29');
-ERROR 22007: Incorrect date value: '2003-02-29' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2003-02-29' for column `test`.`t1`.`col1` at row 1
INSERT ignore INTO t1 VALUES('2003-02-30');
Warnings:
Warning 1265 Data truncated for column 'col1' at row 1
@@ -125,21 +125,21 @@ CREATE TABLE t1 (col1 datetime);
INSERT INTO t1 VALUES('2004-10-31 15:30:00'),('2004-02-29 15:30:00');
INSERT INTO t1 VALUES('0000-10-31 15:30:00');
INSERT INTO t1 VALUES('2004-0-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-10-0 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-09-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-10-32 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2003-02-29 15:30:00');
-ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-13-15 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-13-15 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-13-15 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('0000-00-00 15:30:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES ('59');
-ERROR 22007: Incorrect datetime value: '59' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '59' for column `test`.`t1`.`col1` at row 1
select * from t1;
col1
2004-10-31 15:30:00
@@ -149,49 +149,49 @@ drop table t1;
CREATE TABLE t1 (col1 timestamp);
INSERT INTO t1 VALUES('2004-10-31 15:30:00'),('2004-02-29 15:30:00');
INSERT INTO t1 VALUES('0000-10-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-0-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-10-0 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-09-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-10-32 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2003-02-29 15:30:00');
-ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-13-15 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-13-15 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-13-15 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-02-29 25:30:00');
-ERROR 22007: Incorrect datetime value: '2004-02-29 25:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-02-29 25:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-02-29 15:65:00');
-ERROR 22007: Incorrect datetime value: '2004-02-29 15:65:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-02-29 15:65:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-02-29 15:31:61');
-ERROR 22007: Incorrect datetime value: '2004-02-29 15:31:61' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-02-29 15:31:61' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('0000-00-00 15:30:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('0000-00-00 00:00:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`col1` at row 1
INSERT IGNORE INTO t1 VALUES('0000-00-00 00:00:00');
Warnings:
Warning 1265 Data truncated for column 'col1' at row 1
INSERT INTO t1 VALUES ('59');
-ERROR 22007: Incorrect datetime value: '59' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '59' for column `test`.`t1`.`col1` at row 1
set @@sql_mode='STRICT_ALL_TABLES,ALLOW_INVALID_DATES';
INSERT INTO t1 VALUES('2004-0-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-10-0 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-10-32 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('2004-02-30 15:30:04');
-ERROR 22007: Incorrect datetime value: '2004-02-30 15:30:04' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-02-30 15:30:04' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 VALUES('0000-00-00 00:00:00');
set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_IN_DATE';
INSERT INTO t1 VALUES('0000-00-00 00:00:00');
set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_DATE';
INSERT INTO t1 VALUES('0000-00-00 00:00:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`col1` at row 1
set @@sql_mode='ansi,traditional';
SELECT * FROM t1;
col1
@@ -214,11 +214,11 @@ ERROR HY000: Incorrect datetime value: '31.0.2004 15.30' for function str_to_dat
INSERT INTO t1 (col1) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
ERROR HY000: Incorrect datetime value: '0.10.2004 15.30' for function str_to_date
INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect date value: '2004-09-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-09-31 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
INSERT INTO t1 (col1) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect date value: '2003-02-29 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2003-02-29 15:30:00' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
INSERT INTO t1 (col1) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
@@ -228,27 +228,27 @@ ERROR HY000: Incorrect datetime value: '31.0.2004 15.30' for function str_to_dat
INSERT INTO t1 (col2) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
ERROR HY000: Incorrect datetime value: '0.10.2004 15.30' for function str_to_date
INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col2' at row 1
+ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column `test`.`t1`.`col2` at row 1
INSERT INTO t1 (col2) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
INSERT INTO t1 (col2) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col2' at row 1
+ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column `test`.`t1`.`col2` at row 1
INSERT INTO t1 (col2) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
INSERT INTO t1 (col2) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
ERROR HY000: Incorrect datetime value: '00.00.0000' for function str_to_date
INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1
+ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column `test`.`t1`.`col3` at row 1
INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));
ERROR HY000: Incorrect datetime value: '31.0.2004 15.30' for function str_to_date
INSERT INTO t1 (col3) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
ERROR HY000: Incorrect datetime value: '0.10.2004 15.30' for function str_to_date
INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col3' at row 1
+ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column `test`.`t1`.`col3` at row 1
INSERT INTO t1 (col3) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
INSERT INTO t1 (col3) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col3' at row 1
+ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column `test`.`t1`.`col3` at row 1
INSERT INTO t1 (col3) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
INSERT INTO t1 (col3) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
@@ -273,7 +273,7 @@ ERROR 22007: Incorrect datetime value: '2004-0-10 15:30'
INSERT INTO t1 (col2) VALUES(CAST('0000-00-00' AS DATETIME));
ERROR 22007: Incorrect datetime value: '0000-00-00'
INSERT INTO t1 (col3) VALUES(CAST('0000-10-31 15:30' AS DATETIME));
-ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1
+ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column `test`.`t1`.`col3` at row 1
INSERT INTO t1 (col3) VALUES(CAST('2004-10-0 15:30' AS DATETIME));
ERROR 22007: Incorrect datetime value: '2004-10-0 15:30'
INSERT INTO t1 (col3) VALUES(CAST('2004-0-10 15:30' AS DATETIME));
@@ -291,7 +291,7 @@ ERROR 22007: Incorrect datetime value: '2004-10-0'
INSERT INTO t1 (col1) VALUES(CONVERT('2004-0-10' , DATE));
ERROR 22007: Incorrect datetime value: '2004-0-10'
INSERT INTO t1 (col1) VALUES('2004-0-10');
-ERROR 22007: Incorrect date value: '2004-0-10' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-0-10' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES(CONVERT('0000-00-00',DATE));
ERROR 22007: Incorrect datetime value: '0000-00-00'
INSERT INTO t1 (col2) VALUES(CONVERT('0000-10-31 15:30',DATETIME));
@@ -302,7 +302,7 @@ ERROR 22007: Incorrect datetime value: '2004-0-10 15:30'
INSERT INTO t1 (col2) VALUES(CONVERT('0000-00-00',DATETIME));
ERROR 22007: Incorrect datetime value: '0000-00-00'
INSERT INTO t1 (col3) VALUES(CONVERT('0000-10-31 15:30',DATETIME));
-ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1
+ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column `test`.`t1`.`col3` at row 1
INSERT INTO t1 (col3) VALUES(CONVERT('2004-10-0 15:30',DATETIME));
ERROR 22007: Incorrect datetime value: '2004-10-0 15:30'
INSERT INTO t1 (col3) VALUES(CONVERT('2004-0-10 15:30',DATETIME));
@@ -366,9 +366,9 @@ Warnings:
Warning 1365 Division by 0
Warning 1365 Division by 0
INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect integer value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: 'a59b' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('1a');
ERROR 01000: Data truncated for column 'col1' at row 1
INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -449,9 +449,9 @@ ERROR 22012: Division by 0
UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
ERROR 22012: Division by 0
INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect integer value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: 'a59b' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('1a');
ERROR 01000: Data truncated for column 'col1' at row 1
INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -533,9 +533,9 @@ ERROR 22012: Division by 0
UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
ERROR 22012: Division by 0
INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect integer value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: 'a59b' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('1a');
ERROR 01000: Data truncated for column 'col1' at row 1
INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -617,9 +617,9 @@ ERROR 22012: Division by 0
UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
ERROR 22012: Division by 0
INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect integer value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: 'a59b' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('1a');
ERROR 01000: Data truncated for column 'col1' at row 1
INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -699,9 +699,9 @@ ERROR 22012: Division by 0
UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
ERROR 22012: Division by 0
INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect integer value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: 'a59b' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('1a');
ERROR 01000: Data truncated for column 'col1' at row 1
INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -786,9 +786,9 @@ ERROR 22012: Division by 0
UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
ERROR 22012: Division by 0
INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect decimal value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect decimal value: '' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect decimal value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect decimal value: 'a59b' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('1a');
ERROR 01000: Data truncated for column 'col1' at row 1
INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -853,9 +853,9 @@ ERROR 22012: Division by 0
UPDATE t1 SET col2= MOD(col2,0) WHERE col2 > 0;
ERROR 22012: Division by 0
INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect double value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect double value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect double value: 'a59b' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('1a');
ERROR 01000: Data truncated for column 'col1' at row 1
INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -903,9 +903,9 @@ ERROR 22012: Division by 0
UPDATE t1 SET col2= MOD(col2,0) WHERE col2 > 0;
ERROR 22012: Division by 0
INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect double value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect double value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect double value: 'a59b' for column `test`.`t1`.`col1` at row 1
INSERT INTO t1 (col1) VALUES ('1a');
ERROR 01000: Data truncated for column 'col1' at row 1
INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -1135,9 +1135,9 @@ NULL 10
drop table t1;
create table t1 (col1 date, col2 datetime, col3 timestamp);
insert into t1 values (0,0,0);
-ERROR 22007: Incorrect date value: '0' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0' for column `test`.`t1`.`col1` at row 1
insert into t1 values (0.0,0.0,0.0);
-ERROR 22007: Incorrect date value: '0.0' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0.0' for column `test`.`t1`.`col1` at row 1
insert into t1 (col1) values (convert('0000-00-00',date));
ERROR 22007: Incorrect datetime value: '0000-00-00'
insert into t1 (col1) values (cast('0000-00-00' as date));
@@ -1160,7 +1160,7 @@ insert ignore into t1 values ('0000-00-00');
Warnings:
Warning 1264 Out of range value for column 'col1' at row 1
insert into t1 select * from t1;
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`col1` at row 1
insert ignore into t1 values ('0000-00-00');
Warnings:
Warning 1264 Out of range value for column 'col1' at row 1
@@ -1168,15 +1168,15 @@ insert ignore into t1 (col1) values (cast('0000-00-00' as date));
Warnings:
Warning 1292 Incorrect datetime value: '0000-00-00'
insert into t1 select * from t1;
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column ``.`(temporary)`.`col1` at row 1
alter table t1 modify col1 datetime;
-ERROR 22007: Incorrect datetime value: '0000-00-00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00' for column `test`.`t1`.`col1` at row 1
alter ignore table t1 modify col1 datetime;
Warnings:
Warning 1264 Out of range value for column 'col1' at row 1
Warning 1264 Out of range value for column 'col1' at row 2
insert into t1 select * from t1;
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column ``.`(temporary)`.`col1` at row 1
select * from t1;
col1
0000-00-00 00:00:00
@@ -1256,12 +1256,12 @@ drop table t1;
set @@sql_mode='traditional';
create table t1 (d date);
insert into t1 values ('2000-10-00');
-ERROR 22007: Incorrect date value: '2000-10-00' for column 'd' at row 1
+ERROR 22007: Incorrect date value: '2000-10-00' for column `test`.`t1`.`d` at row 1
insert into t1 values (1000);
-ERROR 22007: Incorrect date value: '1000' for column 'd' at row 1
+ERROR 22007: Incorrect date value: '1000' for column `test`.`t1`.`d` at row 1
insert into t1 values ('2000-10-01');
update t1 set d = 1100;
-ERROR 22007: Incorrect date value: '1100' for column 'd' at row 1
+ERROR 22007: Incorrect date value: '1100' for column `test`.`t1`.`d` at row 1
select * from t1;
d
2000-10-01
@@ -1457,34 +1457,34 @@ col5 mediumint, col6 mediumint unsigned,
col7 int, col8 int unsigned,
col9 bigint, col10 bigint unsigned);
insert into t1(col1) values('-');
-ERROR 22007: Incorrect integer value: '-' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`col1` at row 1
insert into t1(col2) values('+');
-ERROR 22007: Incorrect integer value: '+' for column 'col2' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`col2` at row 1
insert into t1(col3) values('-');
-ERROR 22007: Incorrect integer value: '-' for column 'col3' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`col3` at row 1
insert into t1(col4) values('+');
-ERROR 22007: Incorrect integer value: '+' for column 'col4' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`col4` at row 1
insert into t1(col5) values('-');
-ERROR 22007: Incorrect integer value: '-' for column 'col5' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`col5` at row 1
insert into t1(col6) values('+');
-ERROR 22007: Incorrect integer value: '+' for column 'col6' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`col6` at row 1
insert into t1(col7) values('-');
-ERROR 22007: Incorrect integer value: '-' for column 'col7' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`col7` at row 1
insert into t1(col8) values('+');
-ERROR 22007: Incorrect integer value: '+' for column 'col8' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`col8` at row 1
insert into t1(col9) values('-');
-ERROR 22007: Incorrect integer value: '-' for column 'col9' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`col9` at row 1
insert into t1(col10) values('+');
-ERROR 22007: Incorrect integer value: '+' for column 'col10' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`col10` at row 1
drop table t1;
set sql_mode='traditional';
create table t1(a year);
insert into t1 values ('-');
-ERROR 22007: Incorrect integer value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`a` at row 1
insert into t1 values ('+');
-ERROR 22007: Incorrect integer value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`a` at row 1
insert into t1 values ('');
-ERROR 22007: Incorrect integer value: '' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`a` at row 1
insert into t1 values ('2000a');
ERROR 01000: Data truncated for column 'a' at row 1
insert into t1 values ('2E3x');
diff --git a/mysql-test/main/subselect_mat.result b/mysql-test/main/subselect_mat.result
index 6a725d553e5..2ba851808df 100644
--- a/mysql-test/main/subselect_mat.result
+++ b/mysql-test/main/subselect_mat.result
@@ -1667,8 +1667,8 @@ DROP TABLE t1,t2,t3,t4,t5;
CREATE TABLE t2 (a int);
INSERT IGNORE INTO t2 VALUES ('a'),('a');
Warnings:
-Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'a' at row 2
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`a` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`a` at row 2
CREATE TABLE t4 (a varchar(1));
INSERT INTO t4 VALUES ('m'),('o');
CREATE TABLE t3 (a varchar(1) , b varchar(1) ) ;
diff --git a/mysql-test/main/subselect_sj_mat.result b/mysql-test/main/subselect_sj_mat.result
index 76dae42d9c0..85c314e5fde 100644
--- a/mysql-test/main/subselect_sj_mat.result
+++ b/mysql-test/main/subselect_sj_mat.result
@@ -1704,8 +1704,8 @@ DROP TABLE t1,t2,t3,t4,t5;
CREATE TABLE t2 (a int);
INSERT IGNORE INTO t2 VALUES ('a'),('a');
Warnings:
-Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'a' at row 2
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`a` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`a` at row 2
CREATE TABLE t4 (a varchar(1));
INSERT INTO t4 VALUES ('m'),('o');
CREATE TABLE t3 (a varchar(1) , b varchar(1) ) ;
diff --git a/mysql-test/main/trigger.result b/mysql-test/main/trigger.result
index 537f86e9f40..69308009928 100644
--- a/mysql-test/main/trigger.result
+++ b/mysql-test/main/trigger.result
@@ -622,7 +622,7 @@ drop table t1;
set sql_mode="traditional";
create table t1 (a date);
insert into t1 values ('2004-01-00');
-ERROR 22007: Incorrect date value: '2004-01-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '2004-01-00' for column `test`.`t1`.`a` at row 1
set sql_mode="";
create trigger t1_bi before insert on t1 for each row set new.a = '2004-01-00';
set sql_mode="traditional";
diff --git a/mysql-test/main/type_date.result b/mysql-test/main/type_date.result
index 69bdf569787..e87cd836317 100644
--- a/mysql-test/main/type_date.result
+++ b/mysql-test/main/type_date.result
@@ -108,7 +108,7 @@ DROP TABLE t1, t2, t3;
CREATE TABLE t1 (y YEAR);
INSERT IGNORE INTO t1 VALUES ('abc');
Warnings:
-Warning 1366 Incorrect integer value: 'abc' for column 'y' at row 1
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`y` at row 1
SELECT * FROM t1;
y
0000
@@ -221,7 +221,7 @@ a
0000-00-00
0000-00-00
INSERT INTO t1 VALUES ('0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`a` at row 1
SET SQL_MODE=DEFAULT;
DROP TABLE t1,t2;
CREATE TABLE t1 (a DATE);
@@ -250,7 +250,7 @@ a
1000-00-00
1000-00-00
INSERT INTO t1 VALUES ('1000-00-00');
-ERROR 22007: Incorrect date value: '1000-00-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '1000-00-00' for column `test`.`t1`.`a` at row 1
SET SQL_MODE=DEFAULT;
DROP TABLE t1,t2;
CREATE TABLE t1 SELECT curdate() AS f1;
@@ -504,7 +504,7 @@ SET sql_mode=DEFAULT;
CREATE TABLE t1 (a DATE DEFAULT '0000-00-00');
SET sql_mode=TRADITIONAL;
INSERT INTO t1 VALUES ('0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`a` at row 1
INSERT INTO t1 VALUES ();
ERROR 22007: Incorrect default value '0000-00-00' for column 'a'
INSERT INTO t1 VALUES (DEFAULT);
@@ -545,7 +545,7 @@ CREATE TABLE t1 (a DATE);;
INSERT INTO t1 VALUES (0);
SET sql_mode='TRADITIONAL';
CREATE TABLE t2 AS SELECT * FROM t1;
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t2`.`a` at row 1
DROP TABLE t1;
#
# End of MDEV-8373 Zero date can be inserted in strict no-zero mode through CREATE TABLE AS SELECT timestamp_field
@@ -819,9 +819,9 @@ DATE(a) DATE(b) DATE(c)
NULL NULL NULL
2001-01-01 2001-01-01 2001-01-01
Warnings:
-Warning 1292 Incorrect datetime value: '1' for column 'a' at row 1
-Warning 1292 Incorrect datetime value: '1' for column 'b' at row 1
-Warning 1292 Incorrect datetime value: '1' for column 'c' at row 1
+Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`a` at row 1
+Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`b` at row 1
+Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`c` at row 1
SELECT DATE(COALESCE(a)), DATE(COALESCE(b)), DATE(COALESCE(c)) FROM t1;
DATE(COALESCE(a)) DATE(COALESCE(b)) DATE(COALESCE(c))
NULL NULL NULL
@@ -839,9 +839,9 @@ DATE(a) DATE(b) DATE(c)
NULL NULL NULL
2001-01-01 2001-01-01 2001-01-01
Warnings:
-Warning 1292 Incorrect datetime value: '1' for column 'a' at row 1
-Warning 1292 Incorrect datetime value: '1' for column 'b' at row 1
-Warning 1292 Incorrect datetime value: '1' for column 'c' at row 1
+Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`a` at row 1
+Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`b` at row 1
+Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`c` at row 1
SELECT DATE(COALESCE(a)), DATE(COALESCE(b)), DATE(COALESCE(c)) FROM t1;
DATE(COALESCE(a)) DATE(COALESCE(b)) DATE(COALESCE(c))
NULL NULL NULL
diff --git a/mysql-test/main/type_datetime.result b/mysql-test/main/type_datetime.result
index 74b761a2e8f..b3910553f97 100644
--- a/mysql-test/main/type_datetime.result
+++ b/mysql-test/main/type_datetime.result
@@ -216,7 +216,7 @@ insert into t1 set dt='2007-03-23 13:49:38',da=dt;
Warnings:
Note 1265 Data truncated for column 'da' at row 1
insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
-ERROR 22007: Incorrect date value: '2007-03-32' for column 'da' at row 1
+ERROR 22007: Incorrect date value: '2007-03-32' for column `test`.`t1`.`da` at row 1
select * from t1;
da dt
1962-03-03 1962-03-03 00:00:00
@@ -610,7 +610,7 @@ insert into t1 set dt='2007-03-23 13:49:38',da=dt;
Warnings:
Note 1265 Data truncated for column 'da' at row 1
insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
-ERROR 22007: Incorrect date value: '2007-03-32' for column 'da' at row 1
+ERROR 22007: Incorrect date value: '2007-03-32' for column `test`.`t1`.`da` at row 1
select * from t1;
da dt
1962-03-03 1962-03-03 00:00:00
@@ -854,7 +854,7 @@ SET sql_mode=DEFAULT;
CREATE TABLE t1 (a DATETIME DEFAULT '0000-00-00 00:00:00');
SET sql_mode=TRADITIONAL;
INSERT INTO t1 VALUES ('0000-00-00 00:00:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`a` at row 1
INSERT INTO t1 VALUES ();
ERROR 22007: Incorrect default value '0000-00-00 00:00:00' for column 'a'
INSERT INTO t1 VALUES (DEFAULT);
@@ -895,7 +895,7 @@ CREATE TABLE t1 (a DATETIME);;
INSERT INTO t1 VALUES (0);
SET sql_mode='TRADITIONAL';
CREATE TABLE t2 AS SELECT * FROM t1;
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t2`.`a` at row 1
DROP TABLE t1;
#
# End of MDEV-8373 Zero date can be inserted in strict no-zero mode through CREATE TABLE AS SELECT timestamp_field
diff --git a/mysql-test/main/type_decimal.result b/mysql-test/main/type_decimal.result
index 521dc887ff6..20ace300f3e 100644
--- a/mysql-test/main/type_decimal.result
+++ b/mysql-test/main/type_decimal.result
@@ -176,9 +176,9 @@ Note 1265 Data truncated for column 'a' at row 2
insert ignore into t1 values ("1e+18446744073709551615"),("1e+18446744073709551616"),("1e-9223372036854775807"),("1e-9223372036854775809");
Warnings:
Warning 1264 Out of range value for column 'a' at row 1
-Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column 'a' at row 2
+Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column `test`.`t1`.`a` at row 2
Note 1265 Data truncated for column 'a' at row 3
-Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column 'a' at row 4
+Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column `test`.`t1`.`a` at row 4
insert ignore into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
Warnings:
Warning 1265 Data truncated for column 'a' at row 1
diff --git a/mysql-test/main/type_float.result b/mysql-test/main/type_float.result
index 8743b6c2b42..be7c639ddd3 100644
--- a/mysql-test/main/type_float.result
+++ b/mysql-test/main/type_float.result
@@ -498,7 +498,7 @@ Warnings:
Warning 1265 Data truncated for column 'f' at row 1
INSERT IGNORE INTO t1 VALUES ('.');
Warnings:
-Warning 1366 Incorrect double value: '.' for column 'f' at row 1
+Warning 1366 Incorrect double value: '.' for column `test`.`t1`.`f` at row 1
SELECT * FROM t1 ORDER BY f;
f
0
diff --git a/mysql-test/main/type_newdecimal.result b/mysql-test/main/type_newdecimal.result
index 140f36b1261..44f200c229b 100644
--- a/mysql-test/main/type_newdecimal.result
+++ b/mysql-test/main/type_newdecimal.result
@@ -825,7 +825,7 @@ Warning 1365 Division by 0
Warning 1365 Division by 0
Warning 1365 Division by 0
INSERT INTO Sow6_2f VALUES ('a59b');
-ERROR 22007: Incorrect decimal value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect decimal value: 'a59b' for column `test`.`Sow6_2f`.`col1` at row 1
drop table Sow6_2f;
select 10.3330000000000/12.34500000;
10.3330000000000/12.34500000
diff --git a/mysql-test/main/type_newdecimal.test b/mysql-test/main/type_newdecimal.test
index d2d64b0baee..56273a47b44 100644
--- a/mysql-test/main/type_newdecimal.test
+++ b/mysql-test/main/type_newdecimal.test
@@ -837,6 +837,7 @@ UPDATE Sow6_2f SET col1 = col1 / 0 WHERE col1 > 0;
#-- should return SQLSTATE 22012 division by zero
SELECT MOD(col1,0) FROM Sow6_2f;
#-- should return SQLSTATE 22012 division by zero
+--replace_result sow Sow
-- error 1366
INSERT INTO Sow6_2f VALUES ('a59b');
#-- should return SQLSTATE 22018 invalid character value for cast
diff --git a/mysql-test/main/type_num.result b/mysql-test/main/type_num.result
index 966d94ee385..2dadb4f1f8d 100644
--- a/mysql-test/main/type_num.result
+++ b/mysql-test/main/type_num.result
@@ -42,171 +42,171 @@ Note 1265 Data truncated for column 'a' at row 1
DROP TABLE t1;
CREATE TABLE t1 (a FLOAT);
INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect double value: '' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DOUBLE);
INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect double value: '' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a TINYINT);
INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a SMALLINT);
INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a BIGINT);
INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DECIMAL);
INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect decimal value: '' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: '' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a FLOAT);
INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect double value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect double value: 'x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DOUBLE);
INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect double value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect double value: 'x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a TINYINT);
INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a SMALLINT);
INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a BIGINT);
INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DECIMAL);
INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect decimal value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: 'x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a FLOAT);
INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect double value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect double value: ' x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DOUBLE);
INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect double value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect double value: ' x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a TINYINT);
INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect integer value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: ' x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a SMALLINT);
INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect integer value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: ' x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect integer value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: ' x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a BIGINT);
INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect integer value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: ' x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DECIMAL);
INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect decimal value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: ' x' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a FLOAT);
INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect double value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '.' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DOUBLE);
INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect double value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '.' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a TINYINT);
INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect integer value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '.' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a SMALLINT);
INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect integer value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '.' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect integer value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '.' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a BIGINT);
INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect integer value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '.' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DECIMAL);
INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect decimal value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: '.' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a FLOAT);
INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect double value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '-' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DOUBLE);
INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect double value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '-' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a TINYINT);
INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect integer value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a SMALLINT);
INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect integer value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect integer value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a BIGINT);
INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect integer value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DECIMAL);
INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect decimal value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: '-' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a FLOAT);
INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect double value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '+' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DOUBLE);
INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect double value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '+' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a TINYINT);
INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect integer value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a SMALLINT);
INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect integer value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect integer value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a BIGINT);
INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect integer value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a DECIMAL);
INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect decimal value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: '+' for column `test`.`t1`.`a` at row 1
DROP TABLE t1;
CREATE TABLE t1 (a FLOAT);
INSERT INTO t1 VALUES ('1x');
@@ -425,58 +425,58 @@ Note 1265 Data truncated for column 'i8' at row 1
Note 1265 Data truncated for column 'd' at row 1
INSERT IGNORE INTO t1 VALUES ('','','','','','','');
Warnings:
-Warning 1366 Incorrect double value: '' for column 'f4' at row 1
-Warning 1366 Incorrect double value: '' for column 'f8' at row 1
-Warning 1366 Incorrect integer value: '' for column 'i1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'i2' at row 1
-Warning 1366 Incorrect integer value: '' for column 'i4' at row 1
-Warning 1366 Incorrect integer value: '' for column 'i8' at row 1
-Warning 1366 Incorrect decimal value: '' for column 'd' at row 1
+Warning 1366 Incorrect double value: '' for column `test`.`t1`.`f4` at row 1
+Warning 1366 Incorrect double value: '' for column `test`.`t1`.`f8` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`i1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`i2` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`i4` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`i8` at row 1
+Warning 1366 Incorrect decimal value: '' for column `test`.`t1`.`d` at row 1
INSERT IGNORE INTO t1 VALUES ('x','x','x','x','x','x','x');
Warnings:
-Warning 1366 Incorrect double value: 'x' for column 'f4' at row 1
-Warning 1366 Incorrect double value: 'x' for column 'f8' at row 1
-Warning 1366 Incorrect integer value: 'x' for column 'i1' at row 1
-Warning 1366 Incorrect integer value: 'x' for column 'i2' at row 1
-Warning 1366 Incorrect integer value: 'x' for column 'i4' at row 1
-Warning 1366 Incorrect integer value: 'x' for column 'i8' at row 1
-Warning 1366 Incorrect decimal value: 'x' for column 'd' at row 1
+Warning 1366 Incorrect double value: 'x' for column `test`.`t1`.`f4` at row 1
+Warning 1366 Incorrect double value: 'x' for column `test`.`t1`.`f8` at row 1
+Warning 1366 Incorrect integer value: 'x' for column `test`.`t1`.`i1` at row 1
+Warning 1366 Incorrect integer value: 'x' for column `test`.`t1`.`i2` at row 1
+Warning 1366 Incorrect integer value: 'x' for column `test`.`t1`.`i4` at row 1
+Warning 1366 Incorrect integer value: 'x' for column `test`.`t1`.`i8` at row 1
+Warning 1366 Incorrect decimal value: 'x' for column `test`.`t1`.`d` at row 1
INSERT IGNORE INTO t1 VALUES (' x',' x',' x',' x',' x',' x',' x');
Warnings:
-Warning 1366 Incorrect double value: ' x' for column 'f4' at row 1
-Warning 1366 Incorrect double value: ' x' for column 'f8' at row 1
-Warning 1366 Incorrect integer value: ' x' for column 'i1' at row 1
-Warning 1366 Incorrect integer value: ' x' for column 'i2' at row 1
-Warning 1366 Incorrect integer value: ' x' for column 'i4' at row 1
-Warning 1366 Incorrect integer value: ' x' for column 'i8' at row 1
-Warning 1366 Incorrect decimal value: ' x' for column 'd' at row 1
+Warning 1366 Incorrect double value: ' x' for column `test`.`t1`.`f4` at row 1
+Warning 1366 Incorrect double value: ' x' for column `test`.`t1`.`f8` at row 1
+Warning 1366 Incorrect integer value: ' x' for column `test`.`t1`.`i1` at row 1
+Warning 1366 Incorrect integer value: ' x' for column `test`.`t1`.`i2` at row 1
+Warning 1366 Incorrect integer value: ' x' for column `test`.`t1`.`i4` at row 1
+Warning 1366 Incorrect integer value: ' x' for column `test`.`t1`.`i8` at row 1
+Warning 1366 Incorrect decimal value: ' x' for column `test`.`t1`.`d` at row 1
INSERT IGNORE INTO t1 VALUES ('.','.','.','.','.','.','.');
Warnings:
-Warning 1366 Incorrect double value: '.' for column 'f4' at row 1
-Warning 1366 Incorrect double value: '.' for column 'f8' at row 1
-Warning 1366 Incorrect integer value: '.' for column 'i1' at row 1
-Warning 1366 Incorrect integer value: '.' for column 'i2' at row 1
-Warning 1366 Incorrect integer value: '.' for column 'i4' at row 1
-Warning 1366 Incorrect integer value: '.' for column 'i8' at row 1
-Warning 1366 Incorrect decimal value: '.' for column 'd' at row 1
+Warning 1366 Incorrect double value: '.' for column `test`.`t1`.`f4` at row 1
+Warning 1366 Incorrect double value: '.' for column `test`.`t1`.`f8` at row 1
+Warning 1366 Incorrect integer value: '.' for column `test`.`t1`.`i1` at row 1
+Warning 1366 Incorrect integer value: '.' for column `test`.`t1`.`i2` at row 1
+Warning 1366 Incorrect integer value: '.' for column `test`.`t1`.`i4` at row 1
+Warning 1366 Incorrect integer value: '.' for column `test`.`t1`.`i8` at row 1
+Warning 1366 Incorrect decimal value: '.' for column `test`.`t1`.`d` at row 1
INSERT IGNORE INTO t1 VALUES ('-','-','-','-','-','-','-');
Warnings:
-Warning 1366 Incorrect double value: '-' for column 'f4' at row 1
-Warning 1366 Incorrect double value: '-' for column 'f8' at row 1
-Warning 1366 Incorrect integer value: '-' for column 'i1' at row 1
-Warning 1366 Incorrect integer value: '-' for column 'i2' at row 1
-Warning 1366 Incorrect integer value: '-' for column 'i4' at row 1
-Warning 1366 Incorrect integer value: '-' for column 'i8' at row 1
-Warning 1366 Incorrect decimal value: '-' for column 'd' at row 1
+Warning 1366 Incorrect double value: '-' for column `test`.`t1`.`f4` at row 1
+Warning 1366 Incorrect double value: '-' for column `test`.`t1`.`f8` at row 1
+Warning 1366 Incorrect integer value: '-' for column `test`.`t1`.`i1` at row 1
+Warning 1366 Incorrect integer value: '-' for column `test`.`t1`.`i2` at row 1
+Warning 1366 Incorrect integer value: '-' for column `test`.`t1`.`i4` at row 1
+Warning 1366 Incorrect integer value: '-' for column `test`.`t1`.`i8` at row 1
+Warning 1366 Incorrect decimal value: '-' for column `test`.`t1`.`d` at row 1
INSERT IGNORE INTO t1 VALUES ('+','+','+','+','+','+','+');
Warnings:
-Warning 1366 Incorrect double value: '+' for column 'f4' at row 1
-Warning 1366 Incorrect double value: '+' for column 'f8' at row 1
-Warning 1366 Incorrect integer value: '+' for column 'i1' at row 1
-Warning 1366 Incorrect integer value: '+' for column 'i2' at row 1
-Warning 1366 Incorrect integer value: '+' for column 'i4' at row 1
-Warning 1366 Incorrect integer value: '+' for column 'i8' at row 1
-Warning 1366 Incorrect decimal value: '+' for column 'd' at row 1
+Warning 1366 Incorrect double value: '+' for column `test`.`t1`.`f4` at row 1
+Warning 1366 Incorrect double value: '+' for column `test`.`t1`.`f8` at row 1
+Warning 1366 Incorrect integer value: '+' for column `test`.`t1`.`i1` at row 1
+Warning 1366 Incorrect integer value: '+' for column `test`.`t1`.`i2` at row 1
+Warning 1366 Incorrect integer value: '+' for column `test`.`t1`.`i4` at row 1
+Warning 1366 Incorrect integer value: '+' for column `test`.`t1`.`i8` at row 1
+Warning 1366 Incorrect decimal value: '+' for column `test`.`t1`.`d` at row 1
INSERT IGNORE INTO t1 VALUES ('1x','1x','1x','1x','1x','1x','1x');
Warnings:
Warning 1265 Data truncated for column 'f4' at row 1
diff --git a/mysql-test/main/type_time.result b/mysql-test/main/type_time.result
index 5cdd3b00924..44f0d50d94e 100644
--- a/mysql-test/main/type_time.result
+++ b/mysql-test/main/type_time.result
@@ -320,7 +320,7 @@ DROP TABLE t2,t1;
SET sql_mode=traditional;
CREATE TABLE t1 (a TIME(6));
INSERT INTO t1 VALUES (CAST(0xFFFFFFFF00000000 AS UNSIGNED));
-ERROR 22007: Incorrect time value: '18446744069414584320' for column 'a' at row 1
+ERROR 22007: Incorrect time value: '18446744069414584320' for column `test`.`t1`.`a` at row 1
SET sql_mode=DEFAULT;
INSERT IGNORE INTO t1 VALUES (CAST(0xFFFFFFFF00000000 AS UNSIGNED));
Warnings:
@@ -1167,7 +1167,7 @@ SELECT CAST(a AS TIME), CAST(-9223372036854775808 AS TIME) FROM t1;
CAST(a AS TIME) CAST(-9223372036854775808 AS TIME)
-838:59:59 -838:59:59
Warnings:
-Warning 1292 Incorrect time value: '-9223372036854775808' for column 'a' at row 1
+Warning 1292 Incorrect time value: '-9223372036854775808' for column `test`.`t1`.`a` at row 1
Warning 1292 Truncated incorrect time value: '-9223372036854775808'
DROP TABLE t1;
CREATE TABLE t1 (a INT, b DECIMAL, c DOUBLE);
@@ -1184,12 +1184,12 @@ a TIME(a) TIME(b) TIME(c)
9 00:00:09 00:00:09 00:00:09.000000
9000000 838:59:59 838:59:59 838:59:59.999999
Warnings:
-Warning 1292 Incorrect time value: '-9000000' for column 'a' at row 1
-Warning 1292 Incorrect time value: '-9000000' for column 'b' at row 1
-Warning 1292 Incorrect time value: '-9000000' for column 'c' at row 1
-Warning 1292 Incorrect time value: '9000000' for column 'a' at row 6
-Warning 1292 Incorrect time value: '9000000' for column 'b' at row 6
-Warning 1292 Incorrect time value: '9000000' for column 'c' at row 6
+Warning 1292 Incorrect time value: '-9000000' for column `test`.`t1`.`a` at row 1
+Warning 1292 Incorrect time value: '-9000000' for column `test`.`t1`.`b` at row 1
+Warning 1292 Incorrect time value: '-9000000' for column `test`.`t1`.`c` at row 1
+Warning 1292 Incorrect time value: '9000000' for column `test`.`t1`.`a` at row 6
+Warning 1292 Incorrect time value: '9000000' for column `test`.`t1`.`b` at row 6
+Warning 1292 Incorrect time value: '9000000' for column `test`.`t1`.`c` at row 6
DROP TABLE t1;
CREATE TABLE t1 (a INT, b DECIMAL, c DOUBLE);
INSERT INTO t1 VALUES (0,0,0),(1,1,1),(9,9,9);
@@ -1201,9 +1201,9 @@ a TIME(a) TIME(b) TIME(c)
9 00:00:09 00:00:09 00:00:09.000000
9000000 838:59:59 838:59:59 838:59:59.999999
Warnings:
-Warning 1292 Incorrect time value: '9000000' for column 'a' at row 4
-Warning 1292 Incorrect time value: '9000000' for column 'b' at row 4
-Warning 1292 Incorrect time value: '9000000' for column 'c' at row 4
+Warning 1292 Incorrect time value: '9000000' for column `test`.`t1`.`a` at row 4
+Warning 1292 Incorrect time value: '9000000' for column `test`.`t1`.`b` at row 4
+Warning 1292 Incorrect time value: '9000000' for column `test`.`t1`.`c` at row 4
DROP TABLE t1;
#
# MDEV-8862 Wrong field type for MAX(COALESCE(datetime_column))
diff --git a/mysql-test/main/type_timestamp.result b/mysql-test/main/type_timestamp.result
index b0405bc4ad7..498cc472f17 100644
--- a/mysql-test/main/type_timestamp.result
+++ b/mysql-test/main/type_timestamp.result
@@ -762,7 +762,7 @@ SET sql_mode=DEFAULT;
CREATE TABLE t1 (a TIMESTAMP DEFAULT '0000-00-00 00:00:00');
SET sql_mode=TRADITIONAL;
INSERT INTO t1 VALUES ('0000-00-00 00:00:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`a` at row 1
INSERT INTO t1 VALUES ();
ERROR 22007: Incorrect default value '0000-00-00 00:00:00' for column 'a'
INSERT INTO t1 VALUES (DEFAULT);
@@ -803,7 +803,7 @@ CREATE TABLE t1 (a TIMESTAMP);;
INSERT INTO t1 VALUES (0);
SET sql_mode='TRADITIONAL';
CREATE TABLE t2 AS SELECT * FROM t1;
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t2`.`a` at row 1
DROP TABLE t1;
#
# End of MDEV-8373 Zero date can be inserted in strict no-zero mode through CREATE TABLE AS SELECT timestamp_field
diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result
index 63207ea6a67..2bc82f90e46 100644
--- a/mysql-test/main/view.result
+++ b/mysql-test/main/view.result
@@ -1279,10 +1279,10 @@ load data infile '../../std_data/loaddata3.dat' ignore into table v1 fields term
Warnings:
Note 1265 Data truncated for column 'a' at row 1
Note 1265 Data truncated for column 'a' at row 2
-Warning 1366 Incorrect integer value: 'error ' for column 'a' at row 3
+Warning 1366 Incorrect integer value: 'error ' for column `test`.`t1`.`a` at row 3
Warning 1369 CHECK OPTION failed `test`.`v1`
Note 1265 Data truncated for column 'a' at row 3
-Warning 1366 Incorrect integer value: 'wrong end ' for column 'a' at row 4
+Warning 1366 Incorrect integer value: 'wrong end ' for column `test`.`t1`.`a` at row 4
Warning 1369 CHECK OPTION failed `test`.`v1`
select * from t1 order by a,b;
a b
diff --git a/mysql-test/main/warnings.result b/mysql-test/main/warnings.result
index 7c7e049ff2d..db3ef5f17d2 100644
--- a/mysql-test/main/warnings.result
+++ b/mysql-test/main/warnings.result
@@ -31,19 +31,19 @@ Error 1064 You have an error in your SQL syntax; check the manual that correspon
insert into t1 values (1);
insert ignore into t1 values ("hej");
Warnings:
-Warning 1366 Incorrect integer value: 'hej' for column 'a' at row 1
+Warning 1366 Incorrect integer value: 'hej' for column `test`.`t1`.`a` at row 1
insert ignore into t1 values ("hej"),("d");
Warnings:
-Warning 1366 Incorrect integer value: 'hej' for column 'a' at row 1
-Warning 1366 Incorrect integer value: 'd' for column 'a' at row 2
+Warning 1366 Incorrect integer value: 'hej' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect integer value: 'd' for column `test`.`t1`.`a` at row 2
set SQL_WARNINGS=1;
insert ignore into t1 values ("hej");
Warnings:
-Warning 1366 Incorrect integer value: 'hej' for column 'a' at row 1
+Warning 1366 Incorrect integer value: 'hej' for column `test`.`t1`.`a` at row 1
insert ignore into t1 values ("hej"),("d");
Warnings:
-Warning 1366 Incorrect integer value: 'hej' for column 'a' at row 1
-Warning 1366 Incorrect integer value: 'd' for column 'a' at row 2
+Warning 1366 Incorrect integer value: 'hej' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect integer value: 'd' for column `test`.`t1`.`a` at row 2
drop table t1;
set SQL_WARNINGS=0;
drop temporary table if exists not_exists;
@@ -171,44 +171,44 @@ create table t1 (a int);
insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
update ignore t1 set a='abc';
Warnings:
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 1
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 2
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 3
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 4
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 5
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 6
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 7
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 8
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 9
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 10
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 4
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 6
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 8
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 9
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 10
show warnings limit 2, 1;
Level Code Message
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 3
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 3
show warnings limit 0, 10;
Level Code Message
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 1
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 2
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 3
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 4
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 5
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 6
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 7
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 8
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 9
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 10
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 3
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 4
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 5
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 6
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 7
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 8
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 9
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 10
show warnings limit 9, 1;
Level Code Message
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 10
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 10
show warnings limit 10, 1;
Level Code Message
show warnings limit 9, 2;
Level Code Message
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 10
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 10
show warnings limit 0, 0;
Level Code Message
show warnings limit 1;
Level Code Message
-Warning 1366 Incorrect integer value: 'abc' for column 'a' at row 1
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 1
show warnings limit 0;
Level Code Message
show warnings limit 1, 0;
@@ -254,13 +254,13 @@ SELECT f1 INTO x FROM t3 LIMIT 1;
END//
CALL sp1();
Warnings:
-Warning 1366 Incorrect decimal value: 'a`' for column 'x' at row 1
+Warning 1366 Incorrect decimal value: 'a`' for column ``.``.`x` at row 1
CALL sp2();
Warnings:
-Warning 1366 Incorrect decimal value: 'a`' for column 'x' at row 1
+Warning 1366 Incorrect decimal value: 'a`' for column ``.``.`x` at row 1
CALL sp3();
Warnings:
-Warning 1366 Incorrect decimal value: 'a`' for column 'x' at row 1
+Warning 1366 Incorrect decimal value: 'a`' for column ``.``.`x` at row 1
SET sql_mode = DEFAULT;
DROP PROCEDURE IF EXISTS sp1;
SET sql_mode = '';
@@ -271,7 +271,7 @@ SELECT f1 into x from t2 limit 1;
END//
CALL sp1();
Warnings:
-Warning 1366 Incorrect decimal value: 'a`' for column 'x' at row 1
+Warning 1366 Incorrect decimal value: 'a`' for column ``.``.`x` at row 1
SET sql_mode = DEFAULT;
DROP TABLE t1;
DROP TABLE t2;
diff --git a/mysql-test/main/win.result b/mysql-test/main/win.result
index b780e22c4a8..6ee6f01ba8d 100644
--- a/mysql-test/main/win.result
+++ b/mysql-test/main/win.result
@@ -3458,6 +3458,19 @@ deallocate prepare stmt;
drop table t1;
drop view v1;
#
+# MDEV-17676: Assertion `inited==NONE || (inited==RND && scan)' failed in handler::ha_rnd_init
+#
+CREATE TABLE t1 (b1 text NOT NULL);
+INSERT INTO t1 VALUES ('2'),('1');
+EXPLAIN
+SELECT DISTINCT MIN(b1) OVER () FROM t1;
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using temporary
+SELECT DISTINCT MIN(b1) OVER () FROM t1;
+MIN(b1) OVER ()
+1
+drop table t1;
+#
# Start of 10.3 tests
#
#
diff --git a/mysql-test/main/win.test b/mysql-test/main/win.test
index 29146ae179a..1b49ac681f4 100644
--- a/mysql-test/main/win.test
+++ b/mysql-test/main/win.test
@@ -2218,6 +2218,17 @@ drop table t1;
drop view v1;
--echo #
+--echo # MDEV-17676: Assertion `inited==NONE || (inited==RND && scan)' failed in handler::ha_rnd_init
+--echo #
+
+CREATE TABLE t1 (b1 text NOT NULL);
+INSERT INTO t1 VALUES ('2'),('1');
+EXPLAIN
+SELECT DISTINCT MIN(b1) OVER () FROM t1;
+SELECT DISTINCT MIN(b1) OVER () FROM t1;
+drop table t1;
+
+--echo #
--echo # Start of 10.3 tests
--echo #
diff --git a/mysql-test/suite/compat/oracle/r/sp-cursor.result b/mysql-test/suite/compat/oracle/r/sp-cursor.result
index e539f38e307..a09459ad7cd 100644
--- a/mysql-test/suite/compat/oracle/r/sp-cursor.result
+++ b/mysql-test/suite/compat/oracle/r/sp-cursor.result
@@ -459,7 +459,7 @@ CALL p1('b1');
msg
Fetched a record a=0
Warnings:
-Warning 1366 Incorrect integer value: 'b1' for column 'p_a' at row 1
+Warning 1366 Incorrect integer value: 'b1' for column ``.``.`p_a` at row 1
DROP PROCEDURE p1;
#
# One parameter in SELECT list + subselect
diff --git a/mysql-test/suite/encryption/r/innodb-force-corrupt.result b/mysql-test/suite/encryption/r/innodb-force-corrupt.result
index 4c8ee2ef4de..13c38f1587d 100644
--- a/mysql-test/suite/encryption/r/innodb-force-corrupt.result
+++ b/mysql-test/suite/encryption/r/innodb-force-corrupt.result
@@ -1,6 +1,5 @@
call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` (has an unreadable root page|is corrupted)");
-call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[123]\\.ibd' cannot be decrypted\\.");
-call mtr.add_suppression("failed to read or decrypt \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\]");
+call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=\\d+, page number=[36]\\] in file .*test.t[123]\\.ibd looks corrupted; key_version=3221342974");
SET GLOBAL innodb_file_per_table = ON;
set global innodb_compression_algorithm = 1;
# Create and populate tables to be corrupted
diff --git a/mysql-test/suite/encryption/t/innodb-force-corrupt.test b/mysql-test/suite/encryption/t/innodb-force-corrupt.test
index 2ec4960af4c..6c775dbf733 100644
--- a/mysql-test/suite/encryption/t/innodb-force-corrupt.test
+++ b/mysql-test/suite/encryption/t/innodb-force-corrupt.test
@@ -8,8 +8,7 @@
-- source include/not_embedded.inc
call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` (has an unreadable root page|is corrupted)");
-call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[123]\\.ibd' cannot be decrypted\\.");
-call mtr.add_suppression("failed to read or decrypt \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\]");
+call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=\\d+, page number=[36]\\] in file .*test.t[123]\\.ibd looks corrupted; key_version=3221342974");
SET GLOBAL innodb_file_per_table = ON;
set global innodb_compression_algorithm = 1;
@@ -51,17 +50,17 @@ perl;
open(FILE, "+<", "$ENV{MYSQLD_DATADIR}/test/t1.ibd") or die "open";
binmode FILE;
seek(FILE, $ENV{'INNODB_PAGE_SIZE'} * 3 + 26, SEEK_SET) or die "seek";
-print FILE pack("H*", "c00lcafedeadb017");
+print FILE pack("H*", "c001cafedeadb017");
close FILE or die "close";
open(FILE, "+<", "$ENV{MYSQLD_DATADIR}/test/t2.ibd") or die "open";
binmode FILE;
seek(FILE, $ENV{'INNODB_PAGE_SIZE'} * 3 + 26, SEEK_SET) or die "seek";
-print FILE pack("H*", "c00lcafedeadb017");
+print FILE pack("H*", "c001cafedeadb017");
close FILE or die "close";
open(FILE, "+<", "$ENV{MYSQLD_DATADIR}/test/t3.ibd") or die "open";
binmode FILE;
seek(FILE, $ENV{'INNODB_PAGE_SIZE'} * 3 + 26, SEEK_SET) or die "seek";
-print FILE pack("H*", "c00lcafedeadb017");
+print FILE pack("H*", "c001cafedeadb017");
close FILE or die "close";
EOF
diff --git a/mysql-test/suite/engines/funcs/r/in_number_boundary_error.result b/mysql-test/suite/engines/funcs/r/in_number_boundary_error.result
index 53964697506..b1c46a3a398 100644
--- a/mysql-test/suite/engines/funcs/r/in_number_boundary_error.result
+++ b/mysql-test/suite/engines/funcs/r/in_number_boundary_error.result
@@ -7,7 +7,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
@@ -26,7 +26,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
@@ -45,7 +45,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
@@ -64,7 +64,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
@@ -83,7 +83,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
@@ -102,7 +102,7 @@ INSERT INTO t4 (c1) VALUES(0);
INSERT INTO t4 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t4 (c1) VALUES('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t4`.`c1` at row 1
INSERT INTO t4 (c1) VALUES('9');
SELECT COUNT(c1) AS total_rows FROM t4;
total_rows
diff --git a/mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result b/mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result
index 62ad9a568f9..0c9ae5453e3 100644
--- a/mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result
+++ b/mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result
@@ -7,7 +7,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t5 (c1) VALUES('x');
-ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect decimal value: 'x' for column `test`.`t5`.`c1` at row 1
INSERT INTO t5 (c1) VALUES(999999);
ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5;
@@ -27,7 +27,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t5 (c1) VALUES('x');
-ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect decimal value: 'x' for column `test`.`t5`.`c1` at row 1
INSERT INTO t5 (c1) VALUES(999999);
ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5;
@@ -47,7 +47,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t5 (c1) VALUES('x');
-ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect decimal value: 'x' for column `test`.`t5`.`c1` at row 1
INSERT INTO t5 (c1) VALUES(999999);
ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5;
@@ -67,7 +67,7 @@ INSERT INTO t5 (c1) VALUES(0);
INSERT INTO t5 (c1) VALUES(-1);
ERROR 22003: Out of range value for column 'c1' at row 1
INSERT INTO t5 (c1) VALUES('x');
-ERROR 22007: Incorrect decimal value: 'x' for column 'c1' at row 1
+ERROR 22007: Incorrect decimal value: 'x' for column `test`.`t5`.`c1` at row 1
INSERT INTO t5 (c1) VALUES(999999);
ERROR 22003: Out of range value for column 'c1' at row 1
SELECT COUNT(c1) AS total_rows FROM t5;
diff --git a/mysql-test/suite/engines/iuds/r/insert_decimal.result b/mysql-test/suite/engines/iuds/r/insert_decimal.result
index a341de58946..860fa8a2c4c 100644
--- a/mysql-test/suite/engines/iuds/r/insert_decimal.result
+++ b/mysql-test/suite/engines/iuds/r/insert_decimal.result
@@ -110,15 +110,15 @@ Warnings:
Warning 1264 Out of range value for column 'c1' at row 1
Warning 1264 Out of range value for column 'c2' at row 1
Warning 1264 Out of range value for column 'c3' at row 1
-Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column 'c1' at row 2
-Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column 'c2' at row 2
-Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column 'c3' at row 2
+Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column `test`.`t2`.`c1` at row 2
+Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column `test`.`t2`.`c2` at row 2
+Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column `test`.`t2`.`c3` at row 2
Note 1265 Data truncated for column 'c1' at row 3
Note 1265 Data truncated for column 'c2' at row 3
Note 1265 Data truncated for column 'c3' at row 3
-Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column 'c1' at row 4
-Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column 'c2' at row 4
-Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column 'c3' at row 4
+Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column `test`.`t2`.`c1` at row 4
+Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column `test`.`t2`.`c2` at row 4
+Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column `test`.`t2`.`c3` at row 4
SELECT * FROM t1;
c1 c2 c3 c4
0.00000 -0.10000 0 13
diff --git a/mysql-test/suite/engines/iuds/r/insert_number.result b/mysql-test/suite/engines/iuds/r/insert_number.result
index 8c246f584b5..564ce8d3401 100644
--- a/mysql-test/suite/engines/iuds/r/insert_number.result
+++ b/mysql-test/suite/engines/iuds/r/insert_number.result
@@ -12,16 +12,16 @@ INSERT INTO t2 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t3 VALUES(105,NULL,102,103,104,105,106);
INSERT IGNORE INTO t1 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c2` at row 1
INSERT IGNORE INTO t2 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c2` at row 1
INSERT IGNORE INTO t3 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c2` at row 1
INSERT IGNORE INTO t1 VALUES(-1,124,22,23,24,25,26);
Warnings:
Warning 1264 Out of range value for column 'c1' at row 1
@@ -40,15 +40,15 @@ INSERT INTO t3 VALUES(0,0,32,32,34,35,36);
INSERT IGNORE INTO t1 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`c2` at row 1
INSERT IGNORE INTO t2 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`c2` at row 1
INSERT IGNORE INTO t3 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t3`.`c2` at row 1
SELECT * FROM t1;
c1 c2 c3 c4 c5 c6 c7
0 0 17 18 19 20 21
@@ -1378,22 +1378,22 @@ Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT IGNORE INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c2` at row 1
INSERT IGNORE INTO t5 VALUES('','',-17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c2` at row 1
INSERT IGNORE INTO t4 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c3` at row 1
INSERT IGNORE INTO t5 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c3` at row 1
INSERT INTO t4 VALUES(4,7,8,9,10,11,12,13);
INSERT IGNORE INTO t5 VALUES(-1,-1,-1,8,9,10,11,12);
Warnings:
@@ -5621,16 +5621,16 @@ INSERT INTO t2 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t3 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t1 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c2` at row 1
INSERT INTO t2 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c2` at row 1
INSERT INTO t3 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c2` at row 1
INSERT INTO t1 VALUES(-1,124,22,23,24,25,26);
Warnings:
Warning 1264 Out of range value for column 'c1' at row 1
@@ -5649,15 +5649,15 @@ INSERT INTO t3 VALUES(0,0,32,32,34,35,36);
INSERT INTO t1 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`c2` at row 1
INSERT INTO t2 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`c2` at row 1
INSERT INTO t3 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t3`.`c2` at row 1
SELECT * FROM t1;
c1 c2 c3 c4 c5 c6 c7
0 0 17 18 19 20 21
@@ -6987,22 +6987,22 @@ Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c2` at row 1
INSERT INTO t5 VALUES('','',-17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c2` at row 1
INSERT INTO t4 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c3` at row 1
INSERT INTO t5 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c3` at row 1
INSERT INTO t4 VALUES(4,7,8,9,10,11,12,13);
INSERT INTO t5 VALUES(-1,-1,-1,8,9,10,11,12);
Warnings:
@@ -11321,16 +11321,16 @@ INSERT INTO t2 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t3 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t1 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c2` at row 1
INSERT INTO t2 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c2` at row 1
INSERT INTO t3 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c2` at row 1
INSERT INTO t1 VALUES(-1,124,22,23,24,25,26);
Warnings:
Warning 1264 Out of range value for column 'c1' at row 1
@@ -11349,15 +11349,15 @@ INSERT INTO t3 VALUES(0,0,32,32,34,35,36);
INSERT INTO t1 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`c2` at row 1
INSERT INTO t2 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`c2` at row 1
INSERT INTO t3 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t3`.`c2` at row 1
SELECT * FROM t1;
c1 c2 c3 c4 c5 c6 c7
0 0 17 18 19 20 21
@@ -12687,22 +12687,22 @@ Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c2` at row 1
INSERT INTO t5 VALUES('','',-17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c2` at row 1
INSERT INTO t4 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c3` at row 1
INSERT INTO t5 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c3` at row 1
INSERT INTO t4 VALUES(4,7,8,9,10,11,12,13);
INSERT INTO t5 VALUES(-1,-1,-1,8,9,10,11,12);
Warnings:
@@ -17126,16 +17126,16 @@ INSERT INTO t2 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t3 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t1 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c2` at row 1
INSERT INTO t2 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c2` at row 1
INSERT INTO t3 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c2` at row 1
INSERT INTO t1 VALUES(-1,124,22,23,24,25,26);
Warnings:
Warning 1264 Out of range value for column 'c1' at row 1
@@ -17154,15 +17154,15 @@ INSERT INTO t3 VALUES(0,0,32,32,34,35,36);
INSERT INTO t1 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`c2` at row 1
INSERT INTO t2 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`c2` at row 1
INSERT INTO t3 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t3`.`c2` at row 1
SELECT * FROM t1;
c1 c2 c3 c4 c5 c6 c7
0 0 17 18 19 20 21
@@ -18492,22 +18492,22 @@ Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c2` at row 1
INSERT INTO t5 VALUES('','',-17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c2` at row 1
INSERT INTO t4 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c3` at row 1
INSERT INTO t5 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c3` at row 1
INSERT INTO t4 VALUES(4,7,8,9,10,11,12,13);
INSERT INTO t5 VALUES(-1,-1,-1,8,9,10,11,12);
Warnings:
@@ -23036,16 +23036,16 @@ INSERT INTO t2 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t3 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t1 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c2` at row 1
INSERT INTO t2 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c2` at row 1
INSERT INTO t3 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c2` at row 1
INSERT INTO t1 VALUES(-1,124,22,23,24,25,26);
Warnings:
Warning 1264 Out of range value for column 'c1' at row 1
@@ -23064,15 +23064,15 @@ INSERT INTO t3 VALUES(0,0,32,32,34,35,36);
INSERT INTO t1 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`c2` at row 1
INSERT INTO t2 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`c2` at row 1
INSERT INTO t3 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t3`.`c2` at row 1
SELECT * FROM t1;
c1 c2 c3 c4 c5 c6 c7
0 0 17 18 19 20 21
@@ -24402,22 +24402,22 @@ Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c2` at row 1
INSERT INTO t5 VALUES('','',-17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c2` at row 1
INSERT INTO t4 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c3` at row 1
INSERT INTO t5 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c3` at row 1
INSERT INTO t4 VALUES(4,7,8,9,10,11,12,13);
INSERT INTO t5 VALUES(-1,-1,-1,8,9,10,11,12);
Warnings:
@@ -28946,16 +28946,16 @@ INSERT INTO t2 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t3 VALUES(105,NULL,102,103,104,105,106);
INSERT INTO t1 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c2` at row 1
INSERT INTO t2 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t2`.`c2` at row 1
INSERT INTO t3 VALUES('','',17,18,19,20,21);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t3`.`c2` at row 1
INSERT INTO t1 VALUES(-1,124,22,23,24,25,26);
Warnings:
Warning 1264 Out of range value for column 'c1' at row 1
@@ -28974,15 +28974,15 @@ INSERT INTO t3 VALUES(0,0,32,32,34,35,36);
INSERT INTO t1 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`c2` at row 1
INSERT INTO t2 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`c2` at row 1
INSERT INTO t3 VALUES('101.34 a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t3`.`c2` at row 1
SELECT * FROM t1;
c1 c2 c3 c4 c5 c6 c7
0 0 17 18 19 20 21
@@ -30312,22 +30312,22 @@ Warnings:
Warning 1364 Field 'c2' doesn't have a default value
INSERT INTO t4 VALUES('','',17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t4`.`c2` at row 1
INSERT INTO t5 VALUES('','',-17,18,19,20,21,22);
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t5`.`c2` at row 1
INSERT INTO t4 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t4`.`c3` at row 1
INSERT INTO t5 VALUES('102.34 a','a','a',37,38,39,40,41);
Warnings:
Warning 1265 Data truncated for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c2' at row 1
-Warning 1366 Incorrect integer value: 'a' for column 'c3' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c2` at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t5`.`c3` at row 1
INSERT INTO t4 VALUES(4,7,8,9,10,11,12,13);
INSERT INTO t5 VALUES(-1,-1,-1,8,9,10,11,12);
Warnings:
diff --git a/mysql-test/suite/engines/iuds/r/insert_year.result b/mysql-test/suite/engines/iuds/r/insert_year.result
index ea6e10d130b..c7a0dbcba86 100644
--- a/mysql-test/suite/engines/iuds/r/insert_year.result
+++ b/mysql-test/suite/engines/iuds/r/insert_year.result
@@ -60,12 +60,12 @@ Warning 1264 Out of range value for column 'c1' at row 6
Warning 1264 Out of range value for column 'c2' at row 6
INSERT IGNORE INTO t1 VALUES('','','08-01-04','08/01/05') /* Inserts zero dates for '' strings */;
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c2` at row 1
INSERT IGNORE INTO t4 VALUES('abcd','abcd','08-01-10','08/01/11'),(1234,1234,'08-01-12','08/01/13') /* Inserts zero dates for absurd dates */;
Warnings:
-Warning 1366 Incorrect integer value: 'abcd' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'abcd' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'abcd' for column `test`.`t4`.`c1` at row 1
+Warning 1366 Incorrect integer value: 'abcd' for column `test`.`t4`.`c2` at row 1
Warning 1264 Out of range value for column 'c1' at row 2
Warning 1264 Out of range value for column 'c2' at row 2
INSERT INTO t2 VALUES('20','30','98-12-16','98.12.16 11:30:45'),('40','20','98-12-15','98.12.15 11:30:45');
@@ -3319,12 +3319,12 @@ Warning 1264 Out of range value for column 'c1' at row 6
Warning 1264 Out of range value for column 'c2' at row 6
INSERT IGNORE INTO t1 VALUES('','','08-01-04','08/01/05') /* Inserts zero dates for '' strings */;
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: '' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c1` at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`t1`.`c2` at row 1
INSERT IGNORE INTO t4 VALUES('abcd','abcd','08-01-10','08/01/11'),(1234,1234,'08-01-12','08/01/13') /* Inserts zero dates for absurd dates */;
Warnings:
-Warning 1366 Incorrect integer value: 'abcd' for column 'c1' at row 1
-Warning 1366 Incorrect integer value: 'abcd' for column 'c2' at row 1
+Warning 1366 Incorrect integer value: 'abcd' for column `test`.`t4`.`c1` at row 1
+Warning 1366 Incorrect integer value: 'abcd' for column `test`.`t4`.`c2` at row 1
Warning 1264 Out of range value for column 'c1' at row 2
Warning 1264 Out of range value for column 'c2' at row 2
INSERT INTO t2 VALUES('20','30','98-12-16','98.12.16 11:30:45'),('40','20','98-12-15','98.12.15 11:30:45');
diff --git a/mysql-test/suite/engines/iuds/r/update_decimal.result b/mysql-test/suite/engines/iuds/r/update_decimal.result
index 7b4a3ea9079..8bedcf8ab51 100644
--- a/mysql-test/suite/engines/iuds/r/update_decimal.result
+++ b/mysql-test/suite/engines/iuds/r/update_decimal.result
@@ -334,7 +334,7 @@ INSERT INTO t3 VALUES ('11111.11111','4444444444',1),('55555.55555','5555555555'
UPDATE t2,t3 SET t3.c1='22222.22222' WHERE t2.c1=t3.c1 AND t2.c3=t3.c3;
UPDATE IGNORE t1 SET c3='asdf' WHERE c1='11111.11111';
Warnings:
-Warning 1366 Incorrect decimal value: 'asdf' for column 'c3' at row 1
+Warning 1366 Incorrect decimal value: 'asdf' for column `test`.`t1`.`c3` at row 1
SELECT c3 FROM t1;
c3
0
@@ -1099,7 +1099,7 @@ INSERT INTO t3 VALUES ('11111.11111','4444444444',1),('55555.55555','5555555555'
UPDATE t2,t3 SET t3.c1='22222.22222' WHERE t2.c1=t3.c1 AND t2.c3=t3.c3;
UPDATE IGNORE t1 SET c3='asdf' WHERE c1='11111.11111';
Warnings:
-Warning 1366 Incorrect double value: 'asdf' for column 'c3' at row 1
+Warning 1366 Incorrect double value: 'asdf' for column `test`.`t1`.`c3` at row 1
SELECT c3 FROM t1;
c3
0
diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result
index 481787e4eaa..7be6bb2f049 100644
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -3715,8 +3715,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 25
Warnings:
-Warning 1292 Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning 1292 Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 3
+Warning 1292 Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning 1292 Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -3731,8 +3731,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 25
Warnings:
-Warning 1292 Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 1
+Warning 1292 Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
DROP VIEW v1;
@@ -3749,8 +3749,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 24
Warnings:
-Warning 1292 Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning 1292 Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 3
+Warning 1292 Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning 1292 Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -3765,8 +3765,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 24
Warnings:
-Warning 1292 Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning 1292 Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 1
+Warning 1292 Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
DROP VIEW v1;
@@ -4061,10 +4061,10 @@ NULL 1.7976931348623e308 3
NULL -1 5
NULL 200506271758 19
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 5
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_double' at row 19
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 19
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4079,10 +4079,10 @@ NULL 1.7976931348623e308 3
NULL -1 5
NULL 200506271758 19
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_double' at row 1
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 1
DROP VIEW v1;
@@ -4099,10 +4099,10 @@ NULL 9223372036854775807 3
NULL -1 5
NULL 200506271758 18
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 5
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_bigint' at row 18
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 18
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4117,10 +4117,10 @@ NULL 9223372036854775807 3
NULL -1 5
NULL 200506271758 18
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_bigint' at row 1
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 1
DROP VIEW v1;
@@ -4421,9 +4421,9 @@ NULL 1.7976931348623e308 3
NULL -1 5
2005-06-27 20050627 13
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 5
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4438,9 +4438,9 @@ NULL 1.7976931348623e308 3
NULL -1 5
2005-06-27 20050627 13
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 1
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
DROP VIEW v1;
@@ -4457,9 +4457,9 @@ NULL 9223372036854775807 3
NULL -1 5
2005-06-27 20050627 12
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 5
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4474,9 +4474,9 @@ NULL 9223372036854775807 3
NULL -1 5
2005-06-27 20050627 12
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 1
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
DROP VIEW v1;
diff --git a/mysql-test/suite/funcs_1/r/is_columns_innodb.result b/mysql-test/suite/funcs_1/r/is_columns_innodb.result
index 8f2ba33b591..fbca906a9fb 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_innodb.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_innodb.result
@@ -359,9 +359,9 @@ drop TABLE if exists t7, t8;
CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data/funcs_1/t7.txt' INTO TABLE t7;
-ERROR 22007: Incorrect date value: '' for column 'f3' at row 1
+ERROR 22007: Incorrect date value: '' for column `test`.`t7`.`f3` at row 1
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data/funcs_1/t7.txt' INTO TABLE t8;
-ERROR 22007: Incorrect date value: '' for column 'f3' at row 1
+ERROR 22007: Incorrect date value: '' for column `test`.`t8`.`f3` at row 1
drop TABLE if exists t9;
CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = InnoDB;
LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data/funcs_1/t9.txt' INTO TABLE t9;
diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result
index 3a75e4abac5..85539fbf06f 100644
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -3716,8 +3716,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 25
Warnings:
-Warning 1292 Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning 1292 Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 3
+Warning 1292 Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning 1292 Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -3732,8 +3732,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 25
Warnings:
-Warning 1292 Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 1
+Warning 1292 Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
DROP VIEW v1;
@@ -3750,8 +3750,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 24
Warnings:
-Warning 1292 Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning 1292 Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 3
+Warning 1292 Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning 1292 Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -3766,8 +3766,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 24
Warnings:
-Warning 1292 Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning 1292 Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 1
+Warning 1292 Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
DROP VIEW v1;
@@ -4062,10 +4062,10 @@ NULL 1.7976931348623e308 3
NULL -1 5
NULL 200506271758 19
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 5
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_double' at row 6
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 6
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4080,10 +4080,10 @@ NULL 1.7976931348623e308 3
NULL -1 5
NULL 200506271758 19
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_double' at row 1
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 1
DROP VIEW v1;
@@ -4100,10 +4100,10 @@ NULL 9223372036854775807 3
NULL -1 5
NULL 200506271758 18
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 5
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_bigint' at row 6
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 6
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4118,10 +4118,10 @@ NULL 9223372036854775807 3
NULL -1 5
NULL 200506271758 18
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_bigint' at row 1
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 1
DROP VIEW v1;
@@ -4422,9 +4422,9 @@ NULL 1.7976931348623e308 3
NULL -1 5
2005-06-27 20050627 13
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 5
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4439,9 +4439,9 @@ NULL 1.7976931348623e308 3
NULL -1 5
2005-06-27 20050627 13
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 1
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
DROP VIEW v1;
@@ -4458,9 +4458,9 @@ NULL 9223372036854775807 3
NULL -1 5
2005-06-27 20050627 12
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 5
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4475,9 +4475,9 @@ NULL 9223372036854775807 3
NULL -1 5
2005-06-27 20050627 12
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 1
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
DROP VIEW v1;
diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result
index 3a75e4abac5..85539fbf06f 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -3716,8 +3716,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 25
Warnings:
-Warning 1292 Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning 1292 Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 3
+Warning 1292 Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning 1292 Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -3732,8 +3732,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 25
Warnings:
-Warning 1292 Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 1
+Warning 1292 Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
DROP VIEW v1;
@@ -3750,8 +3750,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 24
Warnings:
-Warning 1292 Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning 1292 Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 3
+Warning 1292 Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning 1292 Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -3766,8 +3766,8 @@ NULL NULL 1
-00:00:01 -1 5
00:17:58 1758 24
Warnings:
-Warning 1292 Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning 1292 Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 1
+Warning 1292 Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
DROP VIEW v1;
@@ -4062,10 +4062,10 @@ NULL 1.7976931348623e308 3
NULL -1 5
NULL 200506271758 19
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 5
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_double' at row 6
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 6
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4080,10 +4080,10 @@ NULL 1.7976931348623e308 3
NULL -1 5
NULL 200506271758 19
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_double' at row 1
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 1
DROP VIEW v1;
@@ -4100,10 +4100,10 @@ NULL 9223372036854775807 3
NULL -1 5
NULL 200506271758 18
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 5
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_bigint' at row 6
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 6
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4118,10 +4118,10 @@ NULL 9223372036854775807 3
NULL -1 5
NULL 200506271758 18
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '200506271758' for column 'my_bigint' at row 1
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 1
DROP VIEW v1;
@@ -4422,9 +4422,9 @@ NULL 1.7976931348623e308 3
NULL -1 5
2005-06-27 20050627 13
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 5
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4439,9 +4439,9 @@ NULL 1.7976931348623e308 3
NULL -1 5
2005-06-27 20050627 13
Warnings:
-Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_double' at row 1
+Warning 1292 Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
DROP VIEW v1;
@@ -4458,9 +4458,9 @@ NULL 9223372036854775807 3
NULL -1 5
2005-06-27 20050627 12
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 5
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@@ -4475,9 +4475,9 @@ NULL 9223372036854775807 3
NULL -1 5
2005-06-27 20050627 12
Warnings:
-Warning 1292 Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning 1292 Incorrect datetime value: '-1' for column 'my_bigint' at row 1
+Warning 1292 Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning 1292 Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
DROP VIEW v1;
diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result
index e5e009a86de..9899456f7a8 100644
--- a/mysql-test/suite/funcs_1/r/storedproc.result
+++ b/mysql-test/suite/funcs_1/r/storedproc.result
@@ -13825,7 +13825,7 @@ CALL sp1();
@xx
0
Warnings:
-Warning 1366 Incorrect integer value: 'asd' for column 'xx' at row 1
+Warning 1366 Incorrect integer value: 'asd' for column ``.``.`xx` at row 1
DROP PROCEDURE IF EXISTS sp1;
CREATE PROCEDURE sp1()
BEGIN
@@ -13874,7 +13874,7 @@ CALL sp1();
xx
0
Warnings:
-Warning 1366 Incorrect double value: 'asd' for column 'xx' at row 1
+Warning 1366 Incorrect double value: 'asd' for column ``.``.`xx` at row 1
DROP PROCEDURE IF EXISTS sp1;
CREATE PROCEDURE sp1()
BEGIN
@@ -13946,7 +13946,7 @@ CALL sp1();
xx
0
Warnings:
-Warning 1366 Incorrect integer value: 'asd' for column 'xx' at row 1
+Warning 1366 Incorrect integer value: 'asd' for column ``.``.`xx` at row 1
DROP PROCEDURE IF EXISTS sp1;
CREATE PROCEDURE sp1()
BEGIN
diff --git a/mysql-test/suite/galera/r/galera_defaults.result b/mysql-test/suite/galera/r/galera_defaults.result
index 8083784bb01..6871ec6d56b 100644
--- a/mysql-test/suite/galera/r/galera_defaults.result
+++ b/mysql-test/suite/galera/r/galera_defaults.result
@@ -52,4 +52,3 @@ WSREP_SST_DONOR
WSREP_SST_DONOR_REJECTS_QUERIES OFF
WSREP_SST_METHOD rsync
WSREP_SYNC_WAIT 15
-<BASE_DIR>; <BASE_HOST>; <BASE_PORT>; cert.log_conflicts = no; debug = no; evs.auto_evict = 0; evs.causal_keepalive_period = PT1S; evs.debug_log_mask = 0x1; evs.delay_margin = PT1S; evs.delayed_keep_period = PT30S; evs.inactive_check_period = PT0.5S; evs.inactive_timeout = PT30S; evs.info_log_mask = 0; evs.install_timeout = PT15S; evs.join_retrans_period = PT1S; evs.keepalive_period = PT1S; evs.max_install_timeouts = 3; evs.send_window = 4; evs.stats_report_period = PT1M; evs.suspect_timeout = PT10S; evs.use_aggregate = true; evs.user_send_window = 2; evs.version = 0; evs.view_forget_timeout = P1D; <GCACHE_DIR>; gcache.keep_pages_size = 0; gcache.mem_size = 0; <GCACHE_NAME>; gcache.page_size = 128M; gcache.recover = no; gcache.size = 10M; gcomm.thread_prio = ; gcs.fc_debug = 0; gcs.fc_factor = 1.0; gcs.fc_limit = 16; gcs.fc_master_slave = no; gcs.max_packet_size = 64500; gcs.max_throttle = 0.25; <GCS_RECV_Q_HARD_LIMIT>; gcs.recv_q_soft_limit = 0.25; gcs.sync_donor = no; <GMCAST_LISTEN_ADDR>; gmcast.mcast_addr = ; gmcast.mcast_ttl = 1; gmcast.peer_timeout = PT3S; gmcast.segment = 0; gmcast.time_wait = PT5S; gmcast.version = 0; <IST_RECV_ADDR>; pc.announce_timeout = PT3S; pc.checksum = false; pc.ignore_quorum = false; pc.ignore_sb = false; pc.linger = PT20S; pc.npvo = false; pc.recovery = true; pc.version = 0; pc.wait_prim = true; pc.wait_prim_timeout = PT30S; pc.weight = 1; protonet.backend = asio; protonet.version = 0; repl.causal_read_timeout = PT90S; repl.commit_order = 3; repl.key_format = FLAT8; repl.max_ws_size = 2147483647; <REPL_PROTO_MAX>;socket.checksum = 2; socket.recv_buf_size = 212992;
diff --git a/mysql-test/suite/galera/r/galera_prepared_statement.result b/mysql-test/suite/galera/r/galera_prepared_statement.result
index d32d412ff46..6f546b32819 100644
--- a/mysql-test/suite/galera/r/galera_prepared_statement.result
+++ b/mysql-test/suite/galera/r/galera_prepared_statement.result
@@ -28,7 +28,7 @@ ALTER TABLE t1 ADD COLUMN f2 INTEGER;
ALTER TABLE t1 DROP COLUMN f1;
connection node_1;
EXECUTE st1;
-ERROR 22007: Incorrect integer value: 'abc' for column 'f2' at row 1
+ERROR 22007: Incorrect integer value: 'abc' for column `test`.`t1`.`f2` at row 1
connection node_1;
DROP TABLE t1;
DROP TABLE t2;
diff --git a/mysql-test/suite/galera/t/galera_defaults.test b/mysql-test/suite/galera/t/galera_defaults.test
index 0ad97916302..3d4a7da7b54 100644
--- a/mysql-test/suite/galera/t/galera_defaults.test
+++ b/mysql-test/suite/galera/t/galera_defaults.test
@@ -36,26 +36,3 @@ AND VARIABLE_NAME NOT IN (
'WSREP_PATCH_VERSION'
)
ORDER BY VARIABLE_NAME;
-
-# wsrep_provider_options
-#
-# We replace the ones that vary from run to run with placeholders
-
---let _WSREP_PROVIDER_OPTIONS = `SELECT @@wsrep_provider_options`
---perl
- use strict;
- my $wsrep_provider_options = $ENV{'_WSREP_PROVIDER_OPTIONS'};
- $wsrep_provider_options =~ s/base_dir = .*?;/<BASE_DIR>;/sgio;
- $wsrep_provider_options =~ s/base_host = .*?;/<BASE_HOST>;/sgio;
- $wsrep_provider_options =~ s/base_port = .*?;/<BASE_PORT>;/sgio;
- $wsrep_provider_options =~ s/gcache\.dir = .*?;/<GCACHE_DIR>;/sgio;
- $wsrep_provider_options =~ s/gcache\.name = .*?;/<GCACHE_NAME>;/sgio;
- $wsrep_provider_options =~ s/gmcast\.listen_addr = .*?;/<GMCAST_LISTEN_ADDR>;/sgio;
- $wsrep_provider_options =~ s/gcs\.recv_q_hard_limit = .*?;/<GCS_RECV_Q_HARD_LIMIT>;/sgio;
- $wsrep_provider_options =~ s/ist\.recv_addr = .*?;/<IST_RECV_ADDR>;/sgio;
- $wsrep_provider_options =~ s/evs\.evict = .*?;/<EVS_EVICT>;/sgio;
- $wsrep_provider_options =~ s/signal = .*?;\s*//sgio;
- $wsrep_provider_options =~ s/dbug = .*?;\s*//sgio;
- $wsrep_provider_options =~ s/repl.proto_max = .*?;\s*/<REPL_PROTO_MAX>;/sgio;
- print $wsrep_provider_options."\n";
-EOF
diff --git a/mysql-test/suite/gcol/r/innodb_virtual_index.result b/mysql-test/suite/gcol/r/innodb_virtual_index.result
index 8d4762e1b90..bde9f086eac 100644
--- a/mysql-test/suite/gcol/r/innodb_virtual_index.result
+++ b/mysql-test/suite/gcol/r/innodb_virtual_index.result
@@ -135,7 +135,7 @@ key (d)
insert into t(a) values ((select d from s for update));
insert into s(c) values ('');
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'c' at row 1
+Warning 1366 Incorrect integer value: '' for column `test`.`s`.`c` at row 1
SET sql_mode = default;
drop table if exists t,s;
#
diff --git a/mysql-test/suite/innodb/r/innodb-online-alter-gis.result b/mysql-test/suite/innodb/r/innodb-online-alter-gis.result
index 34cc62f0a55..0f467c649db 100644
--- a/mysql-test/suite/innodb/r/innodb-online-alter-gis.result
+++ b/mysql-test/suite/innodb/r/innodb-online-alter-gis.result
@@ -42,7 +42,7 @@ drop table t1;
#
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
ALTER TABLE t1 ADD COLUMN b LINESTRING DEFAULT POINT(1,1);
-ERROR 22007: Incorrect LINESTRING value: 'POINT' for column 'b' at row 1
+ERROR 22007: Incorrect LINESTRING value: 'POINT' for column ``.``.`b` at row 1
DESCRIBE t1;
Field Type Null Key Default Extra
a int(11) YES NULL
diff --git a/mysql-test/suite/innodb/r/innodb-update-insert.result b/mysql-test/suite/innodb/r/innodb-update-insert.result
index 6265adb6e21..b50c35578d9 100644
--- a/mysql-test/suite/innodb/r/innodb-update-insert.result
+++ b/mysql-test/suite/innodb/r/innodb-update-insert.result
@@ -28,7 +28,7 @@ charset=utf8 engine=innodb;
set statement sql_mode = '' for
replace into t1 set f1=0xa3;
Warnings:
-Warning 1366 Incorrect string value: '\xA3' for column 'f1' at row 1
+Warning 1366 Incorrect string value: '\xA3' for column `test`.`t1`.`f1` at row 1
select f1 from t1;
f1
?
@@ -37,7 +37,7 @@ update t1 set f3=repeat(0xb1,8103);
update t1 set f1=0x4a;
update ignore t1 set f1=0x82;
Warnings:
-Warning 1366 Incorrect string value: '\x82' for column 'f1' at row 1
+Warning 1366 Incorrect string value: '\x82' for column `test`.`t1`.`f1` at row 1
select f1 from t1;
f1
?
diff --git a/mysql-test/suite/innodb_fts/r/create.result b/mysql-test/suite/innodb_fts/r/create.result
index 896291854a8..55c5c45f643 100644
--- a/mysql-test/suite/innodb_fts/r/create.result
+++ b/mysql-test/suite/innodb_fts/r/create.result
@@ -16,10 +16,10 @@ INSERT INTO t SET t=REPEAT(_utf8mb3 0xe794b2e9aaa8e69687, 15);
# The data below is not 3-byte UTF-8, but 4-byte chars.
INSERT IGNORE INTO t SET t=REPEAT(_utf8mb4 0xf09f9695, 84);
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x96\x95\xF0\x9F...' for column 't' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x96\x95\xF0\x9F...' for column `test`.`t`.`t` at row 1
INSERT IGNORE INTO t SET t=REPEAT(_utf8mb4 0xf09f9696, 85);
Warnings:
-Warning 1366 Incorrect string value: '\xF0\x9F\x96\x96\xF0\x9F...' for column 't' at row 1
+Warning 1366 Incorrect string value: '\xF0\x9F\x96\x96\xF0\x9F...' for column `test`.`t`.`t` at row 1
SELECT COUNT(*) FROM t WHERE MATCH t AGAINST
(REPEAT(CONCAT(REPEAT(_utf8mb3 0xE0B987, 4), REPEAT(_utf8mb3 0xE0B989, 5)), 5));
COUNT(*)
diff --git a/mysql-test/suite/innodb_gis/r/1.result b/mysql-test/suite/innodb_gis/r/1.result
index 03a8543da27..84e7bec53cd 100644
--- a/mysql-test/suite/innodb_gis/r/1.result
+++ b/mysql-test/suite/innodb_gis/r/1.result
@@ -1036,9 +1036,9 @@ SET @a=0x00000000030000000000000000000000000000000000144000000000000014400000000
SET @a=ST_POLYFROMWKB(@a);
create table t1(a polygon NOT NULL)engine=InnoDB;
insert into t1 values (ST_geomfromtext("point(0 1)"));
-ERROR 22007: Incorrect POLYGON value: 'POINT' for column 'a' at row 1
+ERROR 22007: Incorrect POLYGON value: 'POINT' for column `test`.`t1`.`a` at row 1
insert into t1 values (ST_geomfromtext("point(1 0)"));
-ERROR 22007: Incorrect POLYGON value: 'POINT' for column 'a' at row 1
+ERROR 22007: Incorrect POLYGON value: 'POINT' for column `test`.`t1`.`a` at row 1
select * from (select polygon(t1.a) as p from t1 order by t1.a) d;
p
drop table t1;
diff --git a/mysql-test/suite/innodb_gis/r/alter_spatial_index.result b/mysql-test/suite/innodb_gis/r/alter_spatial_index.result
index 7caa5f6829c..d94e67d0765 100644
--- a/mysql-test/suite/innodb_gis/r/alter_spatial_index.result
+++ b/mysql-test/suite/innodb_gis/r/alter_spatial_index.result
@@ -789,13 +789,13 @@ DROP TABLE t1;
create table t1 (p point not null default if(unix_timestamp()>10,POINT(1,1),LineString(Point(0,0),Point(1,1)))) ENGINE=innodb;
set timestamp=10;
insert into t1 values(default);
-ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column 'p' at row 1
+ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column `test`.`t1`.`p` at row 1
drop table t1;
SET timestamp=default;
create table t1 (p point not null default if(unix_timestamp()>10,POINT(1,1),LineString(Point(0,0),Point(1,1)))) ENGINE=innodb;
set timestamp=10;
alter table t1 add column i int;
-ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column 'p' at row 1
+ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column `test`.`(temporary)`.`p` at row 1
drop table t1;
SET timestamp=default;
CREATE OR REPLACE TABLE t1 (a INT) ENGINE=InnoDB;
diff --git a/mysql-test/suite/innodb_gis/r/gis.result b/mysql-test/suite/innodb_gis/r/gis.result
index 5d825561bf3..65d1e940cd3 100644
--- a/mysql-test/suite/innodb_gis/r/gis.result
+++ b/mysql-test/suite/innodb_gis/r/gis.result
@@ -1032,9 +1032,9 @@ SET @a=0x00000000030000000000000000000000000000000000144000000000000014400000000
SET @a=ST_POLYFROMWKB(@a);
create table t1(a polygon NOT NULL)engine=innodb;
insert into t1 values (ST_geomfromtext("point(0 1)"));
-ERROR 22007: Incorrect POLYGON value: 'POINT' for column 'a' at row 1
+ERROR 22007: Incorrect POLYGON value: 'POINT' for column `test`.`t1`.`a` at row 1
insert into t1 values (ST_geomfromtext("point(1 0)"));
-ERROR 22007: Incorrect POLYGON value: 'POINT' for column 'a' at row 1
+ERROR 22007: Incorrect POLYGON value: 'POINT' for column `test`.`t1`.`a` at row 1
select * from (select polygon(t1.a) as p from t1 order by t1.a) d;
p
drop table t1;
diff --git a/mysql-test/suite/maria/icp.result b/mysql-test/suite/maria/icp.result
index d22e705e6de..8fc93e861a7 100644
--- a/mysql-test/suite/maria/icp.result
+++ b/mysql-test/suite/maria/icp.result
@@ -851,7 +851,7 @@ DROP TABLE t1;
create table t1 (a int,b char(5),primary key (a), key (b(1)));
insert ignore into t1 values ('a','b');
Warnings:
-Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`a` at row 1
select 1 from t1 where a and b >= 'aa';
1
drop table t1;
diff --git a/mysql-test/suite/mariabackup/backup_grants.result b/mysql-test/suite/mariabackup/backup_grants.result
new file mode 100644
index 00000000000..d8869b7ac82
--- /dev/null
+++ b/mysql-test/suite/mariabackup/backup_grants.result
@@ -0,0 +1,5 @@
+CREATE user backup@localhost;
+FOUND 1 /missing required privilege RELOAD/ in backup.log
+FOUND 1 /missing required privilege PROCESS/ in backup.log
+GRANT RELOAD, PROCESS on *.* to backup@localhost;
+DROP USER backup@localhost;
diff --git a/mysql-test/suite/mariabackup/backup_grants.test b/mysql-test/suite/mariabackup/backup_grants.test
new file mode 100644
index 00000000000..1c0c3f89346
--- /dev/null
+++ b/mysql-test/suite/mariabackup/backup_grants.test
@@ -0,0 +1,30 @@
+let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
+CREATE user backup@localhost;
+
+# backup possible for unprivileges user, with --no-lock
+--disable_result_log
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup -ubackup --no-lock --target-dir=$targetdir;
+--enable_result_log
+rmdir $targetdir;
+
+# backup fails without --no-lock, because of FTWRL
+--disable_result_log
+error 1;
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup -ubackup --target-dir=$targetdir > $MYSQLTEST_VARDIR/tmp/backup.log;
+--enable_result_log
+
+let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/backup.log;
+--let SEARCH_PATTERN= missing required privilege RELOAD
+--source include/search_pattern_in_file.inc
+--let SEARCH_PATTERN= missing required privilege PROCESS
+--source include/search_pattern_in_file.inc
+
+# backup succeeds with RELOAD privilege
+GRANT RELOAD, PROCESS on *.* to backup@localhost;
+--disable_result_log
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup -ubackup --target-dir=$targetdir;
+--enable_result_log
+
+DROP USER backup@localhost;
+# Cleanup
+rmdir $targetdir;
diff --git a/mysql-test/suite/plugins/r/sql_error_log.result b/mysql-test/suite/plugins/r/sql_error_log.result
index a583cf91a83..98dfe0374fd 100644
--- a/mysql-test/suite/plugins/r/sql_error_log.result
+++ b/mysql-test/suite/plugins/r/sql_error_log.result
@@ -30,7 +30,7 @@ drop procedure test_error;
SET SQL_MODE = STRICT_ALL_TABLES;
create table t1(id int);
insert into t1 values ('aa');
-ERROR 22007: Incorrect integer value: 'aa' for column 'id' at row 1
+ERROR 22007: Incorrect integer value: 'aa' for column `test`.`t1`.`id` at row 1
SET SQL_MODE = '';
drop table t1;
SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = 'not_exists' AND TABLE_NAME = 'not_exists';
@@ -53,5 +53,5 @@ TIME HOSTNAME ERROR 1146: Table 'test.temptab' doesn't exist : SELECT `c` FROM `
TIME HOSTNAME ERROR 1000: new message : RESIGNAL SQLSTATE '40000' SET
MYSQL_ERRNO = 1000,
MESSAGE_TEXT = 'new message'
-TIME HOSTNAME ERROR 1366: Incorrect integer value: 'aa' for column 'id' at row 1 : insert into t1 values ('aa')
+TIME HOSTNAME ERROR 1366: Incorrect integer value: 'aa' for column `test`.`t1`.`id` at row 1 : insert into t1 values ('aa')
TIME HOSTNAME ERROR 1146: Table 'test.non_exists' doesn't exist : INSERT INTO test.non_exists VALUES (0,0,0) /* e1 */
diff --git a/mysql-test/suite/rpl/r/rpl_bug31076.result b/mysql-test/suite/rpl/r/rpl_bug31076.result
index c163cc552ab..8fcbba1c4cd 100644
--- a/mysql-test/suite/rpl/r/rpl_bug31076.result
+++ b/mysql-test/suite/rpl/r/rpl_bug31076.result
@@ -58,7 +58,7 @@ SET @@session.time_zone='UTC'/*!*/;
INSERT INTO visits (myid, user_id, src, ip, cc, org, ref, time, host, entry, visit_exit, visit_start)
VALUES ('3m3l4rhs6do0sf5p1i9lr94g928a272v', '', '', INET_ATON('71.118.124.98'), '', '', 'http://dev.mysql.com/downloads/connector/j/3.0.html', NULL, 'dev.mysql.com', '/get/Downloads/Connector-J/mysql-connector-java-3.0.17-ga.zip/from/pick', '/get/Downloads/Connector-J/mysql-connector-java-3.0.17-ga.zip/from/pick', NOW())/*!*/;
Warnings:
-Warning 1366 Incorrect integer value: '' for column 'user_id' at row 1
+Warning 1366 Incorrect integer value: '' for column `track`.`visits`.`user_id` at row 1
SELECT * FROM visits;
visits_id myid src ip cc org ref time host entry visit_exit user_id visit_start
21231039 3m3l4rhs6do0sf5p1i9lr94g928a272v 1198947426 http://dev.mysql.com/downloads/connector/j/3.0.html 2007-09-18 03:59:02 dev.mysql.com /get/Downloads/Connector-J/mysql-connector-java-3.0.17-ga.zip/from/pick /get/Downloads/Connector-J/mysql-connector-java-3.0.17-ga.zip/from/pick 0 2007-09-18 03:59:02
diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
index b59c21724b2..3aa7c07a845 100644
--- a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
@@ -194,7 +194,7 @@ INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
insert ignore into t31 set f1=1, f2=1, f3=2, f4='second',
f9=2.2, f10='seven samurai', f28=222.222, f35='222';
Warnings:
-Warning 1366 Incorrect integer value: 'seven samurai' for column 'f10' at row 1
+Warning 1366 Incorrect integer value: 'seven samurai' for column `test`.`t31`.`f10` at row 1
insert ignore into t31 values (1, 1, 3, 'third',
/* f5 BIGINT, */ 333333333333333333333333,
/* f6 BLOB, */ '3333333333333333333333',
diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
index b9d254e1b42..0918364b28e 100644
--- a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
@@ -194,7 +194,7 @@ INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
insert ignore into t31 set f1=1, f2=1, f3=2, f4='second',
f9=2.2, f10='seven samurai', f28=222.222, f35='222';
Warnings:
-Warning 1366 Incorrect integer value: 'seven samurai' for column 'f10' at row 1
+Warning 1366 Incorrect integer value: 'seven samurai' for column `test`.`t31`.`f10` at row 1
insert ignore into t31 values (1, 1, 3, 'third',
/* f5 BIGINT, */ 333333333333333333333333,
/* f6 BLOB, */ '3333333333333333333333',
diff --git a/mysql-test/suite/rpl/r/rpl_rewrt_db.result b/mysql-test/suite/rpl/r/rpl_rewrt_db.result
index f6c7e4ad54e..5230283fd6c 100644
--- a/mysql-test/suite/rpl/r/rpl_rewrt_db.result
+++ b/mysql-test/suite/rpl/r/rpl_rewrt_db.result
@@ -79,10 +79,10 @@ load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated
Warnings:
Note 1265 Data truncated for column 'a' at row 1
Note 1265 Data truncated for column 'a' at row 2
-Warning 1366 Incorrect integer value: 'error ' for column 'a' at row 3
+Warning 1366 Incorrect integer value: 'error ' for column `test`.`t1`.`a` at row 3
Warning 1262 Row 3 was truncated; it contained more data than there were input columns
Note 1265 Data truncated for column 'a' at row 4
-Warning 1366 Incorrect integer value: 'wrong end ' for column 'a' at row 5
+Warning 1366 Incorrect integer value: 'wrong end ' for column `test`.`t1`.`a` at row 5
Warning 1262 Row 5 was truncated; it contained more data than there were input columns
connection slave;
connection slave;
@@ -101,7 +101,7 @@ Note 1265 Data truncated for column 'a' at row 1
Note 1265 Data truncated for column 'a' at row 2
Note 1265 Data truncated for column 'a' at row 3
Warning 1366 Incorrect integer value: '
-' for column 'a' at row 4
+' for column `test`.`t1`.`a` at row 4
Warning 1261 Row 4 doesn't contain data for all columns
connection slave;
connection slave;
diff --git a/sql/field.cc b/sql/field.cc
index 5a8192f6e62..fbaf3c6ea91 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -2082,7 +2082,7 @@ bool Field_int::get_date(MYSQL_TIME *ltime,ulonglong fuzzydate)
longlong nr= val_int();
bool neg= !(flags & UNSIGNED_FLAG) && nr < 0;
return int_to_datetime_with_warn(neg, neg ? -nr : nr, ltime, fuzzydate,
- field_name.str);
+ table->s, field_name.str);
}
@@ -3421,7 +3421,8 @@ bool Field_new_decimal::get_date(MYSQL_TIME *ltime, ulonglong fuzzydate)
{
my_decimal value;
return decimal_to_datetime_with_warn(val_decimal(&value),
- ltime, fuzzydate, field_name.str);
+ ltime, fuzzydate, table->s,
+ field_name.str);
}
@@ -4875,7 +4876,8 @@ bool Field_real::get_date(MYSQL_TIME *ltime,ulonglong fuzzydate)
{
ASSERT_COLUMN_MARKED_FOR_READ;
double nr= val_real();
- return double_to_datetime_with_warn(nr, ltime, fuzzydate, field_name.str);
+ return double_to_datetime_with_warn(nr, ltime, fuzzydate,
+ table->s, field_name.str);
}
@@ -6394,7 +6396,7 @@ bool Field_year::get_date(MYSQL_TIME *ltime,ulonglong fuzzydate)
if (tmp || field_length != 4)
tmp+= 1900;
return int_to_datetime_with_warn(false, tmp * 10000,
- ltime, fuzzydate, field_name.str);
+ ltime, fuzzydate, table->s, field_name.str);
}
@@ -8942,10 +8944,18 @@ int Field_geom::store(const char *from, size_t length, CHARSET_INFO *cs)
geom_type != Field::GEOM_GEOMETRYCOLLECTION &&
(uint32) geom_type != wkb_type)
{
+ const char *db= table->s->db.str;
+ const char *tab_name= table->s->error_table_name();
+
+ if (!db)
+ db= "";
+ if (!tab_name)
+ tab_name= "";
+
my_error(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, MYF(0),
Geometry::ci_collection[geom_type]->m_name.str,
Geometry::ci_collection[wkb_type]->m_name.str,
- field_name.str,
+ db, tab_name, field_name.str,
(ulong) table->in_use->get_stmt_da()->
current_row_for_warning());
goto err_exit;
@@ -11228,7 +11238,8 @@ void Field::set_datetime_warning(Sql_condition::enum_warning_level level,
{
THD *thd= get_thd();
if (thd->really_abort_on_warning() && level >= Sql_condition::WARN_LEVEL_WARN)
- make_truncated_value_warning(thd, level, str, ts_type, field_name.str);
+ make_truncated_value_warning(thd, level, str, ts_type,
+ table->s, field_name.str);
else
set_warning(level, code, cuted_increment);
}
@@ -11238,10 +11249,18 @@ void Field::set_warning_truncated_wrong_value(const char *type_arg,
const char *value)
{
THD *thd= get_thd();
+ const char *db_name= table->s->db.str;
+ const char *table_name= table->s->error_table_name();
+
+ if (!db_name)
+ db_name= "";
+ if (!table_name)
+ table_name= "";
+
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,
ER_THD(thd, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD),
- type_arg, value, field_name.str,
+ type_arg, value, db_name, table_name, field_name.str,
static_cast<ulong>(thd->get_stmt_da()->
current_row_for_warning()));
}
diff --git a/sql/item.cc b/sql/item.cc
index 71a9afd6a9d..a26f1eac5ba 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -544,6 +544,15 @@ Item::Item(THD *thd):
}
+const TABLE_SHARE *Item::field_table_or_null()
+{
+ if (real_item()->type() != Item::FIELD_ITEM)
+ return NULL;
+
+ return ((Item_field *) this)->field->table->s;
+}
+
+
/**
Constructor used by Item_field, Item_ref & aggregate (sum)
functions.
@@ -1450,6 +1459,7 @@ bool Item::get_date_from_int(MYSQL_TIME *ltime, ulonglong fuzzydate)
bool neg= !unsigned_flag && value < 0;
if (null_value || int_to_datetime_with_warn(neg, neg ? -value : value,
ltime, fuzzydate,
+ field_table_or_null(),
field_name_or_null()))
return null_value|= make_zero_date(ltime, fuzzydate);
return null_value= false;
@@ -1470,6 +1480,7 @@ bool Item::get_date_from_year(MYSQL_TIME *ltime, ulonglong fuzzydate)
value*= 10000; /* make it YYYYMMHH */
if (null_value || int_to_datetime_with_warn(false, value,
ltime, fuzzydate,
+ field_table_or_null(),
field_name_or_null()))
return null_value|= make_zero_date(ltime, fuzzydate);
return null_value= false;
@@ -1480,6 +1491,7 @@ bool Item::get_date_from_real(MYSQL_TIME *ltime, ulonglong fuzzydate)
{
double value= val_real();
if (null_value || double_to_datetime_with_warn(value, ltime, fuzzydate,
+ field_table_or_null(),
field_name_or_null()))
return null_value|= make_zero_date(ltime, fuzzydate);
return null_value= false;
@@ -1491,6 +1503,7 @@ bool Item::get_date_from_decimal(MYSQL_TIME *ltime, ulonglong fuzzydate)
my_decimal value, *res;
if (!(res= val_decimal(&value)) ||
decimal_to_datetime_with_warn(res, ltime, fuzzydate,
+ field_table_or_null(),
field_name_or_null()))
return null_value|= make_zero_date(ltime, fuzzydate);
return null_value= false;
@@ -4286,7 +4299,7 @@ void Item_param::set_time(MYSQL_TIME *tm, timestamp_type time_type,
{
ErrConvTime str(&value.time);
make_truncated_value_warning(current_thd, Sql_condition::WARN_LEVEL_WARN,
- &str, time_type, 0);
+ &str, time_type, 0, 0);
set_zero_time(&value.time, time_type);
}
maybe_null= 0;
diff --git a/sql/item.h b/sql/item.h
index 8bb3aa33c78..adfc8e4bc6e 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1273,6 +1273,7 @@ public:
virtual const char *full_name() const { return name.str ? name.str : "???"; }
const char *field_name_or_null()
{ return real_item()->type() == Item::FIELD_ITEM ? name.str : NULL; }
+ const TABLE_SHARE *field_table_or_null();
/*
*result* family of methods is analog of *val* family (see above) but
diff --git a/sql/item_create.cc b/sql/item_create.cc
index ab91e378be3..84f2c91ba54 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -7494,7 +7494,7 @@ Item *create_temporal_literal(THD *thd,
ErrConvString err(str, length, cs);
make_truncated_value_warning(thd,
Sql_condition::time_warn_level(status.warnings),
- &err, ltime.time_type, 0);
+ &err, ltime.time_type, 0, 0);
}
return item;
}
diff --git a/sql/item_func.cc b/sql/item_func.cc
index c5ac97f2905..f902191d9cf 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -844,6 +844,7 @@ bool Item_func_hybrid_field_type::get_date_from_decimal_op(MYSQL_TIME *ltime,
my_decimal value, *res;
if (!(res= decimal_op_with_null_check(&value)) ||
decimal_to_datetime_with_warn(res, ltime, fuzzydate,
+ field_table_or_null(),
field_name_or_null()))
return make_zero_mysql_time(ltime, fuzzydate);
return (null_value= 0);
@@ -882,6 +883,7 @@ bool Item_func_hybrid_field_type::get_date_from_int_op(MYSQL_TIME *ltime,
bool neg= !unsigned_flag && value < 0;
if (null_value || int_to_datetime_with_warn(neg, neg ? -value : value,
ltime, fuzzydate,
+ field_table_or_null(),
field_name_or_null()))
return make_zero_mysql_time(ltime, fuzzydate);
return (null_value= 0);
@@ -917,6 +919,7 @@ bool Item_func_hybrid_field_type::get_date_from_real_op(MYSQL_TIME *ltime,
{
double value= real_op();
if (null_value || double_to_datetime_with_warn(value, ltime, fuzzydate,
+ field_table_or_null(),
field_name_or_null()))
return make_zero_mysql_time(ltime, fuzzydate);
return (null_value= 0);
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index fda7f59b128..8e4f4232959 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -5141,7 +5141,7 @@ bool Item_dyncol_get::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date)
bool neg = llval < 0;
if (int_to_datetime_with_warn(neg, (ulonglong)(neg ? -llval :
llval),
- ltime, fuzzy_date, 0 /* TODO */))
+ ltime, fuzzy_date, 0, 0 /* TODO */))
goto null;
return 0;
}
@@ -5150,12 +5150,12 @@ bool Item_dyncol_get::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date)
/* fall through */
case DYN_COL_DOUBLE:
if (double_to_datetime_with_warn(val.x.double_value, ltime, fuzzy_date,
- 0 /* TODO */))
+ 0, 0 /* TODO */))
goto null;
return 0;
case DYN_COL_DECIMAL:
if (decimal_to_datetime_with_warn((my_decimal*)&val.x.decimal.value, ltime,
- fuzzy_date, 0 /* TODO */))
+ fuzzy_date, 0, 0 /* TODO */))
goto null;
return 0;
case DYN_COL_STRING:
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 4d17bc354d4..25fecd0a134 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -431,7 +431,7 @@ static bool extract_date_time(DATE_TIME_FORMAT *format,
make_truncated_value_warning(current_thd,
Sql_condition::WARN_LEVEL_WARN,
val_begin, length,
- cached_timestamp_type, NullS);
+ cached_timestamp_type, 0, NullS);
break;
}
} while (++val != val_end);
@@ -1834,13 +1834,13 @@ overflow:
{
ErrConvInteger err2(sec, unsigned_flag);
make_truncated_value_warning(current_thd, Sql_condition::WARN_LEVEL_WARN,
- &err2, MYSQL_TIMESTAMP_TIME, NullS);
+ &err2, MYSQL_TIMESTAMP_TIME, 0, NullS);
}
else
{
ErrConvString err2(err);
make_truncated_value_warning(current_thd, Sql_condition::WARN_LEVEL_WARN,
- &err2, MYSQL_TIMESTAMP_TIME, NullS);
+ &err2, MYSQL_TIMESTAMP_TIME, 0, NullS);
}
return 0;
}
@@ -2893,7 +2893,7 @@ bool Item_func_maketime::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date)
int len = (int)(ptr - buf) + sprintf(ptr, ":%02u:%02u", (uint)minute, (uint)second);
make_truncated_value_warning(current_thd, Sql_condition::WARN_LEVEL_WARN,
buf, len, MYSQL_TIMESTAMP_TIME,
- NullS);
+ 0, NullS);
}
return (null_value= 0);
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index a60ddeb3017..9112795b754 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -5449,8 +5449,8 @@ ER_DIVISION_BY_ZERO 22012
ger "Division durch 0"
hindi "0 से विभाजन"
ER_TRUNCATED_WRONG_VALUE_FOR_FIELD 22007
- eng "Incorrect %-.32s value: '%-.128s' for column '%.192s' at row %lu"
- ger "Falscher %-.32s-Wert: '%-.128s' für Feld '%.192s' in Zeile %lu"
+ eng "Incorrect %-.32s value: '%-.128s' for column `%.192s`.`%.192s`.`%.192s` at row %lu"
+ ger "Falscher %-.32s-Wert: '%-.128s' für Feld '`%.192s`.`%.192s`.`%.192s` in Zeile %lu"
ER_ILLEGAL_VALUE_FOR_TYPE 22007
eng "Illegal %s '%-.192s' value found during parsing"
ger "Nicht zulässiger %s-Wert '%-.192s' beim Parsen gefunden"
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index a42a2f5afdd..3881f6f28ad 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3238,6 +3238,10 @@ int select_export::send_data(List<Item> &items)
error_pos= copier.most_important_error_pos();
if (unlikely(error_pos))
{
+ /*
+ TODO:
+ add new error message that will show user this printable_buff
+
char printable_buff[32];
convert_to_printable(printable_buff, sizeof(printable_buff),
error_pos, res->ptr() + res->length() - error_pos,
@@ -3247,6 +3251,11 @@ int select_export::send_data(List<Item> &items)
ER_THD(thd, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD),
"string", printable_buff,
item->name.str, static_cast<long>(row_count));
+ */
+ push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+ ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,
+ ER_THD(thd, WARN_DATA_TRUNCATED),
+ item->name.str, static_cast<long>(row_count));
}
else if (copier.source_end_pos() < res->ptr() + res->length())
{
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index ce8617cda64..ddc5a25bd07 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -22777,9 +22777,11 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field,
}
file->extra(HA_EXTRA_NO_CACHE);
+ (void) file->ha_rnd_end();
DBUG_RETURN(0);
err:
file->extra(HA_EXTRA_NO_CACHE);
+ (void) file->ha_rnd_end();
if (error)
file->print_error(error,MYF(0));
DBUG_RETURN(1);
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index ba91b208d03..1bf88de5f5e 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -10085,16 +10085,6 @@ end_temporary:
err_new_table_cleanup:
my_free(const_cast<uchar*>(frm.str));
- if (new_table)
- {
- thd->drop_temporary_table(new_table, NULL, true);
- }
- else
- (void) quick_rm_table(thd, new_db_type,
- &alter_ctx.new_db, &alter_ctx.tmp_name,
- (FN_IS_TMP | (no_ha_table ? NO_HA_TABLE : 0)),
- alter_ctx.get_tmp_path());
-
/*
No default value was provided for a DATE/DATETIME field, the
current sql_mode doesn't allow the '0000-00-00' value and
@@ -10126,10 +10116,21 @@ err_new_table_cleanup:
thd->abort_on_warning= true;
make_truncated_value_warning(thd, Sql_condition::WARN_LEVEL_WARN,
f_val, strlength(f_val), t_type,
+ new_table->s,
alter_ctx.datetime_field->field_name.str);
thd->abort_on_warning= save_abort_on_warning;
}
+ if (new_table)
+ {
+ thd->drop_temporary_table(new_table, NULL, true);
+ }
+ else
+ (void) quick_rm_table(thd, new_db_type,
+ &alter_ctx.new_db, &alter_ctx.tmp_name,
+ (FN_IS_TMP | (no_ha_table ? NO_HA_TABLE : 0)),
+ alter_ctx.get_tmp_path());
+
DBUG_RETURN(true);
err_with_mdl_after_alter:
diff --git a/sql/sql_time.cc b/sql/sql_time.cc
index 35ef1e50c36..739a95ce9c8 100644
--- a/sql/sql_time.cc
+++ b/sql/sql_time.cc
@@ -297,7 +297,7 @@ check_date_with_warn(const MYSQL_TIME *ltime, ulonglong fuzzy_date,
{
ErrConvTime str(ltime);
make_truncated_value_warning(current_thd, Sql_condition::WARN_LEVEL_WARN,
- &str, ts_type, 0);
+ &str, ts_type, 0, 0);
return true;
}
return false;
@@ -314,7 +314,7 @@ adjust_time_range_with_warn(MYSQL_TIME *ltime, uint dec)
return true;
if (warnings)
make_truncated_value_warning(current_thd, Sql_condition::WARN_LEVEL_WARN,
- &str, MYSQL_TIMESTAMP_TIME, NullS);
+ &str, MYSQL_TIMESTAMP_TIME, 0, NullS);
return false;
}
@@ -403,7 +403,7 @@ str_to_datetime_with_warn(CHARSET_INFO *cs,
ret_val ? Sql_condition::WARN_LEVEL_WARN :
Sql_condition::time_warn_level(status.warnings),
str, length, flags & TIME_TIME_ONLY ?
- MYSQL_TIMESTAMP_TIME : l_time->time_type, NullS);
+ MYSQL_TIMESTAMP_TIME : l_time->time_type, 0, NullS);
DBUG_EXECUTE_IF("str_to_datetime_warn",
push_warning(thd, Sql_condition::WARN_LEVEL_NOTE,
ER_YES, str););
@@ -427,7 +427,7 @@ str_to_datetime_with_warn(CHARSET_INFO *cs,
static bool number_to_time_with_warn(bool neg, ulonglong nr, ulong sec_part,
MYSQL_TIME *ltime, ulonglong fuzzydate,
const ErrConv *str,
- const char *field_name)
+ const TABLE_SHARE *s, const char *field_name)
{
int was_cut;
longlong res;
@@ -460,14 +460,15 @@ static bool number_to_time_with_warn(bool neg, ulonglong nr, ulong sec_part,
make_truncated_value_warning(current_thd,
Sql_condition::WARN_LEVEL_WARN, str,
res < 0 ? MYSQL_TIMESTAMP_ERROR : ts_type,
- field_name);
+ s, field_name);
}
return res < 0;
}
bool double_to_datetime_with_warn(double value, MYSQL_TIME *ltime,
- ulonglong fuzzydate, const char *field_name)
+ ulonglong fuzzydate,
+ const TABLE_SHARE *s, const char *field_name)
{
const ErrConvDouble str(value);
bool neg= value < 0;
@@ -481,28 +482,30 @@ bool double_to_datetime_with_warn(double value, MYSQL_TIME *ltime,
longlong nr= static_cast<ulonglong>(floor(value));
uint sec_part= static_cast<ulong>((value - floor(value))*TIME_SECOND_PART_FACTOR);
return number_to_time_with_warn(neg, nr, sec_part, ltime, fuzzydate, &str,
- field_name);
+ s, field_name);
}
bool decimal_to_datetime_with_warn(const my_decimal *value, MYSQL_TIME *ltime,
- ulonglong fuzzydate, const char *field_name)
+ ulonglong fuzzydate,
+ const TABLE_SHARE *s, const char *field_name)
{
const ErrConvDecimal str(value);
ulonglong nr;
ulong sec_part;
bool neg= my_decimal2seconds(value, &nr, &sec_part);
return number_to_time_with_warn(neg, nr, sec_part, ltime, fuzzydate, &str,
- field_name);
+ s, field_name);
}
bool int_to_datetime_with_warn(bool neg, ulonglong value, MYSQL_TIME *ltime,
- ulonglong fuzzydate, const char *field_name)
+ ulonglong fuzzydate,
+ const TABLE_SHARE *s, const char *field_name)
{
const ErrConvInteger str(neg ? - (longlong) value : (longlong) value, !neg);
return number_to_time_with_warn(neg, value, 0, ltime,
- fuzzydate, &str, field_name);
+ fuzzydate, &str, s, field_name);
}
@@ -930,7 +933,7 @@ void make_truncated_value_warning(THD *thd,
Sql_condition::enum_warning_level level,
const ErrConv *sval,
timestamp_type time_type,
- const char *field_name)
+ const TABLE_SHARE *s, const char *field_name)
{
char warn_buff[MYSQL_ERRMSG_SIZE];
const char *type_str;
@@ -949,10 +952,21 @@ void make_truncated_value_warning(THD *thd,
break;
}
if (field_name)
+ {
+ const char *db_name= s->db.str;
+ const char *table_name= s->error_table_name();
+
+ if (!db_name)
+ db_name= "";
+ if (!table_name)
+ table_name= "";
+
cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff),
ER_THD(thd, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD),
- type_str, sval->ptr(), field_name,
+ type_str, sval->ptr(),
+ db_name, table_name, field_name,
(ulong) thd->get_stmt_da()->current_row_for_warning());
+ }
else
{
if (time_type > MYSQL_TIMESTAMP_ERROR)
@@ -1279,7 +1293,7 @@ make_date_with_warn(MYSQL_TIME *ltime, ulonglong fuzzy_date,
/* e.g. negative time */
ErrConvTime str(ltime);
make_truncated_value_warning(current_thd, Sql_condition::WARN_LEVEL_WARN,
- &str, ts_type, 0);
+ &str, ts_type, 0, 0);
return true;
}
if ((ltime->time_type= ts_type) == MYSQL_TIMESTAMP_DATE)
@@ -1443,7 +1457,7 @@ time_to_datetime_with_warn(THD *thd,
{
ErrConvTime str(from);
make_truncated_value_warning(thd, Sql_condition::WARN_LEVEL_WARN,
- &str, MYSQL_TIMESTAMP_DATETIME, 0);
+ &str, MYSQL_TIMESTAMP_DATETIME, 0, 0);
return true;
}
return false;
diff --git a/sql/sql_time.h b/sql/sql_time.h
index d3607a28a76..ca9f79273ec 100644
--- a/sql/sql_time.h
+++ b/sql/sql_time.h
@@ -42,13 +42,13 @@ bool str_to_datetime_with_warn(CHARSET_INFO *cs, const char *str, size_t length,
ulonglong flags);
bool double_to_datetime_with_warn(double value, MYSQL_TIME *ltime,
ulonglong fuzzydate,
- const char *name);
+ const TABLE_SHARE *s, const char *name);
bool decimal_to_datetime_with_warn(const my_decimal *value, MYSQL_TIME *ltime,
ulonglong fuzzydate,
- const char *name);
+ const TABLE_SHARE *s, const char *name);
bool int_to_datetime_with_warn(bool neg, ulonglong value, MYSQL_TIME *ltime,
ulonglong fuzzydate,
- const char *name);
+ const TABLE_SHARE *s, const char *name);
bool time_to_datetime(THD *thd, const MYSQL_TIME *tm, MYSQL_TIME *dt);
bool time_to_datetime_with_warn(THD *thd,
@@ -118,14 +118,15 @@ void make_truncated_value_warning(THD *thd,
Sql_condition::enum_warning_level level,
const ErrConv *str_val,
timestamp_type time_type,
- const char *field_name);
+ const TABLE_SHARE *s, const char *field_name);
static inline void make_truncated_value_warning(THD *thd,
- Sql_condition::enum_warning_level level, const char *str_val, size_t str_length, timestamp_type time_type,
- const char *field_name)
+ Sql_condition::enum_warning_level level, const char *str_val,
+ size_t str_length, timestamp_type time_type,
+ const TABLE_SHARE *s, const char *field_name)
{
const ErrConvString str(str_val, str_length, &my_charset_bin);
- make_truncated_value_warning(thd, level, &str, time_type, field_name);
+ make_truncated_value_warning(thd, level, &str, time_type, s, field_name);
}
extern DATE_TIME_FORMAT *date_time_format_make(timestamp_type format_type,
diff --git a/storage/connect/mysql-test/connect/r/dir.result b/storage/connect/mysql-test/connect/r/dir.result
index e10bb458d62..139544b99e9 100644
--- a/storage/connect/mysql-test/connect/r/dir.result
+++ b/storage/connect/mysql-test/connect/r/dir.result
@@ -26,7 +26,7 @@ fname ftype size
boys .txt 282
boyswin .txt 288
INSERT INTO t1 VALUES ('','','','');
-ERROR 22007: Incorrect double value: '' for column 'size' at row 1
+ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`size` at row 1
DROP TABLE t1;
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=DIR FILE_NAME='*.txt';
ERROR HY000: Cannot get column info for table type DIR
diff --git a/storage/connect/mysql-test/connect/r/xml2.result b/storage/connect/mysql-test/connect/r/xml2.result
index b8075fa1928..f7bbc17c8a0 100644
--- a/storage/connect/mysql-test/connect/r/xml2.result
+++ b/storage/connect/mysql-test/connect/r/xml2.result
@@ -325,7 +325,7 @@ HEX(c) 3F3F3F3F3F3F3F
Warnings:
Level Warning
Code 1366
-Message Incorrect string value: '\xC3\x81\xC3\x82\xC3\x83...' for column 'c' at row 1
+Message Incorrect string value: '\xC3\x81\xC3\x82\xC3\x83...' for column `test`.`t1`.`c` at row 1
Level Warning
Code 1105
Message Out of range value ÁÂÃÄÅÆÇ for column 'c' at row 1
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index 7133f3cfd7e..d1e008d8be4 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -525,9 +525,13 @@ decompress_with_slot:
+ dst_frame)) {
/* Verify encryption checksum before we even try to
decrypt. */
- if (!fil_space_verify_crypt_checksum(
- dst_frame, bpage->size, bpage->id.space(),
- bpage->id.page_no())) {
+ if (!fil_space_verify_crypt_checksum(dst_frame, bpage->size)) {
+ ib::error() << "Encrypted page " << bpage->id
+ << " in file " << space->chain.start->name
+ << " looks corrupted; key_version="
+ << mach_read_from_4(
+ FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION
+ + dst_frame);
decrypt_failed:
/* Mark page encrypted in case it should be. */
if (space->crypt_data->type
@@ -733,23 +737,6 @@ buf_block_alloc(
}
#endif /* !UNIV_INNOCHECKSUM */
-/** Checks if a page contains only zeroes.
-@param[in] read_buf database page
-@param[in] page_size page size
-@return true if page is filled with zeroes */
-bool
-buf_page_is_zeroes(
- const byte* read_buf,
- const page_size_t& page_size)
-{
- for (ulint i = 0; i < page_size.logical(); i++) {
- if (read_buf[i] != 0) {
- return(false);
- }
- }
- return(true);
-}
-
/** Checks if the page is in crc32 checksum format.
@param[in] read_buf database page
@param[in] checksum_field1 new checksum field
@@ -5891,18 +5878,14 @@ or decrypt/decompress just failed.
@retval DB_DECRYPTION_FAILED if page post encryption checksum matches but
after decryption normal page checksum does not match.
@retval DB_TABLESPACE_DELETED if accessed tablespace is not found */
-static
-dberr_t
-buf_page_check_corrupt(buf_page_t* bpage, fil_space_t* space)
+static dberr_t buf_page_check_corrupt(buf_page_t* bpage, fil_space_t* space)
{
ut_ad(space->pending_io());
byte* dst_frame = (bpage->zip.data) ? bpage->zip.data :
((buf_block_t*) bpage)->frame;
- bool still_encrypted = false;
dberr_t err = DB_SUCCESS;
bool corrupted = false;
- fil_space_crypt_t* crypt_data = space->crypt_data;
/* In buf_decrypt_after_read we have either decrypted the page if
page post encryption checksum matches and used key_id is found
@@ -5910,12 +5893,12 @@ buf_page_check_corrupt(buf_page_t* bpage, fil_space_t* space)
not decrypted and it could be either encrypted and corrupted
or corrupted or good page. If we decrypted, there page could
still be corrupted if used key does not match. */
- still_encrypted = crypt_data
- && crypt_data->type != CRYPT_SCHEME_UNENCRYPTED
+ const bool still_encrypted = mach_read_from_4(
+ dst_frame + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION)
+ && space->crypt_data
+ && space->crypt_data->type != CRYPT_SCHEME_UNENCRYPTED
&& !bpage->encrypted
- && fil_space_verify_crypt_checksum(
- dst_frame, bpage->size,
- bpage->id.space(), bpage->id.page_no());
+ && fil_space_verify_crypt_checksum(dst_frame, bpage->size);
if (!still_encrypted) {
/* If traditional checksums match, we assume that page is
diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc
index 099a3752f7f..785ec21a7bf 100644
--- a/storage/innobase/buf/buf0dblwr.cc
+++ b/storage/innobase/buf/buf0dblwr.cc
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2013, 2017, MariaDB Corporation.
+Copyright (c) 2013, 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -335,6 +335,20 @@ too_small:
goto start_again;
}
+/** Check if a page is all zeroes.
+@param[in] read_buf database page
+@param[in] page_size page frame size
+@return whether the page is all zeroes */
+static bool buf_page_is_zeroes(const byte* read_buf, size_t page_size)
+{
+ for (ulint i = 0; i < page_size; i++) {
+ if (read_buf[i] != 0) {
+ return false;
+ }
+ }
+ return true;
+}
+
/**
At database startup initializes the doublewrite buffer memory structure if
we already have a doublewrite buffer created in the data files. If we are
@@ -570,7 +584,7 @@ buf_dblwr_process()
}
const page_size_t page_size(space->flags);
- ut_ad(!buf_page_is_zeroes(page, page_size));
+ ut_ad(!buf_page_is_zeroes(page, page_size.physical()));
/* We want to ensure that for partial reads the
unread portion of the page is NUL. */
@@ -594,7 +608,9 @@ buf_dblwr_process()
}
const bool is_all_zero = buf_page_is_zeroes(
- read_buf, page_size);
+ read_buf, page_size.physical());
+ const bool expect_encrypted = space->crypt_data
+ && space->crypt_data->type != CRYPT_SCHEME_UNENCRYPTED;
if (is_all_zero) {
/* We will check if the copy in the
@@ -610,10 +626,13 @@ buf_dblwr_process()
goto bad;
}
- if (fil_space_verify_crypt_checksum(
- read_buf, page_size, space_id, page_no)
- || !buf_page_is_corrupted(
- true, read_buf, page_size, space)) {
+ if (expect_encrypted && mach_read_from_4(
+ read_buf
+ + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION)
+ ? fil_space_verify_crypt_checksum(read_buf,
+ page_size)
+ : !buf_page_is_corrupted(true, read_buf,
+ page_size, space)) {
/* The page is good; there is no need
to consult the doublewrite buffer. */
continue;
@@ -632,9 +651,11 @@ bad:
&& page_size.is_compressed())) {
goto bad_doublewrite;
}
- if (!fil_space_verify_crypt_checksum(page, page_size,
- space_id, page_no)
- && buf_page_is_corrupted(true, page, page_size, space)) {
+
+ if (expect_encrypted && mach_read_from_4(
+ page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION)
+ ? !fil_space_verify_crypt_checksum(page, page_size)
+ : buf_page_is_corrupted(true, page, page_size, space)) {
if (!is_all_zero) {
bad_doublewrite:
ib::warn() << "A doublewrite copy of page "
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
index 637cf6f6173..e5c2b91cfdf 100644
--- a/storage/innobase/fil/fil0crypt.cc
+++ b/storage/innobase/fil/fil0crypt.cc
@@ -615,8 +615,7 @@ fil_encrypt_buf(
// store the post-encryption checksum after the key-version
mach_write_to_4(dst_frame + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION + 4, checksum);
- ut_ad(fil_space_verify_crypt_checksum(dst_frame, page_size,
- space, offset));
+ ut_ad(fil_space_verify_crypt_checksum(dst_frame, page_size));
srv_stats.pages_encrypted.inc();
@@ -2526,164 +2525,78 @@ encrypted, or corrupted.
@param[in,out] page page frame (checksum is temporarily modified)
@param[in] page_size page size
-@param[in] space tablespace identifier
-@param[in] offset page number
-@return true if page is encrypted AND OK, false otherwise */
-UNIV_INTERN
+@return whether the encrypted page is OK */
bool
-fil_space_verify_crypt_checksum(
- byte* page,
- const page_size_t& page_size,
- ulint space,
- ulint offset)
+fil_space_verify_crypt_checksum(const byte* page, const page_size_t& page_size)
{
- uint key_version = mach_read_from_4(page+ FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION);
-
- /* If page is not encrypted, return false */
- if (key_version == 0) {
- return false;
- }
-
- /* Read stored post encryption checksum. */
- uint32_t checksum = mach_read_from_4(
- page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION + 4);
-
- /* Declare empty pages non-corrupted */
- if (checksum == 0
- && *reinterpret_cast<const ib_uint64_t*>(page + FIL_PAGE_LSN) == 0
- && buf_page_is_zeroes(page, page_size)) {
- return(true);
- }
+ ut_ad(mach_read_from_4(page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION));
/* Compressed and encrypted pages do not have checksum. Assume not
corrupted. Page verification happens after decompression in
buf_page_io_complete() using buf_page_is_corrupted(). */
- if (mach_read_from_2(page+FIL_PAGE_TYPE) == FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED) {
- return (true);
+ if (mach_read_from_2(page + FIL_PAGE_TYPE)
+ == FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED) {
+ return true;
}
- uint32_t cchecksum1, cchecksum2;
-
- /* Calculate checksums */
- if (page_size.is_compressed()) {
- cchecksum1 = page_zip_calc_checksum(
- page, page_size.physical(),
- SRV_CHECKSUM_ALGORITHM_CRC32);
-
- cchecksum2 = (cchecksum1 == checksum)
- ? 0
- : page_zip_calc_checksum(
- page, page_size.physical(),
- SRV_CHECKSUM_ALGORITHM_INNODB);
- } else {
- cchecksum1 = buf_calc_page_crc32(page);
- cchecksum2 = (cchecksum1 == checksum)
- ? 0
- : buf_calc_page_new_checksum(page);
- }
+ /* Read stored post encryption checksum. */
+ const ib_uint32_t checksum = mach_read_from_4(
+ page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION + 4);
/* If stored checksum matches one of the calculated checksums
page is not corrupted. */
+ srv_checksum_algorithm_t algorithm = srv_checksum_algorithm_t(
+ srv_checksum_algorithm);
- bool encrypted = (checksum == cchecksum1 || checksum == cchecksum2
- || checksum == BUF_NO_CHECKSUM_MAGIC);
-
- /* MySQL 5.6 and MariaDB 10.0 and 10.1 will write an LSN to the
- first page of each system tablespace file at
- FIL_PAGE_FILE_FLUSH_LSN offset. On other pages and in other files,
- the field might have been uninitialized until MySQL 5.5. In MySQL 5.7
- (and MariaDB Server 10.2.2) WL#7990 stopped writing the field for other
- than page 0 of the system tablespace.
-
- Starting from MariaDB 10.1 the field has been repurposed for
- encryption key_version.
-
- Starting with MySQL 5.7 (and MariaDB Server 10.2), the
- field has been repurposed for SPATIAL INDEX pages for
- FIL_RTREE_SPLIT_SEQ_NUM.
-
- Note that FIL_PAGE_FILE_FLUSH_LSN is not included in the InnoDB page
- checksum.
-
- Thus, FIL_PAGE_FILE_FLUSH_LSN could contain any value. While the
- field would usually be 0 for pages that are not encrypted, we cannot
- assume that a nonzero value means that the page is encrypted.
- Therefore we must validate the page both as encrypted and unencrypted
- when FIL_PAGE_FILE_FLUSH_LSN does not contain 0.
- */
-
- uint32_t checksum1 = mach_read_from_4(page + FIL_PAGE_SPACE_OR_CHKSUM);
- uint32_t checksum2;
+ switch (algorithm) {
+ case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
+ if (page_size.is_compressed()) {
+ return checksum == page_zip_calc_checksum(
+ page, page_size.physical(),
+ SRV_CHECKSUM_ALGORITHM_CRC32);
+ }
- bool valid = false;
+ return checksum == buf_calc_page_crc32(page)
+#ifdef INNODB_BUG_ENDIAN_CRC32
+ || checksum == buf_calc_page_crc32(page, true)
+#endif
+ ;
+ case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
+ if (page_size.is_compressed()) {
+ return checksum == page_zip_calc_checksum(
+ page, page_size.physical(),
+ SRV_CHECKSUM_ALGORITHM_INNODB);
+ }
+ return checksum == buf_calc_page_new_checksum(page);
+ case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
+ return checksum == BUF_NO_CHECKSUM_MAGIC;
+ case SRV_CHECKSUM_ALGORITHM_NONE:
+ return true;
+ case SRV_CHECKSUM_ALGORITHM_INNODB:
+ case SRV_CHECKSUM_ALGORITHM_CRC32:
+ if (checksum == BUF_NO_CHECKSUM_MAGIC) {
+ return true;
+ }
+ if (page_size.is_compressed()) {
+ if (checksum == page_zip_calc_checksum(
+ page, page_size.physical(), algorithm)) {
+ return true;
+ }
- if (page_size.is_compressed()) {
- valid = checksum1 == cchecksum1;
- checksum2 = checksum1;
- } else {
- checksum2 = mach_read_from_4(
- page + srv_page_size - FIL_PAGE_END_LSN_OLD_CHKSUM);
-
- srv_checksum_algorithm_t algorithm =
- static_cast<srv_checksum_algorithm_t>(
- srv_checksum_algorithm);
- switch (algorithm) {
- case SRV_CHECKSUM_ALGORITHM_STRICT_CRC32:
- valid = buf_page_is_checksum_valid_crc32(
- page, checksum1, checksum2);
- break;
- case SRV_CHECKSUM_ALGORITHM_STRICT_INNODB:
- valid = buf_page_is_checksum_valid_innodb(
- page, checksum1, checksum2);
- break;
- case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
- case SRV_CHECKSUM_ALGORITHM_CRC32:
- case SRV_CHECKSUM_ALGORITHM_INNODB:
- case SRV_CHECKSUM_ALGORITHM_NONE:
- /* never supported
- innodb_checksum_algorithm=none or strict_none
- for encrypted pages. */
- valid = buf_page_is_checksum_valid_crc32(
- page, checksum1, checksum2)
- || buf_page_is_checksum_valid_innodb(
- page, checksum1, checksum2);
- break;
+ algorithm = algorithm == SRV_CHECKSUM_ALGORITHM_INNODB
+ ? SRV_CHECKSUM_ALGORITHM_CRC32
+ : SRV_CHECKSUM_ALGORITHM_INNODB;
+ return checksum == page_zip_calc_checksum(
+ page, page_size.physical(), algorithm);
}
- }
- if (encrypted && valid) {
- /* If page is encrypted and traditional checksums match,
- page could be still encrypted, or not encrypted and valid or
- corrupted. */
-#ifdef UNIV_INNOCHECKSUM
- fprintf(log_file ? log_file : stderr,
- "Page " ULINTPF ":" ULINTPF " may be corrupted."
- " Post encryption checksum %u"
- " stored [%u:%u] key_version %u\n",
- space, offset, checksum, checksum1, checksum2,
- key_version);
-#else /* UNIV_INNOCHECKSUM */
- ib::error()
- << " Page " << space << ":" << offset
- << " may be corrupted.";
- ib::info()
- << "If encrypted: stored checksum" << checksum
- << " calculated checksum [" << cchecksum1 << ":" << cchecksum2
- << "] key_version " << key_version;
- ib::info()
- << "If unencrypted: stored checksum [" << checksum1
- << ":" << checksum2 << "] calculated crc32 ["
- << buf_calc_page_crc32(page)
-# ifdef INNODB_BUG_ENDIAN_CRC32
- << ":" << buf_calc_page_crc32(page, true)
-# endif /* INNODB_BUG_ENDIAN_CRC32 */
- << "] innodb ["
- << buf_calc_page_old_checksum(page) << ":"
- << buf_calc_page_new_checksum(page) << "] LSN "
- << mach_read_from_4(page + FIL_PAGE_LSN);
+ return checksum == buf_calc_page_crc32(page)
+#ifdef INNODB_BUG_ENDIAN_CRC32
+ || checksum == buf_calc_page_crc32(page, true)
#endif
- encrypted = false;
+ || checksum == buf_calc_page_new_checksum(page);
}
- return(encrypted);
+ ut_ad(!"unhandled innodb_checksum_algorithm");
+ return false;
}
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc
index 9ed1efd35ff..261fbb05c63 100644
--- a/storage/innobase/ibuf/ibuf0ibuf.cc
+++ b/storage/innobase/ibuf/ibuf0ibuf.cc
@@ -4927,6 +4927,20 @@ ibuf_print(
mutex_exit(&ibuf_mutex);
}
+/** Check if a page is all zeroes.
+@param[in] read_buf database page
+@param[in] size page size
+@return whether the page is all zeroes */
+static bool buf_page_is_zeroes(const byte* read_buf, const page_size_t& size)
+{
+ for (ulint i = 0; i < size.physical(); i++) {
+ if (read_buf[i] != 0) {
+ return false;
+ }
+ }
+ return true;
+}
+
/** Check the insert buffer bitmaps on IMPORT TABLESPACE.
@param[in] trx transaction
@param[in,out] space tablespace being imported
diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
index 86a433d36e3..1be2063bf60 100644
--- a/storage/innobase/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
@@ -748,15 +748,6 @@ buf_page_is_checksum_valid_none(
ulint checksum_field2)
MY_ATTRIBUTE((nonnull(1), warn_unused_result));
-/** Checks if a page contains only zeroes.
-@param[in] read_buf database page
-@param[in] page_size page size
-@return true if page is filled with zeroes */
-bool
-buf_page_is_zeroes(
- const byte* read_buf,
- const page_size_t& page_size);
-
/** Check if a page is corrupt.
@param[in] check_lsn whether the LSN should be checked
@param[in] read_buf database page
@@ -775,9 +766,7 @@ buf_page_is_corrupted(
#endif
MY_ATTRIBUTE((warn_unused_result));
-
#ifndef UNIV_INNOCHECKSUM
-
/**********************************************************************//**
Gets the space id, page offset, and byte offset within page of a
pointer pointing to a buffer frame containing a file page. */
diff --git a/storage/innobase/include/fil0crypt.h b/storage/innobase/include/fil0crypt.h
index 5238213135f..77445fb8a0e 100644
--- a/storage/innobase/include/fil0crypt.h
+++ b/storage/innobase/include/fil0crypt.h
@@ -1,6 +1,6 @@
/*****************************************************************************
Copyright (C) 2013, 2015, Google Inc. All Rights Reserved.
-Copyright (c) 2015, 2017, MariaDB Corporation.
+Copyright (c) 2015, 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -488,16 +488,9 @@ encrypted, or corrupted.
@param[in,out] page page frame (checksum is temporarily modified)
@param[in] page_size page size
-@param[in] space tablespace identifier
-@param[in] offset page number
@return true if page is encrypted AND OK, false otherwise */
-UNIV_INTERN
bool
-fil_space_verify_crypt_checksum(
- byte* page,
- const page_size_t& page_size,
- ulint space,
- ulint offset)
+fil_space_verify_crypt_checksum(const byte* page, const page_size_t& page_size)
MY_ATTRIBUTE((warn_unused_result));
#endif /* fil0crypt_h */
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc
index 1fdd2ac9b94..5a4321e5fe7 100644
--- a/storage/innobase/row/row0import.cc
+++ b/storage/innobase/row/row0import.cc
@@ -3433,9 +3433,7 @@ not_encrypted:
}
} else {
if (!fil_space_verify_crypt_checksum(
- src, callback.get_page_size(),
- block->page.id.space(),
- block->page.id.page_no())) {
+ src, callback.get_page_size())) {
goto page_corrupted;
}
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
index 15d6ab8e76e..f5a690ce2f2 100644
--- a/storage/innobase/row/row0merge.cc
+++ b/storage/innobase/row/row0merge.cc
@@ -115,14 +115,12 @@ public:
@param[in,out] row_heap memory heap
@param[in] pcur cluster index scanning cursor
@param[in,out] scan_mtr mini-transaction for pcur
- @param[out] mtr_committed whether scan_mtr got committed
@return DB_SUCCESS if successful, else error number */
- dberr_t insert(
+ inline dberr_t insert(
trx_id_t trx_id,
mem_heap_t* row_heap,
btr_pcur_t* pcur,
- mtr_t* scan_mtr,
- bool* mtr_committed)
+ mtr_t* scan_mtr)
{
big_rec_t* big_rec;
rec_t* rec;
@@ -150,11 +148,10 @@ public:
ut_ad(dtuple);
if (log_sys.check_flush_or_checkpoint) {
- if (!(*mtr_committed)) {
+ if (scan_mtr->is_active()) {
btr_pcur_move_to_prev_on_page(pcur);
btr_pcur_store_position(pcur, scan_mtr);
- mtr_commit(scan_mtr);
- *mtr_committed = true;
+ scan_mtr->commit();
}
log_free_check();
@@ -1589,7 +1586,6 @@ row_mtuple_cmp(
@param[in,out] sp_heap heap for tuples
@param[in,out] pcur cluster index cursor
@param[in,out] mtr mini transaction
-@param[in,out] mtr_committed whether scan_mtr got committed
@return DB_SUCCESS or error number */
static
dberr_t
@@ -1600,8 +1596,7 @@ row_merge_spatial_rows(
mem_heap_t* row_heap,
mem_heap_t* sp_heap,
btr_pcur_t* pcur,
- mtr_t* mtr,
- bool* mtr_committed)
+ mtr_t* mtr)
{
dberr_t err = DB_SUCCESS;
@@ -1612,9 +1607,7 @@ row_merge_spatial_rows(
ut_ad(sp_heap != NULL);
for (ulint j = 0; j < num_spatial; j++) {
- err = sp_tuples[j]->insert(
- trx_id, row_heap,
- pcur, mtr, mtr_committed);
+ err = sp_tuples[j]->insert(trx_id, row_heap, pcur, mtr);
if (err != DB_SUCCESS) {
return(err);
@@ -1718,7 +1711,7 @@ row_merge_read_clustered_index(
bool allow_not_null)
{
dict_index_t* clust_index; /* Clustered index */
- mem_heap_t* row_heap; /* Heap memory to create
+ mem_heap_t* row_heap = NULL;/* Heap memory to create
clustered index tuples */
row_merge_buf_t** merge_buf; /* Temporary list for records*/
mem_heap_t* v_heap = NULL; /* Heap memory to process large
@@ -1933,6 +1926,13 @@ row_merge_read_clustered_index(
/* Scan the clustered index. */
for (;;) {
+ /* Do not continue if table pages are still encrypted */
+ if (!old_table->is_readable() || !new_table->is_readable()) {
+ err = DB_DECRYPTION_FAILED;
+ trx->error_key_num = 0;
+ goto func_exit;
+ }
+
const rec_t* rec;
trx_id_t rec_trx_id;
ulint* offsets;
@@ -1942,16 +1942,6 @@ row_merge_read_clustered_index(
mem_heap_empty(row_heap);
- /* Do not continue if table pages are still encrypted */
- if (!old_table->is_readable() ||
- !new_table->is_readable()) {
- err = DB_DECRYPTION_FAILED;
- trx->error_key_num = 0;
- goto func_exit;
- }
-
- mem_heap_empty(row_heap);
-
page_cur_move_to_next(cur);
stage->n_pk_recs_inc();
@@ -1975,18 +1965,15 @@ row_merge_read_clustered_index(
}
/* Insert the cached spatial index rows. */
- bool mtr_committed = false;
-
err = row_merge_spatial_rows(
trx->id, sp_tuples, num_spatial,
- row_heap, sp_heap, &pcur,
- &mtr, &mtr_committed);
+ row_heap, sp_heap, &pcur, &mtr);
if (err != DB_SUCCESS) {
goto func_exit;
}
- if (mtr_committed) {
+ if (!mtr.is_active()) {
goto scan_next;
}
@@ -2029,7 +2016,9 @@ end_of_index:
row = NULL;
mtr_commit(&mtr);
mem_heap_free(row_heap);
+ row_heap = NULL;
ut_free(nonnull);
+ nonnull = NULL;
goto write_buffers;
}
} else {
@@ -2475,8 +2464,6 @@ write_buffers:
/* Temporary File is not used.
so insert sorted block to the index */
if (row != NULL) {
- bool mtr_committed = false;
-
/* We have to do insert the
cached spatial index rows, since
after the mtr_commit, the cluster
@@ -2487,8 +2474,7 @@ write_buffers:
trx->id, sp_tuples,
num_spatial,
row_heap, sp_heap,
- &pcur, &mtr,
- &mtr_committed);
+ &pcur, &mtr);
if (err != DB_SUCCESS) {
goto func_exit;
@@ -2503,13 +2489,13 @@ write_buffers:
current row will be invalid, and
we must reread it on the next
loop iteration. */
- if (!mtr_committed) {
+ if (mtr.is_active()) {
btr_pcur_move_to_prev_on_page(
&pcur);
btr_pcur_store_position(
&pcur, &mtr);
- mtr_commit(&mtr);
+ mtr.commit();
}
}
@@ -2666,7 +2652,7 @@ write_buffers:
buf->n_tuples, path)) {
err = DB_OUT_OF_MEMORY;
trx->error_key_num = i;
- goto func_exit;
+ break;
}
/* Ensure that duplicates in the
@@ -2748,12 +2734,12 @@ write_buffers:
}
func_exit:
- /* row_merge_spatial_rows may have committed
- the mtr before an error occurs. */
if (mtr.is_active()) {
mtr_commit(&mtr);
}
- mem_heap_free(row_heap);
+ if (row_heap) {
+ mem_heap_free(row_heap);
+ }
ut_free(nonnull);
all_done:
diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_strict_sql_mode_out_of_range.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_strict_sql_mode_out_of_range.result
index 2d5e5e64147..6617b49d682 100644
--- a/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_strict_sql_mode_out_of_range.result
+++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_datetime_64bit_strict_sql_mode_out_of_range.result
@@ -6,7 +6,7 @@ created_at DATETIME
) DEFAULT CHARSET UTF8;
INSERT INTO diaries (title, created_at)
VALUES ('2012', '2012');
-ERROR 22007: Incorrect datetime value: '2012' for column 'created_at' at row 1
+ERROR 22007: Incorrect datetime value: '2012' for column `test`.`diaries`.`created_at` at row 1
SELECT * FROM diaries;
id title created_at
DROP TABLE diaries;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
index 3703c208d0b..4ea8cbccc1e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result
@@ -77,7 +77,7 @@ SET rocksdb_bulk_load=1;
INSERT INTO t1 VALUES(13, 0);
INSERT INTO t1 VALUES(2, 'test 2');
Warnings:
-Warning 1366 Incorrect integer value: 'test 2' for column 'b' at row 1
+Warning 1366 Incorrect integer value: 'test 2' for column `test`.`t1`.`b` at row 1
INSERT INTO t1 VALUES(@id, @arg04);
SET @@global.table_open_cache=FALSE;
Warnings:
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result
index 2ae965b6cfc..64d87b7116d 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_not_null.result
@@ -577,8 +577,8 @@ b1 b2
0 0
INSERT INTO t1 (b1,b2) VALUES ('a','b');
Warnings:
-Warning 1366 Incorrect integer value: 'a' for column 'b1' at row 1
-Warning 1366 Incorrect integer value: 'b' for column 'b2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`b1` at row 1
+Warning 1366 Incorrect integer value: 'b' for column `test`.`t1`.`b2` at row 1
SELECT b1,b2 FROM t1;
b1 b2
-1 -2
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result
index a834310417e..ba651fcbb14 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/col_opt_null.result
@@ -500,8 +500,8 @@ b1 b2
0 0
INSERT INTO t1 (b1,b2) VALUES ('a','b');
Warnings:
-Warning 1366 Incorrect integer value: 'a' for column 'b1' at row 1
-Warning 1366 Incorrect integer value: 'b' for column 'b2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`b1` at row 1
+Warning 1366 Incorrect integer value: 'b' for column `test`.`t1`.`b2` at row 1
SELECT b1,b2 FROM t1;
b1 b2
-1 -2
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
index 6a21a339207..e18bb5f9c0c 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result
@@ -2451,9 +2451,9 @@ DROP TABLE t1;
CREATE TABLE t2(id INT NOT NULL PRIMARY KEY, data INT) Engine=MEMORY;
INSERT INTO t2 VALUES (100,NULL),(150,"long varchar"),(200,"varchar"),(250,"long long long varchar");
Warnings:
-Warning 1366 Incorrect integer value: 'long varchar' for column 'data' at row 2
-Warning 1366 Incorrect integer value: 'varchar' for column 'data' at row 3
-Warning 1366 Incorrect integer value: 'long long long varchar' for column 'data' at row 4
+Warning 1366 Incorrect integer value: 'long varchar' for column `test`.`t2`.`data` at row 2
+Warning 1366 Incorrect integer value: 'varchar' for column `test`.`t2`.`data` at row 3
+Warning 1366 Incorrect integer value: 'long long long varchar' for column `test`.`t2`.`data` at row 4
create TABLE t1 (a int not null, b int not null, primary key(a,b));
INSERT INTO t1 VALUES (1,1);
SELECT a FROM t1, t2 WHERE a=b AND (b NOT IN (SELECT a FROM t1 WHERE a > 4));
@@ -2542,10 +2542,10 @@ a
truncate t1;
INSERT INTO t1 VALUES(X'042000200020',X'042000200020'),(X'200400200020',X'200400200020');
Warnings:
-Warning 1366 Incorrect integer value: '\x04 \x00 \x00 ' for column 'a' at row 1
-Warning 1366 Incorrect integer value: '\x04 \x00 \x00 ' for column 'b' at row 1
-Warning 1366 Incorrect integer value: ' \x04\x00 \x00 ' for column 'a' at row 2
-Warning 1366 Incorrect integer value: ' \x04\x00 \x00 ' for column 'b' at row 2
+Warning 1366 Incorrect integer value: '\x04 \x00 \x00 ' for column `test`.`t1`.`a` at row 1
+Warning 1366 Incorrect integer value: '\x04 \x00 \x00 ' for column `test`.`t1`.`b` at row 1
+Warning 1366 Incorrect integer value: ' \x04\x00 \x00 ' for column `test`.`t1`.`a` at row 2
+Warning 1366 Incorrect integer value: ' \x04\x00 \x00 ' for column `test`.`t1`.`b` at row 2
UNLOCK TABLES;
DROP TABLE t1;
#
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result b/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result
index 4abfdb49f37..bfe2c18acb4 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/type_bool.result
@@ -45,8 +45,8 @@ b1 b2
0 0
INSERT INTO t1 (b1,b2) VALUES ('a','b');
Warnings:
-Warning 1366 Incorrect integer value: 'a' for column 'b1' at row 1
-Warning 1366 Incorrect integer value: 'b' for column 'b2' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`b1` at row 1
+Warning 1366 Incorrect integer value: 'b' for column `test`.`t1`.`b2` at row 1
SELECT b1,b2 FROM t1;
b1 b2
-1 -2
diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result
index 6ee39039985..cca18c7c1ab 100644
--- a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result
+++ b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result
@@ -194,7 +194,7 @@ INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
insert ignore into t31 set f1=1, f2=1, f3=2, f4='second',
f9=2.2, f10='seven samurai', f28=222.222, f35='222';
Warnings:
-Warning 1366 Incorrect integer value: 'seven samurai' for column 'f10' at row 1
+Warning 1366 Incorrect integer value: 'seven samurai' for column `test`.`t31`.`f10` at row 1
insert ignore into t31 values (1, 1, 3, 'third',
/* f5 BIGINT, */ 333333333333333333333333,
/* f6 BLOB, */ '3333333333333333333333',
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_date.result b/storage/tokudb/mysql-test/tokudb/r/type_date.result
index 047dc6dc777..70281843ac6 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_date.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_date.result
@@ -100,7 +100,7 @@ DROP TABLE t1, t2, t3;
CREATE TABLE t1 (y YEAR);
INSERT INTO t1 VALUES ('abc');
Warnings:
-Warning 1366 Incorrect integer value: 'abc' for column 'y' at row 1
+Warning 1366 Incorrect integer value: 'abc' for column `test`.`t1`.`y` at row 1
SELECT * FROM t1;
y
0000
@@ -211,7 +211,7 @@ a
0000-00-00
0000-00-00
INSERT INTO t1 VALUES ('0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`a` at row 1
SET SQL_MODE=DEFAULT;
DROP TABLE t1,t2;
CREATE TABLE t1 (a DATE);
@@ -240,7 +240,7 @@ a
1000-00-00
1000-00-00
INSERT INTO t1 VALUES ('1000-00-00');
-ERROR 22007: Incorrect date value: '1000-00-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '1000-00-00' for column `test`.`t1`.`a` at row 1
SET SQL_MODE=DEFAULT;
DROP TABLE t1,t2;
CREATE TABLE t1 SELECT curdate() AS f1;
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_datetime.result b/storage/tokudb/mysql-test/tokudb/r/type_datetime.result
index 80f886683e7..ed980f8cee1 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_datetime.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_datetime.result
@@ -218,7 +218,7 @@ insert into t1 set dt='2007-03-23 13:49:38',da=dt;
Warnings:
Note 1265 Data truncated for column 'da' at row 1
insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
-ERROR 22007: Incorrect date value: '2007-03-32' for column 'da' at row 1
+ERROR 22007: Incorrect date value: '2007-03-32' for column `test`.`t1`.`da` at row 1
select * from t1;
da dt
1962-03-03 1962-03-03 00:00:00
@@ -586,7 +586,7 @@ insert into t1 set dt='2007-03-23 13:49:38',da=dt;
Warnings:
Note 1265 Data truncated for column 'da' at row 1
insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
-ERROR 22007: Incorrect date value: '2007-03-32' for column 'da' at row 1
+ERROR 22007: Incorrect date value: '2007-03-32' for column `test`.`t1`.`da` at row 1
select * from t1;
da dt
1962-03-03 1962-03-03 00:00:00
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_decimal.result b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
index afea1736a5a..3b82bbcef4f 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
@@ -177,9 +177,9 @@ Note 1265 Data truncated for column 'a' at row 2
insert into t1 values ("1e+18446744073709551615"),("1e+18446744073709551616"),("1e-9223372036854775807"),("1e-9223372036854775809");
Warnings:
Warning 1264 Out of range value for column 'a' at row 1
-Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column 'a' at row 2
+Warning 1366 Incorrect decimal value: '1e+18446744073709551616' for column `test`.`t1`.`a` at row 2
Note 1265 Data truncated for column 'a' at row 3
-Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column 'a' at row 4
+Warning 1366 Incorrect decimal value: '1e-9223372036854775809' for column `test`.`t1`.`a` at row 4
insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
Warnings:
Warning 1265 Data truncated for column 'a' at row 1
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_float.result b/storage/tokudb/mysql-test/tokudb/r/type_float.result
index f8ce24f08c4..daff546cc81 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_float.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_float.result
@@ -459,7 +459,7 @@ Warnings:
Warning 1265 Data truncated for column 'f' at row 1
INSERT INTO t1 VALUES ('.');
Warnings:
-Warning 1366 Incorrect double value: '.' for column 'f' at row 1
+Warning 1366 Incorrect double value: '.' for column `test`.`t1`.`f` at row 1
SELECT * FROM t1 ORDER BY f;
f
0
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result
index ec8a947a78c..ad920deeda4 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result
@@ -826,7 +826,7 @@ Warning 1365 Division by 0
Warning 1365 Division by 0
Warning 1365 Division by 0
INSERT INTO Sow6_2f VALUES ('a59b');
-ERROR 22007: Incorrect decimal value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect decimal value: 'a59b' for column `test`.`Sow6_2f`.`col1` at row 1
drop table Sow6_2f;
select 10.3330000000000/12.34500000;
10.3330000000000/12.34500000