commits

Download

commits@lists.mariadb.org

14598 discussions

[Commits] 7145d7b61b5: Revert unnecessary changes.
by jan 19 Dec '18

19 Dec '18

revision-id: 7145d7b61b5e8915e08dec85c8eddd0a65d4a7ee (mariadb-10.3.6-260-g7145d7b61b5) parent(s): 5460eeccad2dd3e4cd4ddff8a8958b5678e34454 author: Jan Lindström committer: Jan Lindström timestamp: 2018-12-19 09:27:03 +0200 message: Revert unnecessary changes. modified: storage/innobase/include/trx0trx.h modified: storage/innobase/lock/lock0wait.cc modified: storage/innobase/row/row0ins.cc modified: storage/innobase/row/row0sel.cc modified: storage/innobase/row/row0upd.cc modified: storage/innobase/srv/srv0conc.cc modified: storage/innobase/srv/srv0srv.cc modified: storage/innobase/trx/trx0rseg.cc --- storage/innobase/include/trx0trx.h | 17 ----------------- storage/innobase/lock/lock0wait.cc | 3 --- storage/innobase/row/row0ins.cc | 2 ++ storage/innobase/row/row0sel.cc | 8 +------- storage/innobase/row/row0upd.cc | 8 -------- storage/innobase/srv/srv0conc.cc | 3 ++- storage/innobase/srv/srv0srv.cc | 3 --- storage/innobase/trx/trx0rseg.cc | 2 +- 8 files changed, 6 insertions(+), 40 deletions(-) diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index bab0dc64262..356fdf8adfd 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -268,23 +268,6 @@ trx_commit_step( /*============*/ que_thr_t* thr); /*!< in: query thread */ -#ifdef WITH_WSREP -/**********************************************************************//** -Prints info about a transaction. -Transaction information may be retrieved without having trx_sys->mutex acquired -so it may not be completely accurate. The caller must own lock_sys->mutex -and the trx must have some locks to make sure that it does not escape -without locking lock_sys->mutex. */ -UNIV_INTERN -void -wsrep_trx_print_locking( -/*==============*/ - FILE* f, /*!< in: output stream */ - const trx_t* trx, /*!< in: transaction */ - ulint max_query_len) /*!< in: max query length to print, - or 0 to use the default max length */ - MY_ATTRIBUTE((nonnull)); -#endif /* WITH_WSREP */ /**********************************************************************//** Prints info about a transaction. Caller must hold trx_sys.mutex. */ diff --git a/storage/innobase/lock/lock0wait.cc b/storage/innobase/lock/lock0wait.cc index e86410965f7..6d482984f3f 100644 --- a/storage/innobase/lock/lock0wait.cc +++ b/storage/innobase/lock/lock0wait.cc @@ -36,9 +36,6 @@ Created 25/5/2010 Sunny Bains #include "row0mysql.h" #include "srv0start.h" #include "lock0priv.h" -#ifdef WITH_WSREP -#include "mysql/service_wsrep.h" -#endif /* WITH_WSREP */ /*********************************************************************//** Print the contents of the lock_sys_t::waiting_threads array. */ static diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index b6b2a51a107..8fb716df0bc 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -44,7 +44,9 @@ Created 4/20/1996 Heikki Tuuri #include "buf0lru.h" #include "fts0fts.h" #include "fts0types.h" +#ifdef WITH_WSREP #include "wsrep_mysqld.h" +#endif /* WITH_WSREP */ /************************************************************************* IMPORTANT NOTE: Any operation that generates redo MUST check that there diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc index c88912dc94f..e9b06be3c5b 100644 --- a/storage/innobase/row/row0sel.cc +++ b/storage/innobase/row/row0sel.cc @@ -54,13 +54,7 @@ Created 12/19/1997 Heikki Tuuri #include "buf0lru.h" #include "srv0srv.h" #include "srv0mon.h" -#include "m_string.h" /* for my_sys.h */ -#include "my_sys.h" /* DEBUG_SYNC_C */ - -#include "my_compare.h" /* enum icp_result */ -#include "thr_lock.h" -#include "handler.h" -#include "ha_innodb.h" +#include "ha_innodb.h" /* For wsrep_thd_skip_locking */ /* Maximum number of rows to prefetch; MySQL interface has another parameter */ #define SEL_MAX_N_PREFETCH 16 diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc index be27348683a..b4f2b91881a 100644 --- a/storage/innobase/row/row0upd.cc +++ b/storage/innobase/row/row0upd.cc @@ -49,9 +49,6 @@ Created 12/27/1996 Heikki Tuuri #include "trx0rec.h" #include "fts0fts.h" #include "fts0types.h" -#ifdef WITH_WSREP -#include "mysql/service_wsrep.h" -#endif #include <algorithm> #include <mysql/plugin.h> #include <mysql/service_wsrep.h> @@ -2437,10 +2434,6 @@ row_upd_sec_index_entry( row_ins_sec_index_entry() below */ if (!rec_get_deleted_flag( rec, dict_table_is_comp(index->table))) { -#ifdef WITH_WSREP - const upd_node_t* parent = - static_cast<const upd_node_t*>(node->common.parent); -#endif /* WITH_WSREP */ err = btr_cur_del_mark_set_sec_rec( flags, btr_cur, TRUE, thr, &mtr); if (err != DB_SUCCESS) { @@ -2451,7 +2444,6 @@ row_upd_sec_index_entry( && wsrep_must_process_fk(node, trx) && !wsrep_thd_is_BF(trx->mysql_thd, FALSE)) { - ulint* offsets = rec_get_offsets( rec, index, NULL, true, ULINT_UNDEFINED, &heap); diff --git a/storage/innobase/srv/srv0conc.cc b/storage/innobase/srv/srv0conc.cc index 3042040ba1b..168ecd32211 100644 --- a/storage/innobase/srv/srv0conc.cc +++ b/storage/innobase/srv/srv0conc.cc @@ -122,9 +122,10 @@ srv_conc_enter_innodb_with_atomics( #ifdef WITH_WSREP if (wsrep_on(trx->mysql_thd) && wsrep_thd_is_aborting(trx->mysql_thd)) { - if (wsrep_debug) + if (wsrep_debug) { ib::info() << "srv_conc_enter due to MUST_ABORT"; + } srv_conc_force_enter_innodb(trx); return; } diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 504e7df339f..84dadb63896 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -76,9 +76,6 @@ Created 10/8/1995 Heikki Tuuri #include <my_service_manager.h> -#ifdef WITH_WSREP -#include "mysql/service_wsrep.h" -#endif /* The following is the maximum allowed duration of a lock wait. */ UNIV_INTERN ulong srv_fatal_semaphore_wait_threshold = DEFAULT_SRV_FATAL_SEMAPHORE_TIMEOUT; diff --git a/storage/innobase/trx/trx0rseg.cc b/storage/innobase/trx/trx0rseg.cc index 8c10feb8b74..b96dffc0e78 100644 --- a/storage/innobase/trx/trx0rseg.cc +++ b/storage/innobase/trx/trx0rseg.cc @@ -57,7 +57,7 @@ trx_rseg_update_wsrep_checkpoint( #ifdef UNIV_DEBUG /* Check that seqno is monotonically increasing */ - long long xid_seqno = wsrep_xid_seqno(xid); + long long xid_seqno = wsrep_xid_seqno(xid); const byte* xid_uuid = wsrep_xid_uuid(xid); if (!memcmp(xid_uuid, wsrep_uuid, sizeof wsrep_uuid) &&

1 0

[Commits] 5b0b73e9922: MDEV-15424: Unreasonable SQL Error (1356) on select from view
by Varun 18 Dec '18

18 Dec '18

revision-id: 5b0b73e9922f895cbae5c3ba48d1b65c45ed69bb (mariadb-10.2.19-72-g5b0b73e9922) parent(s): 74659e55b7dffcdbb7f8b2cac4ccea92dacebd70 author: Varun Gupta committer: Varun Gupta timestamp: 2018-12-19 00:08:25 +0530 message: MDEV-15424: Unreasonable SQL Error (1356) on select from view While printing a view containing a window function we were printing it as an Item_field object instead of an Item_window_func object. This is incorrect and this leads to us throwing an error ER_VIEW_INVALID. Fixed by adjusting the Item_ref:print function. Also made UDF function aware if there arguments have window function. --- mysql-test/r/udf.result | 14 ++++++++++++++ mysql-test/r/win.result | 18 ++++++++++++++++++ mysql-test/t/udf.test | 13 +++++++++++++ mysql-test/t/win.test | 13 +++++++++++++ sql/item.cc | 4 +++- sql/item_func.cc | 2 ++ 6 files changed, 63 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index 98aa2b50fc6..3a84caa828a 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -465,3 +465,17 @@ a b Hello HL DROP FUNCTION METAPHON; DROP TABLE t1; +# +# MDEV-15424: Unreasonal SQL Error (1356) on select from view +# +CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB"; +create table t1(a int , b int); +insert into t1 values(100, 54), (200, 199); +create view v1 as select myfunc_int(max(a) over (order by b) , b) from t1; +select * from v1; +myfunc_int(max(a) over (order by b) , b) +154 +399 +drop view v1; +drop function myfunc_int; +drop table t1; diff --git a/mysql-test/r/win.result b/mysql-test/r/win.result index e902d62326e..2e80c2c961b 100644 --- a/mysql-test/r/win.result +++ b/mysql-test/r/win.result @@ -3470,3 +3470,21 @@ SELECT DISTINCT MIN(b1) OVER () FROM t1; MIN(b1) OVER () 1 drop table t1; +# +# MDEV-15424: Unreasonal SQL Error (1356) on select from view +# +create table t1 (id int, n1 int); +insert into t1 values (1,1), (2,1), (3,2), (4,4); +create view v1 as SELECT ifnull(max(n1) over (partition by n1),'aaa') FROM t1; +explain select * from v1; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 4 +2 DERIVED t1 ALL NULL NULL NULL NULL 4 Using temporary +select * from v1; +ifnull(max(n1) over (partition by n1),'aaa') +1 +1 +2 +4 +drop table t1; +drop view v1; diff --git a/mysql-test/t/udf.test b/mysql-test/t/udf.test index 42a813b0782..881e753de7d 100644 --- a/mysql-test/t/udf.test +++ b/mysql-test/t/udf.test @@ -528,3 +528,16 @@ DROP FUNCTION METAPHON; #INSERT INTO t1 (a) VALUES ('Hello'); #SELECT * FROM t1; DROP TABLE t1; + +--echo # +--echo # MDEV-15424: Unreasonal SQL Error (1356) on select from view +--echo # +--replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB +eval CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "$UDF_EXAMPLE_SO"; +create table t1(a int , b int); +insert into t1 values(100, 54), (200, 199); +create view v1 as select myfunc_int(max(a) over (order by b) , b) from t1; +select * from v1; +drop view v1; +drop function myfunc_int; +drop table t1; diff --git a/mysql-test/t/win.test b/mysql-test/t/win.test index b0e1a16fae6..18bdfa31691 100644 --- a/mysql-test/t/win.test +++ b/mysql-test/t/win.test @@ -2227,3 +2227,16 @@ EXPLAIN SELECT DISTINCT MIN(b1) OVER () FROM t1; SELECT DISTINCT MIN(b1) OVER () FROM t1; drop table t1; + +--echo # +--echo # MDEV-15424: Unreasonal SQL Error (1356) on select from view +--echo # + +create table t1 (id int, n1 int); +insert into t1 values (1,1), (2,1), (3,2), (4,4); + +create view v1 as SELECT ifnull(max(n1) over (partition by n1),'aaa') FROM t1; +explain select * from v1; +select * from v1; +drop table t1; +drop view v1; diff --git a/sql/item.cc b/sql/item.cc index 1c0b6cc4043..761c9fbec3d 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -7815,7 +7815,9 @@ void Item_ref::print(String *str, enum_query_type query_type) { if (ref) { - if ((*ref)->type() != Item::CACHE_ITEM && ref_type() != VIEW_REF && + if ((*ref)->type() != Item::CACHE_ITEM && + (*ref)->type() != Item::WINDOW_FUNC_ITEM && + ref_type() != VIEW_REF && !table_name && name && alias_name_used) { THD *thd= current_thd; diff --git a/sql/item_func.cc b/sql/item_func.cc index 512c8fccab0..89ca25bbfd4 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3484,6 +3484,8 @@ udf_handler::fix_fields(THD *thd, Item_func_or_sum *func, if (item->maybe_null) func->maybe_null=1; func->with_sum_func= func->with_sum_func || item->with_sum_func; + func->with_window_func= func->with_window_func || + item->with_window_func; func->with_field= func->with_field || item->with_field; func->with_param= func->with_param || item->with_param; func->with_subselect|= item->with_subselect;

