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.

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/50


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

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

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

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.0-maint


mysql-test/r/insert.result:
  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.0-maint


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.

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


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

numbers into char fields" and bug #12860 "Difference in zero padding of
exponent between Unix and Windows"

Rewrote the code that determines what 'precision' argument should be
passed to sprintf() to fit the string representation of the input number
into the field.
We get finer control over conversion by pre-calculating the exponent, so
we are able to determine which conversion format, 'e' or 'f', will be
used by sprintf().
We also remove the leading zero from the exponent on Windows to make it
compatible with the sprintf() output on other platforms.


mysql-test/r/insert.result:
  Added test cases for bug #26788 and bug #31152.
mysql-test/t/cast.test:
  Removed --replace_result, since the result is now correct on Windows.
mysql-test/t/insert.test:
  Added test cases for bug #26788 and bug #31152.
mysql-test/t/type_float.test:
  Removed --replace_result, since the result is now correct on Windows.
mysql-test/t/variables.test:
  Removed --replace_result, since the result is now correct on Windows.
sql/field.cc:
  Rewrote the code that determines what 'precision' argument should be
  passed to sprintf() to fit the string representation of the input number
  into the field.
  We get finer control over conversion by pre-calculating the exponent, so
  we are able to determine which conversion format, 'e' or 'f', will be
  used by sprintf().

Disabled test case.

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

Disabled the test case.

into  mysql.com:/home/ram/work/b30495/b30495.5.0

into  stella.local:/home2/mydev/mysql-5.0-axmrg


sql/item_cmpfunc.cc:
  Auto merged

into  mysql.com:/home/ram/work/b30495/b30495.5.0

Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Fixed wrong variable assignment.

Disabled test case

Another try to fix a compiler warning on win64.

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  mysql.com:/home/ram/work/b32560/b32560.5.0

Problem: INTERVAL function implementation doesn't handle NULL range values.

Fix: skip NULL ranges looking for a proper one.


mysql-test/r/func_set.result:
  Fix for bug #32560: crash with interval function and count(*)
    - test result.
mysql-test/t/func_set.test:
  Fix for bug #32560: crash with interval function and count(*)
    - test case.
sql/item_cmpfunc.cc:
  Fix for bug #32560: crash with interval function and count(*)
    - skip NULL ranges calculating INTERVAL(...).

into  stella.local:/home2/mydev/mysql-5.0-axmrg

Disabled test case

Disabled test case

Fixed a compiler warning on win64. Backport from 5.1.

Disabled test case

into  mysql.com:/home/ram/work/b32558/b32558.5.0

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge


client/mysql.cc:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_uca.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-4.1-axmrg

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build