1. 05 Jan, 2006 2 commits
  2. 04 Jan, 2006 10 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7bf8a9e6
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-merge
      
      
      7bf8a9e6
    • unknown's avatar
      Post-merge fixes. · 58d4830c
      unknown authored
      
      sql/sql_acl.cc:
        A post-merge fix.
      sql/sql_base.cc:
        A post-merge fix.
      58d4830c
    • unknown's avatar
      EADDRINUSE is not defined on Windows. · a6b0029f
      unknown authored
      a6b0029f
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxfix · 0d9edb36
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.0
      
      
      0d9edb36
    • unknown's avatar
      Fix QNX test abort in release builds and pushbuild, avoid killing our · b6e0d940
      unknown authored
      parent when we are not the process group leader.
      
      
      b6e0d940
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-7209-new · 3456c4be
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-merge
      
      
      mysys/hash.c:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_acl.cc:
        Manual merge.
      sql/sql_base.cc:
        Manual merge.
      3456c4be
    • unknown's avatar
      A fix for Bug#7209 "Client error with "Access Denied" on updates · f577d864
      unknown authored
      when high concurrency": remove HASH::current_record and make it
      an external search parameter, so that it can not be the cause of a 
      race condition under high concurrent load.
      The bug was in a race condition in table_hash_search,
      when column_priv_hash.current_record was overwritten simultaneously
      by multiple threads, causing the search for a suitable grant record
      to fail.
      No test case as the bug is repeatable only under concurrent load.
      
      
      include/hash.h:
        - remove current_record from HASH, instead modify hash_first,
        hash_next to accept HASH_SEARCH_STATE as an IN/OUT parameter
      mysys/hash.c:
        - remove HASH::current_record
        - change declarations of functions that use HASH in read-only mode
          to accept const HASH * instead of HASH *. 
        - implement hash_search; move the old implementation of hash_search
        to hash_first
      mysys/testhash.c:
        - adjust the test case to changed function declarations
      sql/lock.cc:
        - adjust to changed declarations of hash_search, hash_next
      sql/sql_acl.cc:
        - adjust to changed declarations of hash_search, hash_next
      sql/sql_base.cc:
        - adjust to changed declarations of hash_search, hash_nex
      sql/sql_cache.cc:
        - adjust to a changed declaration of hash_replace
      f577d864
    • unknown's avatar
      BUG#14931: Temporarily add synchronization to avoid sporadic test failures until · 95cecbf8
      unknown authored
      the bug is fixed.
      
      
      mysql-test/r/rpl_sp.result:
        BUG#14931: Temporarily add synchronization to avoid sporadic failures until
        the bug is fixed.
      mysql-test/t/rpl_sp.test:
        BUG#14931: Temporarily add synchronization to avoid sporadic failures until
        the bug is fixed.
      95cecbf8
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxtestsock · 314f0fbf
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.0
      
      
      314f0fbf
    • unknown's avatar
      e1fdf8b4
  3. 03 Jan, 2006 1 commit
    • unknown's avatar
      Fix for bug#15533 crash, information_schema, function, view · 5e7cbbcb
      unknown authored
        enable view prepared mode during getting metedata for I_S table
      
      
      mysql-test/r/information_schema.result:
        Fix for bug#15533 crash, information_schema, function, view
          test case
      mysql-test/t/information_schema.test:
        Fix for bug#15533 crash, information_schema, function, view
          test case
      5e7cbbcb
  4. 31 Dec, 2005 1 commit
  5. 29 Dec, 2005 5 commits
  6. 28 Dec, 2005 10 commits
    • unknown's avatar
      Bug#15591 Occasional test suite abort due to port in use · 57b20336
      unknown authored
      If the server is started with --port-open-timeout=# 
      retry to bind the TCP port if it fails with EADDRINUSE.
      Use the new option in mysql-test-run.sh.
      
      
      mysql-test/mysql-test-run.sh:
        Bug#15591 Occasional test suite abort due to port in use
        Use the new option --port-open-timeout=# for server starts.
        This should fix occasionally late closed TCP ports.
      sql/mysqld.cc:
        Bug#15591 Occasional test suite abort due to port in use
        If the server is started with --port-open-timeout=# 
        retry to bind the TCP port if it fails with EADDRINUSE.
      57b20336
    • unknown's avatar
      config-win.h: · 82d5d2a9
      unknown authored
        Backported Windows MAX_INDEXES handling from 5.1
      
      
      include/config-win.h:
        Backported Windows MAX_INDEXES handling from 5.1
      82d5d2a9
    • unknown's avatar
      Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2 · bf0c5e6f
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/my50-bug15775_part2
      
      
      bf0c5e6f
    • unknown's avatar
      Manual merge · 8f29cc3e
      unknown authored
      
      mysql-test/t/ctype_ucs.test:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
        Auto merged
      8f29cc3e
    • unknown's avatar
      Bug #15775 "drop user" command does not refresh acl_check_hosts · 93bedc1f
      unknown authored
       - Update patch for 5.0 
       - Added common function to be called when 'acl_users' has been modified
      
      
      mysql-test/r/grant2.result:
        Use "create user" to avoid warnings about missing fields
      mysql-test/t/grant2.test:
        Use "create user" to avoid warnings about missing fields
      sql/sql_acl.cc:
        Add new function "rebuild_check_host" that is to be called when the 'acl_users'
        list has changed.
        Call function "rebuild_check_host" from mysql_drop_user, mysql_rename_user and acl_insert_user.
        Use "acl_user->host.hostname" as key when searching the acl_check_hosts in init_check_host.
      93bedc1f
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c37389cf
      unknown authored
      into moonbone.local:/work/14583-bug-4.1-mysql
      
      
      c37389cf
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · e46602f5
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b15108
      
      
      e46602f5
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2 · 50545a18
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
      
      
      mysql-test/r/grant2.result:
        Merge test results
      mysql-test/t/grant2.test:
        Merge tests
      sql/sql_acl.cc:
        Removing the 4.1 version patch
      50545a18
    • unknown's avatar
      BUG#15775 "drop user" command does not refresh acl_check_hosts · 9a8dde9b
      unknown authored
         - DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
           connect's via TCP to fail randomly.
         - 4.1 version
      
      
      mysql-test/r/grant2.result:
        Update test results
      mysql-test/t/grant2.test:
        Add test for to check that connect via TCP work after "drop user"
      sql/sql_acl.cc:
        Reload acl_check_hosts as its memory is mapped to acl_user
        Use acl_user->host.hostname when searching the acl_check_hosts list
      9a8dde9b
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 4f5664f3
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug5390
      
      
      4f5664f3
  7. 27 Dec, 2005 9 commits
    • unknown's avatar
      Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1c74210e
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug5390
      
      
      1c74210e
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6706115c
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my50
      
      
      6706115c
    • unknown's avatar
      Fix bug#14583 · 9a128b97
      unknown authored
      When InnoDB compares varchar field in ucs2 with given key using bin collation,
      it calls my_strnncollsp_ucs2_bin() to perform comparison.
      Because field length was lesser than length of key field should be padded
      with trailing spaces in order to get correct result. 
      Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
      doesn't pads field, wrong comparison result was returned. This results in
      wrong result set.
      
      my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
      but using binary collation.
      
      
      mysql-test/t/ctype_ucs.test:
        Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
        correct records.
      mysql-test/r/ctype_ucs.result:
        Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping correct records.
      strings/ctype-ucs2.c:
        Fix bug#14583 Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
        correct records.my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
        but using binary collation.
      9a128b97
    • unknown's avatar
      ndb - wl#2972 (5.0) fix detached trigger opType + new pgm test_event_merge · b4d11507
      unknown authored
      
      ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        error code 4709 was set outside if()
      ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        fix opType for detached triggers (accidental miss since v21x?)
      ndb/test/ndbapi/Makefile.am:
        test_event_merge v5.0
      ndb/test/ndbapi/test_event_merge.cpp:
        test_event_merge v5.0
      b4d11507
    • unknown's avatar
      5.0 ndb build fix. · f6910883
      unknown authored
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        build fix for 5.0
      f6910883
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 88ef95ff
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      client/mysql.cc:
        Auto merged
      myisam/mi_delete.c:
        Auto merged
      mysql-test/r/fulltext2.result:
        Auto merged
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      88ef95ff
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 4b543591
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-bug5390
      
      
      libmysqld/ha_blackhole.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      4b543591
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · d03d5a30
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug5390
      
      
      BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      d03d5a30
    • unknown's avatar
  8. 26 Dec, 2005 2 commits
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-bug5390 · e049f2c8
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-bug5390
      
      
      BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
        Auto merged
      mysql-test/r/create.result:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      mysql-test/r/merge.result:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      mysql-test/t/create.test:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      mysql-test/t/merge.test:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      sql/lock.cc:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      sql/mysql_priv.h:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      sql/sql_parse.cc:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      sql/sql_update.cc:
        BUG#5390 - problems with merge tables
        Manual merge: ul - use local changes made for 5.0
      e049f2c8
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f04a3619
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b15108
      
      
      sql/ha_innodb.cc:
        Auto merged
      f04a3619