summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove usage of !$ from mysql-testsunknown2004-11-0218-563/+837
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-0216-147/+330
|\ | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 innobase/dict/dict0load.c: Auto merged
| * Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-022-7/+17
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| | * Test expansion: "MOD" on non-integral first operand.unknown2004-11-022-7/+17
| | | | | | | | | | | | | | | | | | | | | 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).
| * | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-021-8/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my41
| | * | NDB fix blob parts distribution - backwards compatibleunknown2004-11-021-8/+11
| | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/NdbBlob.cpp: fix blob parts distribution - backwards compatible
| * | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-021-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * | | build issueunknown2004-11-021-2/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-028-127/+274
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1
| | * | | Many files:unknown2004-11-028-127/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-021-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.1
| | * | | ha_innodb.cc:unknown2004-11-021-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct English grammar sql/ha_innodb.cc: Correct English grammar
| * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-022-2/+11
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6309
| | * | A fix (bug #6309: myisamchk compiled without debug support , --help shows ↵unknown2004-11-022-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vise versa 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).
| * | | dict0load.c:unknown2004-11-021-0/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* | | merge with 4.0unknown2004-11-028-61/+129
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | row0mysql.c, pars0pars.c, eval0eval.c, dict0load.c, dict0dict.c, dict0crea.c:unknown2004-10-316-13/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it dict0dict.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it; fix also a hang that would occur if one tried in ALTER TABLE or RENAME TABLE to create a foreign key constraint name that collided with another existing name innobase/dict/dict0crea.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it innobase/dict/dict0load.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it innobase/dict/dict0dict.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it; fix also a hang that would occur if one tried in ALTER TABLE or RENAME TABLE to create a foreign key constraint name that collided with another existing name innobase/eval/eval0eval.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it innobase/pars/pars0pars.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it innobase/row/row0mysql.c: Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it
| * | - bumped up version number from 4.0.22 to 4.0.23 in configure.inunknown2004-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - tagged ChangeSet@1.2048.1.2 as "mysql-4.0.22" configure.in: - bumped up version number from 4.0.22 to 4.0.23
| * | close table before next iteration of table proccesing in mysql_admin_table ↵unknown2004-10-281-3/+7
| | | | | | | | | | | | (to allow open next table)
| * | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-10-272-8/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| | * | - Applied some Windows portability fixes for myisampack.c and sql_handler.ccunknown2004-10-272-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (backports from fixes made in 4.1) myisam/myisampack.c: - replaced "1ULL" with "((ulonglong)1)" to resolve a compile error on Windows sql/sql_handler.cc: - removed some unused variables - added a (byte*) cast to fix a compile error on Windows (backport of a fix made in 4.1)
| * | | texi2html:unknown2004-10-271-45/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of texi2html so that 4.0.22 HTML manual doesn't turn out all goofy. Docs/Support/texi2html: Updated version of texi2html so that 4.0.22 HTML manual doesn't turn out all goofy.
| * | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-10-273-1/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into mysql.com:/M40/mysql-4.0
| * | | Change 'Build-tools/mysql-copyright' to ensure the receiving machines will buildunknown2004-10-271-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without trying to re-run autotools. (Backport from 4.1.7 for 4.0.22) Build-tools/mysql-copyright: The top level Makefile will try to re-run the autotools unless the timestamps of the relevant files are in truly ascending order. Ensure this order! (Backport from 4.1.7 for 4.0.22)
* | | | ctype_sjis.result, ctype_sjis.test, ctype-sjis.c:unknown2004-11-023-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | removed unused member variable (probably causing some of the problems we've ↵unknown2004-11-012-2/+0
| | | | | | | | | | | | | | | | seen with ndb_mgmd)
* | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2004-11-0121-435/+775
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
| * | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-015-8/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | * | | fix for solaris forte -instances=staticunknown2004-11-015-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Remove support for obsolete 4.1.1 prepared statements C API names:unknown2004-11-012-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | NDB blobs restore backwards compatibilityunknown2004-11-011-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/NdbBlob.cpp: restore backwards compatibility
| * | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-0140-732/+1303
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my41
| | * | | fix call of string::copy() if HAVE_FCONVERT is setunknown2004-11-011-1/+2
| | | | |
| * | | | NDB blob fixes. INCOMPATIBLE with existing blobsunknown2004-11-012-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/NdbBlob.cpp: misplaced code line + change blob tabledist ndb/test/ndbapi/testBlobs.cpp: misplaced code line + change blob tabledist
| * | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-3113-386/+753
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my41 ndb/include/ndbapi/NdbBlob.hpp: Auto merged
| | * | | | NDB bug-6018 support writeTuple with blobsunknown2004-10-3113-386/+753
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2004-11-012-2/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
| * | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-0133-722/+917
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | * | | | | configure.in:unknown2004-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | | | Removed old not used/illegal declarationunknown2004-11-011-1/+0
| | | | | | |
* | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2004-11-0171-851/+1622
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
| * | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-0133-721/+916
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | * | | | | aligned ndb versioning with mysqlunknown2004-11-0133-721/+916
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-011-7/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * | | | | Fixed hanging ndb_mgmd on various platformsunknown2004-11-011-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-014-1/+377
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | | | These modifications are the result ofunknown2004-10-293-1/+376
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Enable REPLACE ... SELECT in prepared statements.unknown2004-10-309-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-2914-60/+486
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | * \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-10-2914-60/+486
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
View Lorry Controller Status