into  trift2.:/MySQL/M51/push-5.1


sql/sql_parse.cc:
  Auto merged

sql/sql_class.cc:
  Fix a valgrind warning (row_count_func is used before it was initialized
  in SQLCOM_CALL)

into  trift2.:/MySQL/M51/push-5.1

The files below "mysql-test/suite/funcs_2" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.

Foreach file F in the suite that has a "deleted" counterpart D, use
    bk rm $F
    bk mv $D $F
    bk edit $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.

There is only one file whose contents differs between 5.0 and 5.1,
restore its current 5.1 contents:
   mysql-test/suite/funcs_2/r/ndb_charset.result


BitKeeper/deleted/.del-charset_master.test~3ac6827798431a7:
  Delete: mysql-test/suite/funcs_2/charset/charset_master.test
mysql-test/suite/funcs_2/charset/charset_master.test:
  Rename: BitKeeper/deleted/.del-charset_master.test -> mysql-test/suite/funcs_2/charset/charset_master.test
BitKeeper/deleted/.del-charset_utf8.txt~c8409ddc3d216d4:
  Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt
BitKeeper/deleted/.del-check_charset.inc~1328722ebe51ab2b:
  Delete: mysql-test/suite/funcs_2/include/check_charset.inc
mysql-test/suite/funcs_2/data/charset_utf8.txt:
  Rename: BitKeeper/deleted/.del-charset_utf8.txt -> mysql-test/suite/funcs_2/data/charset_utf8.txt
mysql-test/suite/funcs_2/include/check_charset.inc:
  Rename: BitKeeper/deleted/.del-check_charset.inc -> mysql-test/suite/funcs_2/include/check_charset.inc
BitKeeper/deleted/.del-check_charset_ucs2.inc~fbcdbb34f38ce9f1:
  Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
BitKeeper/deleted/.del-check_charset_utf8.inc~703a0b77d86f514e:
  Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-gen_charset_utf8.pl~ff00332572f0f0b6:
  Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
mysql-test/suite/funcs_2/include/check_charset_ucs2.inc:
  Rename: BitKeeper/deleted/.del-check_charset_ucs2.inc -> mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
mysql-test/suite/funcs_2/include/check_charset_utf8.inc:
  Rename: BitKeeper/deleted/.del-check_charset_utf8.inc -> mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-innodb_charset.result~5a9b45c455263e16:
  Delete: mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-memory_charset.result~3e27ebf0471b3472:
  Delete: mysql-test/suite/funcs_2/r/memory_charset.result
mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl:
  Rename: BitKeeper/deleted/.del-gen_charset_utf8.pl -> mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
mysql-test/suite/funcs_2/r/innodb_charset.result:
  Rename: BitKeeper/deleted/.del-innodb_charset.result -> mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-myisam_charset.result~e86d46123a579771:
  Delete: mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-ndb_charset.result~37be292ee7801689:
  Delete: mysql-test/suite/funcs_2/r/ndb_charset.result
mysql-test/suite/funcs_2/r/memory_charset.result:
  Rename: BitKeeper/deleted/.del-memory_charset.result -> mysql-test/suite/funcs_2/r/memory_charset.result
mysql-test/suite/funcs_2/r/myisam_charset.result:
  Rename: BitKeeper/deleted/.del-myisam_charset.result -> mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-innodb_charset.test~4555b7e4a5caa39:
  Delete: mysql-test/suite/funcs_2/t/innodb_charset.test
BitKeeper/deleted/.del-memory_charset.test~4f055ebb453f58fd:
  Delete: mysql-test/suite/funcs_2/t/memory_charset.test
BitKeeper/deleted/.del-myisam_charset.test~f859c5b56700de58:
  Delete: mysql-test/suite/funcs_2/t/myisam_charset.test
mysql-test/suite/funcs_2/t/innodb_charset.test:
  Rename: BitKeeper/deleted/.del-innodb_charset.test -> mysql-test/suite/funcs_2/t/innodb_charset.test
mysql-test/suite/funcs_2/t/memory_charset.test:
  Rename: BitKeeper/deleted/.del-memory_charset.test -> mysql-test/suite/funcs_2/t/memory_charset.test
mysql-test/suite/funcs_2/t/myisam_charset.test:
  Rename: BitKeeper/deleted/.del-myisam_charset.test -> mysql-test/suite/funcs_2/t/myisam_charset.test