1 0

[Commits] c3ef531aaff: MDEV-10963 Fragmented BINLOG query
by andrei.elkin＠pp.inet.fi 18 Dec '18

18 Dec '18

revision-id: c3ef531aaff39d3262882213157d36a545b600dd (mariadb-10.1.37-31-gc3ef531aaff) parent(s): 541500295abdba7fa619065069291ac9c1dd6e83 author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-12-18 18:28:59 +0200 message: MDEV-10963 Fragmented BINLOG query The problem was originally stated in http://bugs.mysql.com/bug.php?id=82212 The size of an base64-encoded Rows_log_event exceeds its vanilla byte representation in 4/3 times. When a binlogged event size is about 1GB mysqlbinlog generates a BINLOG query that can't be send out due to its size. It is fixed with fragmenting the BINLOG argument C-string into (approximate) halves when the base64 encoded event is over 1GB size. The mysqlbinlog in such case puts out SET @binlog_fragment_0='base64-encoded-fragment_0'; SET @binlog_fragment_1='base64-encoded-fragment_1'; BINLOG @binlog_fragment_0, @binlog_fragment_1; to represent a big BINLOG. For prompt memory release BINLOG handler is made to reset the BINLOG argument user variables in the middle of processing, as if @binlog_fragment_{0,1} = NULL is assigned. Notice the 2 fragments are enough, though the client and server still may need to tweak their @@max_allowed_packet to satisfy to the fragment size (which they would have to do anyway with greater number of fragments, should that be desired). On the lower level the following changes are made: Log_event::print_base64() remains to call encoder and store the encoded data into a cache but now *without* doing any formatting. The latter is left for time when the cache is copied to an output file (e.g mysqlbinlog output). No formatting behavior is also reflected by the change in the meaning of the last argument which specifies whether to cache the encoded data. Rows_log_event::print_helper() is made to invoke a specialized fragmented cache-to-file copying function which is copy_cache_to_file_wrapped() that takes care of fragmenting also optionally wraps encoded strings (fragments) into SQL stanzas. my_b_copy_to_file() is refactored to into my_b_copy_all_to_file(). The former function is generalized to accepts more a limit argument to constraint the copying and does not reinitialize anymore the cache into reading mode. The limit does not do any effect on the fully read cache. --- client/mysqlbinlog.cc | 21 ++- include/my_sys.h | 4 +- .../suite/binlog/r/binlog_base64_flag.result | 19 +++ .../binlog/r/binlog_mysqlbinlog_row_frag.result | 24 +++ mysql-test/suite/binlog/t/binlog_base64_flag.test | 22 +++ .../binlog/t/binlog_mysqlbinlog_row_frag.test | 45 ++++++ mysys/mf_iocache2.c | 61 ++++---- sql/item_func.cc | 2 +- sql/item_func.h | 4 + sql/log_event.cc | 169 +++++++++++++++++++-- sql/log_event.h | 13 +- sql/log_event_old.cc | 16 +- sql/sql_binlog.cc | 94 ++++++++++-- sql/sql_lex.h | 4 + sql/sql_yacc.yy | 11 +- unittest/sql/mf_iocache-t.cc | 70 ++++++++- 16 files changed, 511 insertions(+), 68 deletions(-) diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index bc13aa6c2cc..2c05bb806a9 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -72,6 +72,7 @@ ulong mysqld_net_retry_count = 10L; ulong open_files_limit; ulong opt_binlog_rows_event_max_size; ulonglong test_flags = 0; +ulong opt_binlog_rows_event_max_encoded_size= MAX_MAX_ALLOWED_PACKET; static uint opt_protocol= 0; static FILE *result_file; static char *result_file_name= 0; @@ -813,7 +814,12 @@ write_event_header_and_base64(Log_event *ev, FILE *result_file, /* Write header and base64 output to cache */ ev->print_header(head, print_event_info, FALSE); - ev->print_base64(body, print_event_info, FALSE); + + DBUG_ASSERT(print_event_info->base64_output_mode == BASE64_OUTPUT_ALWAYS); + + ev->print_base64(body, print_event_info, + print_event_info->base64_output_mode != + BASE64_OUTPUT_DECODE_ROWS); /* Read data from cache and write to result file */ if (copy_event_cache_to_file_and_reinit(head, result_file) || @@ -852,7 +858,9 @@ static bool print_base64(PRINT_EVENT_INFO *print_event_info, Log_event *ev) return 1; } ev->print(result_file, print_event_info); - return print_event_info->head_cache.error == -1; + return + print_event_info->head_cache.error == -1 || + print_event_info->body_cache.error == -1; } @@ -1472,6 +1480,15 @@ that may lead to an endless loop.", "This value must be a multiple of 256.", &opt_binlog_rows_event_max_size, &opt_binlog_rows_event_max_size, 0, GET_ULONG, REQUIRED_ARG, UINT_MAX, 256, ULONG_MAX, 0, 256, 0}, +#ifndef DBUG_OFF + {"debug-binlog-row-event-max-encoded-size", 0, + "The maximum size of base64-encoded rows-event in one BINLOG pseudo-query " + "instance. When the computed actual size exceeds the limit " + "the BINLOG's argument string is fragmented in two.", + &opt_binlog_rows_event_max_encoded_size, + &opt_binlog_rows_event_max_encoded_size, 0, + GET_ULONG, REQUIRED_ARG, UINT_MAX/4, 256, ULONG_MAX, 0, 256, 0}, +#endif {"verify-binlog-checksum", 'c', "Verify checksum binlog events.", (uchar**) &opt_verify_binlog_checksum, (uchar**) &opt_verify_binlog_checksum, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, diff --git a/include/my_sys.h b/include/my_sys.h index 110a2ee9af3..c30580a8c06 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -602,7 +602,9 @@ static inline size_t my_b_bytes_in_cache(const IO_CACHE *info) return *info->current_end - *info->current_pos; } -int my_b_copy_to_file(IO_CACHE *cache, FILE *file); +int my_b_copy_to_file (IO_CACHE *cache, FILE *file, size_t count); +int my_b_copy_all_to_file(IO_CACHE *cache, FILE *file); + my_off_t my_b_append_tell(IO_CACHE* info); my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */ int my_b_pread(IO_CACHE *info, uchar *Buffer, size_t Count, my_off_t pos); diff --git a/mysql-test/suite/binlog/r/binlog_base64_flag.result b/mysql-test/suite/binlog/r/binlog_base64_flag.result index d13e13c97b0..b97cf9072fa 100644 --- a/mysql-test/suite/binlog/r/binlog_base64_flag.result +++ b/mysql-test/suite/binlog/r/binlog_base64_flag.result @@ -28,6 +28,25 @@ a 1 1 3 +DELETE FROM t1 WHERE a=3; +BINLOG ' +ODdYRw8BAAAAZgAAAGoAAAABAAQANS4xLjIzLXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAA4N1hHEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC +'; +SET @binlog_fragment_0=' +TFtYRxMBAAAAKQAAAH8BAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE= +TFtYRxcBAAAAIgAAAKEBAAAQABAAAAAAAAEAAf/+AwAAAA== +'; +SET @binlog_fragment_1=''; +BINLOG @binlog_fragment_0, @binlog_fragment_1; +select * from t1; +a +1 +1 +3 +SELECT @binlog_fragment_0, @binlog_fragment_1 as 'NULL','NULL'; +@binlog_fragment_0 NULL NULL +NULL NULL NULL ==== Test --base64-output=never on a binlog with row events ==== /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/; /*!40019 SET @@session.max_insert_delayed_threads=0*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_frag.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_frag.result new file mode 100644 index 00000000000..041be5ed09f --- /dev/null +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_frag.result @@ -0,0 +1,24 @@ +CREATE TABLE t (a TEXT); +RESET MASTER; +INSERT INTO t SET a=repeat('a', 1024); +SELECT a from t into @a; +FLUSH LOGS; +DELETE FROM t; +FOUND /BINLOG @binlog_fragment_0, @binlog_fragment_1/ in mysqlbinlog.sql +SELECT a LIKE @a as 'true' FROM t; +true +1 +BINLOG number-of-fragments must be exactly two +BINLOG @binlog_fragment; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1 +BINLOG @binlog_fragment, @binlog_fragment, @binlog_fragment; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ' @binlog_fragment' at line 1 +SET @binlog_fragment_0='012345'; +SET @binlog_fragment_1='012345'; +BINLOG @binlog_fragment_0, @binlog_fragment_1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use +SET @binlog_fragment_0='012345'; +BINLOG @binlog_fragment_0, @binlog_fragment_not_exist; +ERROR 42000: Incorrect argument type to variable 'binlog_fragment_not_exist' +# Cleanup +DROP TABLE t; diff --git a/mysql-test/suite/binlog/t/binlog_base64_flag.test b/mysql-test/suite/binlog/t/binlog_base64_flag.test index f8333315088..575a7307665 100644 --- a/mysql-test/suite/binlog/t/binlog_base64_flag.test +++ b/mysql-test/suite/binlog/t/binlog_base64_flag.test @@ -67,6 +67,28 @@ TFtYRxcBAAAAIgAAAKEBAAAQABAAAAAAAAEAAf/+AwAAAA== # The above line should succeed and 3 should be in the table select * from t1; +# The same as above with one-fragment BINLOG to prove +# equivalency with the fragmented BINLOG @frag_0, @frag_1. +DELETE FROM t1 WHERE a=3; +# This is a binlog statement containing a Format_description_log_event +# from the same version as the Table_map and Write_rows_log_event. +BINLOG ' +ODdYRw8BAAAAZgAAAGoAAAABAAQANS4xLjIzLXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAA4N1hHEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC +'; + +# This is a Table_map_log_event+Write_rows_log_event corresponding to: +# INSERT INTO TABLE test.t1 VALUES (3) +SET @binlog_fragment_0=' +TFtYRxMBAAAAKQAAAH8BAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE= +TFtYRxcBAAAAIgAAAKEBAAAQABAAAAAAAAEAAf/+AwAAAA== +'; +SET @binlog_fragment_1=''; +BINLOG @binlog_fragment_0, @binlog_fragment_1; +# The above line should succeed and 3 should be in the table: +select * from t1; +# show "one-shot" feature of binlog_fragment variables +SELECT @binlog_fragment_0, @binlog_fragment_1 as 'NULL','NULL'; # Test that mysqlbinlog stops with an error message when the # --base64-output=never flag is used on a binlog with base64 events. diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_frag.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_frag.test new file mode 100644 index 00000000000..f0317ef1219 --- /dev/null +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_frag.test @@ -0,0 +1,45 @@ +--source include/have_debug.inc +--source include/have_binlog_format_row.inc + +--let $MYSQLD_DATADIR= `select @@datadir` + +CREATE TABLE t (a TEXT); +# events of interest are guaranteed to stay in 000001 log +RESET MASTER; +--eval INSERT INTO t SET a=repeat('a', 1024) +SELECT a from t into @a; +FLUSH LOGS; +DELETE FROM t; + +--exec $MYSQL_BINLOG --debug-binlog-row-event-max-encoded-size=256 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql + +--let SEARCH_PATTERN= BINLOG @binlog_fragment_0, @binlog_fragment_1 +--let SEARCH_FILE= $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql +--source include/search_pattern_in_file.inc + +--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql + +SELECT a LIKE @a as 'true' FROM t; + +# improper syntax error +--echo BINLOG number-of-fragments must be exactly two +--error ER_PARSE_ERROR +BINLOG @binlog_fragment; +--error ER_PARSE_ERROR +BINLOG @binlog_fragment, @binlog_fragment, @binlog_fragment; + +# corrupted fragments error check (to the expected error code notice, +# the same error code occurs in a similar unfragmented case) +SET @binlog_fragment_0='012345'; +SET @binlog_fragment_1='012345'; +--error ER_SYNTAX_ERROR +BINLOG @binlog_fragment_0, @binlog_fragment_1; + +# Not existing fragment is not allowed +SET @binlog_fragment_0='012345'; +--error ER_WRONG_TYPE_FOR_VAR +BINLOG @binlog_fragment_0, @binlog_fragment_not_exist; + +--echo # Cleanup +--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql +DROP TABLE t; diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index fa3b6e672d7..f3877331664 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -23,51 +23,56 @@ #include <stdarg.h> #include <m_ctype.h> -/* - Copy contents of an IO_CACHE to a file. - - SYNOPSIS - my_b_copy_to_file() - cache IO_CACHE to copy from - file File to copy to - - DESCRIPTION - Copy the contents of the cache to the file. The cache will be - re-inited to a read cache and will read from the beginning of the - cache. - - If a failure to write fully occurs, the cache is only copied - partially. +/** + Copy the cache to the file. Copying can be constrained to @c count + number of bytes when the parameter is less than SIZE_T_MAX. The + cache will be optionally re-inited to a read cache and will read + from the beginning of the cache. If a failure to write fully + occurs, the cache is only copied partially. TODO - Make this function solid by handling partial reads from the cache - in a correct manner: it should be atomic. - - RETURN VALUE - 0 All OK - 1 An error occurred + Make this function solid by handling partial reads from the cache + in a correct manner: it should be atomic. + + @param cache IO_CACHE to copy from + @param file File to copy to + @param count the copied size or the max of the type + when the whole cache is to be copied. + @return + 0 All OK + 1 An error occurred */ int -my_b_copy_to_file(IO_CACHE *cache, FILE *file) +my_b_copy_to_file(IO_CACHE *cache, FILE *file, + size_t count) { - size_t bytes_in_cache; + size_t curr_write, bytes_in_cache; DBUG_ENTER("my_b_copy_to_file"); - /* Reinit the cache to read from the beginning of the cache */ - if (reinit_io_cache(cache, READ_CACHE, 0L, FALSE, FALSE)) - DBUG_RETURN(1); bytes_in_cache= my_b_bytes_in_cache(cache); do { - if (my_fwrite(file, cache->read_pos, bytes_in_cache, + curr_write= MY_MIN(bytes_in_cache, count); + if (my_fwrite(file, cache->read_pos, curr_write, MYF(MY_WME | MY_NABP)) == (size_t) -1) DBUG_RETURN(1); - } while ((bytes_in_cache= my_b_fill(cache))); + + cache->read_pos += curr_write; + count -= curr_write; + } while (count && (bytes_in_cache= my_b_fill(cache))); if(cache->error == -1) DBUG_RETURN(1); DBUG_RETURN(0); } +int my_b_copy_all_to_file(IO_CACHE *cache, FILE *file) +{ + DBUG_ENTER("my_b_copy_all_to_file"); + /* Reinit the cache to read from the beginning of the cache */ + if (reinit_io_cache(cache, READ_CACHE, 0L, FALSE, FALSE)) + DBUG_RETURN(1); + DBUG_RETURN(my_b_copy_to_file(cache, file, SIZE_T_MAX)); +} my_off_t my_b_append_tell(IO_CACHE* info) { diff --git a/sql/item_func.cc b/sql/item_func.cc index 8b1c7b3bc61..169eb76d802 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4828,7 +4828,7 @@ bool Item_func_set_user_var::register_field_in_bitmap(uchar *arg) true failure */ -static bool +bool update_hash(user_var_entry *entry, bool set_null, void *ptr, uint length, Item_result type, CHARSET_INFO *cs, bool unsigned_arg) diff --git a/sql/item_func.h b/sql/item_func.h index 2c0e3a62f6a..e3eab02f213 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -2283,4 +2283,8 @@ bool eval_const_cond(COND *cond); extern bool volatile mqh_used; +bool update_hash(user_var_entry *entry, bool set_null, void *ptr, uint length, + Item_result type, CHARSET_INFO *cs, + bool unsigned_arg); + #endif /* ITEM_FUNC_INCLUDED */ diff --git a/sql/log_event.cc b/sql/log_event.cc index 883f1863ac4..4b3bad1fbc7 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2783,9 +2783,23 @@ void free_table_map_log_event(Table_map_log_event *event) delete event; } +/** + Encode the event, optionally per 'do_print_encoded' arg store the + result into the argument cache; optionally per event_info's + 'verbose' print into the cache a verbose representation of the event. + Note, no extra wrapping is done to the being io-cached data, like + to producing a BINLOG query. It's left for a routine that extracts from + the cache. + + @param file pointer to IO_CACHE + @param print_event_info pointer to print_event_info specializing + what out of and how to print the event + @param do_print_encoded whether to store base64-encoded event + into @file. +*/ void Log_event::print_base64(IO_CACHE* file, PRINT_EVENT_INFO* print_event_info, - bool more) + bool do_print_encoded) { const uchar *ptr= (const uchar *)temp_buf; uint32 size= uint4korr(ptr + EVENT_LEN_OFFSET); @@ -2804,17 +2818,9 @@ void Log_event::print_base64(IO_CACHE* file, DBUG_ASSERT(0); } - if (print_event_info->base64_output_mode != BASE64_OUTPUT_DECODE_ROWS) - { - if (my_b_tell(file) == 0) - my_b_write_string(file, "\nBINLOG '\n"); - + if (do_print_encoded) my_b_printf(file, "%s\n", tmp_str); - if (!more) - my_b_printf(file, "'%s\n", print_event_info->delimiter); - } - if (print_event_info->verbose) { Rows_log_event *ev= NULL; @@ -4851,9 +4857,17 @@ void Start_log_event_v3::print(FILE* file, PRINT_EVENT_INFO* print_event_info) print_event_info->base64_output_mode != BASE64_OUTPUT_NEVER && !print_event_info->short_form) { - if (print_event_info->base64_output_mode != BASE64_OUTPUT_DECODE_ROWS) + /* BINLOG is matched with the delimiter below on the same level */ + bool do_print_encoded= + print_event_info->base64_output_mode != BASE64_OUTPUT_DECODE_ROWS; + if (do_print_encoded) my_b_printf(&cache, "BINLOG '\n"); - print_base64(&cache, print_event_info, FALSE); + + print_base64(&cache, print_event_info, do_print_encoded); + + if (do_print_encoded) + my_b_printf(&cache, "'%s\n", print_event_info->delimiter); + print_event_info->printed_fd_event= TRUE; } DBUG_VOID_RETURN; @@ -10491,12 +10505,128 @@ void Rows_log_event::pack_info(Protocol *protocol) #endif #ifdef MYSQL_CLIENT +/** + Print an event "body" cache to @c file possibly in two fragments. + Each fragement is optionally per @c do_wrap to produce an SQL statement. + + @param file a file to print to + @param body the "body" IO_CACHE of event + @param do_wrap whether to wrap base64-encoded strings with + SQL cover. + @param delimiter delimiter string + + The function signals on any error through setting @c body->error to -1. +*/ +void copy_cache_to_file_wrapped(FILE *file, + IO_CACHE *body, + bool do_wrap, + const char *delimiter) +{ + const char str_binlog[]= "\nBINLOG '\n"; + const char fmt_delim[]= "'%s\n"; + const char fmt_n_delim[]= "\n'%s\n"; + const my_off_t cache_size= my_b_tell(body); + + if (reinit_io_cache(body, READ_CACHE, 0L, FALSE, FALSE)) + { + body->error= -1; + goto end; + } + + if (!do_wrap) + { + my_b_copy_to_file(body, file, SIZE_T_MAX); + } + else if (4 + sizeof(str_binlog) + cache_size + sizeof(fmt_delim) > + opt_binlog_rows_event_max_encoded_size) + { + /* + 2 fragments can always represent near 1GB row-based + base64-encoded event as two strings each of size less than + max(max_allowed_packet). Greater number of fragments does not + save from potential need to tweak (increase) @@max_allowed_packet + before to process the fragments. So 2 is safe and enough. + + Split the big query when its packet size's estimation exceeds a + limit. The estimate includes the maximum packet header + contribution of non-compressed packet. + */ + const char fmt_frag[]= "%sSET @binlog_fragment_%d ='\n"; + + my_fprintf(file, fmt_frag, "\n", 0); + if (my_b_copy_to_file(body, file, cache_size/2 + 1)) + { + body->error= -1; + goto end; + } + my_fprintf(file, fmt_n_delim, delimiter); + + my_fprintf(file, fmt_frag, "", 1); + if (my_b_copy_to_file(body, file, SIZE_T_MAX)) + { + body->error= -1; + goto end; + } + my_fprintf(file, fmt_delim, delimiter); + + my_fprintf(file, "BINLOG @binlog_fragment_%d, @binlog_fragment_%d%s\n", + 0, 1, delimiter); + } + else + { + my_fprintf(file, str_binlog); + if (my_b_copy_to_file(body, file, SIZE_T_MAX)) + { + body->error= -1; + goto end; + } + my_fprintf(file, fmt_delim, delimiter); + } + reinit_io_cache(body, WRITE_CACHE, 0, FALSE, TRUE); + +end: + return; +} + +/** + The function invokes base64 encoder to run on the current + event string and store the result into two caches. + When the event ends the current statement the caches are is copied into + the argument file. + Copying is also concerned how to wrap the event, specifically to produce + a valid SQL syntax. + When the encoded data size is within max(MAX_ALLOWED_PACKET) + a regular BINLOG query is composed. Otherwise it is build as fragmented + + SET @binlog_fragment_0='...'; + SET @binlog_fragment_1='...'; + BINLOG @binlog_fragment_0, @binlog_fragment_1; + + where fragments are represented by a pair of indexed user + "one shot" variables. + + NOTE. + If any changes made don't forget to duplicate them to + Old_rows_log_event as long as it's supported. + + @param file pointer to IO_CACHE + @param print_event_info pointer to print_event_info specializing + what out of and how to print the event + @param name the name of a table that the event operates on + + The function signals on any error of cache access through setting + that cache's @c error to -1. +*/ void Rows_log_event::print_helper(FILE *file, PRINT_EVENT_INFO *print_event_info, char const *const name) { IO_CACHE *const head= &print_event_info->head_cache; IO_CACHE *const body= &print_event_info->body_cache; + bool do_print_encoded= + print_event_info->base64_output_mode != BASE64_OUTPUT_DECODE_ROWS && + !print_event_info->short_form; + if (!print_event_info->short_form) { bool const last_stmt_event= get_flags(STMT_END_F); @@ -10504,13 +10634,18 @@ void Rows_log_event::print_helper(FILE *file, my_b_printf(head, "\t%s: table id %lu%s\n", name, m_table_id, last_stmt_event ? " flags: STMT_END_F" : ""); - print_base64(body, print_event_info, !last_stmt_event); + print_base64(body, print_event_info, do_print_encoded); } if (get_flags(STMT_END_F)) { - copy_event_cache_to_file_and_reinit(head, file); - copy_event_cache_to_file_and_reinit(body, file); + if (copy_event_cache_to_file_and_reinit(head, file)) + { + head->error= -1; + return; + } + copy_cache_to_file_wrapped(file, body, do_print_encoded, + print_event_info->delimiter); } } #endif @@ -11379,7 +11514,9 @@ void Table_map_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info) m_dbnam, m_tblnam, m_table_id, ((m_flags & TM_BIT_HAS_TRIGGERS_F) ? " (has triggers)" : "")); - print_base64(&print_event_info->body_cache, print_event_info, TRUE); + print_base64(&print_event_info->body_cache, print_event_info, + print_event_info->base64_output_mode != + BASE64_OUTPUT_DECODE_ROWS); copy_event_cache_to_file_and_reinit(&print_event_info->head_cache, file); } } diff --git a/sql/log_event.h b/sql/log_event.h index 90900f63533..446bd8cb827 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -1157,7 +1157,7 @@ class Log_event void print_header(IO_CACHE* file, PRINT_EVENT_INFO* print_event_info, bool is_more); void print_base64(IO_CACHE* file, PRINT_EVENT_INFO* print_event_info, - bool is_more); + bool do_print_encoded); #endif /* read_log_event() functions read an event from a binlog or relay @@ -4891,15 +4891,22 @@ class Ignorable_log_event : public Log_event { virtual int get_data_size() { return IGNORABLE_HEADER_LEN; } }; +#ifdef MYSQL_CLIENT +void copy_cache_to_file_wrapped(FILE *file, + PRINT_EVENT_INFO *print_event_info, + IO_CACHE *body, + bool do_wrap); +#endif static inline bool copy_event_cache_to_file_and_reinit(IO_CACHE *cache, FILE *file) { - return - my_b_copy_to_file(cache, file) || + return + my_b_copy_all_to_file(cache, file) || reinit_io_cache(cache, WRITE_CACHE, 0, FALSE, TRUE); } + #ifdef MYSQL_SERVER /***************************************************************************** diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index d2b4470bbf9..a6f2ed3f416 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -1850,12 +1850,17 @@ void Old_rows_log_event::pack_info(Protocol *protocol) #ifdef MYSQL_CLIENT +/* Method duplicates Rows_log_event's one */ void Old_rows_log_event::print_helper(FILE *file, PRINT_EVENT_INFO *print_event_info, char const *const name) { IO_CACHE *const head= &print_event_info->head_cache; IO_CACHE *const body= &print_event_info->body_cache; + bool do_print_encoded= + print_event_info->base64_output_mode != BASE64_OUTPUT_DECODE_ROWS && + !print_event_info->short_form; + if (!print_event_info->short_form) { bool const last_stmt_event= get_flags(STMT_END_F); @@ -1863,13 +1868,18 @@ void Old_rows_log_event::print_helper(FILE *file, my_b_printf(head, "\t%s: table id %lu%s\n", name, m_table_id, last_stmt_event ? " flags: STMT_END_F" : ""); - print_base64(body, print_event_info, !last_stmt_event); + print_base64(body, print_event_info, do_print_encoded); } if (get_flags(STMT_END_F)) { - copy_event_cache_to_file_and_reinit(head, file); - copy_event_cache_to_file_and_reinit(body, file); + if (copy_event_cache_to_file_and_reinit(head, file)) + { + head->error= -1; + return; + } + copy_cache_to_file_wrapped(file, body, do_print_encoded, + print_event_info->delimiter); } } #endif diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index 91cf038907e..2e861d00f10 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -28,6 +28,65 @@ // START_EVENT_V3, // Log_event_type, // Log_event + +/** + Copy fragments into the standard placeholder thd->lex->comment.str. + + Compute the size of the (still) encoded total, + allocate and then copy fragments one after another. + The size can exceed max(max_allowed_packet) which is not a + problem as no String instance is created off this char array. + + @param thd THD handle + @return + 0 at success, + -1 otherwise. +*/ +int binlog_defragment(THD *thd) +{ + user_var_entry *entry[2]; + LEX_STRING name[2]= { thd->lex->comment, thd->lex->ident }; + + /* compute the total size */ + thd->lex->comment.str= NULL; + thd->lex->comment.length= 0; + for (uint k= 0; k < 2; k++) + { + entry[k]= + (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name[k].str, + name[k].length); + if (!entry[k] || entry[k]->type != STRING_RESULT) + { + my_error(ER_WRONG_TYPE_FOR_VAR, MYF(0), name[k].str); + return -1; + } + thd->lex->comment.length += entry[k]->length; + } + + thd->lex->comment.str= // to be freed by the caller + (char *) my_malloc(thd->lex->comment.length, MYF(MY_WME)); + if (!thd->lex->comment.str) + { + my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR), 1); + return -1; + } + + /* fragments are merged into allocated buf while the user var:s get reset */ + size_t gathered_length= 0; + for (uint k=0; k < 2; k++) + { + memcpy(thd->lex->comment.str + gathered_length, entry[k]->value, + entry[k]->length); + gathered_length += entry[k]->length; + update_hash(entry[k], true, NULL, 0, STRING_RESULT, &my_charset_bin, 0); + } + + DBUG_ASSERT(gathered_length == thd->lex->comment.length); + + return 0; +} + + /** Execute a BINLOG statement. @@ -53,14 +112,6 @@ void mysql_client_binlog_statement(THD* thd) if (check_global_access(thd, SUPER_ACL)) DBUG_VOID_RETURN; - size_t coded_len= thd->lex->comment.length; - if (!coded_len) - { - my_error(ER_SYNTAX_ERROR, MYF(0)); - DBUG_VOID_RETURN; - } - size_t decoded_len= base64_needed_decoded_length(coded_len); - /* option_bits will be changed when applying the event. But we don't expect it be changed permanently after BINLOG statement, so backup it first. @@ -81,6 +132,8 @@ void mysql_client_binlog_statement(THD* thd) int err; Relay_log_info *rli; rpl_group_info *rgi; + char *buf= NULL; + size_t coded_len= 0, decoded_len= 0; rli= thd->rli_fake; if (!rli) @@ -102,15 +155,13 @@ void mysql_client_binlog_statement(THD* thd) rgi->thd= thd; const char *error= 0; - char *buf= (char *) my_malloc(decoded_len, MYF(MY_WME)); Log_event *ev = 0; + my_bool is_fragmented= FALSE; /* Out of memory check */ - if (!(rli && - rli->relay_log.description_event_for_exec && - buf)) + if (!(rli && rli->relay_log.description_event_for_exec)) { my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR), 1); /* needed 1 bytes */ goto end; @@ -119,6 +170,23 @@ void mysql_client_binlog_statement(THD* thd) rli->sql_driver_thd= thd; rli->no_storage= TRUE; + if (unlikely(is_fragmented= thd->lex->comment.str && thd->lex->ident.str)) + if (binlog_defragment(thd)) + goto end; + + if (!(coded_len= thd->lex->comment.length)) + { + my_error(ER_SYNTAX_ERROR, MYF(0)); + goto end; + } + + decoded_len= base64_needed_decoded_length(coded_len); + if (!(buf= (char *) my_malloc(decoded_len, MYF(MY_WME)))) + { + my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR), 1); + goto end; + } + for (char const *strptr= thd->lex->comment.str ; strptr < thd->lex->comment.str + thd->lex->comment.length ; ) { @@ -272,6 +340,8 @@ void mysql_client_binlog_statement(THD* thd) my_ok(thd); end: + if (unlikely(is_fragmented)) + my_free(thd->lex->comment.str); thd->variables.option_bits= thd_options; rgi->slave_close_thread_tables(thd); my_free(buf); diff --git a/sql/sql_lex.h b/sql/sql_lex.h index f1edc809579..edc647522d3 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -2459,6 +2459,10 @@ struct LEX: public Query_tables_list String *wild; /* Wildcard in SHOW {something} LIKE 'wild'*/ sql_exchange *exchange; select_result *result; + /** + @c the two may also hold BINLOG arguments: either comment holds a + base64-char string or both represent the BINLOG fragment user variables. + */ LEX_STRING comment, ident; LEX_USER *grant_user; XID *xid; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0b85b597baf..bfaa0a60a24 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7950,8 +7950,17 @@ binlog_base64_event: { Lex->sql_command = SQLCOM_BINLOG_BASE64_EVENT; Lex->comment= $2; + Lex->ident.str= NULL; + Lex->ident.length= 0; } - ; + | + BINLOG_SYM '@' ident_or_text ',' '@' ident_or_text + { + Lex->sql_command = SQLCOM_BINLOG_BASE64_EVENT; + Lex->comment= $3; + Lex->ident= $6; + } + ; check_view_or_table: table_or_tables table_list opt_mi_check_type diff --git a/unittest/sql/mf_iocache-t.cc b/unittest/sql/mf_iocache-t.cc index 1eef8365074..fca5ec5014d 100644 --- a/unittest/sql/mf_iocache-t.cc +++ b/unittest/sql/mf_iocache-t.cc @@ -370,10 +370,77 @@ void mdev17133() } +void mdev10963() +{ + int res; + uint n_checks= 8; + uchar buf[1024 * 512]; + uint n_frag= sizeof(buf)/(2 * CACHE_SIZE); + FILE *file; + myf my_flags= MYF(MY_WME); + const char *file_name="cache.log"; + + memset(buf, FILL, sizeof(buf)); + diag("MDEV-10963 Fragmented BINLOG query"); + + init_io_cache_encryption(); + srand((uint) time(NULL)); + + /* copying source */ + res= open_cached_file(&info, 0, 0, CACHE_SIZE, 0); + ok(res == 0, "open_cached_file" INFO_TAIL); + res= my_b_write(&info, buf, sizeof(buf)); + + ulong total_size= my_b_tell(&info); + ok(res == 0 && total_size == sizeof(buf), "cache is written"); + + /* destination */ + file= my_fopen(file_name, O_RDWR | O_TRUNC | O_CREAT, my_flags); + ok(my_fileno(file) > 0, "opened file fd = %d", my_fileno(file)); + + /* + For n_checks times verify a sequence of copying with random fragment + size ranging from zero to about the double of the cache read buffer size. + */ + for (; n_checks; n_checks--, rewind(file)) + { + // copied size is an estimate can be incremeneted to greater than total_size + ulong copied_size= 0; + + res= reinit_io_cache(&info, READ_CACHE, 0L, FALSE, FALSE); + ok(res == 0, "cache turned to read"); + + for (ulong i= 0, curr_size= 0; i < n_frag; i++, copied_size += curr_size) + { + curr_size= rand() % (2 * (total_size - copied_size) / (n_frag - i)); + + DBUG_ASSERT(curr_size <= total_size - copied_size || i == n_frag - 1); + + res= my_b_copy_to_file(&info, file, curr_size); + ok(res == 0, "%lu of the cache copied to file", curr_size); + } + /* + Regardless of total_size <> copied_size the function succeeds: + when total_size < copied_size the huge overflowed value of the last + argument is ignored because nothing already left uncopied in the cache. + */ + res= my_b_copy_to_file(&info, file, total_size - copied_size); + ok(res == 0, "%lu of the cache copied to file", total_size - copied_size); + ok(my_ftell(file, my_flags) == sizeof(buf), + "file written in %d fragments", n_frag+1); + + res= reinit_io_cache(&info, WRITE_CACHE, total_size, 0, 0); + ok(res == 0 && my_b_tell(&info) == sizeof(buf), "cache turned to write"); + } + close_cached_file(&info); + my_fclose(file, my_flags); + my_delete(file_name, MYF(MY_WME)); +} + int main(int argc __attribute__((unused)),char *argv[]) { MY_INIT(argv[0]); - plan(114); + plan(277); /* temp files with and without encryption */ encrypt_tmp_files= 1; @@ -391,6 +458,7 @@ int main(int argc __attribute__((unused)),char *argv[]) mdev14014(); mdev17133(); + mdev10963(); my_end(0); return exit_status();

1 0

[Commits] 7a0b026c629: MDEV-17781: Server crashes in next_linear_tab
by Varun 17 Dec '18

17 Dec '18

revision-id: 7a0b026c6295604fd5c5e26d47e5de4e085041dd (mariadb-10.2.19-64-g7a0b026c629) parent(s): 32eeed21297f0e5a2836daca058e38dbe3a82bc4 author: Varun Gupta committer: Varun Gupta timestamp: 2018-12-17 23:45:46 +0530 message: MDEV-17781: Server crashes in next_linear_tab For degenerate joins we may have JOIN::table_list as NULL, so instead of using JOIN::top_join_tab_count use the function JOIN::exec_join_tab_cnt to get the number of tables joined at the top level. --- mysql-test/r/win.result | 18 ++++++++++++++++++ mysql-test/t/win.test | 14 ++++++++++++++ sql/sql_select.cc | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/win.result b/mysql-test/r/win.result index e902d62326e..874fb6b2def 100644 --- a/mysql-test/r/win.result +++ b/mysql-test/r/win.result @@ -3470,3 +3470,21 @@ SELECT DISTINCT MIN(b1) OVER () FROM t1; MIN(b1) OVER () 1 drop table t1; +# +# MDEV-17781: Server crashes in next_linear_tab +# +CREATE TABLE t1 (i1 int); +explain +(SELECT AVG(0) OVER (), MAX('2') FROM t1) +UNION ALL +(SELECT AVG(0) OVER (), MAX('2') FROM t1); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +(SELECT AVG(0) OVER (), MAX('2') FROM t1) +UNION ALL +(SELECT AVG(0) OVER (), MAX('2') FROM t1); +AVG(0) OVER () MAX('2') +0.0000 NULL +0.0000 NULL +drop table t1; diff --git a/mysql-test/t/win.test b/mysql-test/t/win.test index b0e1a16fae6..0cb70747b26 100644 --- a/mysql-test/t/win.test +++ b/mysql-test/t/win.test @@ -2227,3 +2227,17 @@ EXPLAIN SELECT DISTINCT MIN(b1) OVER () FROM t1; SELECT DISTINCT MIN(b1) OVER () FROM t1; drop table t1; + +--echo # +--echo # MDEV-17781: Server crashes in next_linear_tab +--echo # + +CREATE TABLE t1 (i1 int); +explain +(SELECT AVG(0) OVER (), MAX('2') FROM t1) +UNION ALL +(SELECT AVG(0) OVER (), MAX('2') FROM t1); +(SELECT AVG(0) OVER (), MAX('2') FROM t1) +UNION ALL +(SELECT AVG(0) OVER (), MAX('2') FROM t1); +drop table t1; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index dc948ff676a..0ff80838a74 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8864,7 +8864,7 @@ JOIN_TAB *next_linear_tab(JOIN* join, JOIN_TAB* tab, } /* If no more JOIN_TAB's on the top level */ - if (++tab == join->join_tab + join->top_join_tab_count + join->aggr_tables) + if (++tab >= join->join_tab + join->exec_join_tab_cnt() + join->aggr_tables) return NULL; if (include_bush_roots == WITHOUT_BUSH_ROOTS && tab->bush_children)

