mariadb

Tree: 6c0e80f0d0

Author	SHA1	Message	Date
unknown	6c0e80f0d0	Merge mysql.com:/home/hf/work/30638/my50-30638 into mysql.com:/home/hf/work/30638/my51-30638	18 years ago
unknown	6161ab4d6e	Merge bk@192.168.21.1:mysql-5.1-opt into mysql.com:/home/hf/work/30638/my51-30638	18 years ago
unknown	578c238600	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/home/hf/work/30638/my50-30638	18 years ago
unknown	dda586282d	Merge mysql.com:/home/hf/work/29801/my50-29801 into mysql.com:/home/hf/work/30638/my50-30638	18 years ago
unknown	40727c9523	Merge mysql.com:/home/hf/work/29801/my51-29801 into mysql.com:/home/hf/work/30638/my51-30638	18 years ago
unknown	844a0a4e1d	Merge mysql.com:/home/hf/work/30638/my50-30638 into mysql.com:/home/hf/work/30638/my51-30638 include/config-win.h: Auto merged	18 years ago
unknown	9b7160dff4	Merge mysql.com:/home/hf/work/29801/my50-29801 into mysql.com:/home/hf/work/29801/my51-29801 storage/federated/ha_federated.cc: Auto merged	18 years ago
unknown	e763badfe3	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/scratch/tnurnberg/31588/50-31588	18 years ago
unknown	8e32e10370	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into mysql.com:/scratch/tnurnberg/31588/51-31588	18 years ago
unknown	4022cfd10d	Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt into polly.(none):/home/kaa/src/opt/mysql-5.1-opt	18 years ago
unknown	62d096496f	Merge polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550 into polly.(none):/home/kaa/src/opt/mysql-5.1-opt	18 years ago
unknown	fb434504cc	Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 into polly.(none):/home/kaa/src/opt/mysql-5.0-opt	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	1a163698b4	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into sin.intern.azundris.com:/misc/mysql/31588/51-31588	18 years ago
unknown	8c57b13424	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into magare.gmz:/home/kgeorge/mysql/autopush/B31157-5.1-opt	18 years ago
unknown	b87f070489	Bug #31157 : crash when select+order by the avg of some field within the group by The uncacheable flag should be set at fix_fields() stage. Fixed by moving the flag setting to match the one in 5.1 mysql-test/r/query_cache.result: Bug #31157: test case mysql-test/t/query_cache.test: Bug #31157: test case sql/item_func.cc: Bug #31157: The uncacheable flag should be set at fix_fields() stage. sql/item_func.h: Bug #31157: The uncacheable flag should be set at fix_fields() stage.	18 years ago
unknown	0a47c29fb0	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/scratch/tnurnberg/31588/50-31588	18 years ago
unknown	0b3720facc	Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt into magare.gmz:/home/kgeorge/mysql/work/B31221-5.1-opt mysql-test/r/derived.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 mysql-test/r/type_datetime.result: Auto merged mysql-test/t/type_date.test: Auto merged BitKeeper/deleted/.del-ps_6bdb.result: Auto merged mysql-test/suite/ndb/r/ps_7ndb.result: Auto merged sql/field.cc: Auto merged sql/item_timefunc.cc: Auto merged mysql-test/r/type_date.result: merge 5.0-opt -> 5.1-opt	18 years ago
unknown	e8504c5dfd	Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-opt into magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt	18 years ago
unknown	d5819c1f7c	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B31221-5.0-opt	18 years ago
unknown	787a4b487a	Bug #31221 : Optimizer incorrectly identifies impossible WHERE clause No warning was generated when a TIMESTAMP with a non-zero time part was converted to a DATE value. This caused index lookup to assume that this is a valid conversion and was returning rows that match a comparison between a TIMESTAMP value and a DATE keypart. Fixed by generating a warning on such a truncation. mysql-test/r/derived.result: Bug #31221: fixed an existing not-precise test case mysql-test/r/ps_2myisam.result: Bug #31221: Warnings cased by existing tests mysql-test/r/ps_3innodb.result: Bug #31221: Warnings cased by existing tests mysql-test/r/ps_4heap.result: Bug #31221: Warnings cased by existing tests mysql-test/r/ps_5merge.result: Bug #31221: Warnings cased by existing tests mysql-test/r/ps_6bdb.result: Bug #31221: Warnings cased by existing tests mysql-test/r/ps_7ndb.result: Bug #31221: Warnings cased by existing tests mysql-test/r/type_date.result: Bug #31221: Warnings cased by existing tests mysql-test/r/type_datetime.result: Bug #31221: test case mysql-test/t/derived.test: Bug #31221: fixed an existing not-precise test case mysql-test/t/type_date.test: Bug #31221: test case sql/field.cc: Bug #31221: - Upgraded fix for bug 29729 - issue a warning only if the hh:mm:ss.msec is not zero consistently for all the Field_newdate::store function sql/item_timefunc.cc: Bug #31221: don't ignore the errors when storing data	18 years ago
unknown	fffd105fa2	Bug #30638 why doesn't > 4294967295 rows work in myisam on windows. The BIG_TABLES define wasn't enabled on Windows. #define added include/config-win.h: Bug #30638 why doesn't > 4294967295 rows work in myisam on windows. BIG_TABLES enabled on Windows	18 years ago
unknown	ce6a715f3a	Bug#31588: buffer overrun when setting variables post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output mysql-test/r/variables.result: post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output	18 years ago
unknown	4e1e091c9e	Merge sin.intern.azundris.com:/misc/mysql/31588/50-31588 into sin.intern.azundris.com:/misc/mysql/31588/51-31588 mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/set_var.cc: Auto merged	18 years ago
unknown	b088967252	Merge sin.intern.azundris.com:/misc/mysql/31588/41-31588 into sin.intern.azundris.com:/misc/mysql/31588/50-31588 sql/set_var.cc: Auto merged mysql-test/r/variables.result: SCCS merged mysql-test/t/variables.test: SCCS merged	18 years ago
unknown	cd9d89a75d	Bug#31588: buffer overrun when setting variables Buffer used when setting variables was not dimensioned to accomodate trailing '\0'. An overflow by one character was therefore possible. CS corrects limits to prevent such overflows. mysql-test/r/variables.result: Try to overflow buffer used for setting system variables. Unpatched server should throw a valgrind warning here. Actual value and error message irrelevant, only length counts. mysql-test/t/variables.test: Try to overflow buffer used for setting system variables. sql/set_var.cc: Adjust maximum number of characters we can store in 'buff' by one as strmake() will write a terminating '\0'.	18 years ago
unknown	3afdb865f1	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into magare.gmz:/home/kgeorge/mysql/autopush/B27099-5.1-opt	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	b872877aba	Bug #27099 : system_mysql fail in pushbuild windows On Windows the debug log was doing freopen () instead of fflush() and that was slowing the logging down that much that some tests timed out. Fixed by replacing the freopen() with an syncing-to-disk flag to fopen() and fflush(). Also increased the timeout of the tests running with --debug on windows : seems to slow down as much as valgrind on linux. dbug/dbug.c: Bug #27099: remove the freopen() for the windows log : too slow. Replace it with the "c" option for fopen(). mysql-test/mysql-test-run.pl: Bug #27099: on windows debug log seems to slow the tests down about as much as valgrind does on linux.	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	173eb806db	bug #29801 Federated engine crashes local server if remote server sends malicious response. We need to check if the SHOW TABLE STATUS query we issue inside the FEDERATED engine returned the result with the proper (or just sufficient) number of rows. Otherwise statements like row[12] can crash the server. sql/ha_federated.cc: bug #29801 Federated engine crashes local server if remote server sends malicious response. Return with the error if the remote server return fewer rows than we need.	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

1 2 3 4 5 ...

50151 Commits (6c0e80f0d043f668d6c2d0e722b5fdd03d6c2631) All Branches Search

50151 Commits (6c0e80f0d043f668d6c2d0e722b5fdd03d6c2631)

All Branches