BitKeeper/deleted/.del-ndb_charset.test~354cbaeb1bc2f75d:
  Delete: mysql-test/suite/funcs_2/t/ndb_charset.test
BitKeeper/deleted/.del-readme.txt~e8399f1a3f34d433:
  Delete: mysql-test/suite/funcs_2/readme.txt
mysql-test/suite/funcs_2/readme.txt:
  Rename: BitKeeper/deleted/.del-readme.txt~2 -> mysql-test/suite/funcs_2/readme.txt
mysql-test/suite/funcs_2/t/ndb_charset.test:
  Rename: BitKeeper/deleted/.del-ndb_charset.test -> mysql-test/suite/funcs_2/t/ndb_charset.test
mysql-test/suite/funcs_2/r/ndb_charset.result:
  Fix a bad BitKeeper dependency structure for the "funcs_2" suite:
  
  Restore the 5.1 contents into the 5.0-dependent file.

mysql-test/r/log_tables.result:
  Update results.
mysql-test/t/log_tables.test:
  Silence a race condition: TRUNCATE code issues mysql_frm_type without
  a metadata lock, and finds no table if hits the moment when
  ALTER is swapping two tables.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


client/mysqldump.c:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.

mysql-test/r/func_time.result:
  Update results (use fixed datetime values instead of NOW()).
mysql-test/t/func_time.test:
  Use fixed datetime values instead of NOW(): the test would have a sporadic
  failure when current day changed between two consequtive calls to
  NOW(). The test actually tests FROM_DAYS/TO_DAYS functions, 
  so use of NOW() is not necessary.

into  trift2.:/MySQL/M51/push-5.1

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.

sql/sql_base.cc:
  Fix an incorrect manual merge.

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.
sql/sql_table.cc:
  Manual merge.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
sql/handler.h:
  Manual merge.
sql/lock.cc:
  Manual merge.
sql/opt_range.cc:
  Manual merge.
sql/sql_base.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-cleanup


sql/log.cc:
  Auto merged

into  mysql.com:/home/kent/bk/config_h/mysql-5.1-build


config/ac-macros/misc.m4:
  Auto merged
configure.in:
  Auto merged
include/Makefile.am:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged

into  mysql.com:/home/kent/bk/config_h/mysql-5.0-build

to "my_config.h". Not to pollute the top directory, and to get more control
over what is included. Made the include path for "libedit" pick up its own
"config.h" first.


config/ac-macros/misc.m4:
  aclocal in automake 1.8 can't handle AC_REQUIRE on
  a user macro defined in the same included file.
cmd-line-utils/libedit/Makefile.am:
  Changed include path so that current directory is taken first, as there
  is a "config.h" there with the same name as the one in top "include".
configure.in:
  Generate "config.h" directly into "include", don't pollute top directory
include/Makefile.am:
  Copy "config.h" from current directory to "my_config.h", added note in
  the make file why there are two identical files with different name.
scripts/make_binary_distribution.sh:
  Removed copy of "config.h" from top directory, it is in "include" in a
  source tree.

into  mysql.com:/home/kent/bk/config_h/mysql-5.0-build


mysys/my_pthread.c:
  Auto merged

  Backport of correction for Mac OS X build problem, global variable not
  initiated is "common" and can't be used in shared libraries, unless
  special flags are used (bug#26218)


mysys/my_pthread.c:
  Backport of correction for Mac OS X build problem, global variable not
  initiated is "common" and can't be used in shared libraries, unless
  special flags are used (bug#26218)

into  linux.site:/home/omer/source/jrg51


scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1

existing table->no_replicate code is used instead

into  linux.site:/home/omer/source/jrg51


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Auto merged
mysql-test/suite/funcs_1/views/func_view.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  manual merge
mysql-test/suite/funcs_1/r/memory_func_view.result:
  manual merge
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  manual merge
mysql-test/suite/funcs_1/r/myisam_views.result:
  manual merge

into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build

sql/handler.h:
  Fix a warning.

mysql-test/r/ddl_i18n_koi8r.result:
  Update result file.
mysql-test/r/ddl_i18n_utf8.result:
  Update result file.

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/push-5.1

- Removed unused variable.


sql/sql_lex.cc:
  - Removed unused variable

- Removed unused variable.


sql/sql_lex.cc:
  - Removed unused variable

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1

into  production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.1


scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Merge changes from 5.0

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25422-d


client/mysqldump.c:
  Auto merged
mysql-test/r/log_state.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sp.cc:
  Auto merged