1 0

[Commits] ee543beabf0: MDEV-18021: Galera test galera_sst_mariabackup_table_options fails if AES_CTR is not available
by jan 17 Dec '18

17 Dec '18

revision-id: ee543beabf01c1eff15fc8e888ef62fc99efbaed (mariadb-10.1.37-34-gee543beabf0) parent(s): 8a46b9fe3bb9034d3559cf81505e61d07b1765a8 author: Jan Lindström committer: Jan Lindström timestamp: 2018-12-17 07:05:27 +0200 message: MDEV-18021: Galera test galera_sst_mariabackup_table_options fails if AES_CTR is not available Problem is that if you use bundled yassl AES_CTR is not supported. There is a way to detect that but as we really want to keep this test enabled did not add skip for missing support. Changed method to AES_CBC as there is no need to use AES_CTR. --- mysql-test/include/innodb_encrypt_tables.combinations | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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

1 0

[Commits] 8a46b9fe3bb: MDEV-17771: Add Galera ist and sst tests using mariabackup
by jan 17 Dec '18

17 Dec '18

revision-id: 8a46b9fe3bb9034d3559cf81505e61d07b1765a8 (mariadb-10.1.37-33-g8a46b9fe3bb) parent(s): fb252f70c17c0ade38082ca5db198dca68b810ed author: Jan Lindström committer: Jan Lindström timestamp: 2018-12-17 05:53:18 +0200 message: MDEV-17771: Add Galera ist and sst tests using mariabackup Add check that file key management plugin is found. --- mysql-test/suite/galera/include/have_filekeymanagement.inc | 3 +++ mysql-test/suite/galera/suite.pm | 2 ++ mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test | 1 + 3 files changed, 6 insertions(+) diff --git a/mysql-test/suite/galera/include/have_filekeymanagement.inc b/mysql-test/suite/galera/include/have_filekeymanagement.inc new file mode 100644 index 00000000000..f5507ca4548 --- /dev/null +++ b/mysql-test/suite/galera/include/have_filekeymanagement.inc @@ -0,0 +1,3 @@ +# +# Used in galera/suite.pm to check file key management plugin +# diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm index 57615e5e94a..8b7b7034fac 100644 --- a/mysql-test/suite/galera/suite.pm +++ b/mysql-test/suite/galera/suite.pm @@ -96,6 +96,8 @@ if (which(socat)) { sub skip_combinations { my %skip = (); + $skip{'include/have_filekeymanagement.inc'} = 'needs file_key_management plugin' + unless $ENV{FILE_KEY_MANAGEMENT_SO}; $skip{'include/have_xtrabackup.inc'} = 'Need innobackupex' unless which(innobackupex); $skip{'include/have_xtrabackup.inc'} = 'Need socat or nc' diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test index 03eef64facc..02407547083 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test @@ -1,5 +1,6 @@ --source include/big_test.inc --source include/galera_cluster.inc +--source include/have_filekeymanagement.inc --source include/innodb_encrypt_tables.inc --source include/have_mariabackup.inc

