Commit b5d53f20 authored by unknown's avatar unknown
Browse files

After merge fix for BUG#18908 ERROR 1406 (22001): Data too long for column :: using utf8 


strings/ctype-utf8.c:
  Fix for compilation warning -
  forgot to add a new structure member
  in one of the previous changes.
parent bfdc9c12

sql/log.cc

+12 −0
Original line number Diff line number Diff line
@@ -386,6 +386,18 @@ bool Log_to_csv_event_handler:: 
{

  TABLE *table= general_log.table;



  /*

    "INSERT INTO general_log" can generate warning sometimes.

    Let's reset warnings from previous queries,

    otherwise warning list can grow too much,

    so thd->query gets spoiled as some point in time,

    and mysql_parse() receives a broken query.

    QQ: this problem needs to be studied in more details.

    Probably it's better to suppress warnings in logging INSERTs at all.

    Comment this line and run "cast.test" to see what's happening:

  */

  mysql_reset_errors(table->in_use, 1);



  /* below should never happen */

  if (unlikely(!logger.is_log_tables_initialized))

    return FALSE;

strings/ctype-utf8.c

+1 −0
Original line number Diff line number Diff line
@@ -4051,6 +4051,7 @@ static MY_CHARSET_HANDLER my_charset_filename_handler= 
    my_strntoull_8bit,

    my_strntod_8bit,

    my_strtoll10_8bit,

    my_strntoull10rnd_8bit,

    my_scan_8bit

};