1. 22 Jun, 2006 5 commits
    • unknown's avatar
      Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51 · f6a65b02
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781
      
      
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      f6a65b02
    • unknown's avatar
      ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come) · 5aaba829
      unknown authored
            have to push this to be able to push 5.0
      
      
      storage/ndb/include/kernel/signaldata/DictLock.hpp:
        Rename: ndb/include/kernel/signaldata/DictLock.hpp -> storage/ndb/include/kernel/signaldata/DictLock.hpp
      storage/ndb/src/kernel/blocks/dbdict/DictLock.txt:
        Rename: ndb/src/kernel/blocks/dbdict/DictLock.txt -> storage/ndb/src/kernel/blocks/dbdict/DictLock.txt
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        debug
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        bug#18781 post-merge 5.0->5.1 fixes (one more to come)
      storage/ndb/src/ndbapi/ndberror.c:
        bug#18781 post-merge 5.0->5.1 fixes (one more to come)
      storage/ndb/test/ndbapi/testDict.cpp:
        bug#18781 post-merge 5.0->5.1 fixes (one more to come)
      storage/ndb/test/src/NdbRestarter.cpp:
        bug#18781 post-merge 5.0->5.1 fixes (one more to come)
      5aaba829
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1 · d9ec7f3c
      unknown authored
      into  mysql.com:/home/bk/fix-mysql-5.1
      
      
      sql/sql_insert.cc:
        Auto merged
      d9ec7f3c
    • unknown's avatar
      Patch to handle some bad situations resulting from the fix for BUG#19995. · ab28aa9c
      unknown authored
      
      sql/handler.cc:
        Generating table maps from all locks that can be available: THD::extra_lock,
        THD::lock, and THD::locked_tables.
      sql/sql_class.h:
        Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
        Removing select_insert::lock.
      sql/sql_insert.cc:
        Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
        Removing select_insert::lock.
      ab28aa9c
    • unknown's avatar
      Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1 · 54b38dd6
      unknown authored
      
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      support-files/mysql.server.sh:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      54b38dd6
  2. 21 Jun, 2006 25 commits
  3. 20 Jun, 2006 10 commits
    • unknown's avatar
      Re-enable IM tests. · fb074e38
      unknown authored
      fb074e38
    • unknown's avatar
      Fix merge 5.0 -> 5.1. · a28e7eb4
      unknown authored
      
      mysql-test/r/im_life_cycle.result:
        Fix manual merge.
      a28e7eb4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · d1e45ad8
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.1-merged
      
      
      d1e45ad8
    • unknown's avatar
      rpl_ndb_log.result: · 73d86f32
      unknown authored
        Corrected test case result
      
      
      mysql-test/r/rpl_ndb_log.result:
        Corrected test case result
      73d86f32
    • unknown's avatar
      Merge dator5.(none):/home/pappa/bug16000 · 68d4c991
      unknown authored
      into  dator5.(none):/home/pappa/bug19281
      
      
      mysql-test/t/partition_mgm.test:
        Auto merged
      68d4c991
    • unknown's avatar
      Fix for bug#18516 (also #19353, reported for 5.1): · 99740b3f
      unknown authored
      In addition to include "mysql_upgrade" in a RPM, it should also be called
      when the RPM is upgraded.
      
      
      support-files/mysql.server.sh:
        Support getting additional arguments, which need to be passed on to the server.
        This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments.
        So if the IM would be used, additional arguments cause the start to fail (voluntarily).
        
        This feature is needed so that tools like RPM can start the server in an "isolated" way,
        see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade".
      support-files/mysql.spec.sh:
        Call "mysql_upgrade" during an RPM upgrade.
        
        "mysql_upgrade" needs a server to run, as it issues SQL commands.
        (This had been neglected previously.)
        It also needs to connect as "root", but in an RPM upgrade the password is unknown.
        To allow this, the server is started "--skip-grant-tables".
        Normally, this would open big security holes, so it is also started "--skip-networking",
        and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.
      99740b3f
    • unknown's avatar
      BUG#16000: .par file left behind plus unnecessary messages to error.log · ed7dd45f
      unknown authored
      New test cases
      
      
      mysql-test/r/partition_error.result:
        New test cases
      mysql-test/r/partition_mgm.result:
        New test cases
      mysql-test/t/partition_error.test:
        New test cases
      mysql-test/t/partition_mgm.test:
        New test cases
      ed7dd45f
    • unknown's avatar
      Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 7f272a49
      unknown authored
      into  dator5.(none):/home/pappa/bug16000
      
      
      7f272a49
    • unknown's avatar
      Merge dator5.(none):/home/pappa/bug19309 · b5e43911
      unknown authored
      into  dator5.(none):/home/pappa/bug19281
      
      
      b5e43911
    • unknown's avatar
      Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 5efea6a0
      unknown authored
      into  dator5.(none):/home/pappa/bug19309
      
      
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/partition.result:
        manual merge
      mysql-test/t/partition.test:
        manual merge
      5efea6a0