mariadb

Tree: b3232453a1

Author	SHA1	Message	Date
Guilhem Bichot	b3232453a1	merge of 5.1-bugteam	15 years ago
Guilhem Bichot	b5586c67ec	Fix for Bug#56138 "valgrind errors about overlapping memory when double-assigning same variable", and related small fixes.	15 years ago
Marc Alff	218ca24cd9	local merge	15 years ago
Davi Arnaut	f6deb00a56	WL#5665: Removal of the autotools-based build system The autotools-based build system has been superseded and is being removed in order to ease the maintenance burden on developers tweaking and maintaining the build system. In order to support tools that need to extract the server version, a new file that (only) contains the server version, called VERSION, is introduced. The file contents are human and machine-readable. The format is: MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=5 MYSQL_VERSION_PATCH=8 MYSQL_VERSION_EXTRA=-rc The CMake based version extraction in cmake/mysql_version.cmake is changed to extract the version from this file. The configure to CMake wrapper is retained for backwards compatibility and to support the BUILD/ scripts. Also, a new a makefile target show-dist-name that prints the server version is introduced.	15 years ago
Davi Arnaut	e1cba38b6c	Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.	15 years ago
Davi Arnaut	871930e708	Bug#57994: Compiler flag change build error : my_redel.c Although ICC identifies itself as GCC, even in version numbers, it does not support the stpcpy built-in.	15 years ago
Vladislav Vaintroub	ece6212f89	avoid useless system check on Windows	15 years ago
Vladislav Vaintroub	2cf7ab1578	merge	15 years ago
Vladislav Vaintroub	bf6a7d09e9	Bug#58313: CMake stops with VS Express if -DBUILD_CONFIG=mysql_release.cmake Bug : -DBUILD_CONFIG=mysql_release sets SIGNCODE parameter which requires singtool.exe (part of Windows SDK) in order to be able to sign the binaries ( only if valid certificate is found). However singtool is not a part of the SDK shipped with Visual Studio Express, so the build fails claiming missing singtools.exe Fix: Do not use SIGNCODE wiith VC Express. Also, fix broken nmake build (*.rc files could not be compiled due to ADD_DEFINITIONS contaning C/C++ compiler specific flags)	15 years ago
Alexander Barkov	77c098a722	Bug#58190 BETWEEN no longer uses indexes for date or datetime fields Regression introduced by WL#2649. Problem: queries with date/datetime columns did not use indexes: set names non_latin1_charset; select * from date_index_test where date_column between '2010-09-01' and '2010-10-01'; before WL#2649 indexes worked fine because charset of date/datetime columns was BINARY which always won. Fix: testing that collation of the operation matches collation of the field is only needed in case of "real" string data types. For DATE, DATETIME it's not needed. @ mysql-test/include/ctype_numconv.inc @ mysql-test/r/ctype_binary.result @ mysql-test/r/ctype_cp1251.result @ mysql-test/r/ctype_latin1.result @ mysql-test/r/ctype_ucs.result @ mysql-test/r/ctype_utf8.result Adding tests @ sql/field.h Adding new method Field_str::match_collation_to_optimize_range() for use in opt_range.cc to distinguish between "real string" types like CHAR, VARCHAR, TEXT (Field_string, Field_varstring, Field_blob) and "almost string" types DATE, TIME, DATETIME (Field_newdate, Field_datetime, Field_time, Field_timestamp) @ sql/opt_range.cc Using new method instead of checking result_type() against STRING result. Note: Another part of this problem (which is not regression) is submitted separately (see bug##58329).	15 years ago
Alexander Barkov	677639f46a	Bug#58175 xml functions read initialized bytes when conversions happen Problem: nr_of_decimals could read behind the end of the buffer in case of a non-null-terminated string, which caused valgring warnings. Fix: fixing nr_of_decimals not to read behind the "end" pointer. modified: @ mysql-test/r/xml.result @ mysql-test/t/xml.test @ sql/item.cc	15 years ago
Georgi Kodinov	1ab1cb8a77	Bug #58119 : Typo in warning on log: [Warning] 'proxes_priv' entry Fixed a typo in an error message.	15 years ago
Vladislav Vaintroub	e2fb2141d3	merge	15 years ago
Dmitry Lenev	41af8df76f	Fix tree name which was accidentally changed during the merge.	15 years ago
Dmitry Lenev	8d0eabd20a	Merged recent change from mysql-5.5-bugteam into mysql-5.5-runtime tree.	15 years ago
Dmitry Lenev	4ca561e78b	Suppress false-positive uninitialized variable use warnings in Event_queue::get_top_for_execution_if_time() method which has caused -Werror build to fail.	15 years ago
Dmitry Lenev	b019ba2f47	Fix for bug #57985 "ONLINE/FAST ALTER PARTITION can fail and leave the table unusable". Failing ALTER statement on partitioned table could have left this table in an unusable state. This has happened in cases when ALTER was executed using "fast" algorithm, which doesn't involve copying of data between old and new versions of table, and the resulting new table was incompatible with partitioning function in some way. The problem stems from the fact that discrepancies between new table definition and partitioning function are discovered only when the table is opened. In case of "fast" algorithm this has happened too late during ALTER's execution, at the moment when all changes were already done and couldn't have been reverted. In the cases when "slow" algorithm, which copies data, is used such discrepancies are detected at the moment new table definition is opened implicitly when new version of table is created in storage engine. As result ALTER is aborted before any changes to table were done. This fix tries to address this issue by ensuring that "fast" algorithm behaves similarly to "slow" algorithm and checks compatibility between new definition and partitioning function by trying to open new definition after .FRM file for it has been created. Long term we probably should implement some way to check compatibility between partitioning function and new table definition which won't involve opening it, as this should allow much cleaner fix for this problem.	15 years ago
Alexander Barkov	bdfcad0f9b	Bug#57306 SHOW PROCESSLIST does not display string literals well. A post-patch fixing test failures on Windows. Host name in "SHOW PROCESSLIST" is displayed with port number for some reasons.	15 years ago
Jon Olav Hauglid	2d773c8b3a	Merge from mysql-5.5-bugteam to mysql-5.5-runtime No conflicts	15 years ago
Georgi Kodinov	589428b625	Bug #50021 : Windows standard configuration files are showing Linux options/settings 1. Changed the default value for socket on Windows to the windows default 2. Removed hard-coded trailing slashes from innodb_data_home_dir and innodb_log_group_name_dir. 3. Added extra backslashes to the innodb directory example 4. Made the tempdir platform "dependent" 5. Fixed the comments in the .ini files 6. Removed the tmpdir from the templates and the scripts	15 years ago
Bjorn Munch	b295a25109	merge from 5.1-mtr	15 years ago
Jon Olav Hauglid	a2275f0c8f	Merge from mysql-5.5-runtime to mysql-5.5-bugteam No conflicts	15 years ago
Alexander Barkov	f481c14e3e	Auto-merge	15 years ago
Vasil Dimov	2db59b4d9f	Merge mysql-5.1-bugteam -> mysql-5.5-bugteam (empty)	15 years ago
Alexander Barkov	fad763a81f	Bug#57306 SHOW PROCESSLIST does not display string literals well. Problem: Extended characters outside of ASCII range where not displayed properly in SHOW PROCESSLIST, because thd_info->query was always sent as system_character_set (utf8). This was wrong, because query buffer is never converted to utf8 - it is always have client character set. Fix: sending query buffer using query character set @ sql/sql_class.cc @ sql/sql_class.h Introducing a new class CSET_STRING, a LEX_STRING with character set. Adding set_query(&CSET_STRING) Adding reset_query(), to use instead of set_query(0, NULL). @ sql/event_data_objects.cc Using reset_query() @ sql/log_event.cc Using reset_query() Adding charset argument to set_query_and_id(). @ sql/slave.cc Using reset_query(). @ sql/sp_head.cc Changing backing up and restore code to use CSET_STRING. @ sql/sql_audit.h Using CSET_STRING. In the "else" branch it's OK not to use global_system_variables.character_set_client. &my_charset_latin1, which is set in constructor, is fine (verified with Sergey Vojtovich). @ sql/sql_insert.cc Using set_query() with proper character set: table_name is utf8. @ sql/sql_parse.cc Adding character set argument to set_query_and_id(). (This is the main point where thd->charset() is stored into thd->query_string.cs, for use in "SHOW PROCESSLIST".) Using reset_query(). @ sql/sql_prepare.cc Storing client character set into thd->query_string.cs. @ sql/sql_show.cc Using CSET_STRING to fetch and send charset-aware query information from threads. @ storage/myisam/ha_myisam.cc Using set_query() with proper character set: table_name is utf8. @ mysql-test/r/show_check.result @ mysql-test/t/show_check.test Adding tests	15 years ago
Vasil Dimov	da58ea8375	Merge mysql-5.1-bugteam from bk-internal into my local repo	15 years ago
Vasil Dimov	459c3b8f55	Merge mysql-5.5-bugteam from bk-internal into my local repo	15 years ago
Vasil Dimov	a4b86d7dae	Merge mysql-5.1-bugteam -> mysql-5.5-bugteam (empty)	15 years ago
Vasil Dimov	3cd3081ac1	Merge mysql-5.5-innodb -> mysql-5.5-bugteam	15 years ago
Vasil Dimov	3ff58881bd	Merge mysql-5.1-innodb -> mysql-5.1-bugteam	15 years ago
Davi Arnaut	a6d21fc09b	In certain phases of query processing, a interrupted error might be sent to a user even if its the connection that is actually being killed.	15 years ago
Alexander Barkov	52331c6613	Merging from mysql-5.1-bugteam.	15 years ago
Alexander Barkov	d720c49188	Bug#57279 updatexml dies with: Assertion failed: str_arg[length] == 0 Problem: crash in Item_float constructor on DBUG_ASSERT due to not null-terminated string parameter. Fix: making Item_float::Item_float non-null-termintated parameter safe: - Using temporary buffer when generating error modified: @ mysql-test/r/xml.result @ mysql-test/t/xml.test @ sql/item.cc	15 years ago
Magne Mahre	64c059b0a8	Bug#58199 name_const in the having clause crashes NAME_CONST(..) was used wrongly in a HAVING clause, and should have caused a user error. Instead, it caused a segmentation fault. During parsing, the value parameter to NAME_CONST was specified to be an uninitialized Item_ref object (it would be resolved later). During the semantic analysis, the object is tested, and since it was not initialied, the server seg.faulted. The fix is to check if the object is initialized before testing it. The same pattern has already been applied to most other methods in the Item_ref class. Bug was introduced by the optimization done as part of Bug#33546.	15 years ago
Vladislav Vaintroub	be93a81172	Bug#58272: -DBUILD_CONFIG=mysql_release is broken with cmake 2.8.3 The reason for the bug is that : - we use system checks in cmake/os/mysql_release.cmake - we include cmake/os/mysql_release.cmake using CMAKE_USER_MAKE_RULES_OVERRIDE - this (having system checks based on TRY_COMPILE inside file pointed by CMAKE_USER_MAKE_RULES_OVERRIDE does not work with cmake 2.8.3, and according to Kitware was never meant to work, it just happened to work by accident until 2.8.2 release (though, it seems not to work wiith 2.6.0 either) Related CMake bug discussing the situation: http://public.kitware.com/Bug/view.php?id=11469 The fix is to use INCLUDE instead of CMAKE_USER_MAKE_RULES_OVERRIDE as suggested by Kitware. The downside is that compile flags are not in cache, but this is pure cosmetics. The functionality is the same, flags are used for compiling are correct using INCLUDE.	15 years ago
Davi Arnaut	94c79b37a0	Fix a debug assertion caused by a missing DBUG_RETURN macro.	15 years ago
Tor Didriksen	0654c94ca2	Bug #58137 char(0) column cause: my_gcvt: Assertion `width > 0 && to != ((void *)0)' failed	15 years ago
Bjorn Munch	d718af063e	Bug #58257 mysqltest: in if(), ! $var with space is always false Evaluation would start with the space and thus ignore the $ Added while() to skip past white space	15 years ago
Georgi Kodinov	c6733ff655	Bug #57559 : Crash in Client plugin api The plugin code was releasing the plugin and only then was reporting an error referencing it. Fixed by first reporting an error and then freeing up the plugin.	15 years ago
Georgi Kodinov	bb642a5cc0	Bug #57551 : Live upgrade fails between 5.1.52 -> 5.5.7-rc Updated the server to treat a missing mysql.proxies_priv table as empty. Added some grants to make sure tables are correctly opened when they must be opened. Fixed a mysql_upgrade omission not adding rights to root to execute GRANT PROXY on other users. Removed a redundant CREATE TABLE from mysql_system_tables_fix.sql since it's always executed after mysql_system_tables.sql and the first file has CREATE TABLE in it. Added a test case for the above. Fixed error handling code to close the cursor	15 years ago
Georgi Kodinov	41a03ab9cd	merge	15 years ago
Georgi Kodinov	5dc48be160	merge	15 years ago
Sven Sandberg	a3028ec49a	Made tests clean up after themselves.	15 years ago
Bjorn Munch	f45b6605a2	avoid compilation warning about incomplete switch	15 years ago
Bjorn Munch	533e1731e9	null upmerge	15 years ago
Bjorn Munch	0b260aca41	merge from 5.5-mtr	15 years ago
Bjorn Munch	374c6447ca	upmerge 58257	15 years ago
Bjorn Munch	f6b1d5a63e	upmerge 58087	15 years ago
Bjorn Munch	0f551def8f	Tests: many if/while expresissons simplified after 57276	15 years ago
Davi Arnaut	46dd9e8658	Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.	15 years ago

1 2 3 4 5 ...

67638 Commits (b3232453a1908b4090c7965d7d55197f70ed59d3) All Branches Search

67638 Commits (b3232453a1908b4090c7965d7d55197f70ed59d3)

All Branches