mariadb

Tree: 54d36955b2

Author	SHA1	Message	Date
Chad MILLER	4822696ecb	Pull 5.1 treatment of community features into 5.0.	17 years ago
Davi Arnaut	c715ff413a	Merge from 5.1-pe-stage into 5.1 main.	17 years ago
Davi Arnaut	29de48d836	Remove unused variable.	17 years ago
Davi Arnaut	6bee08c61d	Merge from 5.0-pe-stage into main.	17 years ago
Jim Winstead	84c5ba6ece	Fix incorrect filename in verbose output of innochecksum. (Bug #44484 , patch contributed by Andrew Hutchings)	17 years ago
Jim Winstead	3636eab703	Merge with 5.1-bugteam.	17 years ago
unknown	e83fb6cb12	Added clarification about GPL v2, changed to Sun Microsystems, Inc.	17 years ago
Bernt M. Johnsen	f27d9c267d	Bug#23471 prepared for commit in 5.1 gca branch	17 years ago
Narayanan V	32be241480	merging with mysql-5.1-bugteam	17 years ago
Martin Hansson	391364fac7	Bug#43580: Issue with Innodb on multi-table update Certain multi-updates gave different results on InnoDB from to MyISAM, due to on-the-fly updates being used on the former and the update order matters. Fixed by turning off on-the-fly updates when update order dependencies are present. mysql-test/r/innodb_mysql.result: Bug#43580: Test result. mysql-test/suite/rpl/r/rpl_slave_skip.result: Bug#43580: Changed test result. The InnoDB result is now what it would have been on MyISAM. mysql-test/t/innodb_mysql.test: Bug#43580: Test case. sql/sql_base.cc: Bug#43580: Added a word of caution about using tmp_set here. sql/sql_update.cc: Bug#43580: Fix. Calls to TABLE::mark_columns_needed_for_update() are moved from mysql_multi_update_prepare() and right before the decison to do on-the-fly updates to the place where we do (or don't do) on-the-fly updates.	17 years ago
Narayanan V	fdce101978	Bug#44232 Error msg should be improved when collation not supported. When a user selected an unsupported character set for an IBMDB2I table, error 2501 or 2511 may have been returned, giving the appearance of an internal programming error. This patch consolidates these errors into a single descriptive error message for the common case of an unsupported character set. The new error number is 2504 and indicates a user error. The errors 2501 and 2511 remain to indicate cases of internal programming errors. storage/ibmdb2i/db2i_charsetSupport.cc: Bug#44232 Error msg should be improved when collation not supported. consolidate errors 2501 and 2511 into a single descriptive error message for the common case of an unsupported character set. storage/ibmdb2i/db2i_conversion.cc: Bug#44232 Error msg should be improved when collation not supported. consolidate errors 2501 and 2511 into a single descriptive error message for the common case of an unsupported character set. storage/ibmdb2i/db2i_errors.cc: Bug#44232 Error msg should be improved when collation not supported. consolidate errors 2501 and 2511 into a single descriptive error message for the common case of an unsupported character set. storage/ibmdb2i/db2i_errors.h: Bug#44232 Error msg should be improved when collation not supported. consolidate errors 2501 and 2511 into a single descriptive error message for the common case of an unsupported character set.	17 years ago
Bernt M. Johnsen	ef65e32d70	Bug#23471 prepared for commit in 5.0 gca branch	17 years ago
Alexander Barkov	0df0070549	Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment. Problem: case conversion erroneously changes the second bytes of multi-byte sequences because single-byte functions were called in a mistake. Fix: call multi-byte aware functions instead.	17 years ago
Sergei Golubchik	ad7518418c	bug#44166 removed few sprintf's	17 years ago
Martin Hansson	7e66dbea48	Bug#44306: Assertion fail on duplicate key error in 'INSERT ... SELECT' statements Merge	17 years ago
Martin Hansson	fdd5a63fe6	Bug#44306: Assertion fail on duplicate key error in 'INSERT ... SELECT' statements The code that produces result rows expected that a duplicate row error could not occur in INSERT ... SELECT statements with unfulfilled WHERE conditions. This may happen, however, if the SELECT list contains only aggregate functions. Fixed by checking if an error occured before trying to send EOF to the client. mysql-test/r/insert_select.result: Bug#44306: Test result mysql-test/t/insert_select.test: Bug#44306: Test case sql/sql_select.cc: Bug#44306: Fix	17 years ago
Narayanan V	3023bca110	BUG#39802 On Windows, 32-bit time_t should be enforced A backport of fix for "BUG40092 - Storage engine API uses time_t datatype". Starting from MSVC C++ 2005 (v8), the default size of time_t is changed from 32-bit to 64-bit. As the result, the binaries built with pre-v8 MSVC C++ do not work with the binaries (storage engine plugins) built with v8 or after (server crashes). Fixed storage engine API to use datatype with known size (ulong) instead of time_t. sql/handler.h: Bug#39802 On Windows, 32-bit time_t should be enforced Change create_time, check_time, update_time in the ha_statistics and PARTITION_INFO structures to ulong.	17 years ago
Andrei Elkin	a83b1bdb95	removing the source of a warning in slave.cc:468	17 years ago
Satya B	a3593930ee	Additional Fix for BUG#40827 - Killing insert-select to MyISAM can cause table corruption Disabling the mysiam_debug.test in embedded mode because of BUG#43733 mysql-test/t/myisam_debug.test: Disable the test in embedded mode	17 years ago
Serge Kozlov	c5548ad7bd	Bug#38077. 1. Replace waiting of SQL thread stop by waiting of SQL error on slave and stopped SQL thread. 2. Remove debug code because it already implemented in MTR2.	17 years ago
unknown	e9f38910da	Merge from mysql-5.0.80-release	17 years ago
MySQL Build Team	12b0c92f23	merge in small portability tweaks from 5.0.80	17 years ago
MySQL Build Team	d64c0e1675	A few portability tweaks for Netware, SCO and QNX	17 years ago
Gleb Shchepa	24457353c7	auto-upmerge 5.0-bugteam --> 5.1-bugteam (bug 37362)	17 years ago
Gleb Shchepa	f0791b8b6b	Bug #37362 : Crash in do_field_eq EXPLAIN EXTENDED of nested query containing a error: 1054 Unknown column '...' in 'field list' may cause a server crash. Parse error like described above forces a call to JOIN::destroy() on malformed subquery. That JOIN::destroy function closes and frees temporary tables. However, temporary fields of these tables may be listed in st_select_lex::group_list of outer query, and that st_select_lex may not cleanup them properly. So, after the JOIN::destroy call that st_select_lex::group_list may have Item_field objects with dangling pointers to freed temporary table Field objects. That caused a crash. mysql-test/r/subselect3.result: Added test case for bug #37362. mysql-test/t/subselect3.test: Added test case for bug #37362. sql/sql_select.cc: Bug #37362: Crash in do_field_eq The JOIN::destroy function has been modified to cleanup temporary table column items.	17 years ago
Georgi Kodinov	20378a2b91	merge	17 years ago
Sergey Vojtovich	6a43ad1d53	Merge to 5.1-bugteam.	17 years ago
Andrei Elkin	75da023da6	merging from 5.0-bt rep to a local branch	17 years ago
Andrei Elkin	91199415a5	merge 5.1-bt rep -> local 5.1-bt	17 years ago
Georgi Kodinov	28b2b34e92	merged 5.0-bugteam -> 5.1-bugteam	17 years ago
Georgi Kodinov	9a50874dba	merged 5.1-main to 5.1-bugteam	17 years ago
Georgi Kodinov	abf3efe588	merged 5.0-main to 5.0-bugteam	17 years ago
Andrei Elkin	24bfa85531	moving bug#38694 test files into rpl suite	17 years ago
Andrei Elkin	a152aa32de	merging 5.0-bt to 5.1-bt	17 years ago
Narayanan V	bb668b284d	merging with mysql-5.1-bugteam	17 years ago
Andrei Elkin	cc491da07f	merge bug#44179 fixes to 5.1-bt	17 years ago
Narayanan V	db83fda90d	BUG#37631 - Incorrect key file for table after upgrading from 5.0 to 5.1 This patch adds corrections to the original patch submitted 2009-04-08 (http://lists.mysql.com/commits/71607): - fixed that the original patch didn't work because of an incorrect condition; - added a test case. mysql-test/r/upgrade.result: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 Result file for test case mysql-test/std_data/bug37631.MYD: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 table created in mysql 4.0 mysql-test/std_data/bug37631.MYI: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 table created in mysql 4.0 mysql-test/std_data/bug37631.frm: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 table created in mysql 4.0 mysql-test/t/upgrade.test: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 Adds test for checking that upgrade works on a table which is created by a mysql server version <= 4.0. storage/myisam/ha_myisam.cc: Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 Fix the conformance checker to relax checking for the correct version of the tables (for tables created by mysql server version <= 4.0)	17 years ago
Andrei Elkin	9cf91b4cd9	merging from 5.0-bt rep to a local branch	17 years ago
Andrei Elkin	2d20930eee	Bug #44179 reset slave crashes in my_error when reset_logs returns non-zero my_error() was invoked in reset_slave()'s with purge_relay_logs()-failing branch without passing sql_errno to it. Fixed with setting sql_errno= ER_RELAY_LOG_FAIL in the purge_relay_logs()-failing branch. sql/sql_repl.cc: set sql_errno= ER_RELAY_LOG_FAIL when purge_relay_logs() fails.	17 years ago
Matthias Leich	e5d859fab7	Merge of fix for Bug#44522 main.not_embedded_server fails with "--check-testcases" into actual tree	17 years ago
Sergey Glukhov	765cc53c84	automerge	17 years ago
Satya B	f74e3ee505	merget to 5.1-bugteam	17 years ago
Satya B	c6d6e889cd	Addition to the fix for BUG#40827 - Killing insert-select to MyISAM can cause table corruption Moved the testcase from the file myisam.test to the new testfile mysiam_debug.test mysql-test/r/myisam.result: Removed result file for BUG#40827 mysql-test/r/myisam_debug.result: Result file for BUG#40827 mysql-test/t/myisam.test: Removed testcase for BUG#40827 mysql-test/t/myisam_debug.test: TestCase for BUG#40827	17 years ago
Matthias Leich	44e619956b	Merge 5.0 -> 5.1 of fix for Bug 44522 This is a "null" merge because the fix is already in 5.1	17 years ago
Sergey Glukhov	5d41d82174	Bug#43962 "Packets out of order" calling a SHOW TABLE STATUS Error happens because sp_head::MULTI_RESULTS is not set for SP which has 'show table status' command. The fix is to add a SQLCOM_SHOW_TABLE_STATUS case into sp_get_flags_for_command() func. mysql-test/r/sp.result: test result mysql-test/t/sp.test: test case sql/sp_head.cc: Error happens because sp_head::MULTI_RESULTS is not set for SP which has 'show table status' command. The fix is to add a SQLCOM_SHOW_TABLE_STATUS case into sp_get_flags_for_command() func.	17 years ago
Alexey Botchkov	88139cba8e	merging	17 years ago
Alexey Botchkov	626a272ed4	mysql_client_test fixed. per-file comments: tests/mysql_client_test.c the test for bug 37956 isn't relevant anymore. The query there 'select point(?,?)' doesn't produce an error.	17 years ago
Satya B	a5badbfe6d	Fix for BUG#40827 - Killing insert-select to MyISAM can cause table corruption Killing the insert-select statement corrupts the MyISAM table only when the destination table is empty and when it has indexes. When we bulk insert huge data and if the destination table is empty we disable the indexes for fast inserts, data is then inserted and indexes are re-enabled after bulk_insert operation Killing the query, aborts the repair table operation during enable indexes phase leading to table corruption. We now truncate the table when we detect that enable indexes is killed for bulk insert query.As we have an empty table before the operation, we can fix by truncating the table. mysql-test/r/myisam.result: Result file for BUG#40827 mysql-test/t/myisam.test: Testcase for BUG#40827 storage/myisam/ha_myisam.cc: Fixed end_bulk_insert() method to truncate the table when we detect enable index operation is killed.	17 years ago
Martin Hansson	4ba05b50a2	merge	17 years ago
Vladislav Vaintroub	fbc3812022	merge	17 years ago

1 2 3 4 5 ...

57329 Commits (54d36955b2109d638d630366d91d88f37961ca6c) All Branches Search

57329 Commits (54d36955b2109d638d630366d91d88f37961ca6c)

All Branches