mariadb

Tree: 2cb35cd680

Author	SHA1	Message	Date
unknown	2cb35cd680	test case fix	18 years ago
unknown	72f6ffe3b0	Merge host.loc:/home/uchum/work/5.0-opt-34830 into host.loc:/home/uchum/work/5.0-opt	18 years ago
unknown	4e7c4ab929	wrong merge fix	18 years ago
unknown	4460f5a5b1	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt mysql-test/t/symlink.test: Auto merged mysql-test/r/symlink.result: after merge fix	18 years ago
unknown	be59a0ea7f	test fix mysql-test/r/symlink.result: result fix	18 years ago
unknown	d276cd9059	Fixed bug #34830 : mixed table and field names in Item_ref and Item_direct_ref constructor calls. Order of ref->field_name and ref->table_name arguments is of Item_ref and Item_direct_ref in the fix_inner_refs function is inverted. sql/sql_select.cc: Fixed bug #34830: mixed table and field names in Item_ref and Item_direct_ref constructor calls. Order of ref->field_name and ref->table_name arguments is of Item_ref and Item_direct_ref in the fix_inner_refs function is inverted. See definitions: Item_ref(Name_resolution_context context_arg, Item item, const char table_name_arg, const char field_name_arg, bool alias_name_used_arg= FALSE) and Item_direct_ref(Name_resolution_context context_arg, Item *item, const char table_name_arg, const char *field_name_arg, bool alias_name_used_arg= FALSE)	18 years ago
unknown	fa9e35b48d	after merge fix	18 years ago
unknown	8bdb243fd7	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt sql/mysql_priv.h: Auto merged mysql-test/r/symlink.result: manual merge mysql-test/t/symlink.test: manual merge sql/mysqld.cc: manual merge sql/sql_parse.cc: manual merge	18 years ago
unknown	ab60425901	Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(ver 4.1,5.0) added new function test_if_data_home_dir() which checks that path does not contain mysql data home directory. Using of mysql data home directory in DATA DIRECTORY & INDEX DIRECTORY is disallowed. mysql-test/r/symlink.result: test result mysql-test/t/symlink.test: test case sql/mysql_priv.h: new variable mysql_unpacked_real_data_home sql/mysqld.cc: new variable mysql_unpacked_real_data_home sql/sql_parse.cc: added new function test_if_data_home_dir() which checks that path does not contain mysql data home directory. Using of mysql data home directory in DATA DIRECTORY & INDEX DIRECTORY is disallowed.	18 years ago
unknown	7f572871ad	Merge host.loc:/home/uchum/work/PP/5.0-opt-34620 into host.loc:/home/uchum/work/5.0-opt	18 years ago
unknown	d40ca16156	Fixed bug #34620 : item_row.cc:50: Item_row::illegal_method_call(const char*): Assertion `0' failed If ROW item is a part of an expression that also has aggregate function calls (COUNT/SUM/AVG...), a "splitting" with an Item::split_sum_func2 function is applied to that ROW item. Current implementation of Item::split_sum_func2 replaces this Item_row with a newly created Item_aggregate_ref reference to it. Then the row cache tries to work with the Item_aggregate_ref object as with the Item_row object: row cache calls row-emulation methods such as cols and element_index. Item_aggregate_ref (like it's parent Item_ref) inherits dummy implementations of those methods from the hierarchy root Item, and call to them leads to failed assertions and wrong data output. Row-emulation virtual functions (cols, element_index, addr, check_cols, null_inside and bring_value) of Item_ref have been overloaded to forward calls to an underlying item reference. mysql-test/r/row.result: Added test case for bug #34620. mysql-test/t/row.test: Added test case for bug #34620. sql/item.h: Fixed bug #34620. Row-emulation virtual functions (cols, element_index, addr, check_cols, null_inside and bring_value) of Item_ref have been overloaded to forward calls to an underlying item reference.	18 years ago
unknown	56e6b531d2	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B34747-5.0-opt	18 years ago
unknown	f28612eae2	Bug #34747 : crash in debug assertion check after derived table Was a double-free of the Unique member of Item_func_group_concat. This was not causing a crash because the Unique is a descendent of Sql_alloc. Fixed to free the Unique only if it was allocated for the instance of Item_func_group_concat it was referenced from mysql-test/r/func_gconcat.result: Bug #34747: test case mysql-test/t/func_gconcat.test: Bug #34747: test case sql/item_sum.cc: Bug #34747: free the Unique only if it was allocated for this instance of Item_func_group_concat	18 years ago
unknown	7ca90d539f	Merge kaamos.(none):/data/src/opt/bug33834/my50-bug33834 into kaamos.(none):/data/src/opt/mysql-5.0-opt	18 years ago
unknown	c8885dfb73	Fixed test suite failures with --ps-protocol introduced in PB by the patch for bug #33834.	18 years ago
unknown	87007702fe	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/home/hf/work/25097/my50-25097 libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged sql/log.cc: Auto merged	18 years ago
unknown	a4b0a2cf67	Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. There was no way to return an error from the client library if no MYSQL connections was established. So here i added variables to store that king of errors and made functions like mysql_error(NULL) to return these. client/mysql.cc: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. Show the error message on std_error include/sql_common.h: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. cant_connect_sqlstate constant declared libmysql/libmysql.c: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. mysql_sqlstate(NULL) returns 'unknown_sqlstate' libmysqld/lib_sql.cc: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. EMBEDDED_SERVER version of the vprint_msg_to_log() implemented sql-common/client.c: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. mysql_server_last_errno and mysql_server_last_error introduced to store errors not related to particular connections. mysql_error(NULL) and mysql_errno(NULL) now returns these mysql_server_last_error and errno respectively sql/log.cc: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. EMBEDDED_LIBRARY implementation of the vprint_msg_to_log() moved to lib_sql.cc	18 years ago
unknown	25620347fc	Merge kaamos.(none):/data/src/opt/bug33834/my50-bug33834 into kaamos.(none):/data/src/opt/mysql-5.0-opt sql/sql_yacc.yy: Auto merged	18 years ago
unknown	4f3eab5804	Fix for bug #33834 : FRAC_SECOND: Applicability not clear in documentation While the manual mentions FRAC_SECOND only for the TIMESTAMPADD() function, it was also possible to use FRAC_SECOND with DATE_ADD(), DATE_SUB() and +/- INTERVAL. Fixed the parser to match the manual, i.e. using FRAC_SECOND for anything other than TIMESTAMPADD()/TIMESTAMPDIFF() now produces a syntax error. Additionally, the patch allows MICROSECOND to be used in TIMESTAMPADD/ TIMESTAMPDIFF and marks FRAC_SECOND as deprecated. mysql-test/r/func_time.result: Added a test case for bug #33834. mysql-test/t/func_time.test: Added a test case for bug #33834. sql/sql_yacc.yy: Reject FRAC_SECOND for anything other than TIMESTAMPADD() or TIMESTAMPDIFF(). Allow MICROSECOND to be used with TIMESTAMPADD()/TIMESTAMPDIFF(). Warn about FRAC_SECOND being a deprecated unit.	18 years ago
unknown	62ba88327f	Merge kaamos.(none):/data/src/opt/bug33049/my50-bug33790 into kaamos.(none):/data/src/opt/mysql-5.0-opt	18 years ago
unknown	4368dcdc2d	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B30604-5.0-opt	18 years ago
unknown	d702cb12b2	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/gluh/MySQL/mysql-5.0-opt	18 years ago
unknown	012aab7d8b	Fix for bug #33049 : Assert while running test-as3ap test(mysql-bench suite) Under some circumstances a combination of aggregate functions and GROUP BY in a SELECT query over a VIEW could lead to incorrect calculation of the result type of the aggregate function. This in turn could result in incorrect results, or assertion failures on debug builds. Fixed by changing the logic in Item_sum_hybrid::fix_fields() so that the argument's item is dereferenced before calling its type() method. mysql-test/r/view.result: Added a test case for bug #33049. mysql-test/t/view.test: Added a test case for bug #33049. sql/item_sum.cc: When calculating the result type of an aggregate function, dereference the argument's item before calling its type() method.	18 years ago
unknown	1a8be8bccb	Bug#23588 SHOW COLUMNS on a temporary table causes locking issues skip lock_type update for temporary tables mysql-test/r/tablelock.result: test result mysql-test/t/tablelock.test: test case sql/sql_base.cc: skip lock_type update for temporary tables	18 years ago
unknown	463edf377e	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into moonbone.local:/work/33266-bug-5.0-opt-mysql	18 years ago
unknown	daffceb4e2	Bug#33266: Incorrect test case for the bug#31048 failing on some platforms. The test case for the bug#31048 checks that there is no crash on stack overrun. But due to different stack sizes on different platforms it failed on some of them. The new test case check that a query with at least 4 level subquery nesting works without the stack overrun nesting and other levels of nesting doesn't cause a crash. mysql-test/t/subselect.test: Corrected test case for the bug#31048. mysql-test/r/subselect.result: Corrected test case for the bug#31048.	18 years ago
unknown	1ac319248f	Bug #30604 : different flagging of time_zone_used in normal and ps-protocol Finding a routine should be a transparent operation as far as the binary log is concerned. But it was influencing the binary log because of the TIMESTAMP column in the proc table. Fixed by preserving and restoring the time_zone usage flag when searching for a stored routine in the proc table. mysql-test/r/binlog_innodb.result: Bug #30604: test case mysql-test/r/ctype_cp932_binlog.result: Bug #30604: updated test results (a procedure call before that) mysql-test/t/binlog_innodb.test: Bug #30604: test case sql/sp.cc: Bug #30604: finding a routine should be a transparent operation as far as the binary log is concerned. Fixed by preserving and restoring the time_zone usage flag.	18 years ago
unknown	18f885ed4c	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/home/hf/work/32942/my50-32942 sql/sql_select.cc: Auto merged mysql-test/r/select.result: merging mysql-test/t/select.test: merging	18 years ago
unknown	787dbacab2	Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt into kaamos.(none):/data/src/opt/mysql-5.0-opt sql/item.cc: Auto merged	18 years ago
unknown	d6be1a9b95	Bug #32942 now() - interval '7200' second NOT pre-calculated, causing "full table scan" Problem is not about intervals and doesn't actually cause 'full table scan'. We have an optimization for DISTINCT when we have 'DISTINCT field_from_first_join_table' we don't need to read all the rows from the JOIN-ed table if we found one conforming row. It stopped working in 5.0 as we return NESTED_LOOP_OK if we came upon that case in the evaluate_join_record() and that doesn't break the recordreading loop in sub_select(). Fixed by returning NESTED_LOOP_NO_MORE_ROWS in this case. mysql-test/r/select.result: Bug #32942 now() - interval '7200' second is NOT pre-calculated, causing "full table scan". test result mysql-test/t/select.test: Bug #32942 now() - interval '7200' second is NOT pre-calculated, causing "full table scan" test case sql/sql_select.cc: Bug #32942 now() - interval '7200' second NOT pre-calculated, causing "full table scan" return NESTED_LOOP_NO_MORE_ROWS when we don't need to read rows from this table anymore	18 years ago
unknown	b546edb41d	Merge kaamos.(none):/data/src/opt/mysql-4.1-opt into kaamos.(none):/data/src/opt/mysql-5.0-opt	18 years ago
unknown	4a834b4b12	Merge kaamos.(none):/data/src/mysql-5.0 into kaamos.(none):/data/src/opt/mysql-5.0-opt mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/sp.result: Manual merge. mysql-test/t/sp.test: Manual merge.	18 years ago
unknown	f364c09901	Merge kaamos.(none):/data/src/mysql-4.1 into kaamos.(none):/data/src/opt/mysql-4.1-opt	18 years ago
unknown	0529125af1	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B31887-5.0-opt sql/item.cc: Auto merged sql/mysql_priv.h: Auto merged	18 years ago
unknown	cc2e929ac4	Bug #31887 : DML Select statement not returning same results when executed in version 5 Zero fill is a field attribute only. So we can't always propagate constants for zerofill fields : the values and expression results don't have that flag. Fixed by converting the const value to a string and using that in const propagation when the context allows it. Disable const propagation for fields with ZEROFILL flag in all the other cases. mysql-test/r/compare.result: Bug #31887: test case mysql-test/t/compare.test: Bug #31887: test case sql/item.cc: Bug #31887: If the context allows conversion of an int constant to a zero-filled string constant put the string constant instead of the int constant when doing const propagation sql/mysql_priv.h: Bug #31887: a macro to get all the Field_num descendant fields.	18 years ago
unknown	c4fc5b096e	Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt into kaamos.(none):/data/src/opt/mysql-5.0-opt	18 years ago
unknown	be891fc611	Merge host.loc:/home/uchum/work/5.0-opt-gca into host.loc:/home/uchum/work/5.0-opt	18 years ago
unknown	7a290b55f7	Fixed bug#31194: Privilege ordering does not order properly for wildcard values. The server ignored escape character before wildcards during the calculation of priority values for sorting of a privilege list. (Actually the server counted an escape character as an ordinary wildcard like % or _). I.e. the table name template with a wildcard character like 'tbl_1' had higher priority in a privilege list than concrete table name without wildcards like 'tbl\_1', and some privileges of 'tbl\_1' was hidden by privileges for 'tbl_1'. The get_sort function has been modified to ignore escaped wildcards as usual. mysql-test/r/grant3.result: Added test case for bug#31194. mysql-test/t/grant3.test: Added test case for bug#31194. sql/sql_acl.cc: Fixed bug#31194. The server used the wild_prefix escape character (usually \-character) like % and _ wildcards in the get_sort function for sorting weights calculation. The get_sort function has been modified to ignore escaped wildcards and alone escapes like in the wild_case_compare function.	18 years ago
unknown	247efb9cf0	Fixed bug#33764: Wrong result with IN(), CONCAT() and implicit type conversion. Instead of copying of whole character string from a temporary buffer, the server copied a short-living pointer to that string into a long-living structure. That has been fixed. mysql-test/r/select.result: Added test case for bug#33764. mysql-test/t/select.test: Added test case for bug#33764. sql/item_cmpfunc.cc: Fixed bug#33764. Copying of a pointer has been replaced with an optional copying of a whole array to a newly allocated memory space in case of a functional source item.	18 years ago
unknown	c6610b5791	Merge mbp:src/opt/bug33389/my50-bug25162 into kaamos.(none):/data/src/opt/mysql-5.0-opt sql/item.cc: Auto merged	18 years ago
unknown	d83cd2149b	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into moonbone.local:/work/31590-bug-5.0-opt-mysql	18 years ago
unknown	d5092fa9ca	Fix for bug #33389 : Selecting from a view into a table from within SP or trigger crashes server Under some circumstances a combination of VIEWs, subselects with outer references and PS/SP/triggers could lead to use of uninitialized memory and server crash as a result. Fixed by changing the code in Item_field::fix_fields() so that in cases when the field is a VIEW reference, we first check whether the field is also an outer reference, and mark it appropriately before returning. mysql-test/r/view.result: Added a test case for bug #33389. mysql-test/t/view.test: Added a test case for bug #33389. sql/item.cc: In cases when in Item_field::fix_fields() from_field is a view reference, do not return too early, i.e. before marking the reference as an outer one when needed.	18 years ago
unknown	99933c18d2	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge	18 years ago
unknown	6f383dec2d	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge	18 years ago
unknown	a87fe95118	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/misc/mysql/21567/50-21567	18 years ago
unknown	3e9132f67c	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/home/hf/work/33796/my50-33796	18 years ago
unknown	b825be1bf8	Merge mysql.com:/home/hf/work/33796/my41-33796 into mysql.com:/home/hf/work/33796/my50-33796 libmysql/libmysql.c: merging libmysqld/lib_sql.cc: merging	18 years ago
unknown	db66526c95	Bug #33796 Memory leak for prepared statements in embedded server. Field data for a query was stored to the stmt->alloc that is emptied with mysql_stmt_close statement only. That means a lot of memory can be occupied without a reason if used doesn't call mysql_stmt_close often. libmysql/libmysql.c: Bug #33796 Memory leak for prepared statements in embedded server. Clean up result->alloc even if there's no 'data' created libmysqld/lib_sql.cc: Bug #33796 Memory leak for prepared statements in embedded server. alloc 'fields' in the 'result.alloc' as the 'mem_root' is only cleaned with mysql_stmt_close'	18 years ago
unknown	47065ad525	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/tnurnberg/21567/50-21567 sql/mysqld.cc: Auto merged	18 years ago
unknown	65c7d3004e	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into dipika.(none):/opt/local/work/mysql-5.0-runtime	18 years ago

1 2 3 4 5 ...

38728 Commits (2cb35cd680d70f3e1e26b5672f2125d6fdff4921) All Branches Search

38728 Commits (2cb35cd680d70f3e1e26b5672f2125d6fdff4921)

All Branches