1. 18 May, 2006 3 commits
    • unknown's avatar
      sql_db.cc: · 14315191
      unknown authored
        Bug#19392: Rename Database: Crash if case change
        Additional minor fix, to avoid compiler warnings.
      
      
      sql/sql_db.cc:
        Bug#19392: Rename Database: Crash if case change
        Additional minor fix, to avoid compiler warnings.
      14315191
    • unknown's avatar
      Bug#19392 Rename Database: Crash if case change · 9c686c8a
      unknown authored
      Problem:
      Renaming a database to itself crashed server.
      It hapenned because of wrong DBUG_ASSERT.
      Fix: removing wrong DBUG_ASSERT. Now it reports
      a correct error message "database alreadt exists".
      
      
      mysql-test/r/renamedb.result:
        Adding test case
      mysql-test/t/renamedb.test:
        Adding test case
      sql/sql_db.cc:
        DBUG_ASSERT crashed server when renaming a database to itself.
      9c686c8a
    • 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
  2. 17 May, 2006 10 commits
    • unknown's avatar
      type_newdecimal.result, case.result: · 2a29fbfc
      unknown authored
        Adjusted merge
      
      
      mysql-test/r/case.result:
        Adjusted merge
      mysql-test/r/type_newdecimal.result:
        Adjusted merge
      2a29fbfc
    • unknown's avatar
      Merge mysql.com:/data0/mysqldev/my/tmp_merge · e78b4cca
      unknown authored
      into  mysql.com:/tmp/mysql-5.1-new
      
      
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/type_float.result:
        Auto merged
      sql/item.cc:
        Auto merged
      e78b4cca
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/tmp_merge · 8df5fdb9
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      8df5fdb9
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2d0297f0
      unknown authored
      into mysql.com:/M51/merge-5.1
      
      
      2d0297f0
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 15e4938b
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp-5.1
      
      
      libmysql/libmysql.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      mysql-test/valgrind.supp:
        Manual merge.
      15e4938b
    • unknown's avatar
      Merge mysql.com:/M50/tmp_merge into mysql.com:/M51/merge-5.1 · 4b35cdcb
      unknown authored
      
      configure.in:
        Auto merged
      BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
        Auto merged
      BitKeeper/deleted/.del-mysql_prepare_privilege_tables_for_5.sql~76ea3c82bdbbead4:
        Auto merged
      mysql-test/extra/binlog_tests/binlog.test:
        Auto merged
      mysql-test/extra/rpl_tests/rpl_ddl.test:
        Auto merged
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Auto merged
      mysql-test/r/archive_gis.result:
        Auto merged
      mysql-test/r/bdb_gis.result:
        Auto merged
      mysql-test/r/binlog_stm_binlog.result:
        Auto merged
      mysql-test/r/binlog_stm_blackhole.result:
        Auto merged
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Auto merged
      mysql-test/r/grant2.result:
        Auto merged
      mysql-test/r/im_life_cycle.result:
        Auto merged
      mysql-test/r/im_utils.result:
        Auto merged
      mysql-test/r/insert_update.result:
        Auto merged
      mysql-test/r/innodb_gis.result:
        Auto merged
      mysql-test/r/mysqldump-max.result:
        Auto merged
      mysql-test/r/ndb_bitfield.result:
        Auto merged
      mysql-test/r/ndb_condition_pushdown.result:
        Auto merged
      mysql-test/r/ndb_database.result:
        Auto merged
      mysql-test/r/ndb_gis.result:
        Auto merged
      mysql-test/r/ndb_update.result:
        Auto merged
      mysql-test/r/rpl_create_database.result:
        Auto merged
      mysql-test/r/query_cache_notembedded.result:
        Auto merged
      mysql-test/r/rpl_drop_db.result:
        Auto merged
      mysql-test/r/rpl_multi_update3.result:
        Auto merged
      mysql-test/r/rpl_slave_status.result:
        Auto merged
      mysql-test/r/rpl_trigger.result:
        Auto merged
      mysql-test/r/rpl_view.result:
        Auto merged
      mysql-test/r/sp-code.result:
        Auto merged
      mysql-test/r/sp-vars.result:
        Auto merged
      mysql-test/r/sp_trans.result:
        Auto merged
      mysql-test/r/timezone_grant.result:
        Auto merged
      mysql-test/r/trigger-compat.result:
        Auto merged
      mysql-test/r/trigger-grant.result:
        Auto merged
      mysql-test/r/type_bit_innodb.result:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/binlog_row_binlog-master.opt:
        Auto merged
      mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
        Auto merged
      mysql-test/t/create_select_tmp.test:
        Auto merged
      mysql-test/t/grant2.test:
        Auto merged
      mysql-test/t/handler.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/rpl_commit_after_flush.test:
        Auto merged
      mysql-test/t/rpl_insert_ignore.test:
        Auto merged
      mysql-test/t/rpl_rewrt_db-slave.opt:
        Auto merged
      mysql-test/t/rpl_rewrt_db.test:
        Auto merged
      mysys/mf_tempdir.c:
        Auto merged
      mysys/my_mmap.c:
        Auto merged
      sql/sql_bitmap.h:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      storage/bdb/dist/s_dir:
        Auto merged
      storage/myisam/ftbench/Ecompare.pl:
        Auto merged
      storage/myisam/ftbench/Ecreate.pl:
        Auto merged
      storage/myisam/ftbench/Ereport.pl:
        Auto merged
      storage/myisam/ftbench/README:
        Auto merged
      storage/myisammrg/myrg_range.c:
        Auto merged
      storage/myisammrg/myrg_rnext_same.c:
        Auto merged
      strings/decimal.c:
        Auto merged
      zlib/Makefile.am:
        Auto merged
      4b35cdcb
    • unknown's avatar
      After-merge fixes. · 316f967d
      unknown authored
      316f967d
    • unknown's avatar
      Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge · c4e26cb0
      unknown authored
      into  mysql.com:/home/kgeorge/mysql/5.1/merge
      
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      c4e26cb0
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ea7cc4af
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/rpl_temporary.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/rpl_temporary.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      ea7cc4af
    • unknown's avatar
      Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail · 1d83b61b
      unknown authored
      
      sql/ha_ndbcluster_binlog.cc:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
        - small correction of previous patch
      storage/ndb/src/ndbapi/DictCache.cpp:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
        - cache not released properly
      storage/ndb/tools/desc.cpp:
        Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
        - added retry option so that ndb_desc can be used to wait for a table to be created
      1d83b61b
  3. 16 May, 2006 22 commits
    • unknown's avatar
      Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge · 4d861dad
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/rpl_temporary.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/rpl_temporary.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      4d861dad
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 39ad30a4
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/tools/waiter.cpp:
        Auto merged
      39ad30a4
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 6ee68c82
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/tools/waiter.cpp:
        Auto merged
      6ee68c82
    • unknown's avatar
      ndb: added some missing error codes to mgmapi · a2f26487
      unknown authored
          ndb: ndb_waiter disconnect/reconnect on get status error
      
      
      ndb/src/mgmapi/mgmapi.cpp:
        ndb: added some missing error codes to mgmapi
      ndb/tools/waiter.cpp:
        ndb: ndb_waiter disconnect/reconnect on get status error
      a2f26487
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5fca6059
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      mysql-test/t/disabled.def:
        Auto merged
      5fca6059
    • unknown's avatar
      Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail · 597d84fa
      unknown authored
      - adoptions to handle binlog
      
      
      597d84fa
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6a278824
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      
      6a278824
    • unknown's avatar
      Updated to fix bug in AIX · fdedc069
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        Remove disable log per lars
      mysql-test/r/rpl_stm_log.result:
        New results file
      mysql-test/r/rpl_row_log.result:
        New results file
      mysql-test/r/rpl_row_log_innodb.result:
        New results file
      fdedc069
    • unknown's avatar
      rpl_log.test: · c3e4f43d
      unknown authored
        Fix for failure in aix52 failure during push build
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        Fix for failure in aix52 failure during push build
      c3e4f43d
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix · 771d3d82
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp-5.1
      
      
      client/mysqlbinlog.cc:
        Auto merged
      include/my_sys.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysys/my_init.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      dbug/dbug.c:
        Manual merge
      include/my_dbug.h:
        Manual merge
      771d3d82
    • unknown's avatar
      disable events_logs_tests · 5be20e1c
      unknown authored
      5be20e1c
    • unknown's avatar
      information_schema.result: · 72232c69
      unknown authored
        corrected merge
      
      
      mysql-test/r/information_schema.result:
        corrected merge
      72232c69
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 0f404366
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      storage/ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      storage/ndb/src/mgmsrv/Services.cpp:
        manual merge
      0f404366
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · f5afd233
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      f5afd233
    • unknown's avatar
      Bug #18591 Repeated "show" and "all status" calls to ndb_mgm causes mgmd to crash · 976deafb
      unknown authored
      - not having lock can cause "block number list" to become corrupt => crash
      - also may result in 2 threads receiving same block no => possble cause of
      Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd
      
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        ndb: added missing lock of mutex
      976deafb
    • unknown's avatar
      corrected merge · 7cb13aec
      unknown authored
      7cb13aec
    • unknown's avatar
      Merge jonas@perch:src/mysql-4.1 · 9f46b3b5
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      support-files/mysql.spec.sh:
        Auto merged
      9f46b3b5
    • unknown's avatar
      Merge jonas@perch:src/mysql-5.0 · c1a28709
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      support-files/mysql.spec.sh:
        Auto merged
      c1a28709
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 37b79d90
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/rpl_temporary.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/rpl_temporary.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      storage/ndb/src/ndbapi/ClusterMgr.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ClusterMgr.hpp:
        Auto merged
      storage/ndb/src/ndbapi/DictCache.hpp:
        Auto merged
      storage/ndb/src/ndbapi/TransporterFacade.hpp:
        Auto merged
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
        Auto merged
      mysql-test/r/information_schema.result:
        manual merge
      mysql-test/t/information_schema.test:
        manual merge
      sql/ha_ndbcluster.cc:
        manual merge
      storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
        manual merge
      storage/ndb/src/ndbapi/DictCache.cpp:
        manual merge
      37b79d90
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 17c95456
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      17c95456
    • unknown's avatar
      Merge mysql.com:/home/tmp_merge · c6b8d346
      unknown authored
      into  mysql.com:/home/mysql-5.1-18997e
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      c6b8d346
    • unknown's avatar
      Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value · b41b0fd6
      unknown authored
      if input year for date_add() / date_sub() with INTERVAL is low enough for
      calc_daynr() to possibly return incorrect results (calc_daynr() has no information
      on whether the year is low because it was a two-digit year ('77) or because it
      was a really low four-digit year (0077) and will indiscriminately try to turn the
      value into a four-digit year by adding 1900 or 2000 respectively), the functions
      will now throw NULL.
      
      
      include/my_time.h:
        new define YY_MAGIC_BELOW: if year is below this threshold, magic kicks in in
        calc_daynr(). the idea is to convert two-digit years to four-digit ones, adding
        1900 to values >= YY_PART_YEAR or adding 2000 otherwise.
        current value of YY_MAGIC_BELOW derived from original code in calc_daynr()
      mysql-test/r/func_time.result:
        test where 2 digit -> 4 digit year magic kicks in, and whether we throw NULL when
        it happens
      mysql-test/t/func_time.test:
        test where 2 digit -> 4 digit year magic kicks in, and whether we throw NULL when
        it happens
      sql-common/my_time.c:
        use new const YY_MAGIC_BELOW, apply 2-digit -> 4-digit magic only to years
        below this threshold.
      sql/item_timefunc.cc:
        throw NULL when year in date_add() / date_sub() would be affected by
        2 digit -> 4 digit magic.
      b41b0fd6
  4. 15 May, 2006 5 commits