1 0

[Commits] c4ab352: MDEV-14576 Include full name of object in message about incorrect value for column.
by holyfoot＠askmonty.org 15 Dec '18

15 Dec '18

revision-id: c4ab352b670618bb478138cfbf3ed195317b3ccb (mariadb-10.2.19-60-gc4ab352) parent(s): 0a2edddbf4f4737863edf51970cbbaa91e72e11f committer: Alexey Botchkov timestamp: 2018-12-16 02:21:41 +0400 message: MDEV-14576 Include full name of object in message about incorrect value for column. The error message modified. Then the TABLE_SHARE::error_table_name() implementation taken from 10.3, to be used as a name of the table in this message. --- mysql-test/r/alter_table.result | 6 +- mysql-test/r/create.result | 6 +- mysql-test/r/ctype_big5.result | 128 +++--- mysql-test/r/ctype_cp932_binlog_stm.result | 128 +++--- mysql-test/r/ctype_eucjpms.result | 128 +++--- mysql-test/r/ctype_euckr.result | 140 +++---- mysql-test/r/ctype_gb2312.result | 128 +++--- mysql-test/r/ctype_gbk.result | 454 ++++++++++----------- mysql-test/r/ctype_latin1.result | 8 +- mysql-test/r/ctype_many.result | 4 +- mysql-test/r/ctype_recoding.result | 4 +- mysql-test/r/ctype_sjis.result | 128 +++--- mysql-test/r/ctype_uca.result | 40 +- mysql-test/r/ctype_uca_innodb.result | 28 +- mysql-test/r/ctype_ucs.result | 2 +- mysql-test/r/ctype_ujis.result | 128 +++--- mysql-test/r/ctype_ujis_ucs2.result | 150 +++---- mysql-test/r/ctype_utf16.result | 4 +- mysql-test/r/ctype_utf16le.result | 4 +- mysql-test/r/ctype_utf32.result | 18 +- mysql-test/r/ctype_utf8.result | 86 ++-- mysql-test/r/ctype_utf8mb4.result | 52 +-- mysql-test/r/ctype_utf8mb4_heap.result | 14 +- mysql-test/r/ctype_utf8mb4_innodb.result | 16 +- mysql-test/r/ctype_utf8mb4_myisam.result | 16 +- mysql-test/r/delayed.result | 4 +- mysql-test/r/events_bugs.result | 2 +- mysql-test/r/fulltext.result | 8 +- mysql-test/r/func_set.result | 4 +- mysql-test/r/gis.result | 2 +- mysql-test/r/innodb_icp.result | 2 +- mysql-test/r/insert.result | 32 +- mysql-test/r/loaddata.result | 6 +- mysql-test/r/myisam_icp.result | 2 +- mysql-test/r/outfile_loaddata.result | 4 +- mysql-test/r/partition_innodb.result | 2 +- mysql-test/r/processlist.result | 2 +- mysql-test/r/ps.result | 6 +- mysql-test/r/range.result | 10 +- mysql-test/r/range_mrr_icp.result | 10 +- mysql-test/r/sp-error.result | 2 +- mysql-test/r/sp-vars.result | 8 +- mysql-test/r/sp.result | 6 +- mysql-test/r/strict.result | 184 ++++----- mysql-test/r/subselect_mat.result | 4 +- mysql-test/r/subselect_sj_mat.result | 4 +- mysql-test/r/trigger.result | 2 +- mysql-test/r/type_date.result | 22 +- mysql-test/r/type_datetime.result | 8 +- mysql-test/r/type_decimal.result | 4 +- mysql-test/r/type_float.result | 2 +- mysql-test/r/type_newdecimal.result | 2 +- mysql-test/r/type_num.result | 168 ++++---- mysql-test/r/type_time.result | 22 +- mysql-test/r/type_timestamp.result | 4 +- mysql-test/r/view.result | 4 +- mysql-test/r/warnings.result | 68 +-- mysql-test/suite/funcs_1/r/innodb_func_view.result | 72 ++-- .../suite/funcs_1/r/is_columns_innodb.result | 4 +- mysql-test/suite/funcs_1/r/memory_func_view.result | 72 ++-- mysql-test/suite/funcs_1/r/myisam_func_view.result | 72 ++-- mysql-test/suite/funcs_1/r/storedproc.result | 6 +- .../suite/gcol/r/innodb_virtual_index.result | 2 +- .../suite/innodb/r/innodb-online-alter-gis.result | 2 +- .../suite/innodb/r/innodb-update-insert.result | 4 +- mysql-test/suite/innodb_fts/r/create.result | 4 +- mysql-test/suite/innodb_gis/r/1.result | 4 +- mysql-test/suite/innodb_gis/r/gis.result | 4 +- mysql-test/suite/maria/icp.result | 2 +- mysql-test/suite/plugins/r/sql_error_log.result | 4 +- mysql-test/suite/rpl/r/rpl_bug31076.result | 2 +- .../suite/rpl/r/rpl_extra_col_master_innodb.result | 2 +- .../suite/rpl/r/rpl_extra_col_master_myisam.result | 2 +- mysql-test/suite/rpl/r/rpl_rewrt_db.result | 6 +- sql/field.cc | 33 +- sql/item.cc | 14 +- sql/item.h | 1 + sql/item_create.cc | 2 +- sql/item_func.cc | 3 + sql/item_strfunc.cc | 6 +- sql/item_timefunc.cc | 8 +- sql/share/errmsg-utf8.txt | 4 +- sql/sql_class.cc | 9 + sql/sql_table.cc | 24 +- sql/sql_time.cc | 44 +- sql/sql_time.h | 12 +- sql/table.h | 10 + storage/connect/mysql-test/connect/r/dir.result | 2 +- ...etime_64bit_strict_sql_mode_out_of_range.result | 2 +- .../mysql-test/rocksdb/r/bulk_load_errors.result | 2 +- .../mysql-test/rocksdb/r/col_opt_not_null.result | 4 +- .../mysql-test/rocksdb/r/col_opt_null.result | 4 +- .../rocksdb/mysql-test/rocksdb/r/rocksdb.result | 14 +- .../rocksdb/mysql-test/rocksdb/r/type_bool.result | 4 +- .../rpl/r/rpl_extra_col_master_tokudb.result | 2 +- .../tokudb/mysql-test/tokudb/r/type_date.result | 6 +- .../mysql-test/tokudb/r/type_datetime.result | 4 +- .../tokudb/mysql-test/tokudb/r/type_decimal.result | 4 +- .../tokudb/mysql-test/tokudb/r/type_float.result | 2 +- .../mysql-test/tokudb/r/type_newdecimal.result | 2 +- 100 files changed, 1494 insertions(+), 1422 deletions(-) diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index f30b1d0..dcee72e 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/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/r/create.result b/mysql-test/r/create.result index 2159127..2ff4bac 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1225,7 +1225,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 = ''; @@ -1783,12 +1783,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/r/ctype_big5.result b/mysql-test/r/ctype_big5.result index 2db4da5..f61fc4c 100644 --- a/mysql-test/r/ctype_big5.result +++ b/mysql-test/r/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/r/ctype_cp932_binlog_stm.result b/mysql-test/r/ctype_cp932_binlog_stm.result index f49400b..089820d 100644 --- a/mysql-test/r/ctype_cp932_binlog_stm.result +++ b/mysql-test/r/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/r/ctype_eucjpms.result b/mysql-test/r/ctype_eucjpms.result index 507d002..be341cc 100644 --- a/mysql-test/r/ctype_eucjpms.result +++ b/mysql-test/r/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/r/ctype_euckr.result b/mysql-test/r/ctype_euckr.result index cc50ddd..3006e77 100644 --- a/mysql-test/r/ctype_euckr.result +++ b/mysql-test/r/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/r/ctype_gb2312.result b/mysql-test/r/ctype_gb2312.result index c3c2eee..8a0950c 100644 --- a/mysql-test/r/ctype_gb2312.result +++ b/mysql-test/r/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/r/ctype_gbk.result b/mysql-test/r/ctype_gbk.result index 4e5c969..de056df 100644 --- a/mysql-test/r/ctype_gbk.result +++ b/mysql-test/r/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/r/ctype_latin1.result b/mysql-test/r/ctype_latin1.result index 7de5d8b..db40544 100644 --- a/mysql-test/r/ctype_latin1.result +++ b/mysql-test/r/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/r/ctype_many.result b/mysql-test/r/ctype_many.result index d73a478..25802af 100644 --- a/mysql-test/r/ctype_many.result +++ b/mysql-test/r/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/r/ctype_recoding.result b/mysql-test/r/ctype_recoding.result index 806d9dc..4668ddf 100644 --- a/mysql-test/r/ctype_recoding.result +++ b/mysql-test/r/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/r/ctype_sjis.result b/mysql-test/r/ctype_sjis.result index c19a000..090bb12 100644 --- a/mysql-test/r/ctype_sjis.result +++ b/mysql-test/r/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/r/ctype_uca.result b/mysql-test/r/ctype_uca.result index 2c28140..3d6c56c 100644 --- a/mysql-test/r/ctype_uca.result +++ b/mysql-test/r/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 aЀ aր 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 aЀ aր 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/r/ctype_uca_innodb.result b/mysql-test/r/ctype_uca_innodb.result index c04a99c..bd6f3b8 100644 --- a/mysql-test/r/ctype_uca_innodb.result +++ b/mysql-test/r/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 aЀ aր 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 aЀ aր 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/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result index 3caac47..9507cb9 100644 --- a/mysql-test/r/ctype_ucs.result +++ b/mysql-test/r/ctype_ucs.result @@ -5404,7 +5404,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/r/ctype_ujis.result b/mysql-test/r/ctype_ujis.result index 0b1cf60..a1fcce3 100644 --- a/mysql-test/r/ctype_ujis.result +++ b/mysql-test/r/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/r/ctype_ujis_ucs2.result b/mysql-test/r/ctype_ujis_ucs2.result index 7796104..cb501fd 100644 --- a/mysql-test/r/ctype_ujis_ucs2.result +++ b/mysql-test/r/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/r/ctype_utf16.result b/mysql-test/r/ctype_utf16.result index a105017..fb7ae1f 100644 --- a/mysql-test/r/ctype_utf16.result +++ b/mysql-test/r/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/r/ctype_utf16le.result b/mysql-test/r/ctype_utf16le.result index 6d8d7dd..ba7a238 100644 --- a/mysql-test/r/ctype_utf16le.result +++ b/mysql-test/r/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/r/ctype_utf32.result b/mysql-test/r/ctype_utf32.result index 28b9caf..47e739d 100644 --- a/mysql-test/r/ctype_utf32.result +++ b/mysql-test/r/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/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result index de52405..993a564 100644 --- a/mysql-test/r/ctype_utf8.result +++ b/mysql-test/r/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 aЀ aր 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 aЀ aր 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 aЀ aր 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 aЀ aր 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/r/ctype_utf8mb4.result b/mysql-test/r/ctype_utf8mb4.result index 27ffd55..fac15a5 100644 --- a/mysql-test/r/ctype_utf8mb4.result +++ b/mysql-test/r/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/r/ctype_utf8mb4_heap.result b/mysql-test/r/ctype_utf8mb4_heap.result index d82ed89..8566845 100644 --- a/mysql-test/r/ctype_utf8mb4_heap.result +++ b/mysql-test/r/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/r/ctype_utf8mb4_innodb.result b/mysql-test/r/ctype_utf8mb4_innodb.result index c444e87..53cd88e 100644 --- a/mysql-test/r/ctype_utf8mb4_innodb.result +++ b/mysql-test/r/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 @@ -2288,7 +2288,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 @@ -2308,7 +2308,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 @@ -2402,7 +2402,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 @@ -2416,14 +2416,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/r/ctype_utf8mb4_myisam.result b/mysql-test/r/ctype_utf8mb4_myisam.result index 5176f92..a3abdef 100644 --- a/mysql-test/r/ctype_utf8mb4_myisam.result +++ b/mysql-test/r/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 @@ -2288,7 +2288,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 @@ -2308,7 +2308,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 @@ -2402,7 +2402,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 @@ -2416,14 +2416,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/r/delayed.result b/mysql-test/r/delayed.result index d54fa40..95bcb5d 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/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/r/events_bugs.result b/mysql-test/r/events_bugs.result index b56912d..3e77045 100644 --- a/mysql-test/r/events_bugs.result +++ b/mysql-test/r/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/r/fulltext.result b/mysql-test/r/fulltext.result index 6ca2c5c..2844f05 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -382,10 +382,10 @@ aus Osnabr 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 ('Osnabr�ck'); t collation(t) aus Osnabr�ck latin1_german2_ci diff --git a/mysql-test/r/func_set.result b/mysql-test/r/func_set.result index 73e121f..3bd9f5e 100644 --- a/mysql-test/r/func_set.result +++ b/mysql-test/r/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/r/gis.result b/mysql-test/r/gis.result index bb86d2b..f97f588 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -1689,7 +1689,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/r/innodb_icp.result b/mysql-test/r/innodb_icp.result index 8a58a76..9ba98ba 100644 --- a/mysql-test/r/innodb_icp.result +++ b/mysql-test/r/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/r/insert.result b/mysql-test/r/insert.result index 736aa91..4aea812 100644 --- a/mysql-test/r/insert.result +++ b/mysql-test/r/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/r/loaddata.result b/mysql-test/r/loaddata.result index 4f59e9c..eda4f12 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/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/r/myisam_icp.result b/mysql-test/r/myisam_icp.result index 6a70521..2048205 100644 --- a/mysql-test/r/myisam_icp.result +++ b/mysql-test/r/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/r/outfile_loaddata.result b/mysql-test/r/outfile_loaddata.result index ca3a42c..1449cb1 100644 --- a/mysql-test/r/outfile_loaddata.result +++ b/mysql-test/r/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/r/partition_innodb.result b/mysql-test/r/partition_innodb.result index 98134c0..ec99d28 100644 --- a/mysql-test/r/partition_innodb.result +++ b/mysql-test/r/partition_innodb.result @@ -912,7 +912,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/r/processlist.result b/mysql-test/r/processlist.result index b8e2271..ab518d9 100644 --- a/mysql-test/r/processlist.result +++ b/mysql-test/r/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/r/ps.result b/mysql-test/r/ps.result index 2431e5d..e4d2ce8 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -5141,13 +5141,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(?)'; @@ -5155,7 +5155,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-14603 signal 11 with short stacktrace diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result index 0c6be5e..c23e92d 100644 --- a/mysql-test/r/range.result +++ b/mysql-test/r/range.result @@ -2077,22 +2077,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 @@ -2314,7 +2314,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/r/range_mrr_icp.result b/mysql-test/r/range_mrr_icp.result index 93f414f..138b516 100644 --- a/mysql-test/r/range_mrr_icp.result +++ b/mysql-test/r/range_mrr_icp.result @@ -2079,22 +2079,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 @@ -2316,7 +2316,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/r/sp-error.result b/mysql-test/r/sp-error.result index 6fbe2d6..a6c8822 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -2784,7 +2784,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/r/sp-vars.result b/mysql-test/r/sp-vars.result index 0a7ea0d..6a274ad 100644 --- a/mysql-test/r/sp-vars.result +++ b/mysql-test/r/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 @@ -897,7 +897,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/r/sp.result b/mysql-test/r/sp.result index 8f8865a..fd173b4 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/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` ( @@ -8396,6 +8396,6 @@ 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/r/strict.result b/mysql-test/r/strict.result index 315bb9d..b9db416 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/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/r/subselect_mat.result b/mysql-test/r/subselect_mat.result index dd80cd7..bc22315 100644 --- a/mysql-test/r/subselect_mat.result +++ b/mysql-test/r/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/r/subselect_sj_mat.result b/mysql-test/r/subselect_sj_mat.result index 5dc094a..f6fba1a 100644 --- a/mysql-test/r/subselect_sj_mat.result +++ b/mysql-test/r/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/r/trigger.result b/mysql-test/r/trigger.result index 53e3314..901d132 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/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/r/type_date.result b/mysql-test/r/type_date.result index a9e81b8..0ac62f2 100644 --- a/mysql-test/r/type_date.result +++ b/mysql-test/r/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; @@ -495,7 +495,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); @@ -536,7 +536,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 @@ -810,9 +810,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 @@ -830,9 +830,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/r/type_datetime.result b/mysql-test/r/type_datetime.result index c9b3358..0d75e56 100644 --- a/mysql-test/r/type_datetime.result +++ b/mysql-test/r/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/r/type_decimal.result b/mysql-test/r/type_decimal.result index b858d1e..174cbae 100644 --- a/mysql-test/r/type_decimal.result +++ b/mysql-test/r/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/r/type_float.result b/mysql-test/r/type_float.result index 0b29702..e7df21b 100644 --- a/mysql-test/r/type_float.result +++ b/mysql-test/r/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/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result index b3aa31f..5e955de 100644 --- a/mysql-test/r/type_newdecimal.result +++ b/mysql-test/r/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/r/type_num.result b/mysql-test/r/type_num.result index 966d94e..2dadb4f 100644 --- a/mysql-test/r/type_num.result +++ b/mysql-test/r/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/r/type_time.result b/mysql-test/r/type_time.result index 06da656..d196d0a 100644 --- a/mysql-test/r/type_time.result +++ b/mysql-test/r/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/r/type_timestamp.result b/mysql-test/r/type_timestamp.result index 20523dc..ff233d4 100644 --- a/mysql-test/r/type_timestamp.result +++ b/mysql-test/r/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/r/view.result b/mysql-test/r/view.result index c5c4df0..466b3db 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -1353,10 +1353,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/r/warnings.result b/mysql-test/r/warnings.result index 596cf5f..d5c1a73 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/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/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result index 04e689c..8101f2a 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 297dc2d..9a7280f 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 765869a..9b390b0 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 765869a..9b390b0 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 2c86e6c..155442a 100644 --- a/mysql-test/suite/funcs_1/r/storedproc.result +++ b/mysql-test/suite/funcs_1/r/storedproc.result @@ -13826,7 +13826,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 @@ -13875,7 +13875,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 @@ -13947,7 +13947,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/gcol/r/innodb_virtual_index.result b/mysql-test/suite/gcol/r/innodb_virtual_index.result index 1e3b412..4540994 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_index.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_index.result @@ -137,7 +137,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 2ba8118..423a658 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 6265adb..b50c355 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 4e21c08..c3a14fa 100644 --- a/mysql-test/suite/innodb_fts/r/create.result +++ b/mysql-test/suite/innodb_fts/r/create.result @@ -18,10 +18,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 5728f02..05662d2 100644 --- a/mysql-test/suite/innodb_gis/r/1.result +++ b/mysql-test/suite/innodb_gis/r/1.result @@ -1038,9 +1038,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/gis.result b/mysql-test/suite/innodb_gis/r/gis.result index 4af9d1f..a0729cd 100644 --- a/mysql-test/suite/innodb_gis/r/gis.result +++ b/mysql-test/suite/innodb_gis/r/gis.result @@ -1034,9 +1034,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 d22e705..8fc93e8 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/plugins/r/sql_error_log.result b/mysql-test/suite/plugins/r/sql_error_log.result index a583cf9..98dfe03 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 c163cc5..8fcbba1 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 b59c217..3aa7c07 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 b9d254e..0918364 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 f6c7e4a..5230283 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 6cd8940..c2317e9 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -2092,7 +2092,7 @@ bool Field_num::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); + table->s, field_name); } @@ -3397,7 +3397,7 @@ 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); + ltime, fuzzydate, table->s, field_name); } @@ -4868,7 +4868,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); + return double_to_datetime_with_warn(nr, ltime, fuzzydate, + table->s, field_name); } @@ -6351,7 +6352,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); + ltime, fuzzydate, table->s, field_name); } @@ -8633,10 +8634,18 @@ int Field_geom::store(const char *from, uint 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, + db, tab_name, field_name, (ulong) table->in_use->get_stmt_da()-> current_row_for_warning()); goto err_exit; @@ -10800,7 +10809,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); + make_truncated_value_warning(thd, level, str, ts_type, + table->s, field_name); else set_warning(level, code, cuted_increment); } @@ -10810,10 +10820,19 @@ 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, + type_arg, value, + db_name, table_name, field_name, static_cast<ulong>(thd->get_stmt_da()-> current_row_for_warning())); } diff --git a/sql/item.cc b/sql/item.cc index 25fb9be..1c0b6cc 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -500,6 +500,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. @@ -1358,6 +1367,7 @@ bool Item::get_date(MYSQL_TIME *ltime,ulonglong fuzzydate) } if (null_value || int_to_datetime_with_warn(neg, neg ? -value : value, ltime, fuzzydate, + field_table_or_null(), field_name_or_null())) goto err; return null_value= false; @@ -1366,6 +1376,7 @@ bool Item::get_date(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())) goto err; return null_value= false; @@ -1375,6 +1386,7 @@ bool Item::get_date(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())) goto err; return null_value= false; @@ -3630,7 +3642,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 da1483a..b941c57 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1186,6 +1186,7 @@ class Item: public Value_source, virtual const char *full_name() const { return name ? name : "???"; } const char *field_name_or_null() { return real_item()->type() == Item::FIELD_ITEM ? name : 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 b6430ec..3218d4d 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -7299,7 +7299,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 dcf3a6f..512c8fc 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1023,6 +1023,7 @@ bool Item_func_hybrid_field_type::get_date(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())) goto err; break; @@ -1033,6 +1034,7 @@ bool Item_func_hybrid_field_type::get_date(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())) goto err; break; @@ -1041,6 +1043,7 @@ bool Item_func_hybrid_field_type::get_date(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())) goto err; break; diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 57a1e7e..76f3a98 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -5097,7 +5097,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; } @@ -5106,12 +5106,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 dc5a089..82dbca5 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -430,7 +430,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); @@ -1866,13 +1866,13 @@ bool Item_func_sec_to_time::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) { 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; } @@ -2894,7 +2894,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 0bb1974..8e54fa1 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 86eb6f2..29a9a58 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3009,6 +3009,10 @@ int select_export::send_data(List<Item> &items) error_pos= copier.most_important_error_pos(); if (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, @@ -3018,6 +3022,11 @@ int select_export::send_data(List<Item> &items) ER_THD(thd, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD), "string", printable_buff, item->name, 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, static_cast<long>(row_count)); } else if (copier.source_end_pos() < res->ptr() + res->length()) { diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 02780e7..1765e35 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -9546,6 +9546,8 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, goto err_new_table_cleanup; } } + new_table->s->orig_table_name= table->s->table_name.str; + /* Note: In case of MERGE table, we do not attach children. We do not copy data for MERGE tables. Only the children have data. @@ -9768,16 +9770,6 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, 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 @@ -9809,10 +9801,22 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, 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); 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 cdb9f4e..53e380f 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -223,7 +223,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; @@ -240,7 +240,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; } @@ -329,7 +329,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);); @@ -353,7 +353,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; @@ -387,14 +387,15 @@ static bool number_to_time_with_warn(bool neg, ulonglong nr, ulong sec_part, Sql_condition::WARN_LEVEL_WARN, str, res < 0 ? MYSQL_TIMESTAMP_ERROR : mysql_type_to_time_type(f_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; @@ -408,28 +409,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); } @@ -856,7 +859,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; @@ -875,10 +878,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) @@ -1205,7 +1219,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) @@ -1369,7 +1383,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 d560edc..260e6e3 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -44,13 +44,13 @@ bool str_to_datetime_with_warn(CHARSET_INFO *cs, const char *str, 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, @@ -120,15 +120,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, uint str_length, timestamp_type time_type, - const char *field_name) + 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/sql/table.h b/sql/table.h index 4cd5c3b..b8bd0c8 100644 --- a/sql/table.h +++ b/sql/table.h @@ -625,6 +625,16 @@ struct TABLE_SHARE LEX_STRING normalized_path; /* unpack_filename(path) */ LEX_STRING connect_string; + const char* orig_table_name; /* Original table name for this tmp table */ + const char* error_table_name() const /* Get table name for error messages */ + { + return tmp_table ? ( + orig_table_name ? + orig_table_name : + "(temporary)") : + table_name.str; + } + /* Set of keys in use, implemented as a Bitmap. Excludes keys disabled by ALTER TABLE ... DISABLE KEYS. diff --git a/storage/connect/mysql-test/connect/r/dir.result b/storage/connect/mysql-test/connect/r/dir.result index e10bb45..139544b 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/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 2d5e5e6..6617b49 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 3703c20..4ea8cbc 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 2ae965b..64d87b7 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 a834310..ba651fc 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 2044310..de4ed87 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 4abfdb4..bfe2c18 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 6ee3903..cca18c7 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 047dc6d..7028184 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 80f8866..ed980f8 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 afea173..3b82bbc 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 6387cea..3bfda53 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 ec8a947..ad920de 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

