mariadb

Tree: ff6cf4bb46

Author	SHA1	Message	Date
Alexey Kopytov	6fff896677	Fixed loaddata failures on some platforms in PB2.	16 years ago
Alexey Kopytov	e118ec409f	Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. Conflicts: Text conflict in sql/sql_base.cc Text conflict in sql/sql_partition.cc Text conflict in sql/sql_priv.h Text conflict in sql/sql_show.cc	16 years ago
Marko Mäkelä	dc322344fc	Merge from mysql-5.1-innodb: ------------------------------------------------------------ revno: 3458 revision-id: marko.makela@oracle.com-20100511105012-b2t7wvz6mu6bll74 parent: marko.makela@oracle.com-20100511104910-nim8kgguawpis7zo committer: Marko Mäkelä <marko.makela@oracle.com> branch nick: mysql-5.1-innodb timestamp: Tue 2010-05-11 13:50:12 +0300 message: Do not demand that buf_page_t be fully initialized on 64-bit systems. There may be padding before buf_page_t::zip. (Bug #53307)	16 years ago
Marko Mäkelä	dca77d3f18	Merge from mysql-5.1-innodb: ------------------------------------------------------------ revno: 3457 revision-id: marko.makela@oracle.com-20100511104910-nim8kgguawpis7zo parent: marko.makela@oracle.com-20100511104500-c6kzd0bg5s42p8e9 committer: Marko Mäkelä <marko.makela@oracle.com> branch nick: mysql-5.1-innodb timestamp: Tue 2010-05-11 13:49:10 +0300 message: btr_page_split_and_insert(): Add an assertion suggested by Sunny Bains when reviewing Bug #52964.	16 years ago
Marko Mäkelä	3d9c6280c4	Merge from mysql-5.1-innodb: ------------------------------------------------------------ revno: 3456 revision-id: marko.makela@oracle.com-20100511104500-c6kzd0bg5s42p8e9 parent: vasil.dimov@oracle.com-20100510132852-cz457uqvj8iiy9mm committer: Marko Mäkelä <marko.makela@oracle.com> branch nick: mysql-5.1-innodb2 timestamp: Tue 2010-05-11 13:45:00 +0300 message: Remove a stray expression. Spotted by Sunny Bains.	16 years ago
Martin Hansson	00cd994d6e	Null merge: Backport of fix for Bug#48157.	16 years ago
Martin Hansson	79e60f0a40	Bug#48157: crash in Item_field::used_tables MySQL handles the join syntax "JOIN ... USING( field1, ... )" and natural joins by building the same parse tree as a corresponding join with an "ON t1.field1 = t2.field1 ..." expression would produce. This parse tree was not cleaned up properly in the following scenario. If a thread tries to lock some tables and finds that the tables were dropped and re-created while waiting for the lock, it cleans up column references in the statement by means a per-statement free list. But if the statement was part of a stored procedure, column references on the stored procedure's free list weren't cleaned up and thus contained pointers to freed objects. Fixed by adding a call to clean up the current prepared statement's free list. This is a backport from MySQL 5.1	16 years ago
Mats Kindahl	6363f34ff9	Bug #52737 : plugin_dir is set to /usr/local/mysql/lib/plugin while starting via mysqld_safe Plugin dir was set to a hard-coded path instead of relative the base dir. This patch fixes this by using a path relative the basedir instead of the plugin directory indicated by the configuration.	16 years ago
Alexander Nozdrin	6ac630ea30	Make innodb.innodb_information_schema experimental due to Bug 48883.	16 years ago
Vasil Dimov	218d9e369c	Merge mysql-trunk-bugfixing -> mysql-trunk-innodb	16 years ago
Vasil Dimov	a25ea4220f	Merge mysql-trunk into mysql-trunk-innodb	16 years ago
Alexey Kopytov	d9a5541a34	Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. Conflicts: Text conflict in tests/mysql_client_test.c	16 years ago
Alexey Kopytov	cb421d43cd	Null merge.	16 years ago
Alexey Kopytov	c7fbc8c67c	Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. Text conflict in sql/log.cc Text conflict in sql/log.h Text conflict in sql/sql_class.cc Text conflict in sql/sql_load.cc	16 years ago
Sunny Bains	658ce61215	Add missing ';'.	16 years ago
Sunny Bains	f77390bd1a	Fix for bug#53541. We need to check whether the slot has been freed or not before trying to access the transaction instance. rb://336	16 years ago
Sunny Bains	e50bf39eba	Second part of the fix for bug#53499. We decrement the active thread count when the purge thread completes by calling srv_suspend_thread().	16 years ago
Inaam Rana	a6226390cc	Undo the changes made by Vasil in sys_vars/all_vars when adjusting for the new parameters introduced in the plugin 1.1. Now that we have basic tests for all these new parameters it is no longer needed to adjust the all_vars.result file.	16 years ago
Mattias Jonsson	6fa04cad8f	merge	16 years ago
Marko Makela	82009da5a8	Merge from mysql-5.1-innodb: ------------------------------------------------------------ revno: 3454 committer: Marko Makela <mmakela@bk-internal.mysql.com> branch nick: mysql-5.1-innodb timestamp: Mon 2010-05-10 13:37:52 +0200 message: Add an innodb test case for Bug #49164.	16 years ago
Marko Makela	baf8f1155a	Merge from mysql-5.1-innodb: ------------------------------------------------------------ revno: 3450 committer: Marko Mäkelä <marko.makela@oracle.com> branch nick: 5.1-innodb timestamp: Wed 2010-05-05 14:24:11 +0300 message: row_merge_drop_temp_indexes(): Load the table via the dictionary cache. Allow multiple indexes to be dropped. (Bug #53256)	16 years ago
Martin Hansson	6d0425b18d	Bug#50939: Loose Index Scan unduly relies on engine to remember range endpoints The Loose Index Scan optimization keeps track of a sequence of intervals. For the current interval it maintains the current interval's endpoints. But the maximum endpoint was not stored in the SQL layer; rather, it relied on the storage engine to retain this value in-between reads. By coincidence this holds for MyISAM and InnoDB. Not for the partitioning engine, however. Fixed by making the key values iterator (QUICK_RANGE_SELECT) keep track of the current maximum endpoint. This is also more efficient as we save a call through the handler API in case of open-ended intervals. The code to calculate endpoints was extracted into separate methods in QUICK_RANGE_SELECT, and it was possible to get rid of some code duplication as part of fix.	16 years ago
Sunny Bains	34860f74e4	Fix bug#53499 - purge thread is active during shutdown, assert buf/buf0buf.c line 4115. Check that all background threads are suspended or shutdown instead of just checking for the master thread. rb://333	16 years ago
Jim Winstead	6170e64f67	Using an initial command with mysql_options(..., MYSQL_INIT_COMMAND, ...) that generated multiple result sets (such as a stored procedure or a multi-statement command) would leave the connection unusable. (Bug #42373) A side-effect of this bug fix is to make MYSQL_INIT_COMMAND settings ignored when connecting from within the server, but none of the existing mechanisms for connecting from within the server use or need to set the initial command.	16 years ago
Alfranio Correia	209cccf55d	BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in mixed mode Backport of the patch for 5.1-bugteam.	16 years ago
Alexey Kopytov	5ef2bdea81	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. Conflicts: Text conflict in mysql-test/r/grant.result Text conflict in mysql-test/t/grant.test Text conflict in mysys/mf_loadpath.c Text conflict in sql/slave.cc Text conflict in sql/sql_priv.h	16 years ago
He Zhenxing	df0b6707da	Bug#53189 Table map version unused and can be removed MYSQL_BIN_LOG m_table_map_version member and it's associated functions were not used in the logic of binlogging and replication, this patch removed all related code. sql/log.cc: removed unused m_table_map_version variable and functions sql/log.h: removed unused m_table_map_version variable and functions sql/log_event.h: Removed unused LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F flag sql/sql_class.cc: Removed unused LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F flag sql/sql_load.cc: Removed unused LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F flag sql/table.cc: removed unused table_map_version variable sql/table.h: removed unused table_map_version variable	16 years ago
Calvin Sun	5995b23864	Fix compile errors on x64 Windows. Change types of srv_purge_batch_size and srv_n_purge_threads from ulint to ulong.	16 years ago
Calvin Sun	36663cc052	Clean up CMake file by removing duplicate entry for Windows. Suggested by Vlad.	16 years ago
Luis Soares	2646306cc9	BUG#49522: Replication problem with mixed MyISAM/InnoDB When using a non-transactional table (t1) on the master and with autocommit disabled, no COMMIT is recorded in the binary log ending the statement. Therefore, if the slave has t1 in a transactional engine, then it will be as if a transaction is started but never ends. This is actually BUG#29288 all over again. We fix this by cherrypicking the cset for BUG#29288 which was pushed to a later mysql version. The revision picked was: mats@sun.com-20090923094343-bnheplq8n95opjay . Additionally, a test case for covering the scenario depicted in the bug report is included in this cset.	16 years ago
Alexey Kopytov	e94c1ab135	Null merge.	16 years ago
Alexey Kopytov	77b0e89328	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. Conflicts: Text conflict in mysql-test/r/explain.result Text conflict in mysql-test/t/explain.test Text conflict in sql/net_serv.cc Text conflict in sql/sp_head.cc Text conflict in sql/sql_priv.h	16 years ago
Alexey Kopytov	e58c059695	Manual merge of local mysql-trunk-merge with bk-internal. Conflicts: Text conflict in sql/CMakeLists.txt	16 years ago
Alexander Nozdrin	783c6acd7f	Fix merge error: update test result file.	16 years ago
Alexander Nozdrin	762b535de2	Manual merge from mysql-trunk. Conflicts: - mysql-test/suite/engines/funcs/t/disabled.def - mysql-test/suite/engines/iuds/t/disabled.def - mysql-test/suite/engines/iuds/t/insert_number.test	16 years ago
Alexander Nozdrin	7519e28156	Null-merge from mysql-trunk.	16 years ago
Alexander Nozdrin	7af6ac8f3e	Auto-merge from mysql-trunk-bugfixing.	16 years ago
Martin Hansson	721ec08190	Merge of fix for Bug#52357	16 years ago
Sergey Glukhov	278ae9a8d5	Bug#53334 Incorrect result for InnoDB in LEFT JOIN with impossible condition The fix actually reverts the change introduced by the patch for bug 51494. The fact is that patches for bugs 52177&48419 fix bugs 51194&50575 as well. mysql-test/r/innodb_mysql.result: test case mysql-test/t/innodb_mysql.test: test case sql/sql_select.cc: reverted wrong fix for bug 51494	16 years ago
Gleb Shchepa	bd2a517b23	Bug #53088 : mysqldump with -T & --default-character-set set truncates text/blob to 766 chars mysqldump and SELECT ... INTO OUTFILE truncated long BLOB/TEXT values to size of 766 bytes (MAX_FIELD_WIDTH or 255 * 3 + 1). The select_export::send_data method has been modified to reallocate a conversion buffer for long field data. mysql-test/r/mysqldump.result: Test case for bug #53088. mysql-test/r/outfile_loaddata.result: Test case for bug #53088. mysql-test/t/mysqldump.test: Test case for bug #53088. mysql-test/t/outfile_loaddata.test: Test case for bug #53088. sql/sql_class.cc: Bug #53088: mysqldump with -T & --default-character-set set truncates text/blob to 766 chars The select_export::send_data method has been modified to reallocate a conversion buffer for long field data.	16 years ago
Martin Hansson	0c82d3f3f4	Merge of fix for Bug#52357	16 years ago
Martin Hansson	1eada91053	Bug#52357: Assertion failed: join->best_read in greedy_search optimizer_search_depth=0 The algorithm inside restore_prev_nj_state failed to properly update the counters within the NESTED_JOIN tree. The counter was decremented each time a table in the node was removed from the QEP, the correct thing to do being only to decrement it when the last table in the child node was removed from the plan. This lead to node counters getting negative values and the plan thus appeared impossible. An assertion caught this. Fixed by not recursing up the tree unless the last table in the join nest node is removed from the plan	16 years ago
Konstantin Osipov	9e62cf67b3	Clean-up, give better names, add comments to thd->in_multi_stmt_transaction() and thd->active_transaction(). include/mysql_com.h: Comment SERVER_STATUS_IN_TRANS flag. sql/ha_ndbcluster.cc: Rename: thd->in_multi_stmt_transaction() -> thd->in_multi_stmt_transaction_mode(). sql/handler.cc: Add comments. sql/log.cc: Rename: thd->in_multi_stmt_transaction() -> thd->in_multi_stmt_transaction_mode(). sql/log_event.cc: Rename: thd->in_multi_stmt_transaction() -> thd->in_multi_stmt_transaction_mode(). sql/sql_base.cc: Rename: thd->in_multi_stmt_transaction() -> thd->in_multi_stmt_transaction_mode(). sql/sql_cache.cc: Rename: thd->active_transaction() -> thd->in_active_multi_stmt_transaction(). sql/sql_class.cc: Rename: thd->in_multi_stmt_transaction() -> thd->in_multi_stmt_transaction_mode(). sql/sql_class.h: Rename and comment two transaction processing- related methods. sql/sql_parse.cc: Rename: thd->in_multi_stmt_transaction() -> thd->in_multi_stmt_transaction_mode(). Rename: thd->active_transaction() -> thd->in_active_multi_stmt_transaction(). sql/sql_prepare.cc: Rename: thd->in_multi_stmt_transaction() -> thd->in_multi_stmt_transaction_mode(). sql/sql_rename.cc: Rename: thd->active_transaction() -> thd->in_active_multi_stmt_transaction(). sql/sql_table.cc: Rename: thd->active_transaction() -> thd->in_active_multi_stmt_transaction(). sql/sys_vars.cc: Rename: thd->active_transaction() -> thd->in_active_multi_stmt_transaction(). sql/transaction.cc: Rename: thd->in_multi_stmt_transaction() -> thd->in_multi_stmt_transaction_mode(). Rename: thd->active_transaction() -> thd->in_active_multi_stmt_transaction().	16 years ago
Magne Mahre	b47e4fbf83	Bug#49193 CREATE TABLE reacts differently depending on whether data is selected or not Temporary and permanent tables should live in different namespaces. In this case, resolving a permanent table name gave the temporary table, resulting in a name collision.	16 years ago
Marko Mäkelä	b7ee1e6447	Merge from mysql-5.1-innodb: ------------------------------------------------------------ revno: 3449 revision-id: marko.makela@oracle.com-20100505104425-39y6qbffgotrhck2 parent: marko.makela@oracle.com-20100505104001-883pqiepo384qr5h committer: Marko Mäkelä <marko.makela@oracle.com> branch nick: 5.1-innodb timestamp: Wed 2010-05-05 13:44:25 +0300 message: Factor out innodb_multi_update.test from innodb.test	16 years ago
Alexander Nozdrin	0a032dea1f	Patch for Bug#50511 (Sometimes wrong handling of user variables containing NULL). The bug happened under the following condition: - there was a user variable of type REAL, containing NULL value - there was a table with a NOT_NULL column of any type but REAL, having default value (or auto increment); - a row was inserted into the table with the user variable as value. A warning was emitted here. The problem was that handling of NULL values of REAL type was not properly implemented: it didn't expect that REAL NULL value can be assigned to other data type. Basically, the problem was that set_field_to_null() was used instead of set_field_to_null_with_conversions(). The fix is to use the right function, or more generally, to allow conversion of REAL NULL values to other data types.	16 years ago
Alexander Barkov	3c93a784d4	Bug#51571 load xml infile causes server crash Problem: item->name was NULL for Item_user_var_as_out_param which made strcmp(something, item->name) crash in the LOAD XML code. Fix: - item_func.h: Adding set_name() in constuctor for Item_user_var_as_out_param - sql_load.cc: Changing the condition in write_execute_load_query_log_event() which distiguished between Item_user_var_as_out_param and Item_field from if (item->name == NULL) to if (item->type() == Item::FIELD_ITEM) - loadxml.result, loadxml.test: adding tests	16 years ago
Vasil Dimov	84befd1a40	Merge from bk-internal into my local branch	16 years ago
Magne Mahre	de493d92b2	Bug#48800 CREATE TABLE t...SELECT fails if t is a temporary table If a temporary table A exists, and a (permanent) table with the same name is attempted created with "CREATE TABLE ... AS SELECT", the create would fail with an error. 1050: Table 'A' already exists The error occured in MySQL 5.1 releases, but is not present in MySQL 5.5. This patch adds a regression test to ensure that the problem does not reoccur.	16 years ago
Marko Mäkelä	65aaedf93f	Merge from mysql-5.1-innodb: ------------------------------------------------------------ revno: 3446 revision-id: marko.makela@oracle.com-20100505100507-6kcd2hf32hruxbv7 parent: marko.makela@oracle.com-20100505095328-vetnl0flhmhao7p5 committer: Marko Mäkelä <marko.makela@oracle.com> branch nick: 5.1-innodb timestamp: Wed 2010-05-05 13:05:07 +0300 message: Add Valgrind diagnostics to track down Bug #38999. ------------------------------------------------------------	16 years ago

... 2 3 4 5 6 ...

65401 Commits (ff6cf4bb462cf2d6fc0b761c40639f268eb0b5f5) All Branches Search

65401 Commits (ff6cf4bb462cf2d6fc0b761c40639f268eb0b5f5)

All Branches