1. 14 Jun, 2007 15 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 45eddbdc
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      sql/item_func.cc:
        Auto merged
      45eddbdc
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · f6a7490c
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      f6a7490c
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · bcd6183f
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      bcd6183f
    • unknown's avatar
      fix the binlog-stm_ps.test for the embedded-server · 854353dd
      unknown authored
      
      mysql-test/t/binlog_stm_ps.test:
        embedded server doesn't have binlogs
      854353dd
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · d1614ae9
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      d1614ae9
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.0-opt · db17ac9f
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.1-opt
      
      
      tests/mysql_client_test.c:
        manual merge 5.0-opt -> 5.1-opt
      db17ac9f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-opt · 1acda0ce
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-merge-5.0-opt
      
      
      1acda0ce
    • unknown's avatar
      f0000401
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · dbc4abca
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      client/mysqltest.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/include/mix1.inc:
        merging
      mysql-test/r/innodb_mysql.result:
        merging
      dbc4abca
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1 · 0662a9b7
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      client/mysqltest.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/include/mix1.inc:
        merging
      mysql-test/r/innodb_mysql.result:
        merging
      sql/sql_select.cc:
        merging
      0662a9b7
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 6f168d12
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      client/mysqltest.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        merging
      mysql-test/t/innodb_mysql.test:
        merging
      sql/sql_select.cc:
        merging
      6f168d12
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · 95d439d3
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
      
      
      95d439d3
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 167751b3
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      mysql-test/r/type_decimal.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      167751b3
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · dcd779cb
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28991-5.1-opt
      
      
      dcd779cb
    • unknown's avatar
      Bug #28991: rpl_events failure in pushbuild · 37559e3d
      unknown authored
      In tests waiting on a timeout is not deterministic enough
      to make sure that an event actually finished executing.
      Fixed the test by waiting in a loop and checking the effect
      that the event is supposed to produce.
      
      
      mysql-test/include/rpl_events.inc:
        Bug #28991: wait until event has taken effect
      37559e3d
  2. 13 Jun, 2007 25 commits
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · ddc4aeb5
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      BitKeeper/triggers/post-commit:
        Auto merged
      ddc4aeb5
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · 6f5a6162
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      BitKeeper/triggers/post-commit:
        Auto merged
      6f5a6162
    • unknown's avatar
      fix. · 4f60c511
      unknown authored
      
      BitKeeper/triggers/post-commit:
        send to correct address.
      4f60c511
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 476d23a9
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      476d23a9
    • unknown's avatar
      fix make_win_bin_dist typo · d1ee00ac
      unknown authored
      
      scripts/make_win_bin_dist:
        add missing backslash
      d1ee00ac
    • unknown's avatar
      Fixed bug #28980: the result of ROUND(<decimal expr>,<int column>) · c0ebdff9
      unknown authored
      was erroneously converted to double, while the result of
      ROUND(<decimal expr>, <int literal>) was preserved as decimal.
      As a result of such a conversion the value of ROUND(D,A) could
      differ from the value of ROUND(D,val(A)) if D was a decimal expression.
      
      Now the result of the ROUND function is never converted to 
      double if the first argument is decimal.  
      
      
      mysql-test/r/type_decimal.result:
        Added a test case for bug #28980.
      mysql-test/t/type_decimal.test:
        Added a test case for bug #28980.
      c0ebdff9
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 1ab7b066
      unknown authored
      into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.1o-bug27634
      
      
      1ab7b066
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 89ec16ac
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      89ec16ac
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · 519e6451
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      519e6451
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 253f994a
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      253f994a
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build · ad7d7456
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
      
      
      ad7d7456
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · f442dd9a
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      configure.in:
        Auto merged
      f442dd9a
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 659387db
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      scripts/make_win_bin_dist:
        Auto merged
      659387db
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 6adb9d8f
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/my_print_defaults.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      sql/Makefile.am:
        Auto merged
      6adb9d8f
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 09330a18
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      09330a18
    • unknown's avatar
      Merge trift2.:/MySQL/M50/merge-5.0 · 9411bffb
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      configure.in:
        Auto merged
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/my_print_defaults.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      sql/Makefile.am:
        Keep the existing version, the only difference is formatting.
      9411bffb
    • unknown's avatar
      Merge trift2.:/MySQL/M51/merge-5.1 · b9416f20
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/my_print_defaults.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      sql/Makefile.am:
        Keep the existing version, the only difference is formatting.
      b9416f20
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 541c5c6e
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      scripts/make_win_bin_dist:
        To be done separate, later.
      541c5c6e
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 2cc25fd6
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      scripts/make_win_bin_dist:
        null merge
      2cc25fd6
    • unknown's avatar
      Merge trift2.:/MySQL/M50/merge-5.0 · 4c2fe0df
      unknown authored
      into  trift2.:/MySQL/M51/merge-5.1
      
      
      configure.in:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      sql/Makefile.am:
        Auto merged
      libmysqld/lib_sql.cc:
        "real_id" is not needed in 5.1, so the change need not propagate.
      sql/item_func.cc:
        "real_id" is not needed in 5.1, so the change need not propagate.
      4c2fe0df
    • unknown's avatar
      Merge trift2.:/MySQL/M41/tmp-4.1 · 8d836281
      unknown authored
      into  trift2.:/MySQL/M50/merge-5.0
      
      
      configure.in:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      sql/item_func.cc:
        Auto merged
      netware/my_print_defaults.def:
        5.0 already has 128 kB stack size.
      sql/Makefile.am:
        Manual merge.
      8d836281
    • unknown's avatar
      Merge trift2.:/MySQL/M41/tmp-4.1 · 672948f0
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      672948f0
    • unknown's avatar
      sql/item_func.cc · 9cbd0ae4
      unknown authored
          Improved check for thread identity in the "embedded" case,
          provided by Monty.
          
          This finishes the fixes for bug#27078.
      
      
      sql/item_func.cc:
        Improved check for thread identity in the "embedded" case,
        provided by Monty.
        
        This finishes the fixes for bug#27078.
      9cbd0ae4
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit · dabb72aa
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      dabb72aa
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 · a9d39c16
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      a9d39c16