Commit graph

15602 commits

Author SHA1 Message Date
unknown
edca1f6a0c build issue
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
2004-11-02 13:58:22 +01:00
unknown
6a0ce3adbc dict0load.c:
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
2004-11-02 09:46:23 +02:00
unknown
46aa022aa6 ctype_sjis.result, ctype_sjis.test, 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.


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.
2004-11-02 09:00:46 +04:00
unknown
f8a875a238 removed unused member variable (probably causing some of the problems we've seen with ndb_mgmd) 2004-11-01 22:27:29 +00:00
unknown
b41b45309f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-11-01 18:26:57 +00:00
unknown
727f7a85c8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-01 18:22:34 +00:00
unknown
bf30b006d3 fix for solaris forte -instances=static
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
2004-11-01 18:21:57 +00:00
unknown
55974b50bf Remove support for obsolete 4.1.1 prepared statements C API names:
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.
2004-11-01 19:01:50 +03:00
unknown
04ff58d5e4 NDB blobs restore backwards compatibility
ndb/src/ndbapi/NdbBlob.cpp:
  restore backwards compatibility
2004-11-01 16:04:36 +01:00
unknown
62f23cadd8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-01 15:43:54 +01:00
unknown
a38490bb03 fix call of string::copy() if HAVE_FCONVERT is set 2004-11-01 14:43:53 +00:00
unknown
33db63505d Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-11-01 14:28:29 +00:00
unknown
740fc88e7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-01 14:25:40 +00:00
unknown
075cee0d49 configure.in:
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)
2004-11-01 14:25:07 +00:00
unknown
206281e421 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-11-01 13:58:35 +00:00
unknown
3302dee5c6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-01 13:56:15 +00:00
unknown
a2e4768f20 aligned ndb versioning with mysql
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
2004-11-01 13:55:43 +00:00
unknown
52487afa1f NDB blob fixes. INCOMPATIBLE with existing blobs
ndb/src/ndbapi/NdbBlob.cpp:
  misplaced code line + change blob tabledist
ndb/test/ndbapi/testBlobs.cpp:
  misplaced code line + change blob tabledist
2004-11-01 13:01:20 +01:00
unknown
3ba04dced3 Removed old not used/illegal declaration 2004-11-01 12:49:38 +01:00
unknown
77974c3ada Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-01 10:51:44 +01:00
unknown
934c8966f0 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-11-01 10:51:43 +01:00
unknown
f8f7110afe Fixed hanging ndb_mgmd on various platforms
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
2004-11-01 10:38:27 +01:00
unknown
b1b3a8b9b0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41


ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
2004-10-31 15:44:35 +01:00
unknown
e4f0614cf4 NDB bug-6018 support writeTuple with blobs
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
2004-10-31 15:33:56 +01:00
unknown
d46c7366eb Enable REPLACE ... SELECT in prepared statements.
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.
2004-10-30 17:17:52 +04:00
unknown
6ca39e9603 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-29 14:38:33 +00:00
unknown
a2a9da4f01 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-29 14:06:57 +00:00
unknown
9021812384 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
2004-10-29 13:59:40 +00:00
unknown
c24a628086 These modifications are the result of
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
2004-10-29 14:51:56 +02:00
unknown
16ed686a93 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/fulltext.result:
  Auto merged
2004-10-29 14:31:20 +02:00
unknown
13ff3fa4b9 proper max_records estimation for sort-repair of fulltext indexes
mysql-test/t/ctype_utf8.test:
  bad merge fixed
2004-10-29 14:24:06 +02:00
unknown
6e781e11a9 A fix according to Monty's request:
"uint *errors" is now a non-optional parameter in String:copy()
and copy_and_convert().
2004-10-29 17:00:39 +05:00
unknown
731b06f47f bumped up version for ndb
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
2004-10-29 11:25:16 +00:00
unknown
fcb322279e item_strfunc.cc:
Unnecessary code was removed.


sql/item_strfunc.cc:
  Unnecessary code was removed.
2004-10-29 16:06:51 +05:00
unknown
96929f72b3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


configure.in:
  Auto merged
2004-10-29 11:06:38 +00:00
unknown
eb865dc687 configure.in:
-I/usr/include needed for cxx on Tru64


configure.in:
   -I/usr/include needed for cxx on Tru64
2004-10-29 11:06:06 +00:00
unknown
a739f2d692 Allow to convert to non-Unicode charset when mixing a string
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.
2004-10-29 16:00:03 +05:00
unknown
1768d464f5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-29 10:32:59 +00:00
unknown
3b1b2aae45 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


ndb/include/ndbapi/ndbapi_limits.h:
  Auto merged
2004-10-29 10:24:56 +00:00
unknown
9ca7aadfbc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


configure.in:
  Auto merged
2004-10-29 09:49:55 +00:00
unknown
3b658d0718 Tru64 cxx compiler fix
cxx does not include -I/ust/include.dtk as it should
    removed dependency on ndb_types


configure.in:
  Tru64 cxx compiler fix
  cxx does not include -I/ust/include.dtk as it should
ndb/include/ndbapi/ndbapi_limits.h:
  removed dependency on ndb_types
sql/ha_ndbcluster.h:
  removed dependency on ndb_types
2004-10-29 09:49:04 +00:00
unknown
facda8f3ef Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-10-29 10:26:43 +02:00
unknown
7223b9c1ec Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.6117
2004-10-29 09:32:32 +05:00
unknown
16f4f1b4ba Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-28 15:52:26 +00:00
unknown
9d07242b67 ndb_basic.result:
forgot to commit new result


mysql-test/r/ndb_basic.result:
  forgot to commit new result
2004-10-28 15:43:16 +00:00
unknown
1aa81f3818 test that attribute name truncation works
exposed the attribute name size limit for handler
   added field name truncation to ndb handler


mysql-test/t/ndb_basic.test:
  test that attribute name truncation works
ndb/include/ndbapi/ndbapi_limits.h:
  exposed the attribute name size limit for handler
sql/ha_ndbcluster.cc:
  added field name truncation to ndb handler
2004-10-28 15:35:06 +00:00
unknown
e3ac81bebf scan should not send fragmented signal
use new sendSignal method instead
    new send signal method which sends segments
    remove unused method sendFragmentedSignalUnCond


ndb/src/ndbapi/NdbScanOperation.cpp:
  scan should not send fragmented signal
  use new sendSignal method instead
ndb/src/ndbapi/TransporterFacade.cpp:
  new send signal method which sends segments
ndb/src/ndbapi/TransporterFacade.hpp:
  new send signal method which sends segments
  remove unused method sendFragmentedSignalUnCond
2004-10-28 14:49:40 +00:00
unknown
51ad907d48 set set "CHUNK_SZ" for fragmented signal to real value
added API_TRACE code
removed old implementation of fragmented signal
2004-10-28 13:50:46 +00:00
unknown
f944465bf0 Dbdict.cpp:
changed to using fragmented signals for CREATE_TABLE_REQ


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  changed to using fragmented signals for CREATE_TABLE_REQ
2004-10-28 11:56:09 +00:00
unknown
bbebacbf13 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-local
2004-10-28 11:26:19 +00:00