1. 21 May, 2006 1 commit
  2. 20 May, 2006 4 commits
    • unknown's avatar
      Makefile.am: · b0b60840
      unknown authored
        Specify yaSSL .a file, not .la (bug#19966)
        Don't use Mac OS X "__.SYMDEF SORTED" file in archives
      
      
      libmysqld/Makefile.am:
        Specify yaSSL .a file, not .la (bug#19966)
        Don't use Mac OS X "__.SYMDEF SORTED" file in archives
      b0b60840
    • unknown's avatar
      Many files: · ce3dc8ba
      unknown authored
        Change mode to -rw-rw-r--
      
      
      mysql-test/r/archive_bitfield.result:
        Change mode to -rw-rw-r--
      mysql-test/r/binlog_row_binlog.result:
        Change mode to -rw-rw-r--
      mysql-test/r/ctype_cp932_binlog_row.result:
        Change mode to -rw-rw-r--
      mysql-test/r/events.result:
        Change mode to -rw-rw-r--
      mysql-test/r/events_bugs.result:
        Change mode to -rw-rw-r--
      mysql-test/r/events_logs_tests.result:
        Change mode to -rw-rw-r--
      mysql-test/r/events_microsec.result:
        Change mode to -rw-rw-r--
      mysql-test/r/events_stress.result:
        Change mode to -rw-rw-r--
      mysql-test/r/federated_transactions.result:
        Change mode to -rw-rw-r--
      mysql-test/r/myisam-system.result:
        Change mode to -rw-rw-r--
      mysql-test/r/ndb_config2.result:
        Change mode to -rw-rw-r--
      mysql-test/r/ndb_dd_ddl.result:
        Change mode to -rw-rw-r--
      mysql-test/r/ndb_dd_disk2memory.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_insert_id_pk.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_2innodb.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_2myisam.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_blob.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_blob2.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_charset.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_dd_advance.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_func003.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_log.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_multi_update2.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_multi_update3.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_relayrotate.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_row_001.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_sp006.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_UUID.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_trig004.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_relay_space_innodb.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_row_blob_innodb.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_row_blob_myisam.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_row_log_innodb.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_row_mysqlbinlog.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_stm_EE_err2.result:
        Change mode to -rw-rw-r--
      mysql-test/r/type_newdecimal-big.result:
        Change mode to -rw-rw-r--
      mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
        Change mode to -rw-rw-r--
      mysql-test/t/events_logs_tests-master.opt:
        Change mode to -rw-rw-r--
      mysql-test/t/rpl_ndb_commit_afterflush.test:
        Change mode to -rw-rw-r--
      mysql-test/t/rpl_ndb_insert_ignore.test:
        Change mode to -rw-rw-r--
      plugin/fulltext/AUTHORS:
        Change mode to -rw-rw-r--
      plugin/fulltext/ChangeLog:
        Change mode to -rw-rw-r--
      plugin/fulltext/NEWS:
        Change mode to -rw-rw-r--
      plugin/fulltext/README:
        Change mode to -rw-rw-r--
      plugin/fulltext/configure.in:
        Change mode to -rw-rw-r--
      storage/archive/plug.in:
        Change mode to -rw-rw-r--
      storage/example/plug.in:
        Change mode to -rw-rw-r--
      ce3dc8ba
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6609b5be
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      6609b5be
    • 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
  3. 19 May, 2006 22 commits
  4. 18 May, 2006 13 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
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a73e6126
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      a73e6126
    • 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