summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug#6505 Wrong sorting order:unknown2005-05-063-20/+23
| | | | | | | latin2_croatian_ci collation was fixed.
* Merge bk-internal.mysql.com:/data0/bk/mysql-4.1unknown2005-05-061-0/+6
|\ | | | | | | | | | | | | | | into bk-internal.mysql.com:/users/rburnett/bug10245 BitKeeper/etc/logging_ok: auto-union
| * Bug #10245 VC++ compiler error with mysql.cc unknown2005-05-052-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Only print the read line version if we are on a platform that supports readline mysql.cc: Add #ifdef to only print readline version if we are on a platform that supports readline client/mysql.cc: Add #ifdef to only print readline version if we are on a platform that supports readline BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1unknown2005-05-0622-44/+14770
|\ \ | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/users/rburnett/bug9721 BitKeeper/etc/logging_ok: auto-union
| * \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2005-05-061-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
| | * | Bug#10193unknown2005-05-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invalid DataDir in config causes ndbd segfault ndb/src/kernel/error/ErrorReporter.cpp: print error and return error if unable to open the file for error reporting.
| * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-063-2/+49
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ibmlab.site:/home/my/bk/mysql-4.1
| | * | | bug#6504 Upper/Lower conversion bug:unknown2005-05-063-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upper/lower conversion for LATIN LETTER D WITH STROKE was wrong in latin2.
| * | | | A fix for Bug#8467.unknown2005-05-062-4/+9
| |/ / / | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-065-29/+98
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1 sql/ha_innodb.cc: Auto merged
| | * | | InnoDB: Truncate SHOW INNODB STATUS output at the start of the listunknown2005-04-195-29/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of active transactions, if necessary and possible. (Bug #5436) innobase/include/lock0lock.h: Split lock_print_info() into lock_print_info_summary() and lock_print_info_all_transactions(). innobase/lock/lock0lock.c: Split lock_print_info() into lock_print_info_summary() and lock_print_info_all_transactions(). innobase/include/srv0srv.h: srv_printf_innodb_monitor(): Add output parameters trx_start and trx_end. innobase/srv/srv0srv.c: srv_printf_innodb_monitor(): Add output parameters trx_start and trx_end. sql/ha_innodb.cc: innodb_show_status(): Truncate oversized output at the beginning of the list of active transactions, if possible.
| * | | | Merge mysql.com:/space/my/mysql-4.1unknown2005-05-061-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | * | | | - fixed typo in variable name that caused compile errors on many platforms ↵unknown2005-05-061-1/+1
| | | |/ / | | |/| | | | | | | | | | | | (tmp_error -> tmp_errno)
| * | | | Added cp932 character setunknown2005-05-056-8/+44
| | | | |
| * | | | Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-056-0/+14564
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql BitKeeper/etc/logging_ok: auto-union
| | * | | Added cp932 character setunknown2005-05-056-0/+14564
| | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | Bug #9721 net_write_timeout not used on Windows unknown2005-05-061-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | viosocket.c: Use ?: syntax to simplify code for setting both timeouts vio/viosocket.c: Use ?: syntax to simplify code for setting both timeouts
* | | | | Bug #9721 net_write_timeout not used on Windows unknown2005-05-056-10/+17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-051-1/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Devel/mysql-4.1
| * | | Bug #5843: Server code does not check whether PID file was successfully writtenunknown2005-05-051-1/+7
| | | |
* | | | A fix and test case for Bug#9777 " Empty set returned by Prepared Statement ↵unknown2005-05-054-6/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it should return a non empty one" (see comments for the changed files for details). mysql-test/r/ps.result: A test case for Bug#9777: tests results fixed. mysql-test/t/ps.test: A test case for Bug#9777 sql/item.cc: A fix for Bug#9777: when creating a constant item from within Item_int_with_ref::new_item, create the item by value, not by name. This should work with prepared statements placeholders. Item_int_with_ref is a special optimization case used when we compare datetime constants with datetime value. Converting the item to integer early is OK as it is in line with the purpose of Item_int_with_ref - to speed up comparison by using integers. Minor cleanups. sql/item.h: Declaration for Item_int_with_ref::new_item
* | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-053-0/+118
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/cw/mysql-4.1
| * | | | mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper:unknown2005-05-053-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial Metrowerks CodeWarrior compiler support new file support-files/MacOSX/mwar-wrapper: Initial Metrowerks CodeWarrior compiler support BUILD/compile-darwin-mwcc: Initial Metrowerks CodeWarrior compiler support support-files/MacOSX/mwcc-wrapper: Initial Metrowerks CodeWarrior compiler support
* | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-056-5/+30
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/mysql-4.1
| * | | | terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:unknown2005-05-055-4/+29
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial Metrowerks CodeWarrior compiler support cmd-line-utils/libedit/config.h: Initial Metrowerks CodeWarrior compiler support configure.in: Initial Metrowerks CodeWarrior compiler support include/my_sys.h: Initial Metrowerks CodeWarrior compiler support sql/sql_bitmap.h: Initial Metrowerks CodeWarrior compiler support cmd-line-utils/readline/terminal.c: Initial Metrowerks CodeWarrior compiler support
| * | | Merge mysql.com:/space/my/mysql-4.1unknown2005-05-041-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-bug9444
| | * | | - adjusted the start and stop priority level in the mysql.server init script ↵unknown2005-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for chkconfig on Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux (e.g. RHEL3/RHEL4) support-files/mysql.server.sh: - adjusted the start and stop priority level for chkconfig on Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux (RHEL3/RHEL4)
* | | | | Fig compiler error.unknown2005-05-051-0/+1
| | | | |
* | | | | Initial value for a auto_increment can now be set using ALTER TABLEunknown2005-05-041-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This change is backported from 5.0 (Bug #7061). sql/ha_innodb.cc: Initial value for a auto_increment can now be set using ALTER TABLE AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This change is backported from 5.0.
* | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-0410-12/+208
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/mysql-4.1
| * | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-041-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * \ \ \ Merge mysql.com:/space/my/mysql-4.1unknown2005-05-041-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | | * | | - added missing el_term.h to the source distribution (BUG#10352)unknown2005-05-041-1/+1
| | | | | |
| * | | | | logging_ok:unknown2005-05-044-2/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2005-05-035-9/+192
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-4.1-9096-fresh sql/item.h: Auto merged sql/item_func.cc: Auto merged
| | * | | | A fix and test case for Bug#9096 "select doesn't return all matched unknown2005-05-035-9/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | records if prepared statements is used". This fix changes equality evaluation method of basic constants from by-name to by-value, thus effectively enabling use of parameter markers in some optimizations (constants propagation, evaluation of possible keys for query). mysql-test/r/ps.result: Test results for the test case for Bug#9096 mysql-test/t/ps.test: A short test case for Bug#9096 "select doesn't return all matched records if prepared statements is used". The is enough to reproduce the glitch in update_ref_and_keys causing the bug to occur. sql/item.cc: Implement by-value equality evaluation of basic constants. This is needed to work with Item_param values. Until now Item_param was compared with other items by its name, which is always "?". The bug at hand showed up when an integer constant was created from one parameter marker (with value 200887 and name "?") and then compared by-name with another parameter marker (with value 860 and name "?"). True returned by this comparison resulted in a wrong table access method used to evaluate the query. Implement Item_param methods needed to emulate "basic constant" mode at full. sql/item.h: Change declaration of basic_const_item(): now it also widens its argument from const Item * to Item * if the argument is a basic constant. Declare eq() for all basic constatns, as long as now they are compared by value, not by name. Each constant needs its own comparison method. Declarations of Item_param methods needed to fully emulate a basic constant when parameter value is set. sql/item_func.cc: Fix wrong casts.
* | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-0313-30/+208
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/mysql-4.1
| * | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9947unknown2005-05-021-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | | | | Clean up error message for connections-per-hour user limitunknown2005-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being exceeded. (Bug #9947) sql/sql_parse.cc: Fix error message when connections per hour has been exceeded
| * | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9761unknown2005-05-023-0/+13
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | | | | Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_namesunknown2005-04-283-0/+13
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is set on case-sensitive file systems and the source table was specified in something other than lowercase. (Bug #9761) mysql-test/r/lowercase_table.result: Add results mysql-test/t/lowercase_table.test: Regression test for Bug #9761 sql/sql_table.cc: When lower_case_table_names is set, make sure to look for the source table using a lowercase filename.
| * | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9136unknown2005-05-022-6/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean mysys/default.c: Auto merged
| | * | | | | Fix undersized array in my_print_defaults that caused crash on Sun Solarisunknown2005-04-261-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (and maybe strange results on other platforms). (Bug #9851) extra/my_print_defaults.c: Increase size of tmp_arguments array to actually fit possible values
| | * | | | | Fix handling of the -e flag to my_print_defaults. (Bug #9136)unknown2005-03-151-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/default.c: Don't automatically reset defaults_extra_file in load_defaults(), only update it based on it appearing as a command-line option.
| * | | | | | Merge bk-internal:/home/bk/mysql-4.1unknown2005-05-027-23/+176
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean configure.in: Auto merged
| | * \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-9634unknown2005-04-292-2/+57
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | | * | | | | | Fix 'mysql_client_test' with embedded server. (Bug #9634)unknown2005-04-272-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.sh: Set up arguments for mysql_client_test when testing the embedded server. tests/mysql_client_test.c: Add -A switch for passing arguments to the embedded server.
| | * | | | | | | Manually resolve mergeunknown2005-04-295-21/+119
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/query_cache.result: Resolve merge mysql-test/t/query_cache.test: Resolve merge
| | | * | | | | | | Fix crash in embedded server due to incorrect storage of resultsunknown2005-03-315-21/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the query cache. (Bug #9549) libmysqld/emb_qcache.h: Fix Querycache_stream::use_next_block() to actually use the next block and mark blocks as used when it writes to them. mysql-test/r/query_cache.result: Update results. mysql-test/t/query_cache.test: Add new regression test. libmysqld/emb_qcache.cc: Fix calls to use_next_block() to indicate whether we are writing to the next block or not. sql/sql_cache.cc: Initialize the first block properly when storing a result in the embedded server.
| | * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.0-cleanunknown2005-04-290-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean configure.in: Auto merged