summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-10-041-0/+2
|\ | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my50-bug19356 BitKeeper/etc/collapsed: auto-union
| * Bug#19356: Assert on undefined @uservar in prepared statement executeunknown2006-10-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The executing code had a safety assertion so that it refused to free Items that it didn't create. However, there is a case, undefined user variables, which would put Items into the list to be freed. Instead, do something that is more risky in expectation that the code will be refactored soon, as Kostja wants to do: Remove the assertions from prepare() and execute(). Put one assertion at a higher level, before stmt->set_params_from_vars(), which may then create new to-be-freed Items . mysql-test/r/ps_11bugs.result: Create tests to prove that undefined variables work, as keys and not, and that variables explicitly assigned to Null work. mysql-test/t/ps_11bugs.test: Create tests to prove that undefined variables work, as keys and not, and that variables explicitly assigned to Null work. sql/sql_prepare.cc: Move a safety assertion up one level and higher, because there is legitimately a case where thd->free_list is not NULL going into Prepared_statement::{prepare,execute} methods. Kostja plans to refactor this code so that it is both safe and works. (Now it works, but isn't very safe.)
* | Merge bk-internal:/home/bk/mysql-5.0-runtimeunknown2006-10-031-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/collapsed: auto-union mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ps.result: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged
| * | Bug#21476: (Thread stack overrun not caught, causing SEGV)unknown2006-09-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The STACK_MIN_SIZE is currently set to 8192, when we actually need (emperically discovered) 9236 bytes to raise an fatal error, on Ubuntu Dapper Drake, libc6 2.3.6-0ubuntu2, Linux kernel 2.6.15-27-686, on x86. I'm taking that as a new lower bound, plus 100B of wiggle-room for sundry word sizes and stack behaviors. The added test verifies in a cross-platform way that there are no gaps between the space that we think we need and what we actually need to report an error. DOCUMENTERS: This also adds "let" to the mysqltest commands that evaluate an argument to expand variables therein. (Only right of the "=", of course.) client/mysqltest.c: Add "let" to the list of mysqltest commands that evaluates its arguments (only the right-hand-side of the equals-sign expression). mysql-test/r/mysqltest.result: Added test to show that mysqltest "let" will evaluate the RHS correctly (and expand the backslash test). mysql-test/t/mysqltest.test: Added test to show that mysqltest "let" will evaluate the RHS correctly (and expand the backslash test). sql/mysql_priv.h: Increase the amount we require to be available for the stack, since experience told us that the previous amount was too little by at least 1044 bytes. mysql-test/r/execution_constants.result: New BitKeeper file ``mysql-test/r/execution_constants.result'' mysql-test/t/execution_constants.test: New BitKeeper file ``mysql-test/t/execution_constants.test''
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-09-293-3/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge BitKeeper/etc/collapsed: auto-union mysql-test/mysql-test-run.pl: Auto merged sql/mysql_priv.h: Auto merged sql/sp.cc: Auto merged sql/sql_acl.cc: Auto merged mysql-test/r/sp.result: Manual merge. mysql-test/t/sp.test: Manual merge.
| * | Fix for bug #19121: Windows incompatible udf_exampleunknown2006-09-221-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: fixed path for udf_example.so when running testsuite on Windows sql/CMakeLists.txt: Added missing udf_example sql/Makefile.am: Added udf_example files for make dist sql/udf_example.c: fix for Windows: Windows doesn't have socket.h and friends Added replacements for strmov,bzero and memcpy_fixed when compiling standalone. sql/udf_example.def: BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def
| * Merge bk-internal:/home/bk/mysql-5.0-maintunknown2006-09-151-3/+15
| |\ | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfixunknown2006-09-141-3/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
| | | * /usr/sbin not always in PATH environment variable.unknown2006-09-141-3/+9
| | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Attempt to default to /usr/sbin/sendmail if it exists, otherwise use sendmail.
| | * | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfixunknown2006-09-131-3/+9
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint BitKeeper/etc/ignore: auto-union
| | | * These bitKeeper changes will allow Windows to be used as a primary ↵unknown2006-09-131-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development platform. BitKeeper/etc/ignore: Exclude files created during the Windows build process. BitKeeper/triggers/post-commit: post-commit trigger writes emails to file in the BitKeeper/tmp directory before sending in case of failure. Now uses bk sendmail instead of hardcoded /usr/sbin/sendmail to send message.
| * | | Speed up "bk citool" for msvensson:unknown2006-09-081-0/+1
| |/ /
* | | This is another patch for test suite to make IM tests work smoothly.unknown2006-09-081-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch affects only test suite and has the following changes: 1. On starting Instance Manager -- added code for waiting for guarded mysqld instances to create PID files; 2. Polishing; 3. Move IM-related operations out of mtr_process.pl into new dedicated for IM file -- mtr_im.pl mysql-test/mysql-test-run.pl: 1. Require new file with IM-related operations; 2. Added timeout to wait for PID files of guarded instances; 3. Polishing. mysql-test/lib/mtr_process.pl: Move IM-related operations to new file. mysql-test/lib/mtr_im.pl: File for IM-related operations.
* | Preliminary patch for the following bugs:unknown2006-08-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - BUG#15934: Instance manager fails to work; - BUG#18020: IM connect problem; - BUG#18027: IM: Server_ID differs; - BUG#18033: IM: Server_ID not reported; - BUG#21331: Instance Manager: Connect problems in tests; The only test suite has been changed (server codebase has not been modified). BitKeeper/deleted/.del-im_check_os.inc: Rename: mysql-test/include/im_check_os.inc -> BitKeeper/deleted/.del-im_check_os.inc mysql-test/include/im_check_env.inc: Include only this file from all IM-tests. mysql-test/lib/mtr_io.pl: Update mtr_get_pid_from_file() to workaround race, described in BUG#21884. mysql-test/lib/mtr_process.pl: Refactor im_start()/im_stop() so that they will be more reliable. There are the following user-visible changes: - if one of these functions fails, the test suite is aborted; - mtr_im_stop() now determines whether the component is alive or not not only by checking PID, but also by trying to connect to the component; - after starting IM, the test suite waits for it to start accepting client connections and to start all its guarded mysqld instances; - a lot of debug-logs have been added in order to simplify investigation of future failures. mysql-test/mysql-test-run.pl: 1. Get rid of kill_and_cleanup(); 2. Move im_start()/im_stop() to mtr_process.pl; 3. Change default IM port to 9311 so that it does not interfere with default slave port; mysql-test/r/im_daemon_life_cycle.result: Updated result file. mysql-test/r/im_life_cycle.result: Updated result file. mysql-test/r/im_options_set.result: Updated result file. mysql-test/r/im_options_unset.result: Updated result file. mysql-test/r/im_utils.result: Updated result file. mysql-test/t/im_daemon_life_cycle.imtest: Updated IM-test. mysql-test/t/im_life_cycle.imtest: Updated IM-test. mysql-test/t/im_options_set.imtest: Updated IM-test. mysql-test/t/im_options_unset.imtest: Updated IM-test. mysql-test/t/im_utils.imtest: Updated IM-test.
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2006-08-251-0/+1
| | | | | | | | | | | | | | into alik.:/mnt/raid/alik/MySQL/devel/5.0-rt-bug16899
* | Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clauseunknown2006-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User name (host name) has limit on length. The server code relies on these limits when storing the names. The problem was that sometimes these limits were not checked properly, so that could lead to buffer overflow. The fix is to check length of user/host name in parser and if string is too long, throw an error. mysql-test/r/grant.result: Updated result file. mysql-test/r/sp.result: Updated result file. mysql-test/r/trigger.result: Updated result file. mysql-test/r/view.result: Updated result file. mysql-test/t/grant.test: Added test for BUG#16899. mysql-test/t/sp.test: Added test for BUG#16899. mysql-test/t/trigger.test: Added test for BUG#16899. mysql-test/t/view.test: Added test for BUG#16899. sql/mysql_priv.h: Added prototype for new function. sql/share/errmsg.txt: Added new resources. sql/sql_acl.cc: Remove outdated checks. sql/sql_parse.cc: Add a new function for checking string length. sql/sql_yacc.yy: Check length of user/host name.
* | Bug #21396: Wrong error number generated for a missing tableunknown2006-08-021-0/+1
|/ | | | | | | BitKeeper/etc/collapsed: BitKeeper file /home/georg/work/mysql/prod/mysql-5.0/BitKeeper/etc/collapsed mysys/my_open.c: Win64 bit fix: Replacing 32-bit value (0xFFFFFFFF) by a generic error constant.
* pekka:get - push push pushunknown2006-05-021-0/+1
| | | | | BitKeeper/etc/config: pekka:get
* Merge mysql.com:/space/my/mysql-4.1unknown2005-12-071-4/+4
|\ | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0-merg BitKeeper/triggers/post-commit: Auto merged
| * Merge mysql.com:/space/my/mysql-4.0unknown2005-12-071-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1 BitKeeper/triggers/post-commit: Auto merged
| | * - commit emails are now sent to commits@lists.mysql.com instead of unknown2005-12-061-4/+4
| | | | | | | | | | | | | | | | | | | | | internals@lists.mysql.com to reduce the noise on the internals list.
* | | Merge mysql.com:/home/mysql_src/mysql-4.1unknown2005-10-121-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-5.0; a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset BitKeeper/deleted/.del-compile-pentium64-valgrind-max: Delete: BUILD/compile-pentium64-valgrind-max BitKeeper/etc/config: Auto merged sql/log.cc: Auto merged sql/slave.h: Auto merged client/mysqltest.c: manual merge mysql-test/r/subselect.result: manual merge mysql-test/t/subselect.test: manual merge sql/log_event.cc: manual merge sql/log_event.h: manual merge sql/slave.cc: manual merge sql/sql_yacc.yy: manual merge
| * | Importing BUILD/compile-pentium64-valgrind-max from 5.0 (unchanged), and ↵unknown2005-10-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | speeding up 'bk citool' for me BitKeeper/etc/config: speed up 'bk citool' for me BUILD/compile-pentium64-valgrind-max: New BitKeeper file ``BUILD/compile-pentium64-valgrind-max''
* | | Merge mysql.com:/home/alexi/dev/mysql-4.1-0unknown2005-09-061-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/dev/mysql-5.0-0 sql/item_cmpfunc.cc: Auto merged mysql-test/r/join_outer.result: Manual merge mysql-test/t/join_outer.test: Manual merge sql/item_cmpfunc.h: Manual merge sql/opt_range.cc: Manual merge sql/sql_yacc.yy: Manual merge BitKeeper/etc/RESYNC_TREE: New BitKeeper file ``BitKeeper/etc/RESYNC_TREE''
| * | config:unknown2005-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | changed tomas default checkout BitKeeper/etc/config: changed tomas default checkout
| * | jonas - unknown2005-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix checkout properties BitKeeper/etc/config: Fix checkout properties
* | | config:unknown2005-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | updated tomas default checkout BitKeeper/etc/config: updated tomas default checkout
* | | jonas:unknown2005-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | fix bk checkout properties
* | | Merge mysql.com:/space/my/mysql-4.1-buildunknown2005-07-061-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0-build BitKeeper/etc/config: Auto merged
| * | Merge mysql.com:/space/my/mysql-4.0-buildunknown2005-07-051-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build BitKeeper/etc/config: Auto merged
| | * - disabled openlogging to satisfy BK when using a commercial license keyunknown2005-07-051-1/+1
| | |
| | * Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-06-061-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/mikron/bug10901 BitKeeper/etc/logging_ok: auto-union
| | | * Bug #10901unknown2005-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analyze table corrupts the state on data_file_length, records, index_file_length... by writing the shared state when there is an updated internal state due to inserts or deletes Fixed by synching the shared state with the internal state before writing it to disk Added test cases of 2 error cases and a normal case in new analyze test case BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | sql_repl.cc:unknown2005-06-031-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #11064 some read error not detected in replication on 64-bit platform sql/sql_repl.cc: Bug #11064 some read error not detected in replication on 64-bit platform BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * Merge bk-internal:/home/bk/mysql-4.0unknown2005-05-071-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
| | | * Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-05-071-0/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/7709-mysql-4.0 BitKeeper/etc/logging_ok: auto-union
| | | | * BUG#7709 fix - Boolean fulltext query against unsupported engines does notunknown2005-05-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fail. mysql-test/r/innodb.result: Test case for BUG#7709 - Boolean fulltext query against unsupported engines does not fail added. mysql-test/t/innodb.test: Test case for BUG#7709 - Boolean fulltext query against unsupported engines does not fail added. sql/item_func.cc: Check if table supports fulltext. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | errmsg.txt:unknown2005-05-071-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/czech/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/danish/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/dutch/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/english/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/estonian/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/french/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/german/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/greek/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/hungarian/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/italian/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/japanese/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/korean/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/norwegian/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/norwegian-ny/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/polish/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/portuguese/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/romanian/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/russian/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/slovak/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/spanish/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/swedish/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). sql/share/ukrainian/errmsg.txt: Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195). BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | mergeunknown2005-06-141-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged sql/item_cmpfunc.cc: Auto merged
| * | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-131-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1 BitKeeper/etc/logging_ok: auto-union
| | * | | logging_ok:unknown2005-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted DbtcMain.cpp, testTimeout.cpp: Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout ndb/test/ndbapi/testTimeout.cpp: Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | ctype_utf8.test, ctype_utf8.result:unknown2005-06-131-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #11167. sql_select.cc: Fixed bug #11167. In 4.1 char/varchar fields are limited by 255 characters in length that make them longer than 255 bytes in size for such character sets as UTF8. The functions store_record_in_cache and read_cached_records did not take into account this Moreover the code did not take into account that the size of the varchar fields in 5.0 can be up to 65535 bytes sql/sql_select.cc: Fixed bug #11167. In 4.1 char/varchar fields are limited by 255 characters in length that make them longer than 255 bytes in size for such character sets as UTF8. The functions store_record_in_cache and read_cached_records did not take into account this Moreover the code did not take into account that the size of the varchar fields in 5.0 can be up to 65535 bytes mysql-test/r/ctype_utf8.result: Added a test case for bug #11167. mysql-test/t/ctype_utf8.test: Added a test case for bug #11167. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Adding auxiliary scripts that allow to display messages in result files from ↵unknown2005-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | within test files - show_msg.inc - displays a message followed by a line of '-' at the length of the messgae - show_msg80.inc - displays a message followed by a line of '-' with a fixed length of 80 mysql-test/r/mysqltest.result: Updated result file mysql-test/t/mysqltest.test: Added test cases to test the show_msg.inc and show_msg80.inc auxiliary files BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0unknown2005-06-071-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union myisam/mi_key.c: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged sql/item_buff.cc: Auto merged sql/sql_class.cc: Auto merged
| * | | Accepted openloggingunknown2005-06-071-0/+1
| | | |
* | | | Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0unknown2005-06-021-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union
| * | | fixed compile problem by replacing W_OK with F_OKunknown2005-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | item_func.h:unknown2005-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug #9939: a wrong conversion of arguments for functions COALESCE and IFNULL. The str_op virtual method was added into Item_func_numhybrid. item_func.cc: Fixed bug #9939: a wrong conversion of arguments for functions COALESCE and IFNULL. The str_op virtual method was added into Item_func_numhybrid. item_cmpfunc.h, item_cmpfunc.cc: Fixed bug #9939: a wrong conversion of arguments for functions COALESCE and IFNULL. Item_func_coalesce and Item_func_ifnull now inherit from a modified Item_func_numhybrid. case.test, case.result: Added test cases for bug #9939. mysql-test/r/case.result: Added test cases for bug #9939. mysql-test/t/case.test: Added test cases for bug #9939. sql/item_cmpfunc.cc: Fixed bug #9939: a wrong conversion of arguments for functions COALESCE and IFNULL. Item_func_coalesce and Item_func_ifnull now inherit from a modified Item_func_numhybrid. sql/item_cmpfunc.h: Fixed bug #9939: a wrong conversion of arguments for functions COALESCE and IFNULL. Item_func_coalesce and Item_func_ifnull now inherit from a modified Item_func_numhybrid. sql/item_func.cc: Fixed bug #9939: a wrong conversion of arguments for functions COALESCE and IFNULL. The str_op virtual method was added into Item_func_numhybrid. sql/item_func.h: Fixed bug #9939: a wrong conversion of arguments for functions COALESCE and IFNULL. he str_op virtual method was added into Item_func_numhybrid. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | changes to fix joins not working (bug #10848). New tests, as well as ↵unknown2005-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table->status being set in index_read_idx mysql-test/r/federated.result: new join test results mysql-test/t/federated.test: new simple join tests (more to come with subsequent commits) sql/ha_federated.cc: This fixes joins not working. Monty discussed that having to deal with table->status needs to be moved from the handler/storage engine to a higher level BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1unknown2005-05-242-0/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.0 BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union mysql-test/r/lowercase_table.result: Auto merged mysql-test/t/lowercase_table.test: Auto merged mysys/my_open.c: Auto merged
View Lorry Controller Status