1 0

[Commits] 9db9c340773: MDEV-18015: Assertion `global_status_var.global_memory_used == 0' failed when using UDF , window functions and views
by Varun 15 Dec '18

15 Dec '18

revision-id: 9db9c3407734b8e322a6d11c973ee216870e8197 (mariadb-10.2.19-55-g9db9c340773) parent(s): 59e0d3f0f61968f89f3272c68723744fde5263cc author: Varun Gupta committer: Varun Gupta timestamp: 2018-12-15 21:35:20 +0530 message: MDEV-18015: Assertion `global_status_var.global_memory_used == 0' failed when using UDF , window functions and views Adding destructor for Group_bound_tracker to free Cached_item_str. The Cached_item for window functions are allocated on THD:mem_root but the Cached_item_str has value of type string which is allocated on the heap, so we need to call free() for it. --- mysql-test/r/win.result | 17 +++++++++++++++++ mysql-test/t/win.test | 12 ++++++++++++ sql/item_windowfunc.h | 4 ++++ 3 files changed, 33 insertions(+) diff --git a/mysql-test/r/win.result b/mysql-test/r/win.result index c83cc6cd170..99480214a69 100644 --- a/mysql-test/r/win.result +++ b/mysql-test/r/win.result @@ -3476,3 +3476,20 @@ ifnull(max(n1) over (partition by n1),'aaa') 4 drop table t1; drop view v1; +# +# MDEV-18015: Assertion `global_status_var.global_memory_used == 0' failed when using UDF, +# window functions and views +# +create table t1 (id int, n1 int); +insert into t1 values (1,1),(2,1),(3,2),(4,4); +explain +select max(n1) over (order by 'abc') from t1; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using temporary +select max(n1) over (order by 'abc') from t1; +max(n1) over (order by 'abc') +4 +4 +4 +4 +drop table t1; diff --git a/mysql-test/t/win.test b/mysql-test/t/win.test index 73bb8c46e3f..5110d584554 100644 --- a/mysql-test/t/win.test +++ b/mysql-test/t/win.test @@ -2230,3 +2230,15 @@ select * from v1; select * from v1; drop table t1; drop view v1; + +--echo # +--echo # MDEV-18015: Assertion `global_status_var.global_memory_used == 0' failed when using UDF, +--echo # window functions and views +--echo # + +create table t1 (id int, n1 int); +insert into t1 values (1,1),(2,1),(3,2),(4,4); +explain +select max(n1) over (partition by 'abc') from t1; +select max(n1) over (partition by 'abc') from t1; +drop table t1; diff --git a/sql/item_windowfunc.h b/sql/item_windowfunc.h index 21270733051..465fa6ea991 100644 --- a/sql/item_windowfunc.h +++ b/sql/item_windowfunc.h @@ -70,6 +70,10 @@ class Group_bound_tracker } return 0; } + ~Group_bound_tracker() + { + group_fields.delete_elements(); + } private: List<Cached_item> group_fields;

