1. 02 Nov, 2004 6 commits
    • 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
      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
  2. 01 Nov, 2004 19 commits
    • unknown's avatar
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · e9a716a3
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      e9a716a3
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 137dc9af
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      137dc9af
    • unknown's avatar
      fix for solaris forte -instances=static · 58aaedf2
      unknown authored
          added libNDBT.a
         removed printout
          fixed error that ndb_show_tables required table name
      
      
      configure.in:
        fix for solaris forte -instances=static
      ndb/test/run-test/Makefile.am:
        added libNDBT.a
      ndb/tools/drop_tab.cpp:
        removed printout
      ndb/tools/listTables.cpp:
        removed printout
        fixed error that ndb_show_tables required table name
      ndb/tools/waiter.cpp:
        removed printout
      58aaedf2
    • unknown's avatar
      Remove support for obsolete 4.1.1 prepared statements C API names: · c8ed8b05
      unknown authored
      having approval for it since 4.1.4, I also have some assurance that
      very few people actually used this: to enable these calls a user
      had to #define HAVE_DEPRECATED_411_API and recompile the client library.
      
      
      include/mysql.h:
        remove defines for obsolete 4.1 prepared statements C API names
      libmysql/libmysql.c:
        Remove #ifdefed implementation of obsolete mysql_prepare call.
      c8ed8b05
    • unknown's avatar
      NDB blobs restore backwards compatibility · e659aae3
      unknown authored
      
      ndb/src/ndbapi/NdbBlob.cpp:
        restore backwards compatibility
      e659aae3
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · dd4d74c9
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      dd4d74c9
    • unknown's avatar
      1b18225d
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 96700d56
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      96700d56
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f90764d1
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      f90764d1
    • unknown's avatar
      configure.in: · 9cdae965
      unknown authored
        added flag on sun forte, -instances=static
        (check is only made for "non-gcc", hopefully enough)
      
      
      configure.in:
        added flag on sun forte, -instances=static
        (check is only made for "non-gcc", hopefully enough)
      9cdae965
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 8567d4d4
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      8567d4d4
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b0868808
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      b0868808
    • unknown's avatar
      aligned ndb versioning with mysql · 14a06932
      unknown authored
          changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
          added define NDB_INIT
          removed getarg, strlcat, strlcpy
          aligned ndb version with mysql version
          cpcd: removed old way of reading config file and replaced with mysql load_defaults
          changed from using getarg to my_getopts
          use mysql my_progname
          moved getarg to test
      
      
      BitKeeper/deleted/.del-strlcat.c~250851f8f1ac1c2c:
        Delete: ndb/src/common/util/strlcat.c
      BitKeeper/deleted/.del-strlcpy.c~43266e312d11c47b:
        Delete: ndb/src/common/util/strlcpy.c
      ndb/test/include/getarg.h:
        Rename: ndb/include/util/getarg.h -> ndb/test/include/getarg.h
      configure.in:
        aligned ndb versioning with mysql
        changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
      ndb/include/ndb_global.h:
        added define NDB_INIT
        removed strlcpy, strlcat
      ndb/src/common/editline/sysunix.c:
        removed usage of strlcat
      ndb/src/common/util/Makefile.am:
        removed getarg, strlcat, strlcpy
      ndb/src/common/util/basestring_vsnprintf.c:
        changed define from SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
      ndb/src/common/util/socket_io.cpp:
        removed usage of strlcat
      ndb/src/common/util/version.c:
        aligned ndb version with mysql version
      ndb/src/cw/cpcd/common.cpp:
        removed old way of reading config file and replaced with mysql load_defaults
      ndb/src/cw/cpcd/common.hpp:
        removed old way of reading config file and replaced with mysql load_defaults
      ndb/src/cw/cpcd/main.cpp:
        changed from usin getarg to my_opts
      ndb/src/kernel/blocks/backup/restore/main.cpp:
        changed from usin getarg to my_opts
      ndb/src/kernel/error/ErrorReporter.cpp:
        use mysql my_progname
      ndb/src/kernel/main.cpp:
        removed const in main declaration
      ndb/src/kernel/vm/Configuration.cpp:
        changed from usin getarg to my_opts
      ndb/src/kernel/vm/Configuration.hpp:
        removed const in main declaration
      ndb/src/mgmclient/main.cpp:
        changed from usin getarg to my_opts
      ndb/src/mgmsrv/main.cpp:
        changed from usin getarg to my_opts
      ndb/src/ndbapi/Ndb.cpp:
        fixed compiler warnings
      ndb/test/run-test/Makefile.am:
        moved getarg to test
      ndb/test/src/Makefile.am:
        moved getarg to test
      ndb/test/src/getarg.c:
        moved strlcat and strlcpy into getarg.c
      ndb/tools/delete_all.cpp:
        changed from usin getarg to my_opts
      ndb/tools/desc.cpp:
        changed from usin getarg to my_opts
      ndb/tools/drop_index.cpp:
        changed from usin getarg to my_opts
      ndb/tools/drop_tab.cpp:
        changed from usin getarg to my_opts
      ndb/tools/listTables.cpp:
        changed from usin getarg to my_opts
      ndb/tools/select_all.cpp:
        changed from usin getarg to my_opts
      ndb/tools/select_count.cpp:
        changed from usin getarg to my_opts
      ndb/tools/waiter.cpp:
        changed from usin getarg to my_opts
      14a06932
    • unknown's avatar
      NDB blob fixes. INCOMPATIBLE with existing blobs · 3b9afcc1
      unknown authored
      
      ndb/src/ndbapi/NdbBlob.cpp:
        misplaced code line + change blob tabledist
      ndb/test/ndbapi/testBlobs.cpp:
        misplaced code line + change blob tabledist
      3b9afcc1
    • unknown's avatar
      Removed old not used/illegal declaration · 1adf2f07
      unknown authored
      1adf2f07
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · b8d54e1a
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      b8d54e1a
    • unknown's avatar
      Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5388057b
      unknown authored
      into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      5388057b
    • unknown's avatar
      Fixed hanging ndb_mgmd on various platforms · eea52d8b
      unknown authored
      Move init of node-init-mutex to before alloc node id
      
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Move init of node-init-mutex to before alloc node id
      eea52d8b
  3. 31 Oct, 2004 2 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 397d0a76
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      
      ndb/include/ndbapi/NdbBlob.hpp:
        Auto merged
      397d0a76
    • unknown's avatar
      NDB bug-6018 support writeTuple with blobs · 11b4cab8
      unknown authored
      
      mysql-test/r/ndb_blob.result:
        bug-6018
      mysql-test/t/ndb_blob.test:
        bug-6018
      ndb/include/ndbapi/NdbBlob.hpp:
        bug-6018
      ndb/include/ndbapi/NdbConnection.hpp:
        bug-6018
      ndb/include/ndbapi/NdbIndexOperation.hpp:
        bug-6018
      ndb/include/ndbapi/NdbOperation.hpp:
        bug-6018
      ndb/src/ndbapi/NdbBlob.cpp:
        bug-6018
      ndb/src/ndbapi/NdbConnection.cpp:
        bug-6018
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        bug-6018
      ndb/src/ndbapi/NdbIndexOperation.cpp:
        bug-6018
      ndb/src/ndbapi/NdbOperation.cpp:
        bug-6018
      ndb/src/ndbapi/NdbOperationExec.cpp:
        bug-6018
      ndb/test/ndbapi/testBlobs.cpp:
        bug-6018
      11b4cab8
  4. 30 Oct, 2004 1 commit
    • unknown's avatar
      Enable REPLACE ... SELECT in prepared statements. · ef1c59fa
      unknown authored
      
      mysql-test/include/ps_modify.inc:
        replace ... select now works.
      mysql-test/r/ps_2myisam.result:
        replace ... select now works.
      mysql-test/r/ps_3innodb.result:
        replace ... select now works.
      mysql-test/r/ps_4heap.result:
        replace ... select now works.
      mysql-test/r/ps_5merge.result:
        replace ... select now works.
      mysql-test/r/ps_6bdb.result:
        replace ... select now works.
      mysql-test/r/ps_7ndb.result:
        replace ... select now works.
      mysql-test/t/ps_7ndb.test:
        replace ... select now works.
      sql/sql_prepare.cc:
        Enable SQLCOM_REPLACE_SELECT: no need for any code changes but
        enable this SQLCOM in the switch.
      ef1c59fa
  5. 29 Oct, 2004 12 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4338e4ad
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      4338e4ad
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 97f0c1c8
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      97f0c1c8
    • unknown's avatar
      added define flag SNPRINTF_RETURN_ZERO to indicate that snprintf returns... · 135d926d
      unknown authored
          added define flag SNPRINTF_RETURN_ZERO to indicate that snprintf returns zero if buffer too small
          use flag SNPRINTF_RETURN_ZERO
          emulate snprintf behavior by writing to _big_ buffer if set
          use my_vsnprintf if HAVE_SNPRINTF is not set and set SNPRINTF_RETURN_ZERO in that case
      
      
      configure.in:
        added define flag to indicate that snprintf returns zero if buffer too small
      ndb/src/common/util/basestring_vsnprintf.c:
        use flag SNPRINTF_RETURN_ZERO
        emulate snprintf behavior by writing to _big_ buffer if set
        use my_vsnprintf if HAVE_SNPRINTF is not set and set SNPRINTF_RETURN_ZERO in that case
      135d926d
    • unknown's avatar
      These modifications are the result of · b863689b
      unknown authored
      WL#2067 add features to mysqltest: "disable_error_abort" + "$mysql_errno"
      
      $mysql_errno is a new builtin variable of mysqltest and contains the
      return code of the last command send to the server.
      
      "--disable_abort_on_error" switches the abort of mysqltest
      after "unmasked" failing statements off.
      "--enable_abort_on_error" switches the abort of mysqltest
      after "unmasked" failing statements on. (default)
      
      "Maskings" are
          !$<error number>  and  --error <error number>
      in the line before the statement to be checked.
      
      The benefit of the option "--disable_abort_on_error" is that
      - all statements after the failing statement are executed
      - a r/<test>.reject will be produced
      - it is possible to write test cases, which perform
        code sequences depending on the return code of a single
        statement
      
      
      client/mysqltest.c:
        Implementation of the features
        - "--disable_abort_on_error"/"--enable_abort_on_error" switch
        - "$mysql_errno" variable
      mysql-test/r/mysqltest.result:
        test cases for the features added
      mysql-test/t/mysqltest.test:
        updated results
      b863689b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 8b4f5972
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      mysql-test/r/fulltext.result:
        Auto merged
      8b4f5972
    • unknown's avatar
      proper max_records estimation for sort-repair of fulltext indexes · 7f3dfa0d
      unknown authored
      
      mysql-test/t/ctype_utf8.test:
        bad merge fixed
      7f3dfa0d
    • unknown's avatar
      A fix according to Monty's request: · 08809ca1
      unknown authored
      "uint *errors" is now a non-optional parameter in String:copy()
      and copy_and_convert().
      
      08809ca1
    • unknown's avatar
      bumped up version for ndb · 0746e86d
      unknown authored
         protocal change in create table, now allows for more than 91 attributes
         upgrade compatability with 3.5.3
      
      
      configure.in:
        bumped up version for ndb
        protocal change in create table, now allows for more than 91 attributes
      ndb/src/common/util/version.c:
        upgrade compatability with 3.5.3
      0746e86d
    • unknown's avatar
      item_strfunc.cc: · 5329e3a6
      unknown authored
        Unnecessary code was removed.
      
      
      sql/item_strfunc.cc:
        Unnecessary code was removed.
      5329e3a6
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b190d3c9
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      configure.in:
        Auto merged
      b190d3c9
    • unknown's avatar
      configure.in: · 29659488
      unknown authored
         -I/usr/include needed for cxx on Tru64
      
      
      configure.in:
         -I/usr/include needed for cxx on Tru64
      29659488
    • unknown's avatar
      Allow to convert to non-Unicode charset when mixing a string · 312fc6da
      unknown authored
      constant with a column. The string is converted into the column
      character set. It conversion doesn't lose data, then operation
      is possible. Otherwise, give an error, as it was earlier.
      
      
      sql/item.h:
        Change bool argument to uint flags:
        we have now two different flags.
      312fc6da