1. 03 Nov, 2004 3 commits
  2. 02 Nov, 2004 27 commits
    • unknown's avatar
      bad automerge (?) fixed · 78c4faa2
      unknown authored
      78c4faa2
    • unknown's avatar
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 60d1fbc9
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      60d1fbc9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5ff32da2
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      configure.in:
        Auto merged
      5ff32da2
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · bc0988c2
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      bc0988c2
    • unknown's avatar
      add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11 · 5c6cd1f7
      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
      5c6cd1f7
    • unknown's avatar
      Remove usage of !$ from mysql-tests · 505caa28
      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
      505caa28
    • unknown's avatar
      Merge build.mysql.com:/home/bk/mysql-4.1 · 0920d479
      unknown authored
      into build.mysql.com:/users/rburnett/mysql-4.1-current
      
      
      0920d479
    • unknown's avatar
      Bug# 5303 Windows --log-error option doesn't work correctly · 55de7025
      unknown authored
      
      sql/mysqld.cc:
        changed to open log_error_file instead of "mysql.err" on Windows
      55de7025
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3200d66f
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      innobase/dict/dict0load.c:
        Auto merged
      3200d66f
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2ddf5682
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      2ddf5682
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6293a578
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      6293a578
    • unknown's avatar
      Make sure that Int8(16,32,64) is signed · a6aaa907
      unknown authored
      Better fix for previous build issue
      
      
      a6aaa907
    • unknown's avatar
      Test expansion: "MOD" on non-integral first operand. · 6b53505f
      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).
      6b53505f
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 03a91f9b
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      
      03a91f9b
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f154fa0
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      5f154fa0
    • unknown's avatar
      build issue · edca1f6a
      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
      edca1f6a
    • unknown's avatar
      NDB fix blob parts distribution - backwards compatible · d5121051
      unknown authored
      
      ndb/src/ndbapi/NdbBlob.cpp:
        fix blob parts distribution - backwards compatible
      d5121051
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 37e92c9b
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      
      37e92c9b
    • unknown's avatar
      Many files: · fc04692c
      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.
      fc04692c
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · 502300b8
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      502300b8
    • unknown's avatar
      ha_innodb.cc: · b3042ccb
      unknown authored
        Correct English grammar
      
      
      sql/ha_innodb.cc:
        Correct English grammar
      b3042ccb
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0d92f0c7
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6309
      
      
      0d92f0c7
    • unknown's avatar
      A fix (bug #6309: myisamchk compiled without debug support , --help shows vise versa · 7e06386a
      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).
      7e06386a
    • unknown's avatar
      dict0load.c: · 6a0ce3ad
      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
      6a0ce3ad
    • unknown's avatar
      merge with 4.0 · 94839ddf
      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
      94839ddf
    • unknown's avatar
      ctype_sjis.result, ctype_sjis.test, ctype-sjis.c: · 46aa022a
      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.
      46aa022a
  3. 01 Nov, 2004 10 commits