1. 28 Mar, 2007 3 commits
  2. 27 Mar, 2007 7 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3812f992
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      3812f992
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 8d37f95b
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug24985
      
      
      storage/myisam/ha_myisam.cc:
        Auto merged
      mysql-test/r/heap_btree.result:
        Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
                    causes incorrect duplicate entries
        Manual merge from 5.0
      mysql-test/t/heap_btree.test:
        Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
                    causes incorrect duplicate entries
        Manual merge from 5.0
      8d37f95b
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-bug24985 · 5dfbe3cc
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug24985
      
      
      mysql-test/r/heap_btree.result:
        Auto merged
      mysql-test/t/heap_btree.test:
        Auto merged
      storage/heap/ha_heap.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      5dfbe3cc
    • unknown's avatar
      Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE · fe4ff304
      unknown authored
                  causes incorrect duplicate entries
      After merge fix
      
      fe4ff304
    • unknown's avatar
      Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · 5d567b7b
      unknown authored
      into  trift-lap.fambruehe:/MySQL/M51/push-5.1
      
      
      mysql-test/t/query_cache_sql_prepare.test:
        Auto merged
      5d567b7b
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-bug24985 · 0abd1439
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug24985
      
      
      mysql-test/r/heap_btree.result:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      mysql-test/t/heap_btree.test:
        Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
                    causes incorrect duplicate entries
        Manual merge from 4.1
      0abd1439
    • unknown's avatar
      Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE · c664a9b5
      unknown authored
                  causes incorrect duplicate entries
      
      Keys for BTREE indexes on ENUM and SET columns of MEMORY tables
      with character set UTF8 were computed incorrectly. Many
      different column values got the same key value.
      
      Apart of possible performance problems, it made unique indexes
      of this type unusable because it rejected many different
      values as duplicates.
      
      The problem was that multibyte character detection was tried
      on the internal numeric column value. Many values were not
      identified as characters. Their key value became blank filled.
      
      Thanks to Alexander Barkov and Ramil Kalimullin for the patch,
      which sets the character set of ENUM and SET key segments to
      the pseudo binary character set.
      
      
      mysql-test/r/heap_btree.result:
        Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
                    causes incorrect duplicate entries
        Added test result.
      mysql-test/t/heap_btree.test:
        Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
                    causes incorrect duplicate entries
        Added test.
      sql/ha_heap.cc:
        Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
                    causes incorrect duplicate entries
        Set key segment charset to my_charset_bin for ENUM and SET
        columns.
      c664a9b5
  3. 26 Mar, 2007 14 commits
  4. 25 Mar, 2007 4 commits
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 71b453cd
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      71b453cd
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user · ef8786ff
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ef8786ff
    • unknown's avatar
      Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb · 5043b31e
      unknown authored
      into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
      
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      storage/ndb/test/src/UtilTransactions.cpp:
        Auto merged
      5043b31e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · bae12c0c
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0--team
      
      
      sql/ha_myisam.cc:
        Auto merged
      bae12c0c
  5. 24 Mar, 2007 3 commits
    • unknown's avatar
      BUG#24566 - Incorrect key file for table ( the size of table is more than 2G) · 23666d49
      unknown authored
      Accessing a file that is bigger than 2G may report that read/write operation
      failed. This may affect anything that uses my_pread/my_pwrite functions, e.g.
      MyISAM, ARCHIVE, binary log.
      
      For MyISAM INSERT may report that table is crashed when writing to a table
      that is bigger than 2G.
      
      This is fixed by using proper offset type in my_pread/my_pwrite functions on
      systems that do not have native pread/pwrite calls.
      
      Affects systems that do not have native pread/pwrite calls, e.g. Windows.
      
      No test case for this fix, since it requires huge table.
      
      
      mysys/my_pread.c:
        Use proper offset type for restoring position on systems that do not have native
        pread/pwrite calls.
      23666d49
    • unknown's avatar
      BUG#26257 New Federated Server Functionality Doesn't support differently named tables · 9448df61
      unknown authored
      * Modified Federated memory allocation to use MEM_ROOT
      * Modified sql_servers and federated to allocate share connection
        parameters to use MEM_ROOT
      * Modified Federated to allow tablename in addition to server name
      * Implicit flushing of tables using altered/dropped server name
      * Added tests to prove new functionality works
      
      Contributors to this patch: Patrick Galbraith, Antony Curtis
      
      
      mysql-test/r/federated_server.result:
        BUG #26257 New Federated Server Functionality Doesn't support differently named tables
        
          New test results
      mysql-test/t/federated_server.test:
        BUG #26257 New Federated Server Functionality Doesn't support differently named tables
        
        New test which ensures that one can use the new 'create server'
        functionality and have tables point to the correct table, using CONNECTION='server',
        CONNECTION="server/tablename" and CONNECTION="mysql://...url"
      sql/mysql_priv.h:
        BUG #26257 New Federated Server Functionality Doesn't support differently named tables
        
        new function: close_cached_connection_tables()
      sql/sql_base.cc:
        BUG #26257 New Federated Server Functionality Doesn't support differently named tables
        
        new function: close_cached_connection_tables()
          closes all open tables which match connection string
          provides functionality to allow flushing of altered/dropped server names.
      sql/sql_servers.cc:
        BUG #26257 New Federated Server Functionality Doesn't support differently named tables
        
        * Added function clone_server() to allocate a new server for use by
          get_server_by_name() when creating a federated table
        
        * Now using MEM_ROOT allocation (mark and sweep) to account for meta
          data parameters being allocated properly, particularly with regards to
          to SERVER object. Also cleans up code allocating share.
        
        * Tables using the old definition of server name are now flushed on successful
          execution of ALTER/DROP SERVER.
        
        style: fixed some line-wrapping
      sql/sql_servers.h:
        BUG #26257 New Federated Server Functionality Doesn't support differently named tables
        
        * change in prototype to get_server_by_name()
          caller can now provide mem_root which strings will be copied in to.
      storage/federated/ha_federated.cc:
        BUG #26257 New Federated Server Functionality Doesn't support differently named tables
        
        * Simplified share and share member memory allocaton to use MEM_ROOT
        * Modified parse_url to parse table names along with server names
      storage/federated/ha_federated.h:
        BUG #26257 New Federated Server Functionality Doesn't support differently named tables
        
        * Added MEM_ROOT share member
      9448df61
    • unknown's avatar
      Bug#25721 · ed0b3143
      unknown authored
        "Concurrent ALTER/CREATE SERVER can lead to deadlock"
        Deadlock caused by inconsistant use of mutexes in sql_server.cc
        One mutex has been removed to resolve deadlock.
        Many functions were made private which should not be exported.
        Unused variables and function removed.
      
      
      mysql-test/r/federated_server.result:
        Bug 25721 "Concurrent ALTER/CREATE SERVER can lead to deadlock"
        
        New test results
      mysql-test/t/federated_server.test:
        Bug 25721 "Concurrent ALTER/CREATE SERVER can lead to deadlock"
        
        Test for bug by using stored procedure. Unpatched server would deadlock frequently.
      sql/sql_parse.cc:
        Bug 25721 "Concurrent ALTER/CREATE SERVER can lead to deadlock"
        
        check for correct error code when dropping server
      sql/sql_servers.cc:
        Bug 25721 "Concurrent ALTER/CREATE SERVER can lead to deadlock"
        
        Removed unneccessary mutex, only need THR_LOCK_servers rwlock to
        guard data structures against race conditions. Misuse of other mutex
        caused deadlock by inconsistant ordering of mutex lock operations.
        Alter order of some operations to hit memory before disk.
        Removed unused function.
        Removed servers_version and servers_cache_initialised variables.
        Made many internal functions static.
      sql/sql_servers.h:
        Bug 25721 "Concurrent ALTER/CREATE SERVER can lead to deadlock"
        
        remove internal functions from being exported.
      ed0b3143
  6. 23 Mar, 2007 9 commits