summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* 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
* | 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:/data0/bk/mysql-4.1unknown2005-05-061-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/users/rburnett/bug9721 BitKeeper/etc/logging_ok: auto-union
| * | A fix for Bug#8467.unknown2005-05-061-0/+1
| | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-051-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql BitKeeper/etc/logging_ok: auto-union
| | * | Added cp932 character setunknown2005-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Bug #9721 net_write_timeout not used on Windows unknown2005-05-051-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an extra parameter to all calls to timeout(). 1 means we want to set the write timeout 0 means we wnat to set the read timeout viossl.c: Add which parameter to ssl timeout routine vio_priv.h: Added which parameter to vio_ignore_timeout and vio_ssl_timeout violite.h: Add which parameter to vio_timeout sigs net_serv.cc: Use proper which code in call to vio_timeout to set the proper timeout viosocket.c: Set the appropriate timeout in vio_timeout vio/viosocket.c: Set the appropriate timeout in vio_timeout sql/net_serv.cc: Use proper which code in call to vio_timeout to set the proper timeout include/violite.h: Add which parameter to vio_timeout sigs vio/vio_priv.h: Added which parameter to vio_ignore_timeout and vio_ssl_timeout vio/viossl.c: Add which parameter to ssl timeout routine BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | logging_ok:unknown2005-05-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result: BUG#10287 mysql-test/r/ndb_restore.result: BUG#10287 mysql-test/t/ndb_restore.test: BUG#10287 ndb/test/src/NDBT_ResultRow.cpp: BUG#10287 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Fix bug #9703 "Error 1032 with GROUP BY query and large tables"unknown2005-04-291-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | Reset old error if tmp table was successfully created. Test data is large and can be found in bug report along with test query. sql/sql_select.cc: Fix bug #9703 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge xiphis.org:/var/db/bk/work-acurtis/bug6776unknown2005-04-081-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/var/db/bk/work-acurtis/bug6776.1 sql/sql_udf.cc: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-061-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286 sql/sql_yacc.yy: Auto merged
| * | | Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variablesunknown2005-04-061-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | mergedunknown2005-04-051-0/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | add changeset key to the bk commit mailunknown2005-04-051-0/+3
| | |
| * | Do-compile:unknown2005-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option --with-big-tables Build-tools/Do-compile: Added option --with-big-tables BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-03-171-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
| | * | Update URL.unknown2005-03-171-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-261-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 acinclude.m4: Auto merged mysql-test/r/ps_1general.result: Auto merged
| * \ \ \ Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-231-0/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | don't allow to commit as mysqldevunknown2005-03-181-0/+11
| | | | | |
* | | | | | "After Monty's review" changes to the fix for BUG#8325 "Deadlock in ↵unknown2005-03-231-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replication thread stops replication": s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late); no message on error log (deadlock is too common sometimes), a global counter instead (SHOW STATUS LIKE 'slave_retried_transactions'). Plus a fix for libmysql/Makefile.shared libmysql/Makefile.shared: When we "make clean" in libmysql/ we remove the symlinks there, so we need to mark that they have to be recreated later: this is done by removing ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'. This Makefile.shared is used by libmysql_r too. No reason to remove linked_client_sources as we don't remove the links in client/. mysql-test/r/rpl_deadlock.result: result fix mysql-test/t/rpl_deadlock.test: small test addition sql/mysqld.cc: if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions". sql/slave.cc: If slave retries automatically a transaction, no message on error log (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4, 5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks are usually resolved at first try. New global counter rli->retried_trans (for SHOW STATUS: total number of times the slave had to retry any transaction). safe_sleep() is thread-safe, sleep() was not. I change the rli->trans_retries counter to go from 0 to max instead of the other way (better for new sleep()). sql/slave.h: new global counter rli->retried_trans sql/sql_show.cc: SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes. Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet) when the static global status_vars is created (active_mi is set in init_slave()). sql/structs.h: new SHOW_SLAVE_RETRIED_TRANS BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeonunknown2005-03-171-0/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon BitKeeper/etc/logging_ok: auto-union sql/log_event.cc: Auto merged
| * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-03-171-0/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon BitKeeper/etc/logging_ok: auto-union
| | * | safer creation of temp files used in replication of LOAD DATA INFILE.unknown2005-03-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we come to create these, they may already exist and it's necessary to delete these old, useless copies. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | mysql.1.in:unknown2005-03-141-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix path that needs no parameterization. man/mysql.1.in: Fix path that needs no parameterization. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Bug #6660 mysqldump creates bad pathnames on Windowsunknown2005-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows. However, this patch fixes the bug in mysqldump.c mysqldump.c: Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows client/mysqldump.c: Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | BUG#6554 Problem Building MySql on Fedora Core 3unknown2005-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moved static variables defined inside of function to file scope to avoid this linking problem on FC3 sql/ha_berkeley.cc: Moved list of bdb extension to file scope sql/ha_ndbcluster.cc: Moved list of ndb extesions to file scope BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | New Project files for Windows Ithanium 64-bit buildsunknown2005-03-061-0/+1
| | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | logging_ok:unknown2005-03-041-0/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted func_group.result, func_group.test: Added a test case for bug #8893. opt_sum.cc: A misplaced initialization for the returned parameter prefix_len in the function find_key_for_maxmin caused usage of a wrong key prefix by the min/max optimization in cases when the matching index was not the first index that contained the min/max field. sql/opt_sum.cc: A misplaced initialization for the returned parameter prefix_len in the function find_key_for_maxmin caused usage of a wrong key prefix by the min/max optimization in cases when the matching index was not the first index that contained the min/max field. mysql-test/t/func_group.test: Added a test case for bug #8893. mysql-test/r/func_group.result: Added a test case for bug #8893. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1unknown2005-02-221-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* \ \ Merge mysql.com:/home/jimw/my/mysql-4.0-cleanunknown2005-02-171-0/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean BitKeeper/triggers/post-commit: Auto merged
| * | Merge mysql.com:/home/jimw/my/mysql-4.0-no-merge-spamunknown2005-02-171-0/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.0-clean
| | * | Make post-commit trigger not send emails when the message would not containunknown2005-02-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any actual changes. (Often the case in merges where the only change involves renumbering ChangeSet entries.) BitKeeper/triggers/post-commit: Suppress emails when there's no changes actually reported
* | | | Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0unknown2005-02-151-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dellis/bkl/bug-4.1 BitKeeper/etc/logging_ok: auto-union myisam/ft_nlq_search.c: Auto merged
| * | | ft_nlq_search.c:unknown2005-02-151-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Added bounds check to avoid accessing unallocated FT_DOC array. (BUG #8522) myisam/ft_nlq_search.c: Added bounds check to avoid accessing unallocated FT_DOC array. (BUG #8522) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Bug#8351unknown2005-02-141-0/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | Fix for crash when using a double quote in boolean fulltext query. mysql-test/r/fulltext.result: Added a test case for bug #8351. mysql-test/t/fulltext.test: Added a test case for bug #8351. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Manual mergeunknown2005-02-111-1/+0
|\ \ | |/ | | | | | | | | | | BitKeeper/triggers/post-commit: Auto merged sql/table.cc: Auto merged
| * 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 commit triggerunknown2005-02-101-6/+13
|\ \ | |/ | | | | | | | | | | | | | | 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-041-0/+1
| |/ | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-041-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.1 BitKeeper/etc/logging_ok: auto-union
View Lorry Controller Status