1. 10 Jun, 2005 1 commit
  2. 09 Jun, 2005 12 commits
  3. 08 Jun, 2005 3 commits
    • unknown's avatar
      Merge mysql.com:/var/tmp/sslbug/mysql-4.0 · 226ecf1d
      unknown authored
      into mysql.com:/var/tmp/sslbug/mysql-4.1
      
      
      include/my_global.h:
        Auto merged
      226ecf1d
    • unknown's avatar
      Fix for · 59445ce4
      unknown authored
      BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
      BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
      Remove obsolete code.
      
      
      include/my_global.h:
        Obsolete code removed. OpenSSL doesn't have crypt anymore (it was dropped in ~2003).
        This patch fixes compilation failures with both OpenSSL and yaSSL on systems where
        crypt was defined in unistd.h.
        Conclusion is we do not use OpenSSL's crypt unless it wasn't defined in
        unistd.h/crypt.h and it was defined in old OpenSSL.
      59445ce4
    • unknown's avatar
      bug#11166 - ndb · a7917b1e
      unknown authored
        Fix potential inconsistency when running ndb_restore due to faulty parsing
          of backup log wrt inserts
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Make sure that entire stopGCP is in log
      ndb/tools/restore/Restore.cpp:
        
          Notice: this will not group and commit the deltas listed below
          into a ChangeSet, because there are no ChangeSet comments.
          Click [Checkin] again to check in only the commented deltas,
          or type Control-l to go back and provide ChangeSet comments.
      ndb/tools/restore/Restore.hpp:
        Keep track of last gci to next iteration
      ndb/tools/restore/consumer_restore.cpp:
        Handle insert in log
        Only allow certain errors
      a7917b1e
  4. 07 Jun, 2005 23 commits
    • unknown's avatar
      improved mapping from numerical open codes to string fopen codes. · 777899a6
      unknown authored
      This was necessary because the old code would return 
      "w+" for O_RDONLY|O_SHARE for example.
      
      
      mysys/my_fopen.c:
        improved mapping from numerical open codes to string fopen codes.
      777899a6
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 31aad78f
      unknown authored
      into mdk10.(none):/home/reggie/bk/41test3
      
      
      sql/sql_acl.cc:
        Auto merged
      31aad78f
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 2f7ee68d
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      2f7ee68d
    • unknown's avatar
      bug#5373: handler READ NEXT w/o HANDLER READ [FIRST] · 575a46a1
      unknown authored
      check table->file->inited to catch incorrect calling sequence.
      
      
      mysql-test/r/innodb_handler.result:
        bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
      mysql-test/t/innodb_handler.test:
        bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
      sql/sql_handler.cc:
        cleanup: call index_init *correctly*, not every time.
        check table->file->inited to catch incorrect calling sequence.
      575a46a1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · d2f3847a
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      d2f3847a
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · beb288f4
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      beb288f4
    • unknown's avatar
      Many files: · d499ead6
      unknown authored
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      
      
      sql/sql_class.cc:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      mysql-test/r/ps_1general.result:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      mysql-test/r/ps_2myisam.result:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      mysql-test/r/ps_3innodb.result:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      mysql-test/r/ps_4heap.result:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      mysql-test/r/ps_5merge.result:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      d499ead6
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 · 270832b0
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      myisam/mi_check.c:
        Auto merged
      270832b0
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · d4e921d6
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      d4e921d6
    • unknown's avatar
      bug#11133 - ndb · 62321bd2
      unknown authored
        incorrect handling of writeTuple with multi op transaction
      
      
      ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        1) Pass operation instead of insertIsDone to LQH
        2) transform operation correctly when in parallell que
           (multi op within same trans)
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Let ACC decide what operation was performed when WRITE
      ndb/test/ndbapi/testNdbApi.cpp:
        Add testcase for bug 11133
      ndb/test/run-test/daily-basic-tests.txt:
        Add testcase for bug 11133
      62321bd2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 01a5d650
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      01a5d650
    • unknown's avatar
      Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites · 3dba83b9
      unknown authored
      Fix instead wrong call to ha_key_cmp
      This is related to bug #10741 Inserting double value into utf8 column crashes server
      
      
      myisam/mi_key.c:
        Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
      myisam/mi_rnext_same.c:
        Fixed wrong arguments to ha_key_cmp()
        This caused a compare to fail if we first found a key with end space and then same key without end space
      mysql-test/r/ctype_utf8.result:
        Additional test
      mysql-test/t/ctype_utf8.test:
        Additional test
      3dba83b9
    • unknown's avatar
      item_buff.cc: · 8b15aba8
      unknown authored
        Removed an extra space char.
      
      
      sql/item_buff.cc:
        Removed an extra space char.
      8b15aba8
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 571cf5db
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      571cf5db
    • unknown's avatar
      sql_select.cc, item_buff.cc, item.h: · 4da133ca
      unknown authored
        Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
        + COUNT(DISTINCT...) due to an attempt to allocate a too large
        buffer for the BLOB field.
        Now the size of the buffer is limited by max_sort_length.
      group_by.test, group_by.result:
        Added a test case for bug #11088.
      
      
      mysql-test/r/group_by.result:
        Added a test case for bug #11088.
      mysql-test/t/group_by.test:
        Added a test case for bug #11088.
      sql/item.h:
        Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
        + COUNT(DISTINCT...) due to an attempt to allocate a too large
        buffer for the BLOB fields.
        Now the size of the buffer is limited by max_sort_length.
      sql/item_buff.cc:
        Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
        + COUNT(DISTINCT...) due to an attempt to allocate a too large
        buffer for the BLOB fields.
        Now the size of the buffer is limited by max_sort_length.
      sql/sql_select.cc:
        Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
        + COUNT(DISTINCT...) due to an attempt to allocate a too large
        buffer for the BLOB fields.
        Now the size of the buffer is limited by max_sort_length.
      4da133ca
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9f161063
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      9f161063
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 · 6356c580
      unknown authored
      into  mysql.com:/Users/emurphy/src/work/mysql-4.1
      
      
      6356c580
    • unknown's avatar
      Accepted openlogging · 295a5542
      unknown authored
      295a5542
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · f51f9ce8
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      f51f9ce8
    • unknown's avatar
      Bug#10253: compound index length and utf8 char set · c9914ac6
      unknown authored
      produces invalid query results
      
      mi_key.c:
        well_formed_length should be executed before space trimming, not after.
      ctype_utf8.test:
      ctype_utf8.result:
        adding test.
      
      
      myisam/mi_key.c:
        Bug#10253: ompound index length and utf8 char set produces invalid query results
        well_formed_length should be executed before space trimming, not after.
      mysql-test/r/ctype_utf8.result:
        adding test.
        adding test.
      mysql-test/t/ctype_utf8.test:
        adding test.
      c9914ac6
    • unknown's avatar
      - BUG#10676: don't install "make_win_src_distribution" and "make_win_binary_distribution" · af72f54b
      unknown authored
        when doing "make install" (they are not needed/useful) outside the build tree. Added
        "mysql_client_test" to the "MySQL-bench" RPM.
      - some small RPM spec file improvements (more variables than hard-coded values, cleanups)
      
      
      scripts/Makefile.am:
        - no need to install "make_win_src_distribution" and "make_win_binary_distribution"
          in "make install" (BUG#10676)
      support-files/mysql.spec.sh:
        - added mysql_client_test to the "bench" subpackage (BUG 10676)
        - use "mysqldatadir" variable instead of hard-coding the path multiple times
        - use the "mysqld_user" variable on all occasions a user name is referenced
        - removed (incomplete) Brazilian translations
        - removed redundant release tags from the subpackage descriptions
      af72f54b
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · e3dc3db6
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      e3dc3db6
    • unknown's avatar
      BUG#7967 Fix mysqlhotcopy --record-log-position · d09d8156
      unknown authored
      
      BitKeeper/etc/ignore:
        Added scripts/mysqlhotcopy.sh.rej to the ignore list
      scripts/mysqlhotcopy.sh:
        BUG#7967 Use fetchrow_hashref() when parsing SHOW SLAVE STATUS so
        that --record-log-pos option will work with all versions from 3.23
        forward and will not break again in the future if additional columns
        are added.
      d09d8156
  5. 06 Jun, 2005 1 commit
    • unknown's avatar
      ctype_cp1250_ch.result, ctype_cp1250_ch.test: · 936b9319
      unknown authored
        Adding test.
      ctype-win1250ch.c:
        Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
        Wrong min_sort_char fix.
      
      
      strings/ctype-win1250ch.c:
        Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
        Wrong min_sort_char fix.
      mysql-test/t/ctype_cp1250_ch.test:
        Adding test.
      mysql-test/r/ctype_cp1250_ch.result:
        Adding test.
      936b9319