into mysql.com:/home/my/mysql-4.1

into mysql.com:/home/jimw/my/mysql-4.1-clean

into mysql.com:/home/jimw/my/mysql-4.1-clean

  InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607)


innobase/row/row0mysql.c:
  InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607)

as a work around for #8317 and #9637

This function sends SET NAMES command and changes mysql->charset
so mysql_real_escape_string will work as expected.


libmysql/libmysql.def:
  added new function mysql_set_character_set

mysql-test/r/select.result:
  Better error message
mysql-test/t/select.test:
  Better error message
sql/hostname.cc:
  Join identical code
sql/sql_yacc.yy:
  Combine code (and get a better error message)
strings/ctype-ucs2.c:
  Cast pointer differencess

process of the predecessing test case instead of the current test case. 
Shifting the command to the end of the current test case should avoid this problem. 


mysql-test/r/ps_grant.result:
  Updated result
mysql-test/t/ps_grant.test:
  Shift ' show full processlist ' to the end of the test script

into mysql.com:/Users/kent/mysql/cw/mysql-4.1

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

BUILD/check-cpu:
  Set old_flag to pentium

  additional fix for bug@10493, for sjis
ctype-cp932.c:
  additional fix for bug#10493, for cp932


strings/ctype-cp932.c:
  additional fix for bug#10493, for cp932
strings/ctype-big5.c:
  additional fix for bug@10493, for sjis

into mysql.com:/Users/kent/mysql/cw/mysql-4.1


configure.in:
  Auto merged

  Enable creation of embedded lib when --with-darwin-mwcc


configure.in:
  Enable creation of embedded lib when --with-darwin-mwcc
libmysqld/Makefile.am:
  Enable creation of embedded lib when --with-darwin-mwcc

into mysql.com:/root/mysql-4.1

substr fix

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

sql/item_strfunc.h:
  Remove the testcode

into mysql.com:/home/psergey/mysql-4.1-bug10095


mysql-test/t/range.test:
  Auto merged

into mysql.com:/home/hf/work/mysql-4.1.ssj

strings/ctype-sjis.c:
  pos should be decreased
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

BUILD/check-cpu:
  Pentium M

  Bumped up version number to indicate 4.1.12 was branched off


configure.in:
  Bumped up version number to indicate 4.1.12 was branched off

with multi-byte strings, length() instead
of numchars() where used in a mistake.

into mysql.com:/home/ram/work/mysql-4.1

into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733


sql/sql_yacc.yy:
  Auto merged

include/my_global.h:
  a fix (bug #10438: Raid stopped working because of change in atomic add detection).
  In order to compile with atomic.h on itanium we redefine 'new' because it's used
  as a local variable in this file and conflicts with a kernel header.

into mysql.com:/home/jimw/my/mysql-4.1-clean

  Detect conflicting options in SELECT


mysql-test/r/select.result:
  Test for bug#8733
mysql-test/t/select.test:
  Test for bug#8733
sql/mysql_priv.h:
  New bit for ALL
sql/sql_yacc.yy:
  We want to complain if DISTINCT or ALL is used in SELECT when a
  conflicting option is already selected.

BUILD/check-cpu:
  Change variable name
  Add missing fi
  Test with -n instead of -z

into mysql.com:/home/jimw/my/mysql-4.1-clean

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


include/my_global.h:
  Auto merged

into mysql.com:/home/jimw/my/mysql-4.1-clean

include/my_global.h:
  Add "&& defined(__GNUC__)"

BUILD/check-cpu:
  Recognize more cpu's
  Fix for older compilers

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


include/my_global.h:
  Auto merged
sql/item.h:
  Auto merged