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


sql/sql_prepare.cc:
  Auto merged

 - Fix for gcc 4.0.1, use cast packet arg local variable


sql/sql_prepare.cc:
  Use local variable packet that contains an uchar pointer to packet_arg

  After merge fix.


mysql-test/r/ctype_utf8.result:
  After merge fix.

into  mysql.com:/usr/home/bar/mysql-5.0.b12371


mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/ctype_utf8.result:
  After merge fix.
mysql-test/r/show_check.result:
  After merge fix.
sql/item_strfunc.h:
  After merge fix.
tests/mysql_client_test.c:
  After merge fix.

into  mysql.com:/usr/home/bar/mysql-5.0.b12371

into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089

  select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
  Adding test case
sql_yacc.yy:
  Adding new syntax.
item_strfunc.h:
  Fixing wrong max_length calculation.
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0,
  according to Monty's suggestion.


sql/item_strfunc.h:
  Bug#13233
  select distinct char(column) fails with utf8
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0.
sql/sql_yacc.yy:
  Adding new syntax.
mysql-test/t/ctype_utf8.test:
  Adding test case
mysql-test/r/ctype_utf8.result:
  Adding test case

                  information_schema is current database
  skip the check of I_S tables if table is derived table


mysql-test/r/information_schema.result:
  fix for bug#14089 FROM list subquery always fails when 
                    information_schema is current database
    test case
mysql-test/t/information_schema.test:
  fix for bug#14089 FROM list subquery always fails when 
                    information_schema is current database
    test case

into  mysql.com:/usr/home/bar/mysql-5.0.b12371

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  New dump for index operation count
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  New dump for index operation count
  Fix leak on index ops

into lmy004.:/work/mysql-5.0-bug12595-4

ESCAPE has length of 1 if specified and sql_mode is NO_BACKSLASH_ESCAPES
or has length of 0 or 1 in every other situation.
(approved patch applied on a up-to-date tree re-commit) 


mysql-test/r/select.result:
  results of test for bug 12595
mysql-test/t/select.test:
  test for bug #12595 (ESCAPE must be exactly one character long)
sql/item_cmpfunc.cc:
  if ESCAPE was in the statement check whether its length is
  different than 1. In NO_BACKSLASH_ESCAPES mode only length of 1 is
  allowed, otherwise the length could be 0 or 1 character (code point
  in the sense of Unicode).
sql/item_cmpfunc.h:
  pass variable from the parsing stage - whether
  ESCAPE clause was found in the statement
sql/sql_help.cc:
  pass FALSE for escape_used_in_parsing because we
  want the default mode of no error checking - our internal code.
sql/sql_lex.cc:
  initialized variable used to transfer information during
  parsing up in the stack when reducing in the grammar
sql/sql_lex.h:
  new variable used for transfering information when
  reducing in the grammar.
sql/sql_yacc.yy:
  initialize Lex->escape_used and then use it when reducing.
  This is needed as fix for bug #12595 to distinguish between
  situation where ESCAPE was found and when not because internally
  we may pass a string an empty string and there is no other way
  to find out whether this is correct or not in case of 
  NO_BACKSLASH_ESCAPES mode, which allows only length of 1 if
  ESCAPE is part of the SQL statement.

into  mysql.com:/home/cps/mysql/trees/mysql-5.0

(v.2 with post-review fixes)


server-tools/instance-manager/instance.cc:
  On QNX one cannot use fork() in multithreaded environment. Therefore we should use QNX's spawn()

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


client/mysql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

  Set the version number to 5.0.16


configure.in:
  Set the version number to 5.0.16

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

ctype_utf8.test, ctype_utf8.result:
  Adding test case.
item.h:
item.cc:
  Adding Item_param::safe_charset_converter


sql/item.cc:
   Bug#12371: executing prepared statement fails (illegal mix of collations)
  Adding Item_param::safe_charset_converter
sql/item.h:
  Adding Item_param::safe_charset_converter
mysql-test/r/ctype_utf8.result:
  Adding test case.
mysql-test/t/ctype_utf8.test:
  Adding test case.

into  mysql.com:/usr/home/bar/mysql-5.0


mysys/charset.c:
  Auto merged

  Bug#13238 mysqldump and mysqladmin hangs
  Avoid recursion into init_available_charsets.
  Serg's version didn't work for me: I got 
  double mutex locking.
  Pushing this version instead
  (It was approved by Serg anyway)


mysys/charset.c:
  Bug#13238 mysqldump and mysqladmin hangs
  Avoid recursion into init_available_charsets.
  Serg's version didn't work for me: I got 
  double mutex locking.
  Pushing this version instead
  (It was approved by Serg anyway)

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


mysql-test/my_manage.c:
  Auto merged
mysql-test/mysql_test_run_new.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflicts
mysql-test/t/variables.test:
  Resolve conflicts
sql/sql_acl.cc:
  Resolve conflicts
strings/ctype-simple.c:
  Resolve conflicts
strings/ctype-ucs2.c:
  Resolve conflicts

  Made yaSSL support an option (off by default)


support-files/mysql.spec.sh:
  Made yaSSL support an option (off by default)

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0

into  mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0


innobase/include/rem0rec.h:
  Auto merged
innobase/include/rem0rec.ic:
  Auto merged
innobase/row/row0upd.c:
  Auto merged

into  mysql.com:/home/alexi/dev/mysql-4.1-4375

Applying InnoDB patch from Jan Lindstrom

 during replication.
 Modified my_dir(). Now this function skips hidden and system
 files which sometimes are created by Windows.
 NOTE. The fix is similar to the previuos one (05 July 2004)
 except for correct setting of the 'attrib' variable value
 (within the previous fix this variable was left uninitialized
 when my_dir() was called with My_flags & MY_WANT_STAT == 0).


mysys/my_lib.c:
  Modified my_dir().
   Now this function skips hidden and system files
   which sometimes are created by Windows.

without database"


mysql-test/r/sp-error.result:
  Test results fixed (a test case for Bug#13587)
mysql-test/t/sp-error.test:
  A test case for Bug#13587 "Server crash when SP is created without 
  database"
sql/sql_parse.cc:
  - move initialization of lex->sphead->m_db before it's used.
  - cleanup; comment why right now can't be cleaned any more

into mysql.com:/home/psergey/mysql-5.0-bug12915-merge

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2

  Changed option text in mysqldump.c
mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)


client/mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)

  Enabled yaSSL
mysql-test-run.pl:
  Increased test case timeout from 15 min


mysql-test/mysql-test-run.pl:
  Increased test case timeout from 15 min
support-files/mysql.spec.sh:
  Enabled yaSSL

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1

sql/ha_federated.cc:
  Re-application of patch from earlier, adding debug to create_where_from_key as well 
  as small bug fix for setting of records and deleted in delete_all_rows to after db call.

into  zim.(none):/home/brian/mysql/mysql-5.0

mysql-test/r/archive.result:
  Result file for adding check table support
mysql-test/t/archive.test:
  Simple test for check table. The additional select is added just to make sure the file is not destroyed.
sql/ha_archive.cc:
  Updates for adding CHECK table support. is_crashed() now returns the state of the file.
sql/ha_archive.h:
  Updates for adding CHECK table support