mariadb

Tree: ab2f3dd2a2

Author	SHA1	Message	Date
Bjorn Munch	ad365a5c07	Bug #45190 mtr should report some statistics even if aborting after too many tests fail Added calls to mtr_report_stats() also after timeout or too many failures	17 years ago
Sergey Glukhov	86e425fe11	5.0-bugteam->5.1-bugteam merge	17 years ago
Sergey Glukhov	33734e956f	Bug#45152 crash with round() function on longtext column in a derived table The crash happens due to wrong max_length value which is set on Item_func_round::fix_length_and_dec() stage. The value is set to args[0]->max_length which is too big in case of LONGTEXT(LONGBLOB) fields. The fix is to set max_length using float_length() function. mysql-test/r/func_math.result: test result mysql-test/t/func_math.test: test case sql/item_func.cc: The crash happens due to wrong max_length value which is set on Item_func_round::fix_length_and_dec() stage. The value is set to args[0]->max_length which is too big in case of LONGTEXT(LONGBLOB) fields. The fix is to set max_length using float_length() function.	17 years ago
Alexey Kopytov	39d0b1bd5b	Automerge.	17 years ago
Alexey Kopytov	aef45b47a0	Automerge.	17 years ago
Alexey Kopytov	47b334a642	Automerge.	17 years ago
Alexey Kopytov	7561bc9212	Manual merge.	17 years ago
Narayanan V	094ddf2266	Bug#45197 cp1250 character set with IBMDB2I generates 2027 error Running a SELECT query over an IBMDB2I table with a cp1250 character set was producing an error 2027 (ibmdb2i error 2027: Error converting single-byte sort sequence to UCS-2). The QMY_DESCRIBE_RANGE API was returning error 2027 to the storage engine because the CCSID used for a cp1250 column (870) does not match the CCSID used by the DB2 sort sequences associated with cp1250_* collations (1153). This was because the storage engine relies on a set of system APIs to determine which CCSID value most closely matches a particular MySQL character set. However, in the case of cp1250, the system is returning CCSID 870, which does not have a codepoint for the euro symbol, making it an incorrect match. This patch overrides the selection of a compatible CCSID to always return 1153 for cp1250. storage/ibmdb2i/db2i_charsetSupport.cc: Bug#45197 cp1250 character set with IBMDB2I generates 2027 error override the selection of a compatible CCSID to always return 1153 for cp1250.	17 years ago
He Zhenxing	76e12894dc	Merge 5.0-bt to 5.1-bt	17 years ago
He Zhenxing	83a11b78df	post fix of test result	17 years ago
He Zhenxing	12e655a7f8	Auto merge	17 years ago
He Zhenxing	e14191885f	Merge BUG#41948	17 years ago
He Zhenxing	e1fb88f2cc	Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam	17 years ago
He Zhenxing	5dd1abae7d	BUG#43263 BEGIN skipped in some replicate-do-db cases BEGIN/COMMIT/ROLLBACK was subject to replication db rules, and caused the boundary of a transaction not recognized correctly when these queries were ignored by the rules. Fixed the problem by skipping replication db rules for these statements. sql/log_event.cc: Skip checking replication db rules for BEGIN/COMMIT/ROLLBACK statements	17 years ago
Davi Arnaut	92e2fa7f17	MySQL 5.0 backport of Chad Miller's patch for Bug#34309: Bug#34309: '_PC' macro redefinition For reasons that are now a mystery, we had defined a CPP symbol to help ancient compilers work better (in some way that's lost to history). This interferes with at least one modern compiler. Now, don't define the _PC symbol. Those other underscore-leading symbols are suspect also, but at least the names aren't inscrutable. Let's leave them for now.	17 years ago
He Zhenxing	abf5f8dac2	BUG#41948 Query_log_event constructor needlessly contorted Make the caller of Query_log_event, Execute_load_log_event constructors and THD::binlog_query to provide the error code instead of having the constructors to figure out the error code. sql/log_event.cc: Changed constructors of Query_log_event and Execute_load_log_event to accept the error code argument instead of figuring it out by itself sql/log_event.h: Changed constructors of Query_log_event and Execute_load_log_event to accept the error code argument	17 years ago
unknown	7a06fac510	Raise version number after cloning 5.0.83	17 years ago
Tatiana A. Nurnberg	88e84c1fbf	auto-merge	17 years ago
Tatiana A. Nurnberg	5aee5bb251	auto-merge	17 years ago
Tatiana A. Nurnberg	88a1c9c9aa	auto-merge	17 years ago
Kristofer Pettersson	e9a3b64991	Automerge	17 years ago
Kristofer Pettersson	b34227cee6	Automerge	17 years ago
Tatiana A. Nurnberg	2ba60c19c3	Bug#39200: optimize table does not recognize ROW_FORMAT=COMPRESSED When doing ALTER TABLE, we forgot to point out that we actually have ROW_FORMAT information (from the original table), so we dropped to "sensible defaults". This affects both ALTER TABLE and OPTIMIZE TABLE which may fall back on ALTER TABLE for InnoDB. We now flag that we do indeed know the row-type, thereby preserving compression-type etc. No .test in 5.1 since we'd need a reasonable new plugin from InnoDB to show this properly; in higher versions, maria can demonstrate this. sql/sql_table.cc: In mysql_alter_table() flag that we have row-type info from old table. In compare_tables(), we must explicitly check whether row-type has changed (rather than rely on the flag which will always be set at this point now).	17 years ago
Alexey Kopytov	ca7a17dc31	Automerge	17 years ago
Joerg Bruehe	74507d486a	Merge up 5.0-build into 5.1-build: mostly just the merge changesets, but also a change of Perl scripts to use "/usr/bin/perl" fixed.	17 years ago
Kristofer Pettersson	66e0ee6639	Bug#44658 Create procedure makes server crash when user does not have ALL privilege MySQL crashes if a user without proper privileges attempts to create a procedure. The crash happens because more than one error state is pushed onto the Diagnostic area. In this particular case the user is denied to implicitly create a new user account with the implicitly granted privileges ALTER- and EXECUTE ROUTINE. The new account is needed if the original user account contained a host mask. A user account with a host mask is a distinct user account in this context. An alternative would be to first get the most permissive user account which include the current user connection and then assign privileges to that account. This behavior change is considered out of scope for this bug patch. The implicit assignment of privileges when a user creates a stored routine is a considered to be a feature for user convenience and as such it is not a critical operation. Any failure to complete this operation is thus considered non-fatal (an error becomes a warning). The patch back ports a stack implementation of the internal error handler interface. This enables the use of multiple error handlers so that it is possible to intercept and cancel errors thrown by lower layers. This is needed as a error handler already is used in the call stack emitting the errors which needs to be converted. mysql-test/r/grant.result: * Added test case for bug44658 mysql-test/t/grant.test: * Added test case for bug44658 sql/sp.cc: * Removed non functional parameter no_error and my_error calls as all errors from this function will be converted to a warning anyway. * Change function return type from int to bool. sql/sp.h: * Removed non functional parameter no_error and my_error calls as all errors from this function will be converted to a warning anyway. * Changed function return value from int to bool sql/sql_acl.cc: * Removed the non functional no_error parameter from the function prototype. The function is called from two places and in one of the places we now ignore errors through error handlers. * Introduced the parameter write_to_binlog * Introduced an error handler to cancel any error state from mysql_routine_grant. * Moved my_ok() signal from mysql_routine_grant to make it easier to avoid setting the wrong state in the Diagnostic area. * Changed the broken error state in sp_grant_privileges() to a warning so that if "CREATE PROCEDURE" fails because "Password hash isn't a hexidecimal number" it is still clear what happened. sql/sql_acl.h: * Removed the non functional no_error parameter from the function prototype. The function is called from two places and in one of the places we now ignore errors through error handlers. * Introduced the parameter write_to_binlog * Changed return type for sp_grant_privileges() from int to bool sql/sql_class.cc: * Back ported implementation of internal error handler from 6.0 branch sql/sql_class.h: * Back ported implementation of internal error handler from 6.0 branch sql/sql_parse.cc: * Moved my_ok() signal from mysql_routine_grant() to make it easier to avoid setting the wrong state in the Diagnostic area.	17 years ago
Joerg Bruehe	b62add77f4	Merge main 5.1 into 5.1-build	17 years ago
Narayanan V	b674d2c908	merging with mysql-5.1-bugteam tree	17 years ago
Bjorn Munch	709cd00979	fixed .bzr-mysql/default.conf	17 years ago
Bjorn Munch	cf6aeea48c	merge from 5.1 main	17 years ago
Narayanan V	858e118ab9	Bug#44811 Tests with utf8 charset fail with ibmdb2i on 64bit MySQL wmemset was being used to fill the row buffers. wmemset was intended to fill the buffer with 16-bit UCS2 pad values. However, the 64-bit version of wmemset uses 32-bit wide characters and thus filled the buffer incorrectly. In some cases, the null byte map would be overwritten, causing ctype_utf8.test and ibmdb2i_rir.test to fail, giving the error message CPF5035. This patch eliminates the use of wmemset to fill the row buffer. wmemset has been replaced with memset16, which always fills memory with 16-bit values. storage/ibmdb2i/db2i_conversion.cc: Bug#44811 Tests with utf8 charset fail with ibmdb2i on 64bit MySQL Eliminate the use of wmemset to fill the row buffer. Replace wmemset with memset16, which always fills memory with 16-bit values. storage/ibmdb2i/db2i_misc.h: Bug#44811 Tests with utf8 charset fail with ibmdb2i on 64bit MySQL Eliminate the use of wmemset to fill the row buffer. Replace wmemset with memset16, which always fills memory with 16-bit values.	17 years ago
Joerg Bruehe	f101f2b58b	Merge main 5.0 into 5.0-build	17 years ago
Sergey Glukhov	b4a725c4f3	5.0-bugteam->5.1-bugteam merge	17 years ago
Sergey Glukhov	4cfc9d771a	test case fix	17 years ago
Bjorn Munch	4404b6a915	Bug #43659 MTR2 should report worker data for tests when using --parallel > 1 Adding "w# " before the test result Also enable --parallel=2 so this can be tested.	17 years ago
Sergey Glukhov	0aa26d39aa	5.0-bugteam->5.1-bugteam merge	17 years ago
Sergey Glukhov	1b91400ac6	Bug#37268 'binary' character set makes CLI-internal commands case sensitive The fix is to use case insensitive collation for mysql client command search. client/mysql.cc: The fix is to use case insensitive collation for mysql client command search. mysql-test/r/mysql.result: test result mysql-test/t/mysql.test: test case	17 years ago
Georgi Kodinov	67bbc74853	merge 5.0-main -> 5.1-main	17 years ago
Georgi Kodinov	4673975379	changed the version	17 years ago
Alexey Kopytov	a7e70fbb47	Automerge.	17 years ago
Bjorn Munch	444bbe56f5	cherry picking fix for Bug #39542 from 6.0-runtime	17 years ago
Georgi Kodinov	6282b4d3e4	merged 5.1-bugteam to working tree	17 years ago
Georgi Kodinov	c675beab98	merged 5.0-bugteam to 5.1-bugteam	17 years ago
Georgi Kodinov	cbbc350578	merged 5.0-bugteam	17 years ago
Georgi Kodinov	f1463061b2	automerge	17 years ago
Tatiana A. Nurnberg	7f50fc02c2	Bug#34861: mysqldump with --tab gives weird output for triggers. mysqldump --tab still dumped triggers to stdout rather than to individual tables. We now append triggers to the .sql file for the corresponding table. --events and --routines correspond to a database rather than a table and will still go to stdout with --tab unless redirected with --result-file (-r). client/mysqldump.c: Extend open_sql_file_for_table() so we can open-append. Change dump_triggers_for_table() so it will append its output to the table's .sql-file when --tab is used. mysql-test/r/mysqldump.result: Show that when using --tab, triggers now end up in the .sql file with the corresponding table (after that table), while --routines and --events go to stdout or --result-file. mysql-test/t/mysqldump.test: Show that when using --tab, triggers now end up in the .sql file with the corresponding table (after that table), while --routines and --events go to stdout or --result-file.	17 years ago
Georgi Kodinov	80730df7d6	Bug #38159 : Function parsing problem generates misleading error message Added a more detailed error message on calling an ambiguous missing function. mysql-test/r/ps.result: Bug #38159: fixed existing tests mysql-test/r/sp-error.result: Bug #38159: test case mysql-test/t/ps.test: Bug #38159: fixed existing tests mysql-test/t/sp-error.test: Bug #38159: test case sql/item_func.cc: Bug #38159: generate more detailed error message sql/share/errmsg.txt: Bug #38159: add a more detailed error message sql/sql_derived.cc: Bug #38159: treat the detailed error message the same way as the generic one sql/sql_lex.cc: Bug #38159: - detect if the token is ambiguous and print the appropriate error. - backport is_lex_native_function() from 5.1 sql/sql_lex.h: Bug #38159: detect if the token is ambiguous and print the appropriate error. sql/sql_yacc.yy: Bug #38159: generate more detailed error message sql/table.cc: Bug #38159: treat the detailed error message the same way as the generic one	17 years ago
Sergey Glukhov	c8a7b79142	5.0-bugteam->5.1-bugteam merge	17 years ago
Sergey Glukhov	f54beb2dcc	Bug#41212 crash after race condition between merge table and table_cache evictions On 64-bit Windows: querying MERGE table with keys may cause server crash.The problem is generic and may affect any statement accessing MERGE table cardinality values. When MERGE engine was copying cardinality statistics, it was using incorrect size of element in cardinality statistics array (sizeof(ptr)==8 instead of sizeof(ulong)==4), causing access of memory beyond of the allocated bounds. sql/ha_myisam.cc: When copying rec_per_key array (an array of ulong) use proper size of element, that is sizeof(ulong). sql/ha_myisammrg.cc: When copying rec_per_key array (an array of ulong) use proper size of element, that is sizeof(ulong). sql/table.cc: When allocating rec_per_key array (an array of ulong) use proper size of element, that is sizeof(ulong).	17 years ago
Alexey Kopytov	1b8322c3c6	Bug #44767 : invalid memory reads in password() and old_password() functions The PASSWORD() and OLD_PASSWORD() functions could lead to memory reads outside of an internal buffer when used with BLOB arguments. String::c_ptr() assumes there is at least one extra byte in the internally allocated buffer when adding the trailing '\0'. This, however, may not be the case when a String object was initialized with externally allocated buffer. The bug was fixed by adding an additional "length" argument to make_scrambled_password_323() and make_scrambled_password() in order to avoid String::c_ptr() calls for PASSWORD()/OLD_PASSWORD(). However, since the make_scrambled_password[_323] functions are a part of the client library ABI, the functions with the new interfaces were implemented with the 'my_' prefix in their names, with the old functions changed to be wrappers around the new ones to maintain interface compatibility. mysql-test/r/func_crypt.result: Added a test case for bug #44767. mysql-test/t/func_crypt.test: Added a test case for bug #44767. sql/item_strfunc.cc: Use the new my_make_scrambled_password() to avoid String::c_ptr(). sql/item_strfunc.h: Changed Item_func[_old]_password::alloc() interfaces so that we can use the new my_make_scrambled_password() functions. sql/mysql_priv.h: Added declarations for the new my_make_scrambled_password() functions. sql/password.c: Added new my_make_scrambled_password() functions with an additional "length" argument. Changed ones to be wrappers around the new ones to maintain interface compatibility. sql/sql_yacc.yy: Utilize the new password hashing functions with additional length argument.	17 years ago

... 4 5 6 7 8 ...

57715 Commits (ab2f3dd2a2d23d2b96604515ddc0576b54ad8049) All Branches Search

57715 Commits (ab2f3dd2a2d23d2b96604515ddc0576b54ad8049)

All Branches