into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/unireg.h:
  Auto merged
sql/item.cc:
  manual merge
sql/log_event.cc:
  manual merge
sql/protocol.cc:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_base.cc:
  manual merge
sql/sql_parse.cc:
  manual merge
sql/sql_select.cc:
  manual merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/mysql-test-run.pl:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/buf/buf0flu.c:
  Auto merged
storage/innobase/buf/buf0lru.c:
  Auto merged
storage/innobase/include/buf0buf.h:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/include/sync0arr.h:
  Auto merged
storage/innobase/include/sync0rw.h:
  Auto merged
storage/innobase/include/sync0rw.ic:
  Auto merged
storage/innobase/include/sync0sync.h:
  Auto merged
storage/innobase/os/os0sync.c:
  Auto merged
storage/innobase/sync/sync0arr.c:
  Auto merged
storage/innobase/sync/sync0rw.c:
  Auto merged
storage/innobase/sync/sync0sync.c:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


innobase/buf/buf0buf.c:
  use local (null merge)
innobase/buf/buf0flu.c:
  use local (null merge)
innobase/buf/buf0lru.c:
  use local (null merge)
innobase/include/buf0buf.h:
  use local (null merge)
innobase/include/buf0buf.ic:
  use local (null merge)
innobase/include/sync0arr.h:
  Auto merged
innobase/include/sync0rw.h:
  use local (null merge)
innobase/include/sync0rw.ic:
  use local (null merge)
innobase/include/sync0sync.h:
  use local
innobase/os/os0sync.c:
  use local (null merge)
innobase/sync/sync0arr.c:
  use local (null merge)
innobase/sync/sync0rw.c:
  use local (null merge)
innobase/sync/sync0sync.c:
  use local (null merge)
mysql-test/mysql-test-run.pl:
  use local (null merge)

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41


innobase/buf/buf0buf.c:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/sync0arr.h:
  Auto merged
innobase/include/sync0rw.h:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/os/os0sync.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


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

mysql-test/mysql-test-run.pl:
  Add a way to remove options which mysql-test-run.pl no longer uses.  Since
  mysql-test-run.pl passes unrecognized options through to mysqld directly,
  it is not possible to just remove an option.  Otherwise it would be given
  to mysqld, which probably will not recognize it and will fail to start.
  
  Instead, we now explicitly ignore the option, and print a warning to
  the user.

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_table.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/grant.result:
  Manual merge
mysql-test/t/grant.test:
  Manual merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


sql/sql_table.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


mysql-test/t/grant.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-simple.c:
  Auto merged
mysql-test/r/grant.result:
  Manual merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


strings/ctype-simple.c:
  use local (null merge)

mysql-test/r/grant.result:
  Update test results to .test changes
mysql-test/t/grant.test:
  Drop users when done with them, to avoid skewing results of later tests.
  
  For example, running some test which examines the cardinality of the
  mysql.user table would fail if run right after this test, due to the
  extra users.

testing embedded server works correctly.


mysql-test/r/create.result:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/r/grant.result:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/t/create.test:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/t/grant.test:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).

sql/sql_select.cc:
  Fix compiler warning (probably harmless, wrong integer size)

strings/ctype-simple.c:
  Backport quick fix to remove Windows compiler warnings.

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/set_var.cc:
  Auto merged

mysql-test/t/ctype_ucs.test:
  Post-merge fix (fix order of tests to match results).

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysql-test/t/log_state.test:
  Manual merge fix-up
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/ctype_ucs.result:
  Manual merge
mysql-test/r/func_misc.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/r/key.result:
  Manual merge
mysql-test/r/log_state.result:
  Manual merge
mysql-test/suite/binlog/t/binlog_killed.test:
  Manual merge
mysql-test/t/ctype_ucs.test:
  Manual merge
mysql-test/t/func_misc.test:
  Manual merge
mysql-test/t/key.test:
  Manual merge
sql/item_strfunc.h:
  Manual merge
strings/ctype-simple.c:
  Manual merge

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime

Only select entries from the general_log that were issued by the current
connection.


mysql-test/r/log_tables.result:
  Update test result.
mysql-test/t/log_tables.test:
  Only select entries from the current thread.

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/ctype_ucs.result:
  Manual merge
mysql-test/r/func_misc.result:
  Manual merge
mysql-test/t/binlog_killed.test:
  Manual merge
mysql-test/t/ctype_ucs.test:
  Manual merge
mysql-test/t/func_misc.test:
  Manual merge
sql/item_strfunc.h:
  Manual merge
strings/ctype-simple.c:
  Manual merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41


sql/set_var.cc:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Manual merge
mysql-test/t/ctype_ucs.test:
  Manual merge

Disable failing test case.


mysql-test/t/disabled.def:
  Disable main.status test case.

Disable failing test case.


mysql-test/t/disabled.def:
  Disable main.ctype_create test case.

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

mysql-test/t/insert.test:
  Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result
mysql-test/t/variables.test:
  We need to do replace_result because variables are printed by another procedure.
sql/field.cc:
  Fixed the code to limit the precision to DBL_DIG.

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
sql/field.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
sql/field.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
sql/field.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
sql/field.cc:
  Auto merged

mysql-test/r/insert.result:
  Fixed the test cases.
mysql-test/t/cast.test:
  We need to do replace_result because warnings are printed by another procedure.
mysql-test/t/insert.test:
  Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result.
sql/field.cc:
  Limit the precision to avoid garbage past the significant digits.

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/field.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/field.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


sql/field.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


sql/field.cc:
  Auto merged

Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.