Commit graph

15585 commits

Author SHA1 Message Date
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
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
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
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
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
unknown
f6129385b3 ndbapi_limits.h:
corrected define for NDB_MAX_TUPLE_SIZE_IN_WORDS


ndb/include/ndbapi/ndbapi_limits.h:
  corrected define for NDB_MAX_TUPLE_SIZE_IN_WORDS
2004-10-28 11:24:59 +00:00
unknown
5d1e470416 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 11:24:16 +00:00
unknown
51cff67d08 added test for max limit of 128 attributes in table
new define for long signal section size
   bumbed up limit for attributes to 128
    use new define in SectionSegment
    some bug fixing of send fragmented signal +
    make chunk size a multiple the dew define for SectionSegment size


mysql-test/r/ndb_basic.result:
  added test for max limit of 128 attributes in table
mysql-test/t/ndb_basic.test:
  added test for max limit of 128 attributes in table
ndb/include/kernel/ndb_limits.h:
  new define for long signal section size
ndb/include/ndbapi/ndbapi_limits.h:
  bumbed up limit for attributes to 128
ndb/src/kernel/vm/LongSignal.hpp:
  use new define in SectionSegment
ndb/src/ndbapi/TransporterFacade.cpp:
  some bug fixing of send fragmented signal +
  make chunk size a multiple the dew define for SectionSegment size
2004-10-28 11:19:51 +00:00
unknown
5be6c328f5 Produce a "truncated" warning if a value cannot be converted
into the column character set on INSERT/UPDATE.


sql/sql_string.cc:
  New argument to report an error.
sql/sql_string.h:
  New argument to report an error.
2004-10-28 15:21:20 +05:00
unknown
9b041682cc Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-10-28 11:35:27 +02:00
unknown
7dcd331692 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-10-28 11:32:19 +02:00
unknown
f095309268 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-10-28 11:03:23 +02:00
unknown
f785b951b5 Fix for aix4 which defines clock_gettime, but it only returns
ENOSYS
2004-10-28 10:50:39 +02:00
unknown
a5087248e3 An extra "separator" class member was removed from Item_func_concat_ws.
args[0] is now used instead.
2004-10-28 11:43:31 +05:00
unknown
de0e5012db Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.6117
2004-10-28 11:38:59 +05:00
unknown
b97048498a Making the latest fix for Bug#6166 (key.test) work in prepared statements.
sql/sql_prepare.cc:
  Catch another class of errors possible during yyparse:
  if thd->net.report_error is set, we need to send the message and 
  abort.
2004-10-28 02:54:32 +04:00
unknown
fbabd08534 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
2004-10-27 23:31:24 +03:00
unknown
616b7460aa Fix for bug#5385 ("Text files have unix line break"):
Windows style line end \r\n on README, license, and similar essential plaintext files.


scripts/make_win_src_distribution.sh:
  Some plain text files (which a Windows user might view in any editor) should have 
  Windows style line end \r\n (bug#5385). The tool is changed to do a systematic pass 
  over all files, find all relevant ones (especially "README*", "ChangeLog", "INSTALL*", 
  license text), and adapt them.
  Included are two minor cleanups ("useless use of cat" avoided, variable setting 
  moved to more sensible place).
2004-10-27 21:59:34 +02:00
unknown
447fef48fd A fix and test case for Bug#6096 "field.max_length is always zero for
numeric columns (stmt_resultset_metadata)"


libmysql/libmysql.c:
  A fix for Bug#6096 "field.max_length is always zero for numeric columns
   (stmt_resultset_metadata)": set field->max_lenght for numeric
  columns when we set up skip_result functions. A minor drawback for this 
  approach is that field->max_length  can be not zero even if 
  STMT_ATTR_UPDATE_MAX_LENGTH is not set.
sql-common/my_time.c:
  Fix valgrind warning.
tests/client_test.c:
  A test case for Bug#6096 "field.max_length is always zero for numeric 
  columns (stmt_resultset_metadata)
2004-10-27 23:46:22 +04:00
unknown
8ace53109e Fixed access to freed memory
innobase/srv/srv0srv.c:
  after merge fix
sql/set_var.cc:
  after merge fix
sql/sql_cache.cc:
  after merge fix
2004-10-27 21:56:17 +03:00
unknown
a94c7639da Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
2004-10-27 21:17:31 +03:00
unknown
464da8f13a removed incorrect error message about aggregate functions
improved mechanisn of detection posibility to be NULL for single row queries
switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions
(changes to make subselects test working with PS protocol)


mysql-test/r/subselect.result:
  removed incorrect error message about aggregate functions
  improved mechanisn of detection posibility to be NULL for single row queries
mysql-test/t/subselect.test:
  removed incorrect error message about aggregate functions
sql/item_subselect.cc:
  removed incorrect error message about aggregate functions
  switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions
  improved mechanisn of detection posibility to be NULL for single row queries
sql/item_subselect.h:
  new method to help in NULL ability detection
2004-10-27 21:11:06 +03:00