mariadb

Tree: 362aaccba0

Author	SHA1	Message	Date
Satya B	362aaccba0	merge mysql-5.0-bugteam to mysql-5.1-bugteam	16 years ago
Satya B	882535423d	Fix for Bug #41597 - After rename of user, there are additional grants when grants are reapplied. After renaming a user and trying to re-apply grants results in additional grants. This is because we use username as part of the key for GRANT_TABLE structure. When the user is renamed, we only change the username stored and the hash key still contains the old user name and this results in the extra privileges Fixed by rebuilding the hash key and updating the column_priv_hash structure when the user is renamed mysql-test/r/grant3.result: Bug #41597 - After rename of user, there are additional grants when grants are reapplied. Testcase for BUG#41597 mysql-test/t/grant3.test: Bug #41597 - After rename of user, there are additional grants when grants are reapplied. Testcase for BUG#41597 sql/sql_acl.cc: Bug #41597 - After rename of user, there are additional grants when grants are reapplied. Fixed handle_grant_struct() to update the hash key when the user is renamed. Added to set_user_details() method to GRANT_NAME class	16 years ago
Sergey Vojtovich	2fb597247b	Merge 5.1-bugteam -> 5.1-bugteam-local.	16 years ago
Sergey Vojtovich	0ae6a35e10	Merge 5.1-bugteam -> 5.1-bugteam-local.	16 years ago
unknown	52db2f3646	Bug #34777 mysqlbinlog: --help output for --base64-output is hard to understand There are some problems about help text: - It is stated that "auto" is the default twice. It need be stated only once. - It is stated that --base64-output is short for --base64-output=always. But that sounds like the default is "always", not "auto". Make the help text clear as following: Determine when the output statements should be base64-encoded BINLOG statements: 'never' disables it and works only for binlogs without row-based events; 'auto' prints base64 only when necessary (i.e., for row-based events and format description events); 'always' prints base64 whenever possible. 'always' is for debugging only and should not be used in a production system. If this argument is not given, the default is 'auto'; if it is given with no argument, 'always' is used.	16 years ago
Alexander Barkov	ead175bb07	Bug#45645 Mysql server close all connection and restart using lower function Problem: the "caseinfo" member of CHARSET_INFO structure was not initialized for user-defined Unicode collations, which made the server crash. Fix: initializing caseinfo properly.	16 years ago
Kristofer Pettersson	b11e374b6e	Automerge	16 years ago
Kristofer Pettersson	40444a7d26	Automerge	16 years ago
Alexander Barkov	14fe0fa509	Bug#43207 wrong LC_TIME names for romanian locale Adding tests for the bug.	16 years ago
Alexander Barkov	e426eb2a3c	Bug#43207 wrong LC_TIME names for romanian locale A contributed patch by Andrei Boros (SCA signed). - Fixing locale definition file - Adding tests	16 years ago
Ramil Kalimullin	0b43c4e74c	Fix for bug#47963: Wrong results when index is used Problem: using null microsecond part in a WHERE condition (e.g. WHERE date_time_field <= "YYYY-MM-DD HH:MM:SS.0000") may lead to wrong results due to improper DATETIMEs comparison in some cases. Fix: comparing DATETIMEs as strings we must trim trailing 0's in such cases. mysql-test/r/innodb_mysql.result: Fix for bug#47963: Wrong results when index is used - test result. mysql-test/t/innodb_mysql.test: Fix for bug#47963: Wrong results when index is used - test case. sql/item.cc: Fix for bug#47963: Wrong results when index is used - comparing DATETIMEs as strings we must trim trailing 0's in the microsecond part to ensure 'YYYY-MM-DD HH:MM:SS.000' == 'YYYY-MM-DD HH:MM:SS'	16 years ago
Alexey Kopytov	f6868a4eb4	Bug #47123 : Endless 100% CPU loop with STRAIGHT_JOIN The problem was in incorrect handling of predicates involving NULL as a constant value by the range optimizer. For example, when creating a SEL_ARG node from a condition of the form "field < const" (which would normally result in the "NULL < field < const" SEL_ARG), the special case when "const" is NULL was not taken into account, so "NULL < field < NULL" was produced for the "field < NULL" condition. As a result, SEL_ARG structures of this form could not be further optimized which in turn could lead to incorrectly constructed SEL_ARG trees. In particular, code assuming SEL_ARG structures to always form a sequence of ordered disjoint intervals could enter an infinite loop under some circumstances. Fixed by changing get_mm_leaf() so that for any sargable predicate except "<=>" involving NULL as a constant, "empty" SEL_ARG is returned, since such a predicate is always false. mysql-test/r/partition_pruning.result: Fixed a broken test case. mysql-test/r/range.result: Added a test case for bug #47123. mysql-test/r/subselect.result: Fixed a broken test cases. mysql-test/t/range.test: Added a test case for bug #47123. sql/opt_range.cc: Fixed get_mm_leaf() so that for any sargable predicate except "<=>" involving NULL as a constant, "empty" SEL_ARG is returned, since such a predicate is always false.	16 years ago
Joerg Bruehe	e066294824	Merge merge changesets from main 5.1 into 5.1-bugteam.	16 years ago
Joerg Bruehe	e676534be5	Upmerge a merge changeset.	16 years ago
Joerg Bruehe	edb40a05a1	Upmerge merge changesets.	16 years ago
Joerg Bruehe	7a4f45688a	Merge a compile fix.	16 years ago
Georgi Kodinov	c4479b1db7	merge	16 years ago
Joerg Bruehe	bd39cd40ce	Upmerge the Windows compile fix from 5.0 to 5.1	16 years ago
Joerg Bruehe	ce0a06935b	Merge 5.0-bugteam (compile fix) into main 5.0	16 years ago
Joerg Bruehe	f7d759ac59	Upmerge a Windows compile fix from 5.0 to 5.1.	16 years ago
Joerg Bruehe	0888592457	Merge the Windows compile fix into the push tree.	16 years ago
Joerg Bruehe	4bebf04354	Compile fix for Windows: Use "#ifdef", not plain "#if".	16 years ago
Martin Hansson	3bd2461668	Bug#46019: ERROR 1356 When selecting from within another view that has Group By When SELECT'ing from a view that mentions another, materialized, view, access was being denied. The issue was resolved by lifting a special case which avoided such access checking in check_single_table_access. In the past, this was necessary since if such a check were performed, the error message would be downgraded to a warning in the case of SHOW CREATE VIEW. The downgrading of errors was meant to handle only that scenario, but could not distinguish the two as it read only the error messages. The special case was needed in the fix of bug no 36086. Before that, views were confused with derived tables. After bug no 35996 was fixed, the manipulation of errors during SHOW CREATE VIEW execution is not dependent on the actual error messages in the queue, it rather looks at the actual cause of the error and takes appropriate action. Hence the aforementioned special case is now superfluous and the bug is fixed. mysql-test/r/view_grant.result: Bug#46019: Test result. mysql-test/t/view_grant.test: Bug#46019: Test case. sql/sql_parse.cc: Bug#46019: fix.	16 years ago
Georgi Kodinov	7b4ef910f7	Bug #40877 : multi statement execution fails in 5.1.30 Implemented the server infrastructure for the fix: 1. Added a function LEX_STRING thd_query_string(THD) to return a LEX_STRING structure instead of char . This is the function that must be called in innodb instead of thd_query() 2. Did some encapsulation in THD : aggregated thd_query and thd_query_length into a LEX_STRING and made accessor and mutator methods for easy code updating. 3. Updated the server code to use the new methods where applicable.	16 years ago
Joerg Bruehe	d7cc9194e0	Upmerge a merge changeset - no contents change.	16 years ago
Georgi Kodinov	25b4f777c3	merge	16 years ago
Georgi Kodinov	d80e35f26f	Revert the fix for bug #47123 until test suite failures are resolved.	16 years ago
Joerg Bruehe	29d526838d	Merge the bug fixes into the push tree.	16 years ago
Joerg Bruehe	74f4e39490	Merge bug fix into push tree.	16 years ago
Georgi Kodinov	0da66a091b	version change	16 years ago
Georgi Kodinov	3f220a7574	merge	16 years ago
Georgi Kodinov	d6573fea19	All NDB tests made experimental after a discussion with Bernhard Ocklin.	16 years ago
Georgi Kodinov	8bf642a2cd	Marked all the NDB related tests experimental as agreed with Bernard Ocklin.	16 years ago
Alexey Kopytov	79406bc49a	Manual merge.	16 years ago
Sergey Vojtovich	eade898061	Disabled part of test for BUG#47073 until additional fix is pushed.	16 years ago
Jorgen Loland	565fef25ce	merge	16 years ago
Jorgen Loland	bf14598c99	Followup patch for BUG#47280 Temporary tables may set join->group to 0 even though there is grouping. Also need to test if sum_func_count>0 when JOIN::exec() decides whether to present results in a grouped manner. sql/sql_select.cc: Temporary tables may set join->group to 0 even though there is grouping. Also need to test if sum_func_count>0 when JOIN::exec() decides whether to present results in a grouped manner.	16 years ago
Georgi Kodinov	26b3613b0e	merge	16 years ago
Georgi Kodinov	c8c0dad8f7	merge	16 years ago
Georgi Kodinov	903d21287c	version change	16 years ago
Georgi Kodinov	67113c2e29	merge	16 years ago
Georgi Kodinov	3eb048ab87	merged main to mysql-5.0-bugteam	16 years ago
Georgi Kodinov	445454f728	merged 5.1-main	16 years ago
He Zhenxing	7048cfde0a	Attempt to fix Windows testcase output issue	16 years ago
Sergey Vojtovich	8e65618fa9	BUG#47455 - The myisam_crash_before_flush_keys test fails on Windows Simplified and made more determenistic myisam_crash_before_flush_keys test. mysql-test/r/myisam_crash_before_flush_keys.result: We don't need myisamchk to test this bug fix. CHECK TABLE after server restart is enough to ensure that the fix works. mysql-test/t/myisam_crash_before_flush_keys.test: We don't need myisamchk to test this bug fix. CHECK TABLE after server restart is enough to ensure that the fix works.	16 years ago
Jorgen Loland	6da93b223b	Bug#47280 - strange results from count(*) with order by multiple columns without where/group Simple SELECT with implicit grouping used to return many rows if the query was ordered by the aggregated column in the SELECT list. This was incorrect because queries with implicit grouping should only return a single record. The problem was that when JOIN:exec() decided if execution needed to handle grouping, it was assumed that sum_func_count==0 meant that there were no aggregate functions in the query. This assumption was not correct in JOIN::exec() because the aggregate functions might have been optimized away during JOIN::optimize(). The reason why queries without ordering behaved correctly was that sum_func_count is only recalculated if the optimizer chooses to use temporary tables (which it does in the ordered case). Hence, non-ordered queries were correctly treated as grouped. The fix for this bug was to remove the assumption that sum_func_count==0 means that there is no need for grouping. This was done by introducing variable "bool implicit_grouping" in the JOIN object. mysql-test/r/func_group.result: Add test for BUG#47280 mysql-test/t/func_group.test: Add test for BUG#47280 sql/opt_sum.cc: Improve comment for opt_sum_query() sql/sql_class.h: Add comment for variables in TMP_TABLE_PARAM sql/sql_select.cc: Introduce and use variable implicit_grouping instead of (!group_list && sum_func_count) in places that need to test if grouping is required. Also added comments for: optimization of aggregate fields for implicitly grouped queries (JOIN::optimize) and choice of end_select method (JOIN::execute) sql/sql_select.h: Add variable implicit_grouping, which will be TRUE for queries that contain aggregate functions but no GROUP BY clause. Also added comment to sort_and_group variable.	16 years ago
unknown	ecb9119beb	Null-merge from mysql-5.0.84sp1-release	16 years ago
unknown	f9c6730258	Bug#46640: output from mysqlbinlog command in 5.1 breaks replication The BINLOG statement was sharing too much code with the slave SQL thread, introduced with the patch for Bug#32407. This caused statements to be logged with the wrong server_id, the id stored inside the events of the BINLOG statement rather than the id of the running server. Fix by rearranging code a bit so that only relevant parts of the code are executed by the BINLOG statement, and the server_id of the server executing the statements will not be overrided by the server_id stored in the 'format description BINLOG statement'. mysql-test/extra/binlog_tests/binlog.test: Added test to verify if the server_id stored in the 'format description BINLOG statement' will override the server_id of the server executing the statements. mysql-test/suite/binlog/r/binlog_row_binlog.result: Test result for bug#46640 mysql-test/suite/binlog/r/binlog_stm_binlog.result: Test result for bug#46640 sql/log_event.cc: Moved rows_event_stmt_clean() call from update_pos() to apply_event(). This in any case makes more sense, and is needed as update_pos() is no longer called when executing BINLOG statements. Moved setting of rli->relay_log.description_event_for_exec from Format_description_log_event::do_update_pos() to Format_description_log_event::do_apply_event() sql/log_event_old.cc: Moved rows_event_stmt_clean() call from update_pos() to apply_event(). This in any case makes more sense, and is needed as update_pos() is no longer called when executing BINLOG statements. sql/slave.cc: The skip flag is no longer needed, as the code path for BINLOG statement has been cleaned up. sql/sql_binlog.cc: Don't invoke the update_pos() code path for the BINLOG statement, as it contains code that is redundant and/or harmful (especially setting thd->server_id).	16 years ago
unknown	7b32690cf9	Raise version number after cloning 5.0.87	16 years ago
unknown	b9a794d139	Null-merge from mysql-5.1.37sp1-release	16 years ago

1 2 3 4 5 ...

58434 Commits (362aaccba070b9a4fd9f64787f5fb6e06bb61141) All Branches Search

58434 Commits (362aaccba070b9a4fd9f64787f5fb6e06bb61141)

All Branches