summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix for the bug #7344 (multiple server_init/server_end lead to crash)unknown2005-02-182-0/+2
| | | | | | | | | | Some variable wasn't moved to the initial state during mysql_server_end myisam/ft_stopwords.c: resetting ft_stopword_file sql/mysqld.cc: free_charsets() call added
* Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-131-2/+9
|\ | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.clean
| * new static archive_inited variable, so that archive_db_end() will do ↵unknown2005-02-121-2/+9
| | | | | | | | | | | | | | | | | | | | | | something only if archive_db_init() was run before (protection against destroying uninited mutex in the case where mysqld fails early at startup (before archive_db_init() was called) and then calls archive_db_end() to clean up). sql/examples/ha_archive.cc: new static archive_inited variable, so that archive_db_end() will do something only if archive_db_init() was run before.
* | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-121-7/+11
|\ \ | |/ |/| | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.clean
| * Fix for bug #8477 (Embedded query_cache test crashes)unknown2005-02-121-7/+11
| | | | | | | | | | libmysqld/emb_qcache.cc: Querycahce data transition fixed
* | Bug#8235 Connection collation change & table create with default result in crashunknown2005-02-124-3/+69
| | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ctype_ucs.result: Test case mysql-test/t/ctype_ucs.test: Test case sql/field.cc: Fixed minus check to be UCS2-compatible strings/ctype-ucs2.c: Missing my_scan_ucs2() was added.
* | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-02-122-18/+18
|\ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * \ Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-02-122-18/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | make LOAD INDEX to workunknown2005-02-122-18/+18
| | | |
* | | | Manual mergeunknown2005-02-111-1/+1
|\ \ \ \
| * | | | distinct.result:unknown2005-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjustment of the result file after the revision of the fix for bug #7520. mysql-test/r/distinct.result: Adjustment of the result file after the revision of the fix for bug #7520.
| * | | | Merge rurik.mysql.com:/home/igor/mysql-4.0unknown2005-02-112-8/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
| * \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-02-114-7/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M40/mysql-4.0
* | \ \ \ \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-02-112-8/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| * | | | | | Manual mergeunknown2005-02-112-8/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Auto merged sql/table.cc: Auto merged
| | * | | | | select.result:unknown2005-02-112-8/+7
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After revision of the fix for bug #7520. table.cc: Revised the fix for bug #7520. Made it compliant with 5.0 code where the bug does not exist. sql/table.cc: Revised the fix for bug #7520. Made it compliant with 5.0 code where the bug does not exist. mysql-test/r/select.result: After revision of the fix for bug #7520.
| | * | | | Merge rurik.mysql.com:/home/igor/mysql-4.0unknown2005-02-103-0/+29
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
| | * | | | | Fix extra blank line in emails sent by post-commit trigger.unknown2005-02-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Remove extra blank link
* | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| * \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1unknown2005-02-111-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug8306
| | * | | | | | Bug#8391 - "merge" fails on Linux/IA64unknown2005-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was a thread stack overrun. IA64 had its own stack size section already. Enlarged its default stack size from 192K to 256K.
* | | | | | | | Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1unknown2005-02-111-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | Build-tools/Do-compile: Auto merged
| * | | | | | Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0unknown2005-02-101-2/+4
| |\ \ \ \ \ \
| | * | | | | | Change 'Build-tools/Do-compile' from 'system("rm -f ...");' to 'unlink()' to ↵unknown2005-02-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensure it also works on file names with special characters. Build-tools/Do-compile: Ever and again, some test creates a file name with special characters that need to be escaped when passed to the shell; as this is not done, 'system("rm -f ...");' fails on them, the old test tree is not deleted, and the build fails. Prevent this by changing to Perl 'unlink()' which does not need escaping.
* | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-02-103-0/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 BitKeeper/etc/logging_ok: auto-union extra/replace.c: Auto merged
| * | | | | | | | select.result:unknown2005-02-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusted results of the test case for bug #7520 for 4.1. mysql-test/r/select.result: Adjusted results of the test case for bug #7520 for 4.1.
| * | | | | | | | Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0unknown2005-02-104-13/+42
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 BitKeeper/etc/logging_ok: auto-union extra/replace.c: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged sql/table.cc: Auto merged
| | * | | | | | | select.result, select.test:unknown2005-02-103-0/+29
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #7520. table.cc: Fixed bug #7520. The bug was caused by a wrong calculation of the field max_key_length for a TABLE structure when there was an index on a blob field. sql/table.cc: Fixed bug #7520. The bug was caused by a wrong calculation of the field max_key_length for a TABLE structure when there was an index on a blob field. mysql-test/t/select.test: Added a test case for bug #7520. mysql-test/r/select.result: Added a test case for bug #7520.
* | | | | | | | Set of fixes requested by Kent in IRC. Tested (except the windows changes ↵unknown2005-02-102-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since I am trusting Kent...). No windows compiles here folks... VC++Files/tests/mysql_client_test.dsp: fix request by Kent sql/item.cc: fix requested by kent
* | | | | | | | Merge commit triggerunknown2005-02-102-19/+26
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union extra/replace.c: Auto merged BitKeeper/triggers/post-commit: Merge changes
| * | | | | | | Merge bk-internal:/home/bk/mysql-4.0unknown2005-02-101-6/+13
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.0-clean
| | * | | | | | Add BUG# to subject and X-Bug header for all outgoingunknown2005-01-251-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emails re: bug fixes, and update the URL for the manual page on installing from the source tree. Fake bug number for testing: Bug #1234 BitKeeper/triggers/post-commit: Update URL for docs page
| * | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-02-082-13/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.0
| | * \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-02-042-13/+14
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | | * | | | | | | A fix (bug #7971: set_bit/clear_bit names conflict w/Linux kernel headers >= ↵unknown2005-02-011-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.6.9-rcxx) extra/replace.c: A fix (bug #7971: set_bit/clear_bit names conflict w/Linux kernel headers >= 2.6.9-rcxx) set_bit replaced with internal_set_bit clear_bit replaced with internal_clear_bit
* | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6749-4.1unknown2005-02-101-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | BUG#6749: If there is no current database, then nothing should be binlogged ifunknown2005-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binlog-do-db or binlog-ignore-db are in effect. (In the future 5.1? 5.0? I think each statement should be verified against the filtering criteria based on the database it *uses* and not the *current* one. But, right now the *current* database is what counts according to the semantics of the manual.) sql/log.cc: BUG#6749: If there is no current database, then nothing should be binlogged if binlog-do-db or binlog-ignore-db are in effect. (In the future I think that each statement should be verified against the filtering criteria based on the database it *uses* and not the *current* one. But, right now the *current* database is what counts according to the semantics of the manual.)
* | | | | | | | | | | Follow-up for bug#7990unknown2005-02-102-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysql/libmysql.c: And now put it to the proper place and make it work (Bug#7990) tests/mysql_client_test.c: Enable the test for bug#7990
* | | | | | | | | | | A fix and test case for Bug#7990 "mysql_stmt_close doesn't unknown2005-02-102-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset mysql->net.last_error": the solution is to clear MYSQL->net error before performing COM_CLOSE: if the call succeeds, the connection is usable for other statements. More comprehensive fix is to clear MYSQL->net for all recoverable errors at the time they happen, it will be implemented in 5.0 as it introduces incompatibility in behavior. libmysql/libmysql.c: A simple fix for Bug#7990 "mysql_stmt_close doesn't reset mysql->net.last_error" tests/mysql_client_test.c: A test case for Bug#7990 " mysql_stmt_close doesn't reset mysql->net.last_error"
* | | | | | | | | | | A fix and test case for Bug#8330 "mysql_stmt_execute crashes" (libmysql).unknown2005-02-102-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysql/libmysql.c: Fix for bug#8330 "mysql_stmt_execute crashes": we need to bail out from mysql_stmt_execute if mysql->net is occupied with a result set of another statement. Otherwise on the next attempt to use net we get a crash, as it's freed in case of error. tests/mysql_client_test.c: A test case for Bug#8330 "mysql_stmt_execute craches" (libmysql)
* | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-zlibunknown2005-02-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * | | | | | | | | | | Add the zlib .libs directory to LD_LIBRARY_PATH in mysql-test-run.sh,unknown2005-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which fixes running the tests when using the bundled zlib. mysql-test/mysql-test-run.sh: Add zlib .libs dir to LD_LIBRARY_PATH
* | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-02-094-74/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 sql/item_cmpfunc.cc: Auto merged
| * | | | | | | | | | | | reverted patch for BUG#7351 (because of performance ussie)unknown2005-02-094-74/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-0912-100/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/sql_select.cc: Auto merged
| * | | | | | | | | | | | Better bugfix for "HAVING when refering to RAND()" (Bug #8216)unknown2005-02-0812-100/+96
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT. This will ensure that any reference to these has a valid value. Generalized the code for split_sum_func() BitKeeper/etc/ignore: added support-files/ndb-config-2-node.ini mysql-test/r/group_by.result: More complicated test to assure that rand() is only calulated once mysql-test/r/user_var.result: Back to old results :( (ok but not perfect) mysql-test/t/group_by.test: More complicated test to assure that rand() is only calulated once sql/item.cc: Better bugfix for "HAVING when refering to RAND()" This will ensure that when refering to things like RAND() in HAVING through an alias we will not recalculate that rand() value in the HAVING part but use the value in the row Generalize split_sum_func() sql/item.h: Better bugfix for "HAVING when refering to RAND()" T sql/item_cmpfunc.cc: Better bugfix for "HAVING when refering to RAND()" Use generalized split_sum_func2() function sql/item_func.cc: Better bugfix for "HAVING when refering to RAND()" Use generalized split_sum_func2() function sql/item_row.cc: Better bugfix for "HAVING when refering to RAND()" Use generalized split_sum_func2() function sql/item_strfunc.cc: Better bugfix for "HAVING when refering to RAND()" Use generalized split_sum_func2() function sql/sql_list.h: Add functions to concatenate lists sql/sql_select.cc: Better bugfix for "HAVING when refering to RAND()" Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT. This will ensure that any reference to these has a valid value.
* | | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-093-2/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-merge
| * | | | | | | | | | | | - make sure to include the embedded test results in the source distributionunknown2005-02-091-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | - added copyright header on top of the fill_help_tables.sql file (BUG#5772)unknown2005-02-092-0/+24
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the commercial distribution Build-tools/mysql-copyright-2: - added functionality to replace a copyright header in .sql files, too (needed for updating scripts/fill_help_tables.sql in the commercial source distribution) scripts/fill_help_tables.sh: - added copyright header on top of the fill_help_tables.sql file (BUG#5772)
* | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-091-20/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
View Lorry Controller Status