into  ibmlab.site:/home/my/bk/mysql-5.1-new

into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.1


sql/mysqld.cc:
  Auto merged

  Backport option description change from 5.1 to 5.0.


sql/mysqld.cc:
  Backport option description change from 5.1 to 5.0.

into  zim.(none):/home/mikael/bug16370

into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new

(nothing to document, this bug was not released).



mysql-test/t/disabled.def:
  bug is fixed, enabling test case
mysql-test/t/rpl_rbr_to_sbr.test:
  making test portable
mysql-test/r/rpl_rbr_to_sbr.result:
  result update

into  zim.(none):/home/mikael/bug16370


sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  zim.(none):/home/mikael/bug16370


sql/sql_yacc.yy:
  Auto merged

into  zim.(none):/home/mikael/bug17127


sql/sql_yacc.yy:
  Auto merged

into  zim.(none):/home/mikael/bug17127


sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1


mysql-test/mysql-test-run.pl:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

declared in the 'for' statement is not portable, some compilers
still don't implement this ANSI C++ specification (Bug #14995)

into  zim.(none):/home/mikael/bug16370


sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  zim.(none):/home/mikael/bug16370


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/sql_partition.cc:
  manual merge

into  zim.(none):/home/mikael/bug15961


sql/share/errmsg.txt:
  Auto merged
sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

New error message


sql/share/errmsg.txt:
  New error message
sql/sql_partition.cc:
  New error message

into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new

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

into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new

into  zim.(none):/home/mikael/bug16370


sql/sql_yacc.yy:
  Auto merged

  Revise option description. And let's put it in the proper
  lexical order within the option list.


sql/mysqld.cc:
  Revise option description. And let's put it in the proper
  lexical order within the option list.

New test case (bug was already fixed)


mysql-test/r/ndb_partition_key.result:
  New test case
mysql-test/t/ndb_partition_key.test:
  New test case

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

into  mysql.com:/usr/local/mysql/tmpbuild-5.1

  Small change to enable sending of mails from Windows bk clones


BitKeeper/triggers/post-commit:
  Small change to enable sending of mails from Windows bk clones

into  mysql.com:/usr/local/mysql/mysql-5.1-new

sql/log_event.cc:
  Fix Windows compile errors.
storage/innobase/btr/btr0sea.c:
  Fix AIX compile error (declarations must come before code in traditional C).
sql/sql_class.h:
  Fix HPUX compile problem (HP compiler bug).
  Local class of member in derived class has no access to protected members,
  so make the class global and a friend.
sql/sql_insert.cc:
  Fix HPUX compile problem (HP compiler bug).
  Local class of member in derived class has no access to protected members,
  so make the class global and a friend.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new


sql/sql_yacc.yy:
  Auto merged

- detect the need for row-based binlogging not at execution stage but earlier at parsing stage; needed for example for CREATE TABLE SELECT UUID().
- more tests of this mixed mode.


mysql-test/r/rpl_switch_stm_row_mixed.result:
  result update
mysql-test/t/rpl_switch_stm_row_mixed.test:
  testing more scenarios for the mixed replication mode.
  Added support for manual testing of UDFs vs the mixed mode (behind a variable in the test).
  Changing old file names to better ones.
sql/item_create.cc:
  at parse time, when we see a UUID(), put up a flag in LEX to say this binlogs properly only with row-based binlogging.
sql/item_func.cc:
  it's not perfect to put up the flag at this execution stage, better do it at parse stage.
sql/item_strfunc.cc:
  it's not perfect to put up the flag at this execution stage, better do it at parse stage
sql/set_var.cc:
  this assertion is wrong, this piece of code can happen in RBR mode too.
sql/sql_lex.cc:
  when we reinitialize the LEX members before every query, we have to reinitialize the new flag
sql/sql_lex.h:
  A new flag, set at parsing stage, which tells if some items seen during parsing stage require row-based replication to binlog/replicate correctly
  when this statement is later executed.
  It has to be in LEX and not directly in THD, for this to work in prepared statements.
sql/sql_parse.cc:
  Parsing stage happened at some time in the past and set up the flag in LEX, now that we execute the statement we actually turn on row-based binlogging
  if the thread's binlog format is "mixed". We then turn it off when leaving mysql_execute_command().
  Some cleanup code was not executed if leaving mysql_execute_command() at the "error" label, fixing this. A better fix than the "goto end" would be
  to modify each "goto error" to "res=1; goto end" but it required changing many lines which I don't want to do now ("make smallest possible patch").
sql/sql_yacc.yy:
  When at parsing stage we see a UDF we put up a flag to say that row-based binlogging is preferred.

into  shellback.(none):/home/msvensson/mysql/mysql-5.1

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


sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  e
  Resolve conflict
mysql-test/t/partition.test:
  Resolve conflict

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


sql/sql_table.cc:
  Auto merged
mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged

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


mysql-test/r/partition.result:
  Resolve conflict
mysql-test/t/partition.test:
  Resolve conflict
sql/ha_partition.cc:
  Resolve conflict