bk commit into 5.1 tree (bar:1.2409)

[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
  1.2409 07/01/31 17:01:28 bar@stripped +5 -0
  Merge mysql.com:/home/bar/mysql-5.0.b25815
  into  mysql.com:/home/bar/mysql-5.1.b25815

  sql/mysqld.cc
    1.605 07/01/31 17:01:25 bar@stripped +0 -25
    After merge fix

  mysql-test/r/binlog_stm_ctype_cp932.result
    1.13 07/01/31 17:00:19 bar@stripped +0 -0
    Auto merged

  mysql-test/extra/binlog_tests/ctype_cp932.test
    1.15 07/01/31 17:00:19 bar@stripped +0 -0
    Auto merged

  sql/mysql_priv.h
    1.472 07/01/31 17:00:19 bar@stripped +0 -12
    Auto merged

  sql/field.cc
    1.365 07/01/31 17:00:19 bar@stripped +0 -0
    Auto merged

  mysql-test/r/binlog_stm_ctype_cp932.result
    1.6.3.2 07/01/31 17:00:19 bar@stripped +0 -0
    Merge rename: mysql-test/r/ctype_cp932.result -> mysql-test/r/binlog_stm_ctype_cp932.result

  mysql-test/extra/binlog_tests/ctype_cp932.test
    1.8.3.2 07/01/31 17:00:19 bar@stripped +0 -0
    Merge rename: mysql-test/t/ctype_cp932.test -> mysql-test/extra/binlog_tests/ctype_cp932.test

# 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.myoffice.izhnet.ru
# Root:	/home/bar/mysql-5.1.b25815/RESYNC

--- 1.364/sql/field.cc	2007-01-12 15:24:32 +04:00
+++ 1.365/sql/field.cc	2007-01-31 17:00:19 +04:00
@@ -7213,7 +7213,7 @@
                               cannot_convert_error_pos, from + length))
     return 2;
 
-  if (copy_length < length)
+  if (from_end_pos < from + length)
   {
     report_data_too_long(this);
     return 2;

--- 1.604/sql/mysqld.cc	2007-01-19 03:23:20 +04:00
+++ 1.605/sql/mysqld.cc	2007-01-31 17:01:25 +04:00
@@ -7486,7 +7486,7 @@
   case (int) OPT_STANDALONE:		/* Dummy option for NT */
     break;
 #endif
- /*
+  /*
     The following change issues a deprecation warning if the slave
     configuration is specified either in the my.cnf file or on
     the command-line. See BUG#21490.