1 0

[Commits] e1b0a8f9622: MDEV-6453: Assertion `inited==NONE || (inited==RND && scan)' failed in handler::ha_rnd_init(bool)
by varunraiko1803＠gmail.com 15 Dec '18

15 Dec '18

revision-id: e1b0a8f9622ab8c2bab988cb71225f992fec320a (mariadb-10.0.30-286-ge1b0a8f9622) parent(s): d01dbe66a8bf9cb6031f95159c49100f9299a768 author: Varun Gupta committer: Varun Gupta timestamp: 2018-01-29 12:23:31 +0530 message: MDEV-6453: Assertion `inited==NONE || (inited==RND && scan)' failed in handler::ha_rnd_init(bool) with InnoDB, joins, AND/OR conditions The inited parameter handler is not initialised when we do a quick_select after a table scan. --- mysql-test/r/range_innodb.result | 18 ++++++++++++++++++ mysql-test/t/range_innodb.test | 17 +++++++++++++++++ sql/opt_range.cc | 2 ++ 3 files changed, 37 insertions(+) diff --git a/mysql-test/r/range_innodb.result b/mysql-test/r/range_innodb.result index 794e6c7b3cc..8bb1c833a56 100644 --- a/mysql-test/r/range_innodb.result +++ b/mysql-test/r/range_innodb.result @@ -37,3 +37,21 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t0 ALL NULL NULL NULL NULL 10 1 SIMPLE t2 range a,b b 5 NULL 201 Using where; Using join buffer (flat, BNL join) drop table t0,t1,t2; +CREATE TABLE t1 ( +pk INT PRIMARY KEY, f1 INT, f2 CHAR(1), f3 CHAR(1), +KEY(f1), KEY(f2) +) ENGINE=InnoDB; +INSERT INTO t1 VALUES +(1,4,'v',NULL),(2,6,'v',NULL),(3,7,'c',NULL),(4,1,'e',NULL),(5,0,'x',NULL), +(6,7,'i',NULL),(7,7,'e',NULL),(8,1,'p',NULL),(9,7,'s',NULL),(10,1,'j',NULL), +(11,5,'z',NULL),(12,2,'c',NULL),(13,0,'a',NULL),(14,1,'q',NULL),(15,8,'y',NULL), +(16,1,'m',NULL),(17,1,'r',NULL),(18,9,'v',NULL),(19,1,'n',NULL); +CREATE TABLE t2 (f4 INT, f5 CHAR(1)) ENGINE=InnoDB; +INSERT INTO t2 VALUES (4,'q'),(NULL,'j'); +SELECT * FROM t1 AS t1_1, t1 AS t1_2, t2 +WHERE f5 = t1_2.f2 AND ( t1_1.f1 = 103 AND t1_1.f2 = 'o' OR t1_1.pk < f4 ); +pk f1 f2 f3 pk f1 f2 f3 f4 f5 +1 4 v NULL 14 1 q NULL 4 q +2 6 v NULL 14 1 q NULL 4 q +3 7 c NULL 14 1 q NULL 4 q +drop table t1,t2; diff --git a/mysql-test/t/range_innodb.test b/mysql-test/t/range_innodb.test index f76794814ef..605006587cc 100644 --- a/mysql-test/t/range_innodb.test +++ b/mysql-test/t/range_innodb.test @@ -45,3 +45,20 @@ explain select * from t0 left join t2 on t2.a <t0.a and t2.b between 50 and 250; drop table t0,t1,t2; +CREATE TABLE t1 ( + pk INT PRIMARY KEY, f1 INT, f2 CHAR(1), f3 CHAR(1), + KEY(f1), KEY(f2) +) ENGINE=InnoDB; + +INSERT INTO t1 VALUES +(1,4,'v',NULL),(2,6,'v',NULL),(3,7,'c',NULL),(4,1,'e',NULL),(5,0,'x',NULL), +(6,7,'i',NULL),(7,7,'e',NULL),(8,1,'p',NULL),(9,7,'s',NULL),(10,1,'j',NULL), +(11,5,'z',NULL),(12,2,'c',NULL),(13,0,'a',NULL),(14,1,'q',NULL),(15,8,'y',NULL), +(16,1,'m',NULL),(17,1,'r',NULL),(18,9,'v',NULL),(19,1,'n',NULL); + +CREATE TABLE t2 (f4 INT, f5 CHAR(1)) ENGINE=InnoDB; +INSERT INTO t2 VALUES (4,'q'),(NULL,'j'); + +SELECT * FROM t1 AS t1_1, t1 AS t1_2, t2 +WHERE f5 = t1_2.f2 AND ( t1_1.f1 = 103 AND t1_1.f2 = 'o' OR t1_1.pk < f4 ); +drop table t1,t2; diff --git a/sql/opt_range.cc b/sql/opt_range.cc index f1d84e5c623..30b7f43ef28 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -3003,6 +3003,8 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, quick=0; needed_reg.clear_all(); quick_keys.clear_all(); + if (head->file->inited != handler::NONE) + head->file->ha_index_or_rnd_end(); DBUG_ASSERT(!head->is_filled_at_execution()); if (keys_to_use.is_clear_all() || head->is_filled_at_execution()) DBUG_RETURN(0);

