mariadb

Tree: 0515b14020

Author	SHA1	Message	Date
unknown	0515b14020	Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445 into polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445 BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952: Auto merged BitKeeper/deleted/.del-mytest.c~9a99338689e5de8: Auto merged BitKeeper/deleted/.del-mytest.dsw~2324698861155335: Auto merged libmysql/Makefile.am: Auto merged tests/bug25714.c: Auto merged tests/mysql_client_test.c: Auto merged BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9: Auto merged BitKeeper/deleted/.del-mytest_1.c: Merge rename: BitKeeper/deleted/.del-mytest.c -> BitKeeper/deleted/.del-mytest_1.c BitKeeper/deleted/.del-myTest-package.dsp~ec9faf3287cbe2b9: Auto merged BitKeeper/deleted/.del-myTest-package_ia64.dsp~e423b69f2c624850: Auto merged BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06: Auto merged BitKeeper/deleted/.del-myTest_ia64.dsp~b17572b217d092e6: Auto merged libmysql/CMakeLists.txt: Manual merge.	18 years ago
unknown	c4d0901d00	Fix for bug #32221 : bug25714, mytest, mysql_client_test complaints and crashes. MySQL distributions contain a number of programs that are used only by the MySQL test suite internally, i.e. they are not indended to be invoked directly by a user. As a result, such programs are not documented, do not have any built-in help or proper error reporting, which may confuse users. This patch fixes the problem with the following changes: - mytest, libmysqltest and all references to them were removed from the distribution since they are not used anymore - bug25714 now displays an error message when run with incorrect arguments or with the --help option - mysql_client_test now does not call abort() in case of errors, instead it does a clean exit() with a proper error status. BitKeeper/deleted/.del-mytest.c: Delete: libmysql/mytest.c BitKeeper/deleted/.del-myTest-package.dsp: Delete: VC++Files/libmysqltest/myTest-package.dsp BitKeeper/deleted/.del-myTest-package_ia64.dsp: Delete: VC++Files/libmysqltest/myTest-package_ia64.dsp BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952: Delete: VC++Files/libmysqltest/myTest.dsp BitKeeper/deleted/.del-myTest.vcproj: Delete: VC++Files/libmysqltest/myTest.vcproj BitKeeper/deleted/.del-myTest_ia64.dsp: Delete: VC++Files/libmysqltest/myTest_ia64.dsp BitKeeper/deleted/.del-mytest.c~9a99338689e5de8: Delete: VC++Files/libmysqltest/mytest.c BitKeeper/deleted/.del-mytest.dsw~2324698861155335: Delete: VC++Files/libmysqltest/mytest.dsw VC++Files/copy_mysql_files.bat: Removed references to libmysqltest. libmysql/CMakeLists.txt: Removed rules for myTest. libmysql/Makefile.am: Removed mytest.c from EXTRA_DIST. tests/bug25714.c: Display a meaningful error message when run incorrectly or with the --help option. tests/mysql_client_test.c: In case of error, don't cause abnormal program termination, do a clean exit() with an error status.	18 years ago
unknown	0280133ac0	Merge polly.(none):/home/kaa/src/opt/bug32020/my50-bug31445 into polly.(none):/home/kaa/src/opt/bug32020/my51-bug31445 mysql-test/r/skip_grants.result: Auto merged mysql-test/t/skip_grants.test: Auto merged sql/sql_udf.cc: Auto merged	18 years ago
unknown	737cdfeaeb	Fix for bug #32020 : loading udfs while --skip-grant-tables is enabled causes out of memory errors The code in mysql_create_function() and mysql_drop_function() assumed that the only reason for UDFs being uninitialized at that point is an out-of-memory error during initialization. However, another possible reason for that is the --skip-grant-tables option in which case UDF initialization is skipped and UDFs are unavailable. The solution is to check whether mysqld is running with --skip-grant-tables and issue a proper error in such a case. mysql-test/r/skip_grants.result: Added a test case for bug #32020. mysql-test/t/skip_grants.test: Added a test case for bug #32020. sql/sql_udf.cc: Issue a proper error when a user tries to CREATE/DROP a UDF on a server running with the --skip-grant-tables option.	18 years ago
unknown	dc0a59a2e7	Fix for bug #25421 : MySQL threads don't respond to the kill command Calculating the estimated number of records for a range scan may take a significant time, and it was impossible for a user to interrupt that process by killing the connection or the query. Fixed by checking the thread's 'killed' status in check_quick_keys() and interrupting the calculation process if it is set to a non-zero value. sql/opt_range.cc: Check the thread's 'killed' status in check_quick_keys() and interrupt the calculation process if it is set to a non-zero value.	18 years ago
unknown	e259d46103	Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 into polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550 mysql-test/t/func_str.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_strfunc.h: Auto merged mysql-test/r/func_str.result: Manual merge.	18 years ago
unknown	04311fabaa	Bug #28550 "Potential bugs related to the return type of the CHAR function". Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account. This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args(). mysql-test/r/func_str.result: Import patch bug288550.patch mysql-test/t/func_str.test: Import patch bug288550.patch sql/item.cc: Import patch bug288550.patch sql/item.h: Import patch bug288550.patch sql/item_strfunc.h: Import patch bug288550.patch	18 years ago
unknown	666efa1c43	Bug#31381 Error in retrieving Data from INFORMATION_SCHEMA move 'table_collation' field filling outside of if(file) condition because this field has 'OPEN_FRM_ONLY' attribute mysql-test/r/information_schema.result: test result mysql-test/t/information_schema.test: test case sql/sql_show.cc: move 'table_collation' field filling outside of if(file) condition because this field has 'OPEN_FRM_ONLY' attribute	18 years ago
unknown	9f75b3cf6a	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/suite/funcs_1/r/innodb__datadict.result: manual merge mysql-test/suite/funcs_1/r/myisam__datadict.result: manual merge	18 years ago
unknown	62a7e160bc	Bug#31568 Some "information_schema" entries suddenly report a NULL default updated result files mysql-test/suite/funcs_1/r/innodb__datadict.result: updated result file mysql-test/suite/funcs_1/r/memory__datadict.result: updated result file mysql-test/suite/funcs_1/r/myisam__datadict.result: updated result file	18 years ago
unknown	6f8fd0a797	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/sql_yacc.yy: Auto merged	18 years ago
unknown	55a3a64eb1	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt sql/item.cc: Auto merged sql/item.h: manual merge	18 years ago
unknown	048006e2f9	Bug#30986 Character set introducer followed by a HEX string can return bad result(addon) issue an error if string has illegal characters mysql-test/r/ctype_utf8.result: issue an error if string has illegal characters mysql-test/t/ctype_utf8.test: issue an error if string has illegal characters sql/item.cc: issue an error if string has illegal characters sql/item.h: issue an error if string has illegal characters sql/sql_yacc.yy: issue an error if string has illegal characters	18 years ago
unknown	3e7e78d7fc	Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019 into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/type_decimal.result: Auto merged strings/decimal.c: Auto merged	18 years ago
unknown	9bb3c7ebdd	Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019 into gleb.loc:/home/uchum/work/bk/5.0-opt	18 years ago
unknown	4ecb2aa4eb	Merge magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.1-opt sql/item_sum.cc: Auto merged	18 years ago
unknown	97a98ff59b	item_sum.cc: Fixed dbug macros usage errors sql/item_sum.cc: Fixed dbug macros usage errors	18 years ago
unknown	c62aa5c795	Merge magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt into magare.gmz:/home/kgeorge/mysql/work/B31156-5.1-opt mysql-test/r/func_group.result: Auto merged mysql-test/t/func_group.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_sum.cc: Auto merged	18 years ago
unknown	c9141ac580	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt	18 years ago
unknown	6c974c673f	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.1-opt sql/item_cmpfunc.cc: Auto merged	18 years ago
unknown	387d03f574	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt sql/item_cmpfunc.cc: Auto merged	18 years ago
unknown	1a5582d422	Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into gleb.loc:/home/uchum/work/bk/5.1-opt	18 years ago
unknown	334686d323	Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into gleb.loc:/home/uchum/work/bk/5.0-opt	18 years ago
unknown	39bc53e7c7	Merge magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt into magare.gmz:/home/kgeorge/mysql/work/B31440-5.1-opt mysql-test/r/func_regexp.result: Auto merged sql/item_cmpfunc.cc: Auto merged	18 years ago
unknown	9380fdb1c6	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt	18 years ago
unknown	acf0609c83	Merge mysql.com:/home/hf/work/31155/my50-31155 into mysql.com:/home/hf/work/31155/my51-31155 sql/item.cc: Auto merged sql/item.h: Auto merged	18 years ago
unknown	147eef3eba	Merge bk@192.168.21.1:mysql-5.1-opt into mysql.com:/home/hf/work/31155/my51-31155 sql/item.cc: Auto merged sql/item.h: merging	18 years ago
unknown	1ccf107a5e	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/home/hf/work/31155/my50-31155 sql/item.cc: Auto merged	18 years ago
unknown	9908eceb2a	Merge mysql.com:/home/hf/work/31155/my50-31155 into mysql.com:/home/hf/work/31155/my51-31155 sql/item.h: Auto merged sql/item_geofunc.h: Auto merged sql/item.cc: merging sql/item_geofunc.cc: merging	18 years ago
unknown	f0fcc8c267	Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31471 into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/create.result: Auto merged mysql-test/r/null.result: Auto merged sql/item_cmpfunc.cc: Auto merged	18 years ago
unknown	1fc06a1f46	Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31471 into gleb.loc:/home/uchum/work/bk/5.0-opt	18 years ago
unknown	048cb42dbf	after merge fix	18 years ago
unknown	937504e7a0	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/sql_yacc.yy: manual merge	19 years ago
unknown	f30eacb223	Bug#30981 CHAR(0x41 USING ucs2) doesn't add leading zero Bug#30982 CHAR(..USING..) can return a not-well-formed string Bug#30986 Character set introducer followed by a HEX string can return bad result check_well_formed_result moved to Item from Item_str_func fixed Item_func_char::val_str for proper ucs symbols converting added check for well formed strings for correct conversion of constants with underscore charset mysql-test/r/ctype_ucs.result: test result mysql-test/r/ctype_utf8.result: test result mysql-test/t/ctype_ucs.test: test case mysql-test/t/ctype_utf8.test: test case sql/item.cc: check_well_formed_result() moved from Item_str_func sql/item.h: check_well_formed_result() moved from Item_str_func sql/item_strfunc.cc: check_well_formed_result moved to Item fixed Item_func_char::val_str for proper ucs symbols converting sql/item_strfunc.h: check_well_formed_result moved to Item sql/sql_yacc.yy: added check for well formed string	19 years ago
unknown	76af571717	Bug #31440 : 'select 1 regex null' asserts debug server The special case with NULL as a regular expression was handled at prepare time. But in this special case the item was not marked as fixed. This caused an assertion at execution time. Fixed my marking the item as fixed even when known to return NULL at prepare time. mysql-test/r/func_regexp.result: Bug #31440: test case mysql-test/t/func_regexp.test: Bug #31440: test case sql/item_cmpfunc.cc: Bug #31440: mark the item as fixed even when known to return NULL.	19 years ago
unknown	c866f8015f	Fixed bug #31471 : decimal_bin_size: Assertion `scale >= 0 && precision > 0 && scale <= precision'. A sign of a resulting item of the IFNULL function was not updated and the maximal length of this result was calculated improperly. Correct algorithm was copy&pasted from the IF function implementation. sql/item_cmpfunc.cc: Fixed bug #31471. The Item_func_ifnull::fix_length_and_dec method has been modified to update the Item_func_ifnull::unsigned_flag field and to take this field into account when calculating the Item_func_ifnull::max_length value. (See Item_func_if::fix_length_and_dec for reference). mysql-test/t/null.test: Added test case for bug #31471. mysql-test/r/null.result: Added test case for bug #31471. mysql-test/r/create.result: Update test case after the bugfix of bug #31471.	19 years ago
unknown	cbe0318080	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt libmysql/libmysql.c: Auto merged	19 years ago
unknown	2dd78add6b	Merge mysql.com:/home/gluh/MySQL/Merge/5.1 into mysql.com:/home/gluh/MySQL/Merge/5.1-opt libmysql/libmysql.c: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/r/innodb_mysql.result: Auto merged sql/field.cc: Auto merged sql/ha_partition.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_select.cc: Auto merged	19 years ago
unknown	6146c0c75d	Merge mysql.com:/home/gluh/MySQL/Merge/5.0 into mysql.com:/home/gluh/MySQL/Merge/5.0-opt libmysql/libmysql.c: Auto merged	19 years ago
unknown	9676a86aed	after merge fix	19 years ago
unknown	9c46621dca	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt sql/item_timefunc.h: Auto merged mysql-test/suite/rpl/r/rpl_flushlog_loop.result: Auto merged sql/set_var.cc: manual merge. mysql-test/r/view.result: manual merge mysql-test/suite/rpl/t/rpl_flushlog_loop.test: manual merge mysql-test/t/view.test: manual merge	19 years ago
unknown	62f72d3610	Bug#28893 --relay-log variable is not exposed with SHOW VARIABLES added variables relay_log, relay_log_index, relay_log_info_file to init_vars[] to make them visible within SHOW VARIABLES mysql-test/r/rpl_flush_log_loop.result: test result mysql-test/t/rpl_flush_log_loop.test: test case sql/set_var.cc: added variables relay_log, relay_log_index, relay_log_info_file to init_vars[] to make them visible within SHOW VARIABLES	19 years ago
unknown	15453e3a6a	Bug#25359 Test 'view' is dependent on current year to be 2006 removed now() call to make the test to be year independent mysql-test/r/view.result: result fix mysql-test/t/view.test: removed now() call to make the test to be year independent	19 years ago
unknown	09ddd95132	Merge bk-internal:/home/bk/mysql-5.1-opt into dl145s.mysql.com:/data0/mhansson/bug31160/my51-bug31160 sql/item_timefunc.h: Auto merged	19 years ago
unknown	9141577596	Merge martin@mhansson.mysql.internal:/home/martin/mysql/src/bug31160/my51-bug31160 into dl145s.mysql.com:/data0/mhansson/bug31160/my51-bug31160	19 years ago
unknown	69ecde861a	Merge bk-internal:/home/bk/mysql-5.0-opt into dl145s.mysql.com:/data0/mhansson/bug31160/my50-bug31160 sql/item_timefunc.h: Auto merged	19 years ago
unknown	addc2f4720	Merge martin@mhansson.mysql.internal:/home/martin/mysql/src/bug31160/my50-bug31160 into dl145s.mysql.com:/data0/mhansson/bug31160/my50-bug31160	19 years ago
unknown	05903b333f	Merge linux-st28.site:/home/martin/mysql/src/bug31160/my50-bug31160 into linux-st28.site:/home/martin/mysql/src/bug31160/my51-bug31160 mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/func_time.result: Auto merged sql/item_timefunc.h: Auto merged mysql-test/t/func_time.test: SCCS merged	19 years ago
unknown	ae4141ed75	Bug#31160: MAKETIME() crashes server when returning NULL in ORDER BY using filesort Even though it returns NULL, the MAKETIME function did not have this property set, causing a failed assertion (designed to catch exactly this). Fixed by setting the nullability property of MAKETIME(). mysql-test/r/func_sapdb.result: Bug#31160: Changed test result. mysql-test/r/func_time.result: Bug#31160: Test result. mysql-test/t/func_time.test: Bug#31160: Test case. sql/item_timefunc.h: Bug#31160: The fix: Initializing maybe_null to true	19 years ago
unknown	4f0fc8d7d5	Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt into linux-st28.site:/home/martin/mysql/src/bug30832-again-push/my51-bug30832-again	19 years ago

1 2 3 4 5 ...

50128 Commits (0515b1402032b82d99d7bf1a0a90241e69d645a5) All Branches Search

50128 Commits (0515b1402032b82d99d7bf1a0a90241e69d645a5)

All Branches