1. 04 Oct, 2007 4 commits
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 698e9b4f
      unknown authored
      into  mysql.com:/home/ram/work/b31070/b31070.5.0
      
      
      698e9b4f
    • unknown's avatar
      merging: results adjusted · 6dc4dfb3
      unknown authored
      6dc4dfb3
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b31070/b31070.4.1 · 19810085
      unknown authored
      into  mysql.com:/home/ram/work/b31070/b31070.5.0
      
      
      mysql-test/r/ctype_big5.result:
        Auto merged
      mysql-test/r/ctype_gbk.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-euc_kr.c:
        Auto merged
      strings/ctype-gb2312.c:
        Auto merged
      strings/ctype-sjis.c:
        Auto merged
      BitKeeper/deleted/.del-ctype-cp932.c:
        Auto merged
      19810085
    • unknown's avatar
      Fix for bug #31069: crash in 'sounds like' · db2d3104
      unknown authored
      and for bug #31070: crash during conversion of charsets
      
      Problem: passing a 0 byte length string to some my_mb_wc_XXX() 
      functions leads to server crash due to improper argument check.
      
      Fix: properly check arguments passed to my_mb_wc_XXX() functions.
      
      
      mysql-test/include/ctype_common.inc:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test case.
      mysql-test/r/ctype_big5.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_euckr.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_gb2312.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_gbk.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_uca.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      strings/ctype-big5.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-cp932.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-euc_kr.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-gb2312.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-sjis.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      db2d3104
  2. 03 Oct, 2007 1 commit
  3. 02 Oct, 2007 5 commits
  4. 28 Sep, 2007 1 commit
  5. 27 Sep, 2007 2 commits
  6. 26 Sep, 2007 2 commits
  7. 25 Sep, 2007 1 commit
  8. 24 Sep, 2007 3 commits
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · bc09b357
      unknown authored
      into  sita.local:/Users/tsmith/m/bk/maint/50
      
      
      bc09b357
    • unknown's avatar
      Add test for named pipes on windows · 562deff3
      unknown authored
      Improve test for  shm on windows
      
      
      mysql-test/include/windows.inc:
        improve "skip message" and don't require a result file
      mysql-test/r/shm.result:
        Update result after adding more tests
      mysql-test/t/shm-master.opt:
        Add $MTR_BUILD_THREAD to get a unique shared memory base name
      mysql-test/t/shm.test:
        Run a bunch of more test to check shm
      mysql-test/r/named_pipe.result:
        New BitKeeper file ``mysql-test/r/named_pipe.result''
      mysql-test/t/named_pipe-master.opt:
        New BitKeeper file ``mysql-test/t/named_pipe-master.opt''
      mysql-test/t/named_pipe.test:
        New BitKeeper file ``mysql-test/t/named_pipe.test''
      562deff3
    • unknown's avatar
      Merge sita.local:/Users/tsmith/m/bk/50 · 139b563e
      unknown authored
      into  sita.local:/Users/tsmith/m/bk/maint/50
      
      
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      139b563e
  9. 22 Sep, 2007 3 commits
  10. 21 Sep, 2007 5 commits
    • unknown's avatar
      - Increase default connect_timeout to avoid intermittent · 1c078caa
      unknown authored
      disconnects when test servers are put under load
      
      
      1c078caa
    • unknown's avatar
      Bug #15327: configure: --with-tcp-port option being partially ignored · e8972b7a
      unknown authored
        
      make sure that if builder configured with a non-standard (!= 3306)
      default TCP port that value actually gets used throughout.
      
      
      win/configure.js:
        Bug #15327: configure: --with-tcp-port option being partially ignored
            
        If MYSQL_TCP_PORT defaulted in configure (factory default 3306
        at the time of this writing), set MYSQL_TCP_PORT to factory
        default, then clear factory default after. That way, we lose no
        information, and we can distinguish between "defaulted" and the
        pathological case "builder specifically configured a port that
        coincides with factory default." This can in theory happen if
        builder configures and builds several servers from a script
        (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
        Not all that probable, but much preferable to having more "magic"
        happen in the server when we can solve this without any guesswork.
      e8972b7a
    • unknown's avatar
      Bug#28359 Intermitted lost connection at 'reading authorization packet' errors · 885efe4c
      unknown authored
       - Increase default 'connect_timeout' value to 10 seconds
      
      
      sql/mysql_priv.h:
        Increase the default connect_timeout value to 10 seconds
      885efe4c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 89c7db56
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      89c7db56
    • unknown's avatar
      Bug#30843 Bad Test addition to t/archive.test · 8a421126
      unknown authored
       - Add extra insert
      
      
      mysql-test/r/archive.result:
        Add an extra insert to guarantee that the delayed
        insert shows up in the table
      mysql-test/t/archive.test:
        Add an extra insert to guarantee that the delayed
        insert shows up in the table
      8a421126
  11. 20 Sep, 2007 2 commits
    • unknown's avatar
      result fix · ad57f912
      unknown authored
      ad57f912
    • unknown's avatar
      Bug#27747 database metadata doesn't return sufficient column default info · fac190a2
      unknown authored
      added get_field_default_value() function which obtains default value from the field
      (used in store_create_info() & get_schema_column_record() functions)
      
      
      mysql-test/r/alter_table.result:
        result fix
      mysql-test/r/create.result:
        result fix
      mysql-test/r/ctype_collate.result:
        result fix
      mysql-test/r/ctype_recoding.result:
        result fix
      mysql-test/r/default.result:
        result fix
      mysql-test/r/gis.result:
        result fix
      mysql-test/r/grant.result:
        result fix
      mysql-test/r/information_schema.result:
        result fix
      mysql-test/r/key.result:
        result fix
      mysql-test/r/mysql.result:
        result fix
      mysql-test/r/ps_1general.result:
        result fix
      mysql-test/r/show_check.result:
        result fix
      mysql-test/r/sp.result:
        result fix
      mysql-test/r/type_enum.result:
        result fix
      mysql-test/r/type_ranges.result:
        result fix
      mysql-test/t/information_schema.test:
        test case
      fac190a2
  12. 19 Sep, 2007 1 commit
  13. 15 Sep, 2007 2 commits
    • unknown's avatar
      select.test: · 692b686d
      unknown authored
        Post-fix for bug#27695.
      
      
      mysql-test/t/select.test:
        Post-fix for bug#27695.
      692b686d
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 613f7ff3
      unknown authored
      into  mysql.com:/home/tnurnberg/15327/50-15327
      
      
      client/mysql.cc:
        Auto merged
      client/mysql_upgrade.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      configure.in:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      scripts/Makefile.am:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      613f7ff3
  14. 14 Sep, 2007 8 commits
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f58cbe3d
      unknown authored
      into  devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
      
      
      f58cbe3d
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 62273acf
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      62273acf
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 2a4e2aa5
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      2a4e2aa5
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · 7a2bb241
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      7a2bb241
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 4d8ec62d
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B31001-5.0-opt
      
      
      4d8ec62d
    • unknown's avatar
      Bug #31001: ORDER BY DESC in InnoDB not working · ad496be0
      unknown authored
      The optimizer sets index traversal in reverse order only if there are 
       used key parts that are not compared to a constant.
      However using the primary key as an ORDER BY suffix rendered the check
      incomplete : going in reverse order must still be used even if 
      all the parts of the secondary key are compared to a constant.
      
      Fixed by relaxing the check and set reverse traversal even when all
      the secondary index keyparts are compared to a const.
      Also account for the case when all the primary keys are compared to a
      constant.
      
      
      mysql-test/r/innodb_mysql.result:
        Bug #31001: test case
      mysql-test/t/innodb_mysql.test:
        Bug #31001: test case
      sql/sql_select.cc:
        Bug #31001: 
         - account for the case when all the primary key parts are compared
           to a constant
         - force test_if_skip_sort_order to go backwards over the key even 
           when the number of keyparts used is the same as the number of 
           keyparts equal to a constant. (because of the primary key 
           suffix).
      ad496be0
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 2ab4e3d1
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug30324
      
      
      2ab4e3d1
    • unknown's avatar
      BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results · 466747d5
      unknown authored
      - The bug was caused by COUNT(DISTINCT ...) code using Unique object in 
        a way that assumed that BIT(N) column occupies a contiguous space in
        temp_table->record[0] buffer. 
      - The fix is to make COUNT(DISTINCT ...) code instruct create_tmp_table to
        create temporary table with column of type BIGINT, not BIT(N).
      
      
      mysql-test/r/type_bit.result:
        BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
        - Testcase
      mysql-test/t/type_bit.test:
        BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
        - Testcase
      sql/item_sum.cc:
        BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
        - Make COUNT(DISTINCT ...) code instruct create_tmp_table to create 
          temporary table with BIGINT, not BIT(N) column.
      466747d5