summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | marking the file gone again to hopefully get the tree on its feetunknown2005-05-232-0/+2
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Resolve merge from 4.1unknown2005-05-181-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged myisam/mi_check.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged client/mysqldump.c: Resolve merge mysql-test/r/myisam.result: Resolve merge mysql-test/r/mysqldump.result: Resolve merge mysql-test/r/olap.result: Resolve merge mysql-test/r/subselect.result: Resolve merge mysql-test/t/myisam.test: Resolve merge mysql-test/t/mysqldump.test: Resolve merge mysql-test/t/olap.test: Resolve merge mysql-test/t/range.test: Resolve merge mysql-test/t/subselect.test: Resolve merge ndb/src/common/util/version.c: Resolve merge ndb/src/ndbapi/ndberror.c: Resolve merge sql/item.cc: Resolve merge sql/item_strfunc.h: Resolve merge sql/sql_select.cc: Resolve merge sql/sql_yacc.yy: Resolve merge
| * | | ndberror.c:unknown2005-05-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated error message for ndb ndb/src/ndbapi/ndberror.c: updated error message for ndb BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" ↵unknown2005-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (BUG#10020) mysql-test/r/subselect.result: test fro bug 10020 mysql-test/t/subselect.test: bug 10020 test suite sql/item.cc: any constant allowed here BUG#10020) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Fix for bug #10493 (SJIS fields are not correctly saved)unknown2005-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | strings/ctype-sjis.c: pos should be decreased BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | new build scripts for SAP teamunknown2005-05-181-0/+2
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | mergedunknown2005-05-142-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union client/mysql.cc: automerged
| * \ \ \ Mergeunknown2005-05-132-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | | Add myself to the list of users who don't automatically check outunknown2005-05-131-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all version controlled files (should speed up bk citool)
| * | | | Mergeunknown2005-05-081-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211: Auto merged configure.in: Auto merged libmysql/libmysql.c: Auto merged sql/ha_blackhole.cc: Auto merged sql/share/Makefile.am: Auto merged
| | * | | errmsg.txt:unknown2005-05-081-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/japanese-sjis/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/serbian/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-05-071-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged sql/share/Makefile.am: Auto merged libmysql/libmysql.c: Merge from 4.0
| | | * | [backport of 4.1, because 4.0 autobuild now hits the same problem;unknown2005-05-071-0/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end because config.status may later need this file (if it does not find it it won't incorporate dependencies of errmsg.sys in sql/share/Makefile). In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile. configure.in: Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in because config.status may later need this file (if it does not find it it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( ) sql/share/Makefile.am: using "all:" leads to double-"all:" in Makefile (counting the auto-generated); all-local is the standard way to : BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB).unknown2005-05-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/sp.result: Correct the result file for the changed test. mysql-test/t/sp.test: 1) Correct the "fib" stored procedure and its initial data to be mathematical correct: fib(0) = 0 2) Do a small run of "fib" first, that is not likely to hit a memory limit (see entry 9937 in the bug DB). BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1unknown2005-05-071-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0 BitKeeper/etc/logging_ok: auto-union sql/sql_base.cc: Auto merged
| | * | Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616unknown2005-05-061-0/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1 BitKeeper/etc/logging_ok: auto-union sql/sql_base.cc: Auto merged
| | | * Bug#6616unknown2005-05-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT Infinite loop caused by missing update to thd version. sql/sql_base.cc: Bug#6616 thd version needs to be updated before reopening tables to prevent an infinite loop. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Merge bk-internal.mysql.com:/users/rburnett/bug9721unknown2005-05-061-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/users/rburnett/mysql-5.0 BitKeeper/etc/logging_ok: auto-union include/violite.h: Auto merged sql/net_serv.cc: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged