summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | 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
| | * | | 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
| * | | | Merge ibmlab.site:/home/my/bk/mysql-4.1unknown2005-05-061-0/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into ibmlab.site:/home/my/bk/mysql-5.0 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 abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-061-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/root/mysql-5.0 BitKeeper/etc/logging_ok: auto-union
| | * \ \ \ merging cp932 from 4.1unknown2005-05-061-0/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-have_cp932.inc: Delete: mysql-test/include/have_cp932.inc BitKeeper/deleted/.del-ctype_cp932.result: Delete: mysql-test/r/ctype_cp932.result BitKeeper/deleted/.del-have_cp932.require: Delete: mysql-test/r/have_cp932.require BitKeeper/deleted/.del-ctype_cp932.test: Delete: mysql-test/t/ctype_cp932.test BitKeeper/deleted/.del-ctype-cp932.c: Delete: strings/ctype-cp932.c include/m_ctype.h: Auto merged mysys/charset-def.c: Auto merged sql/mysqld.cc: Auto merged
| | | * | | 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
| * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-061-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/5.0 BitKeeper/etc/logging_ok: auto-union
| | * | | | Mergeunknown2005-05-051-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged sql/item.h: SCCS merged
| | | * | | | A lot of fixes to Precision mathunknown2005-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly about precision/decimals of the results of the operations include/decimal.h: decimal interface changed a little sql/field.cc: a lot of precision/decimals related changes to the Field_new_decimal sql/field.h: Field_new_decimal interface changed sql/ha_ndbcluster.cc: f->precision should be used here sql/item.cc: precision/decimals counting related changes sql/item.h: precision/decimals counting related changes sql/item_cmpfunc.cc: precision/decimals counting related changes sql/item_cmpfunc.h: precision/decimals counting related changes sql/item_func.cc: precision/decimals counting related changes sql/item_func.h: precision/decimals counting related changes sql/item_sum.cc: precision/decimals counting related changes sql/item_sum.h: precision/decimals counting related changes sql/my_decimal.cc: precision/decimals counting related changes sql/my_decimal.h: precision/decimals counting related changes sql/mysqld.cc: precision/decimals counting related changes sql/set_var.cc: precision/decimals counting related changes sql/sp_head.cc: dbug_decimal_print was replaced with dbug_decimal_as_string sql/sql_class.h: div_precincrement variable added sql/sql_parse.cc: precision/decimals counting related changes sql/sql_select.cc: precision/decimals counting related changes sql/sql_show.cc: Field::representation_length was removed strings/decimal.c: decimal_actual_fraction was introduced BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-051-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ram-book.(none):/home/ram/work/5.0 BitKeeper/etc/logging_ok: auto-union
| | * | | | | A fix (bug #10179: error in default value setting).unknown2005-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_handler.h: A fix (bug #10179: error in default value setting). Proper masks added: we should not touch extra bits. sql/key.cc: A fix (bug #10179: error in default value setting). Unnecessary code removed. sql/unireg.cc: A fix (bug #10179: error in default value setting). 1. we should take into account uneven bits (for bit fields) stored among NULL bits. 2. changed code which sets NULL bits for fields. 3. changed code which sets unused bits after NULL bits. 4. unused variables removed. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | | Manual mergeunknown2005-05-051-0/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged include/my_sys.h: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/ndb_restore.test: Auto merged ndb/test/src/NDBT_ResultRow.cpp: Auto merged sql/ha_innodb.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged
| | * | | | 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
| * | | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0unknown2005-05-031-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | Merge with 4.1unknown2005-04-301-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged mysql-test/r/drop.result: Auto merged mysys/default.c: Auto merged mysys/mf_keycache.c: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysqld.cc: Auto merged BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e: Auto merged mysql-test/r/cast.result: Merge mysql-test/t/cast.test: Merge sql/sql_insert.cc: Merge sql/sql_select.cc: Merge
| | * | | 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 gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-091-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0 BitKeeper/etc/logging_ok: auto-union
| * | | Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1unknown2005-04-091-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/var/db/bk/work-acurtis/bug6776.2 BitKeeper/etc/logging_ok: auto-union sql/sql_udf.cc: Auto merged
View Lorry Controller Status