1. 28 Mar, 2007 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 74519b98
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_servers.h:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      storage/heap/ha_heap.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      sql/sql_servers.cc:
        Manual merge
      74519b98
    • unknown's avatar
      restored run-time thread lib detection · 8f93150d
      unknown authored
      
      sql/stacktrace.c:
        removed code duplication
      sql/stacktrace.h:
        removed code duplication
      8f93150d
  2. 27 Mar, 2007 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 548aad25
      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
      548aad25
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-bug24985 · 5e0ce039
      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
      5e0ce039
    • unknown's avatar
      Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE · de3c3719
      unknown authored
                  causes incorrect duplicate entries
      After merge fix
      
      
      de3c3719
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-bug24985 · 42422d0e
      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
      42422d0e
    • unknown's avatar
      Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE · 1fd0ba89
      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.
      1fd0ba89
  3. 25 Mar, 2007 1 commit
  4. 24 Mar, 2007 3 commits
    • unknown's avatar
      BUG#24566 - Incorrect key file for table ( the size of table is more than 2G) · fa82ebd2
      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.
      fa82ebd2
    • unknown's avatar
      BUG#26257 New Federated Server Functionality Doesn't support differently named tables · 99c5c28c
      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
      99c5c28c
    • unknown's avatar
      Bug#25721 · cb5b56c8
      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.
      cb5b56c8
  5. 23 Mar, 2007 5 commits
  6. 22 Mar, 2007 24 commits
    • unknown's avatar
      merging · b4efce0c
      unknown authored
      b4efce0c
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 7bc01344
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      sql/sql_view.cc:
        Auto merged
      7bc01344
    • unknown's avatar
      merging · 3aa9cea3
      unknown authored
      3aa9cea3
    • unknown's avatar
      After merge fix · eebba6a2
      unknown authored
      eebba6a2
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 3e6787d3
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
      
      
      3e6787d3
    • unknown's avatar
      sql_view.cc: · 842eaa44
      unknown authored
        Post-fix for bug#26813.
      
      
      sql/sql_view.cc:
        Post-fix for bug#26813.
      842eaa44
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 646b2cbb
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      646b2cbb
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 3206447b
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      3206447b
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 2c5395ee
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/t/insert_select.test:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      mysql-test/r/create.result:
        merging
      mysql-test/r/temp_table.result:
        SCCS merged
      mysql-test/r/type_float.result:
        merging
      mysql-test/r/union.result:
        merging
      mysql-test/t/temp_table.test:
        merging
      2c5395ee
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · b8c101df
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      b8c101df
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 3a222d57
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      3a222d57
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt · 45b55666
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      45b55666
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1 · 1cc700a7
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      1cc700a7
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 96793a96
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      96793a96
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · 55f991c2
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
      
      
      55f991c2
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9558c66c
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
      
      
      9558c66c
    • unknown's avatar
      Bug#26813: The SUPER privilege is wrongly required to alter a view created by · 9b774e8f
      unknown authored
      another user.
      
      When the DEFINER clause isn't specified in the ALTER statement then it's loaded
      from the view definition. If the definer differs from the current user then
      the error is thrown because only a super-user can set other users as a definers.
      
      Now if the DEFINER clause is omitted in the ALTER VIEW statement then the
      definer from the original view is used without check.
      
      
      mysql-test/t/view_grant.test:
        Added a test case for the bug#27006: The SUPER privilege is wrongly required
        to alter a view created by another user.
      mysql-test/r/view_grant.result:
        Added a test case for the bug#27006: The SUPER privilege is wrongly required
        to alter a view created by another user.
      sql/sql_view.cc:
        Bug#26813: The SUPER privilege is wrongly required to alter a view created by
        another user.
        Now if the DEFINER clause is omitted in the ALTER VIEW statement then the
        definer from the original view is used without check.
      9b774e8f
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 · 0b7ba9c2
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testNodeRestart.cpp:
        Manual merge (res.waitNodesStartPhase -> NdbSleep_SecSleep)
      0b7ba9c2
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · dc41a5ce
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26207-5.0-opt
      
      
      sql/sql_select.h:
        Auto merged
      dc41a5ce
    • unknown's avatar
      Bug #26207: When making the key image to use · 0a48cd93
      unknown authored
       in index search MySQL was not explicitly
       suppressing warnings. And if the context 
       happens to enable warnings (e.g. INSERT ..
       SELECT) the warnings resulting from converting 
       the data the key is compared to are 
       reported to the client.
       Fixed by suppressing warnings when converting
       the data to the same type as the key parts.
      
      
      mysql-test/r/insert_select.result:
        Bug #26207: test case
      mysql-test/t/insert_select.test:
        Bug #26207: test case
      sql/sql_select.h:
        Bug #26207: supress warnings when converting
          data of the same type to key buffer format.
      0a48cd93
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · d5414e9f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug26996
      
      
      d5414e9f
    • unknown's avatar
      Bug#24791: Union with AVG-groups generates wrong results · 33da0f37
      unknown authored
      Patch appled after doing a pull from the team tree. Additional tests had to be
      fixed
      
      
      mysql-test/r/union.result:
        Bug 24791
        
        The tests for temporary tables have been fixed. Since the call to 
        display_length(Item) was removed from the constructor for Item_type_holder, items 
        in temporary tables keep the original values of the items, rather than the magic
        numbers supplied by display_length.
      33da0f37
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · a9df90a7
      unknown authored
      into  linux-st28.site:/home/martin/mysql/src/5.0o-bug24791
      
      
      sql/item.cc:
        Auto merged
      a9df90a7
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · bdb9b448
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      bdb9b448