mariadb

Tree: 22830296ee

Author	SHA1	Message	Date
Alexander Nozdrin	52ebe700c4	Temporarily fix for configure.in -- CMakeFiles requires suffix in version tag.	15 years ago
Alexander Nozdrin	6b553e775c	Fix version tag (remove -ga suffix).	15 years ago
unknown	cdd706981c	Re-enabled rpl.rpl_innodb_bug30888.	15 years ago
Gleb Shchepa	71082fd17d	manual merge 5.1-bugteam --> 5.5-bugteam (bug 52160)	15 years ago
Gleb Shchepa	20d704978d	Bug #52160 : crash and inconsistent results when grouping by a function and column The bugreport reveals two different bugs about grouping on a function: 1) grouping by the TIME_TO_SEC function result caused a server crash or wrong results and 2) grouping by the function returning a blob caused an unexpected "Duplicate entry" error and wrong result. Details for the 1st bug: TIME_TO_SEC() returns NULL if its argument is invalid (empty string for example). Thus its nullability depends not only on the nullability of its arguments but also on their values. Fixed by (overoptimistically) setting TIME_TO_SEC() to be nullable despite the nullability of its arguments. Details for the 2nd bug: The server is unable to create indices on blobs without explicit blob key part length. However, this fact was ignored for blob function result fields of GROUP BY intermediate tables. Fixed by disabling GROUP BY index creation for blob function result fields like regular blob fields. mysql-test/r/func_time.result: Test case for bug #52160. mysql-test/r/type_blob.result: Test case for bug #52160. mysql-test/t/func_time.test: Test case for bug #52160. mysql-test/t/type_blob.test: Test case for bug #52160. sql/item_timefunc.h: Bug #52160: crash and inconsistent results when grouping by a function and column TIME_TO_SEC() returns NULL if its argument is invalid (empty string for example). Thus its nullability depends not only Fixed by (overoptimistically) setting TIME_TO_SEC() to be nullable despite the nullability of its arguments. sql/sql_select.cc: Bug #52160: crash and inconsistent results when grouping by a function and column The server is unable to create indices on blobs without explicit blob key part length. However, this fact was ignored for blob function result fields of GROUP BY intermediate tables. Fixed by disabling GROUP BY index creation for blob function result fields like regular blob fields.	15 years ago
Sven Sandberg	c4a4119829	wL#5625: Deprecate mysqlbinlog options --base64-output=always and --base64-output Adds deprecation warning for the mysqlbinlog options --base64-output=always and --base64-output. A warning is printed when the flags are used, and also when running mysqlbinlog --help. client/mysqlbinlog.cc: Give a warning for --base64-output=always and --base64-output, and print warning in mysqlbinlog --help. mysql-test/r/mysqlbinlog.result: updated result file mysql-test/t/mysqlbinlog.test: Test that mysqlbinlog --base64-output=always gives a warning.	15 years ago
Tor Didriksen	a5eba94a1d	Bug #52131 : SET and ENUM stored endian-dependent in binary log Post-Push fix, DBUG build broken on freebsd7 sql/field.cc:8456: warning: control reaches end of non-void function sql/field.cc: Return NULL to keep compiler happy.	15 years ago
Vasil Dimov	23552ecd41	Merge mysql-5.1-innodb -> mysql-5.1-bugteam	15 years ago
Calvin Sun	460ad14e04	Bug#52062: Compiler warning in os0file.c on windows 64-bit On Windows, the parameter for number of bytes passed into WriteFile() and ReadFile() is DWORD. Casting is needed to silence the warning on 64-bit Windows. Also, adding several asserts to ensure the variable for number of bytes is no more than 32 bits, even on 64-bit Windows. This is for InnoDB Plugin. rb://415 Approved by: Inaam	15 years ago
Calvin Sun	16feea4109	Bug#52062: Compiler warning in os0file.c on windows 64-bit On Windows, the parameter for number of bytes passed into WriteFile() and ReadFile() is DWORD. Casting is needed to silence the warning on 64-bit Windows. Also, adding several asserts to ensure the variable for number of bytes is no more than 32 bits, even on 64-bit Windows. This is for built-in InnoDB. rb://415 Approved by: Inaam	15 years ago
Georgi Kodinov	c3f923857a	Bug #57774 : Typos/ambiguities in the WL1054 comments Fixed few typos and added better wording as suggested.	15 years ago
Vasil Dimov	a213162c0d	Merge mysql-5.1-bugteam -> mysql-5.5-bugteam (empty)	15 years ago
Vasil Dimov	06a10d4bd3	Merge mysql-5.5-innodb -> mysql-5.5-bugteam	15 years ago
Jimmy Yang	6f03e15cf9	Merge fix for bug#57616 from mysql-5.5-security to mysql-5.5-innodb.	15 years ago
Vasil Dimov	e3decfa0ae	Fix a compilation warning: /export/home/pb2/build/sb_0-2459340-1288264809.63/mysql-5.5.8-ga/storage/innobase/os/os0sync.c: In function 'os_cond_wait_timed': /export/home/pb2/build/sb_0-2459340-1288264809.63/mysql-5.5.8-ga/storage/innobase/os/os0sync.c:184: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'time_t' gmake[2]: *** [storage/innobase/CMakeFiles/innobase.dir/os/os0sync.c.o] Error 1	15 years ago
Mattias Jonsson	1a9083b94a	post merge fix	15 years ago
Calvin Sun	8fc8e01f45	Null merge mysql-5.1-innodb --> mysql-5.5-innodb	15 years ago
Calvin Sun	ec51b47954	Bug#52062: Compiler warning in os0file.c on windows 64-bit On Windows, the parameter for number of bytes passed into WriteFile() and ReadFile() is DWORD. Casting is needed to silence the warning on 64-bit Windows. Also, adding several asserts to ensure the variable for number of bytes is no more than 32 bits, even on 64-bit Windows. rb://415 Approved by: Inaam	15 years ago
Calvin Sun	3fb574bf03	Fixed a C89 violation when atomic builtins are not defined, causing a compile error with MSVC. The problem was introduced in Revision: 3150 revid:marko.makela@oracle.com-20100809085837-s1nfx6gjf7l6ttab	15 years ago
Mats Kindahl	f523b5771a	Merging patch for BUG#52131 with mysql-5.5-bugteam.	15 years ago
Marko Mäkelä	712beace38	Fix a bogus debug assertion in the fix of Bug #57707 . buf_pool_init(): Replace ut_ad(n_instances < MAX_BUFFER_POOLS) with ut_ad(n_instances <= MAX_BUFFER_POOLS). (Spotted by Michael Izioumtchenko.) Add ut_ad(n_instances > 0).	15 years ago
Vasil Dimov	a882351b4f	Merge mysql-5.1-innodb -> mysql-5.5-innodb (empty diff)	15 years ago
Vasil Dimov	e3021d2a8c	Merge mysql-5.5-bugteam -> mysql-5.5-innodb	15 years ago
Vasil Dimov	4bf273c8f1	Merge mysql-5.1-bugteam -> mysql-5.1-innodb	15 years ago
Alexander Nozdrin	02ca1fe3f1	Follow-up for Bug#55850: update funcs_1 result files.	15 years ago
Marko Mäkelä	26d81a2a98	Bug #57707 InnoDB buf_page_t size has doubled on 32-bit systems buf_page_t: Remove the buf_pool pointer. Add buf_pool_index:6 next to buf_fix_count:19 (it was buf_fix_count:25). This will limit the number of concurrent transactions to somewhere around 524,288. buf_pool_index(buf_pool): A new function to determine the index of a buffer pool in buf_pool_ptr[]. buf_pool_ptr: Make this a dynamically allocated array instead of an array of pointers. Allocate the array in buf_pool_init() and free in buf_pool_free(). buf_pool_free_instance(): No longer free the buf_pool object, as it is allocated from a big array. buf_pool_from_bpage(), buf_pool_from_block(): Move the definitions to the beginning of the files, because some compilers have (had) problems with forward definitions of inline functions. Calculate the buffer pool from buf_pool_index. buf_pool_from_array(): Add debug assertions for input validation.	15 years ago
Marko Mäkelä	0fbc74a451	Bug #57730 Clean up references to InnoDB Plugin CMakeLists.txt: Remove the checks for mysql_storage_engine.cmake and MYSQL_VERSION_ID. ha_innodb.cc, ha_innodb.h: Remove the checks for MYSQL_VERSION_ID.	15 years ago
Anitha Gopi	3cc4cdf160	Up merge revision 3547 from 5.1. Enable sp_sync test since Bug 48157 is fixed	15 years ago
Anitha Gopi	fcfda43ca3	Fixed bug numbers in disabled.def files	15 years ago
Inaam Rana	431e3ee7c6	Fix compiler warning introduced by previous commit.	15 years ago
Inaam Rana	1c3dc21f2a	Bug #57611 ibdata file and continuous growing undo logs rb://498 Fix handling of update_undo_logs at trx commit. Previously, when rseg->update_undo_list grows beyond 500 the update_undo_logs were marked with state TRX_UNDO_TO_FREE which should have been TRX_UNDO_TO_PURGE. In 5.5 we don't need the heuristic as we support multiple rollback segments. Approved by: Sunny Bains	15 years ago
Inaam Rana	29d62e4cd4	Null merge mysql-5.1-innodb to mysql-5.5-innodb	15 years ago
Inaam Rana	26738c280f	Bug #57611 ibdata file and continuous growing undo logs rb://498 Fix handling of update_undo_logs at trx commit. Previously, when rseg->update_undo_list grows beyond 500 the update_undo_logs were marked with state TRX_UNDO_TO_FREE which should have been TRX_UNDO_TO_PURGE. Approved by: Sunny Bains	15 years ago
unknown	840c602e83	Bug#57720 - Windows Vista and possibly Windows 7 can return ERROR_TIMEOUT instead of WAIT_TIMEOUT from calls to SleepConditionVariableCS() which is used in os0sync.c; os_cond_wait_timeout() where it is mapped to sleep_condition_variable(). Consider ERROR_TIMEOUT to be a timeout just like WAIT_TIMEOUT. In addition, test for EINTR as a possible return value from pthread_cond_timeout() in the posix section of os_cond_wait_timeout(), even though it is not supposed to be returned, but just to be safe.	15 years ago
Marc Alff	c039e82497	Fixed test result	15 years ago
Alexander Nozdrin	e86b6c0db4	Patch for Bug#55850 (Trigger warnings not cleared). The problem was that the warnings risen by a trigger were not cleared upon successful completion. The warnings should be cleared if the trigger completes successfully. The fix is to skip merging warnings into caller's Warning Info for triggers.	15 years ago
Marc Alff	b431da6214	local merge	15 years ago
Bjorn Munch	dca17350be	null upmerge	15 years ago
Bjorn Munch	32c86a488d	merge from 5.5-mtr	15 years ago
Kristofer Pettersson	29f3d85df1	automerge	15 years ago
Georgi Kodinov	ef7982fd17	Bug #57689 : mysql_change_user() breaks user connection on older clients COM_CHANGE_USER was always handled like an implicit request to change the client plugin, so that the client can re-use the same code path for both normal login and COM_CHANGE_USER. However this doesn't really work well with old clients because they don't understand the request to change a client plugin. Fixed by implementing a special state in the code (and old client issuing COM_CHANGE_USER). In this state the server parses the COM_CHANGE_USER package and pushes back the password hash, the user name and the database to the input stream in the same order that the native password server side plugin expects. As a result it replies with an OK/FAIL just like the old server does thus making the new server compatible with older clients. No test case added, since it would requre an old client binary. Tested using accounts with and without passwords. Tested with a correct and incorrect password.	15 years ago
Georgi Kodinov	bda4655eb9	merge	15 years ago
Georgi Kodinov	50d18aa2d5	merge	15 years ago
Tor Didriksen	56f6599e7c	Bug#45288: pb2 returns a lot of compilation warnings sql/sql_lex.h:1437: warning: control reaches end of non-void function sql/sql_lex.h: Make compiler happy, by adding a return statement.	15 years ago
Bjorn Munch	676e012e47	merge from 5.1-mtr	15 years ago
Kristofer Pettersson	4b36063336	Bug#54569 Some options are not allowed to take argument when passed with loose- prefix Boolean options cause parsing failures when they are given with prefix loose- and an argument, either in the command line or in configuration file. The reason was a faulty logic which forced the parsing to throw an error when an argument of type NO_ARG was used together with an argument which has been identified as a key-value pair. Despite the attribute NO_ARG these options actually take arguments if they are of type BOOL. include/my_getopt.h: * More comments to help future refactoring mysys/my_getopt.c: * removed if-statement which prevented logic for handling boolean types with arguments to be executed. * Added comments to aid in future refactoring.	15 years ago
Bjorn Munch	56354413f8	Revert simplified if() in mysql-test/include/show_events.inc	15 years ago
Horst.Hunger	06a263e2b3	Due to failing on Freebsd.	15 years ago
Jimmy Yang	d96b0e5801	merge from mysql-5.1-innodb to mysql-5.5-innodb.	15 years ago
Jimmy Yang	112684b0ba	Fix bug #57700 Latching order violation in row_truncate_table_for_mysql(). Approved by Sunny Bains	15 years ago

1 2 3 4 5 ...

67464 Commits (22830296ee509122b3797b2dee99c17b3e474a3b) All Branches Search

67464 Commits (22830296ee509122b3797b2dee99c17b3e474a3b)

All Branches