2 1

[Commits] 59e0d3f0f61: MDEV-15424: Unreasonable SQL Error (1356) on select from view
by Varun 14 Dec '18

14 Dec '18

revision-id: 59e0d3f0f61968f89f3272c68723744fde5263cc (mariadb-10.2.19-54-g59e0d3f0f61) parent(s): e3dda3d95ee4c09c2ed45ce886ecd25d1fc1ae92 author: Varun Gupta committer: Varun Gupta timestamp: 2018-12-15 02:32:07 +0530 message: MDEV-15424: Unreasonable SQL Error (1356) on select from view While printing a view containing a window function we were printing it as an Item_field object instead of an Item_window_func object. This is incorrect and this leads to us throwing an error ER_VIEW_INVALID. Fixed by adjusting the Item_ref:print function. Also made UDF function aware if there arguments have window function. --- mysql-test/r/udf.result | 14 ++++++++++++++ mysql-test/r/win.result | 19 +++++++++++++++++++ mysql-test/t/udf.test | 13 +++++++++++++ mysql-test/t/win.test | 14 ++++++++++++++ sql/item.cc | 4 +++- sql/item_func.cc | 2 ++ 6 files changed, 65 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index 98aa2b50fc6..3a84caa828a 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -465,3 +465,17 @@ a b Hello HL DROP FUNCTION METAPHON; DROP TABLE t1; +# +# MDEV-15424: Unreasonal SQL Error (1356) on select from view +# +CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB"; +create table t1(a int , b int); +insert into t1 values(100, 54), (200, 199); +create view v1 as select myfunc_int(max(a) over (order by b) , b) from t1; +select * from v1; +myfunc_int(max(a) over (order by b) , b) +154 +399 +drop view v1; +drop function myfunc_int; +drop table t1; diff --git a/mysql-test/r/win.result b/mysql-test/r/win.result index 4ffa9f34c1d..c83cc6cd170 100644 --- a/mysql-test/r/win.result +++ b/mysql-test/r/win.result @@ -3457,3 +3457,22 @@ i row_number() over (partition by i order by i) deallocate prepare stmt; drop table t1; drop view v1; +# +# MDEV-15424: Unreasonal SQL Error (1356) on select from view +# +create table t1 (id int, n1 int); +insert into t1 values (1,1), (2,1), (3,2), (4,4); +create view v1 as SELECT ifnull(max(n1) over (partition by n1),'aaa') FROM t1; +explain +select * from v1; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 4 +2 DERIVED t1 ALL NULL NULL NULL NULL 4 Using temporary +select * from v1; +ifnull(max(n1) over (partition by n1),'aaa') +1 +1 +2 +4 +drop table t1; +drop view v1; diff --git a/mysql-test/t/udf.test b/mysql-test/t/udf.test index 42a813b0782..881e753de7d 100644 --- a/mysql-test/t/udf.test +++ b/mysql-test/t/udf.test @@ -528,3 +528,16 @@ DROP FUNCTION METAPHON; #INSERT INTO t1 (a) VALUES ('Hello'); #SELECT * FROM t1; DROP TABLE t1; + +--echo # +--echo # MDEV-15424: Unreasonal SQL Error (1356) on select from view +--echo # +--replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB +eval CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "$UDF_EXAMPLE_SO"; +create table t1(a int , b int); +insert into t1 values(100, 54), (200, 199); +create view v1 as select myfunc_int(max(a) over (order by b) , b) from t1; +select * from v1; +drop view v1; +drop function myfunc_int; +drop table t1; diff --git a/mysql-test/t/win.test b/mysql-test/t/win.test index 807d394edd3..73bb8c46e3f 100644 --- a/mysql-test/t/win.test +++ b/mysql-test/t/win.test @@ -2216,3 +2216,17 @@ execute stmt; deallocate prepare stmt; drop table t1; drop view v1; + +--echo # +--echo # MDEV-15424: Unreasonal SQL Error (1356) on select from view +--echo # + +create table t1 (id int, n1 int); +insert into t1 values (1,1), (2,1), (3,2), (4,4); + +create view v1 as SELECT ifnull(max(n1) over (partition by n1),'aaa') FROM t1; +explain +select * from v1; +select * from v1; +drop table t1; +drop view v1; diff --git a/sql/item.cc b/sql/item.cc index 25fb9be22eb..40306b3cb72 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -7803,7 +7803,9 @@ void Item_ref::print(String *str, enum_query_type query_type) { if (ref) { - if ((*ref)->type() != Item::CACHE_ITEM && ref_type() != VIEW_REF && + if ((*ref)->type() != Item::CACHE_ITEM && + (*ref)->type() != Item::WINDOW_FUNC_ITEM && + ref_type() != VIEW_REF && !table_name && name && alias_name_used) { THD *thd= current_thd; diff --git a/sql/item_func.cc b/sql/item_func.cc index dcf3a6f3c29..3e2f4257e12 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3481,6 +3481,8 @@ udf_handler::fix_fields(THD *thd, Item_func_or_sum *func, if (item->maybe_null) func->maybe_null=1; func->with_sum_func= func->with_sum_func || item->with_sum_func; + func->with_window_func= func->with_window_func || + item->with_window_func; func->with_field= func->with_field || item->with_field; func->with_param= func->with_param || item->with_param; func->with_subselect|= item->with_subselect;

1 0

Jump to page: