1. 08 Nov, 2004 2 commits
    • unknown's avatar
      ndb: bug#6435 · 03f2882f
      unknown authored
      fix null handling in ha_ndbcluster when using ordered index
      
      
      mysql-test/r/ndb_index_ordered.result:
        bug#6435
      mysql-test/t/ndb_index_ordered.test:
        bug#6435
      sql/ha_ndbcluster.cc:
        Fix null handling in ordered index code
      03f2882f
    • unknown's avatar
      ndb: bug#6451 · ec33031e
      unknown authored
      1) fix so that missing blob tables don't prevent table from being
          dropped
      2) decrease size of blob part if record length exceeds max length
      3) add test case for table wo/ corresponding blob table
      4) init scan counters when sending scan_tabreq
      
      
      mysql-test/r/ndb_autodiscover.result:
        testcase for table wo/ corresponding blob tables
      mysql-test/r/ndb_autodiscover2.result:
        testcase for table wo/ corresponding blob tables
      mysql-test/t/ndb_autodiscover.test:
        testcase for table wo/ corresponding blob tables
      mysql-test/t/ndb_autodiscover2.test:
        testcase for table wo/ corresponding blob tables
      ndb/include/ndbapi/NdbDictionary.hpp:
        Add non-const get column
      ndb/src/ndbapi/NdbDictionary.cpp:
        Add non-const get column
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Allow "partially" getTable, which enables dropping of tables
           that fails to create blob tables
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Init counter when sending SCAN_TABREQ
      sql/ha_ndbcluster.cc:
        Make sure that blob don't have to big part size
      ec33031e
  2. 03 Nov, 2004 1 commit
    • unknown's avatar
      opt_range.cc, range.result, range.test: · 12f1b6c6
      unknown authored
        Bug #6045: Binary Comparison regression in MySQL 4.1
        Binary searches didn't use a case insensitive index, now they do.
      
      
      mysql-test/t/range.test:
        Bug #6045: Binary Comparison regression in MySQL 4.1
        Binary searches didn't use a case insensitive index, now they do.
      mysql-test/r/range.result:
        Bug #6045: Binary Comparison regression in MySQL 4.1
        Binary searches didn't use a case insensitive index, now they do.
      sql/opt_range.cc:
        Bug #6045: Binary Comparison regression in MySQL 4.1
        Binary searches didn't use a case insensitive index, now they do.
      12f1b6c6
  3. 02 Nov, 2004 24 commits
    • unknown's avatar
      bad automerge (?) fixed · 65d027bd
      unknown authored
      65d027bd
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 121bdab3
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      configure.in:
        Auto merged
      121bdab3
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e0e8f7d2
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      e0e8f7d2
    • unknown's avatar
      add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11 · 34852614
      unknown authored
          remove compiler warning
          patch for my_vsnprintf not dully implemented
          patch for platfroms that return -1 on snprintf overflow
          compile fix for hpux
      
      
      configure.in:
        add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11
      ndb/src/common/editline/sysunix.c:
        remove compiler warning
      ndb/src/common/util/basestring_vsnprintf.c:
        patch for my_vsnprintf not dully implemented
        patch for platfroms that return -1 on snprintf overflow
      ndb/src/kernel/vm/Emulator.hpp:
        compile fix for hpux
      ndb/src/mgmsrv/Services.cpp:
        compile fix for hp ux
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        remove compiler warning
      34852614
    • unknown's avatar
      Remove usage of !$ from mysql-tests · 2bcfcbfe
      unknown authored
      Added protocol::flush() for easier embedded-server code
      Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
      Added option --silent to client_test
      
      
      client/mysqltest.c:
        Removed compiler warning
        Fixed identation & comments from earlier push
        Renamed variable 'disable_abort_on_error' to 'abort_on_error'
        Ensure that '$mysql_errno' also with --ps-protocol
      include/mysql_com.h:
        Removed special handling of net_flush for embedded server
      mysql-test/r/mysqltest.result:
        Remove usage of !$ in tests
      mysql-test/t/client_test.test:
        Use --silent
      mysql-test/t/comments.test:
        Remove usage of !$ in tests
      mysql-test/t/join_outer.test:
        Remove usage of !$ in tests
      mysql-test/t/key.test:
        Remove usage of !$ in tests
      mysql-test/t/mysqltest.test:
        Remove usage of !$ in tests
      mysql-test/t/show_check.test:
        Remove usage of !$ in tests
      mysql-test/t/temp_table.test:
        Remove usage of !$ in tests
      mysql-test/t/type_ranges.test:
        Remove usage of !$ in tests
      sql/mysqld.cc:
        Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
      sql/net_serv.cc:
        Remove special usage of net_flush in embedded server
      sql/protocol.cc:
        Added protocol::flush() for easier embedded-server code
      sql/protocol.h:
        Added protocol::flush() for easier embedded-server code
      sql/sql_prepare.cc:
        Added protocol::flush() for easier embedded-server code
        Remove one extra flush() for prepared statements
      sql/sql_show.cc:
        Added protocol::flush() for easier embedded-server code
      tests/client_test.c:
        Added option --silent
      2bcfcbfe
    • unknown's avatar
      Merge build.mysql.com:/home/bk/mysql-4.1 · a4703018
      unknown authored
      into build.mysql.com:/users/rburnett/mysql-4.1-current
      
      a4703018
    • unknown's avatar
      Bug# 5303 Windows --log-error option doesn't work correctly · f2a1eae8
      unknown authored
      
      sql/mysqld.cc:
        changed to open log_error_file instead of "mysql.err" on Windows
      f2a1eae8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c47deeb5
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      innobase/dict/dict0load.c:
        Auto merged
      c47deeb5
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1c4af82b
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      1c4af82b
    • unknown's avatar
      Test expansion: "MOD" on non-integral first operand. · 769dd156
      unknown authored
      
      mysql-test/r/ps_10nestset.result:
        Result of expanded test: "MOD" on non-integral first operand.
      mysql-test/t/ps_10nestset.test:
        Use the newly expanded "MOD" operator (non-integral first operand, bug#6138).
      769dd156
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 61b52a97
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      61b52a97
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · dacaea4d
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      dacaea4d
    • unknown's avatar
      build issue · f8cff2d4
      unknown authored
      Fix so that signed/unsigned char does not matter in comparision
      
      
      ndb/src/ndbapi/NdbOperationExec.cpp:
        Fix so that signed/unsigned char does not matter in comparision
      f8cff2d4
    • unknown's avatar
      NDB fix blob parts distribution - backwards compatible · 6dc61f1e
      unknown authored
      
      ndb/src/ndbapi/NdbBlob.cpp:
        fix blob parts distribution - backwards compatible
      6dc61f1e
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · ce8ca34e
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      ce8ca34e
    • unknown's avatar
      Many files: · 469889f5
      unknown authored
        Allow mixing of different character sets for more SQL functions.
      item_func.h:
        Allow mixing of different character sets for more SQL functions..
      
      
      sql/item_cmpfunc.cc:
        Allow mixing of different character sets for more SQL functions.
      sql/item_func.cc:
        Allow mixing of different character sets for more SQL functions.
      sql/item_func.h:
        Allow mixing of different character sets for more SQL functions..
      sql/item_strfunc.cc:
        Allow mixing of different character sets for more SQL functions.
      sql/item.cc:
        Allow mixing of different character sets for more SQL functions.
      sql/item.h:
        Allow mixing of different character sets for more SQL functions.
      mysql-test/t/ctype_recoding.test:
        Allow mixing of different character sets for more SQL functions.
      mysql-test/r/ctype_recoding.result:
        Allow mixing of different character sets for more SQL functions.
      469889f5
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · 173fd106
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      173fd106
    • unknown's avatar
      ha_innodb.cc: · b6795af9
      unknown authored
        Correct English grammar
      
      
      sql/ha_innodb.cc:
        Correct English grammar
      b6795af9
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c8a78383
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6309
      
      c8a78383
    • unknown's avatar
      A fix (bug #6309: myisamchk compiled without debug support , --help shows vise versa · 40abc17c
      unknown authored
             bug #6380: mysqlcheck --help prints wrong --debug msg for non-debug version).
      
      
      client/mysqlcheck.c:
        A fix (bug #6380: mysqlcheck --help prints wrong --debug msg for non-debug version).
      myisam/myisamchk.c:
        A fix (bug #6309: myisamchk compiled without debug support , --help shows vise versa).
      40abc17c
    • unknown's avatar
      dict0load.c: · 9700388f
      unknown authored
        Raise fatal semaphore wait timeout to 2 hours when we are printing the InnoDB table monitor output
      
      
      innobase/dict/dict0load.c:
        Raise fatal semaphore wait timeout to 2 hours when we are printing the InnoDB table monitor output
      9700388f
    • unknown's avatar
      merge with 4.0 · 23cc9b3f
      unknown authored
      
      Build-tools/mysql-copyright:
        Auto merged
      Docs/Support/texi2html:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/eval/eval0eval.c:
        Auto merged
      innobase/pars/pars0pars.c:
        Auto merged
      23cc9b3f
    • unknown's avatar
      ctype_sjis.result, ctype_sjis.test, ctype-sjis.c: · 4e17c88b
      unknown authored
        Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.
      
      
      strings/ctype-sjis.c:
        Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.
      mysql-test/t/ctype_sjis.test:
        Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.
      mysql-test/r/ctype_sjis.result:
        Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.
      4e17c88b
  4. 01 Nov, 2004 13 commits