bk commit into 5.1 tree (bar:1.2327) BUG#18908

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-03 10:18:13+04:00, bar@stripped +2 -0
  After merge fix for BUG#18908 ERROR 1406 (22001): Data too long for column :: using utf8

  sql/log.cc@stripped, 2006-11-03 10:18:08+04:00, bar@stripped +12 -0
    After merge fix for BUG#18908 ERROR 1406 (22001): Data too long for column :: using
utf8

  strings/ctype-utf8.c@stripped, 2006-11-03 10:18:08+04:00, bar@stripped +1 -0
    Fix for compilation warning -
    forgot to add a new structure member
    in one of the previous changes.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-rpl

--- 1.239/sql/log.cc	2006-11-03 10:18:24 +04:00
+++ 1.240/sql/log.cc	2006-11-03 10:18:24 +04:00
@@ -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;

--- 1.105/strings/ctype-utf8.c	2006-11-03 10:18:24 +04:00
+++ 1.106/strings/ctype-utf8.c	2006-11-03 10:18:24 +04:00
@@ -4051,6 +4051,7 @@ static MY_CHARSET_HANDLER my_charset_fil
     my_strntoull_8bit,
     my_strntod_8bit,
     my_strtoll10_8bit,
+    my_strntoull10rnd_8bit,
     my_scan_8bit
 };