1. 20 May, 2006 1 commit
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-clean · 650fea23
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.1-clean
      
      
      include/my_pthread.h:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/join_outer.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/rpl_temporary.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      storage/ndb/test/ndbapi/Makefile.am:
        Auto merged
      storage/ndb/test/ndbapi/testInterpreter.cpp:
        Auto merged
      sql/set_var.cc:
        Resolve conflict
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Resolve conflict
      650fea23
  2. 19 May, 2006 20 commits
  3. 18 May, 2006 18 commits
    • unknown's avatar
      Bug #19395 mysqld does not always detect cluster shutdown · f87e68e4
      unknown authored
          Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
      
      
      mysql-test/r/ndb_autodiscover3.result:
        Bug #19395 mysqld does not always detect cluster shutdown
      mysql-test/t/disabled.def:
        Bug #19395 mysqld does not always detect cluster shutdown
      mysql-test/t/ndb_autodiscover3.test:
        Bug #19395 mysqld does not always detect cluster shutdown
      sql/ha_ndbcluster_binlog.cc:
        Bug #19395 mysqld does not always detect cluster shutdown
      storage/ndb/include/ndbapi/Ndb.hpp:
        Bug #19395 mysqld does not always detect cluster shutdown
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
      storage/ndb/src/ndbapi/Ndb.cpp:
        Bug #19395 mysqld does not always detect cluster shutdown
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
      storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
        Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
      f87e68e4
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 41e6fb25
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0
      
      
      41e6fb25
    • unknown's avatar
      After merge fixes · 495e1080
      unknown authored
      495e1080
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 33c439ce
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
      
      
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      33c439ce
    • unknown's avatar
      Bug #13975: "same string" + 0 has 2 different results · 573d9e47
      unknown authored
        The 'decimals' member of Item_func was being improperly initialized,
        which resulted in improper results when handling large numeric values.
      
      
      mysql-test/r/func_str.result:
        Add test results
      mysql-test/t/func_str.test:
        Add new regression test
      sql/item_strfunc.h:
        Remove unnecessary reset of decimals in Item_func_conv::fix_length_and_dec().
      573d9e47
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/tmp_5.0_merge · 89257c91
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
      
      
      mysql-test/r/binlog_stm_drop_tmp_tbl.result:
        Auto merged
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/r/rpl_temporary.result:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      mysql-test/t/rpl_stm_until.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      mysql-test/r/rpl_stm_until.result:
        Manual merge
      mysql-test/t/rpl_temporary.test:
        Manual merge
      sql/sql_base.cc:
        Manual merge
      89257c91
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 425782b3
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      425782b3
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug18818/my51-bug18818 · ecf4865e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      configure.in:
        Auto merged
      ecf4865e
    • unknown's avatar
      Fix "glibc detected double free" · 127d73ab
      unknown authored
      Remove extra call to vio_end
      
      
      sql/mysqld.cc:
        Remove the second call to vio_end as it should only be called once when the server shutdown.
      127d73ab
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 46221f45
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      client/mysql.cc:
        Auto merged
      46221f45
    • unknown's avatar
      Merge knielsen@10.100.52.19:/usr/local/mysql/tmp-5.1 · a5d9932b
      unknown authored
      into  mysql.com:/data0/knielsen/tmp-5.1
      
      
      a5d9932b
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 74183117
      unknown authored
      into moonbone.local:/work/19077-bug-5.0-mysql
      
      
      74183117
    • unknown's avatar
      After-merge fix. · 41200a07
      unknown authored
      
      mysql-test/r/sp.result:
        After-merge fixes
      mysql-test/r/trigger-grant.result:
        After-merge fixes
      mysql-test/t/trigger-grant.test:
        After-merge fixes
      sql/sql_insert.cc:
        After-merge fixes
      41200a07
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/tmp_merge · 1875f315
      unknown authored
      into  mysql.com:/usr/local/mysql/merge-5.1
      
      
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/trigger-grant.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/trigger-grant.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      server-tools/instance-manager/options.h:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      server-tools/instance-manager/options.cc:
        Manual merge
      sql/item_func.cc:
        Manual merge
      sql/mysql_priv.h:
        Manual merge
      sql/sp_head.cc:
        Manual merge
      sql/sql_table.cc:
        Manual merge
      1875f315
    • unknown's avatar
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · ed5ac749
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
      
      
      ed5ac749
    • unknown's avatar
      Fixed bug #19816. · 087be9ba
      unknown authored
      This bug was introduced when the patch resolving the
      performance problem 17164 was applied. As a result
      of that modification the not_null_tables attributes
      were calculated incorrectly for constant OR conditions.
      This triggered invalid conversion of outer joins into
      inner joins.
      
      
      mysql-test/r/join_outer.result:
        Added a test case for bug #19816.
      mysql-test/t/join_outer.test:
        Added a test case for bug #19816.
      087be9ba
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/tmp_merge · de0e4a9a
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
      
      
      mysql-test/r/join_outer.result:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      de0e4a9a
  4. 17 May, 2006 1 commit