mariadb

Tree: 98406ba452

Author	SHA1	Message	Date
mmakela	72d602070a	branches/zip: Add debug checks to track down Issue #461 . dict_table_check_for_dup_indexes(): Add the flag tmp_ok. If !tmp_ok, check that no index name starts with TEMP_INDEX_PREFIX. ha_innobase::add_index(), ha_innobase::prepare_drop_index(), ha_innobase::final_drop_index(): Call dict_table_check_for_dup_indexes().	16 years ago
Georgi Kodinov	031d698c58	changed the version back	16 years ago
Georgi Kodinov	c9cfd2df5f	merge	16 years ago
Georgi Kodinov	e1dbabba15	merge	16 years ago
mmakela	72a38104ea	branches/zip: trx0sys.ic: Correct a typo in a comment.	16 years ago
Sergey Glukhov	c1ad5072b8	Bug#52336 Segfault / crash in 5.1 copy_fields (param=0x9872980) at sql_select.cc:15355 The problem is that we can not use make_cond_for_table(). This function relies on used_tables() condition which is not set properly for subqueries. As result subquery is not filtered out. The fix is to use remove_eq_conds() function instead of make_cond_for_table() func. 'remove_eq_conds()' algorithm relies on const_item() value and it allows to handle subqueries in right way. mysql-test/r/having.result: test case mysql-test/t/having.test: test case sql/sql_select.cc: The fix is to use remove_eq_conds() function instead of make_cond_for_table() function.	16 years ago
Gleb Shchepa	e2a546aef4	Bug #40625 : Concat fails on DOUBLE values in a Stored Procedure, while DECIMAL works Selecting of the CONCAT(...<SP variable>...) result into a user variable may return wrong data. Item_func_concat::val_str contains a number of memory allocation-saving tricks. One of them concatenates strings inplace inserting the value of one string at the beginning of the other string. However, this trick didn't care about strings those points to the same data buffer: this is possible when a CONCAT() parameter is a stored procedure variable - Item_sp_variable::val_str() uses the intermediate Item_sp_variable::str_value field, where it may store a reference to an external buffer. The Item_func_concat::val_str function has been modified to take into account val_str functions (such as Item_sp_variable::val_str) that return a pointer to an internal Item member variable that may reference to a buffer provided. mysql-test/r/func_concat.result: Test case for the bug #40625. mysql-test/t/func_concat.test: Test case for the bug #40625. sql/item_strfunc.cc: Bug #40625: Concat fails on DOUBLE values in a Stored Procedure, while DECIMAL works The Item_func_concat::val_str function has been modified to take into account val_str functions (such as Item_sp_variable::val_str) that return a pointer to an internal Item member variable that may reference to a buffer provided.	16 years ago
Anurag Shekhar	ab8ff15cd1	Bug #47904 Incorrect results w/ table subquery, derived SQs, and LEFT JOIN on index 'my_decimal' class has two members which can be used to access the value. The member variable buf (inherited from parent class decimal_t) is set to member variable buffer so that both are pointing to same value. Item_copy_decimal::copy() uses memcpy to clone 'my_decimal'. The member buffer is declared as an array and memcpy results in copying the values of the array, but the inherited member buf, which should be pointing at the begining of the array 'buffer' starts pointing to the begining of buffer in original object (which is being cloned). Further updates on 'my_decimal' updates only the inherited member 'buf' but leaves buffer unchanged. Later when the new object (which now holds a inconsistent value) is cloned again using proper cloning function 'my_decimal2decimal' the buf pointer is fixed resulting in loss of the current value. Using my_decimal2decimal instead of memcpy in Item_copy_decimal::copy() fixed this problem. mysql-test/r/subselect.result: Updated result file after addding test case for bug#47904. mysql-test/t/subselect.test: Added test case for bug#47904. sql/item.cc: Memcopy shouldn't be used to clone my_decimal. Use my_decimal2decimal instead.	16 years ago
Sergey Vojtovich	40de15baa1	Merge fix for BUG40980 to mysql-5.1-bugteam.	16 years ago
Sergey Vojtovich	0dec4ecd07	Merge innodb-zip-ss6900 to mysql-5.1-bugteam.	16 years ago
Sergey Vojtovich	ab1242b9e3	BUG#40980 - Drop table can remove another MyISAM table's data and index files It was possible if DATA/INDEX DIRECTORY is pointing to symlinked MySQL data home directory. Do not allow to drop data/index files implicitly symlinked to data home directory. For such tables remove symlink only. mysql-test/r/symlink.result: A test case for BUG#40980. mysql-test/t/symlink.test: A test case for BUG#40980. storage/myisam/mi_delete_table.c: Do not allow to drop data/index files implicitly symlinked to data home directory. For such tables remove symlink only.	16 years ago
Davi Arnaut	7ecad98c45	Bug#50755: Crash if stored routine def contains version comments The problem was that a syntactically invalid trigger could cause the server to crash when trying to list triggers. The crash would happen due to a mishap in the backup/restore procedure that should protect parser items which are not associated with the trigger. The backup/restore is used to isolate the parse tree (and context) of a statement from the load (and parsing) of a trigger. In this case, a error during the parsing of a trigger could cause the improper backup/restore sequence. The solution is to properly restore the original statement context before the parser is exited due to syntax errors in the trigger body. mysql-test/r/trigger.result: Add test case result for Bug#50755 mysql-test/t/trigger.test: Add test case for Bug#50755 sql/sp_head.cc: Merge sp_head::destroy() and sp_head destructor. Retrieve THD from the LEX so that m_thd is not necessary. sql/sql_lex.cc: Explicitly restore the original environment.	16 years ago
Ramil Kalimullin	2303a8c6e4	Manual merge.	16 years ago
Georgi Kodinov	4d0e9957ac	Bug #47453 : InnoDB incorrectly changes TIMESTAMP columns when JOINed during an UPDATE Extended the fix for bug 29310 to multi-table update: When a table is being updated it has two set of fields - fields required for checks of conditions and fields to be updated. A storage engine is allowed not to retrieve columns marked for update. Due to this fact records can't be compared to see whether the data has been changed or not. This makes the server always update records independently of data change. Now when an auto-updatable timestamp field is present and server sees that a table handle isn't going to retrieve write-only fields then all of such fields are marked as to be read to force the handler to retrieve them.	16 years ago
Vladislav Vaintroub	7b46404b14	merge	16 years ago
Vladislav Vaintroub	f72dcc9be8	Bug #48042 The description for Event ID ( 100 ) in Source ( MySQL ) cannot be found. The problem is that message resource (message.rc) is compiled as part of static library sql.lib rather than with executable mysqld.exe. resource files do not work in static libraries. The fix is to add message.rc to mysqld.exe source files list.	16 years ago
Alexey Kopytov	e67c60094f	Null merge.	16 years ago
Ramil Kalimullin	6595861f58	Fix for bug#50946: fast index creation still seems to copy the table Problem: ALTER TABLE ADD INDEX may lead to table copying if there's numeric field(s) with non-default display width modificator specified. Fix: compare numeric field's storage lenghts when we decide whether they can be considered 'equal' for table alteration purposes. mysql-test/r/error_simulation.result: Fix for bug#50946: fast index creation still seems to copy the table - test result. mysql-test/t/error_simulation.test: Fix for bug#50946: fast index creation still seems to copy the table - test case. sql/field.cc: Fix for bug#50946: fast index creation still seems to copy the table - check numeric field's pack lengths instead of it's display lenghts comparing fields equality for table alteration purposes. sql/sql_table.cc: Fix for bug#50946: fast index creation still seems to copy the table - check compare_tables() result for testing purposes.	16 years ago
Staale Smedseng	20c9177518	Bug#46261 Plugins can be installed with --skip-grant-tables Previously installed dynamic plugins are explicitly not loaded on startup with --skip-grant-tables enabled. However, INSTALL PLUGIN/UNINSTALL PLUGIN commands are allowed, and result in inconsistent error messages (reporting duplicate plugin or plugin does not exist). This patch adds a check for --skip-grant-tables mode, and returns error ER_OPTION_PREVENTS_STATEMENT to the user when the above commands are attempted.	16 years ago
Kristofer Pettersson	4859951a90	automerge	16 years ago
Kristofer Pettersson	3a626d1027	Bug#50373 --secure-file-priv="" Correcting a patch misstake. The converted file path is placed in 'buff' not in opt_secure_file_priv. mysql-test/r/loaddata.result: * Updated test case; Since secure_file_priv now is normalized the previous values are changed. sql/mysqld.cc: * Fixed patch misstake	16 years ago
Staale Smedseng	8b16a2a55b	Bug#51591 deadlock in the plugins+status+variables Unlocking/locking of LOCK_plugin in ha_ndbcluster.cc not needed anymore (but missing from the initial patch).	16 years ago
Kristofer Pettersson	95da93d7ac	Automerge	16 years ago
Kristofer Pettersson	794a441317	Bug#50373 --secure-file-priv="" The server variable opt_secure_file_priv wasn't normalized properly and caused the operations LOAD DATA INFILE .. INTO TABLE .. and SELECT load_file(..) to do different interpretations of the --secure-file-priv option. The patch moves code to the server initialization routines so that the path always is normalized once and only once. It was also intended that setting the option to an empty string should be equal to lifting all previously set restrictions. This is also fixed by this patch. sql/mysqld.cc: * If --secure_file_option is an empty string then the option variable should be unset. * opt_secure_file_option should be normalized once when the server starts. sql/sql_load.cc: * moved variable normalization code to fix_paths()	16 years ago
Staale Smedseng	9743819d36	Bug#51591 deadlock in the plugins+status+variables Potential deadlock situation involving LOCK_plugin, LOCK_global_system_variables and LOCK_status. This patch backports the fix from next-mr, unlocking LOCK_plugin before calling plugin->init() and add_status_vars().	16 years ago
Sergey Glukhov	649deaa8a1	Bug#52124 memory leaks like a sieve in datetime, timestamp, time, date fields + warnings Arg_comparator initializes 'comparators' array in case of ROW comparison and does not free this array on destruction. It leads to memory leaks. The fix: -added Arg_comparator::cleanup() method which frees 'comparators' array. -added Item_bool_func2::cleanup() method which calls Arg_comparator::cleanup() method mysql-test/r/ps.result: test case mysql-test/r/row.result: test case mysql-test/t/ps.test: test case mysql-test/t/row.test: test case sql/item_cmpfunc.h: -added Arg_comparator::cleanup() method which frees 'comparators' array. -added Item_bool_func2::cleanup() method which calls Arg_comparator::cleanup() method	16 years ago
Georgi Kodinov	16fadb10b5	Bug #52629 : memory leak from sys_var_thd_dbug in binlog.binlog_write_error When re-setting (SET GLOBAL debug='') the GLOBAL debug settings the server was not freeing the data elements from the top (initial) frame before setting them to 0 without freeing the underlying memory. As these are global settings there's a chance that something is there already. Fixed by : 1. making sure the allocated data are cleaned up before re-setting them while parsing a debug string 2. making sure the stuff allocated in the global settings is freed on shutdown.	16 years ago
Luis Soares	8fa9a5861b	automerge: merged bug clone into latest mysql-5.1-bugteam.	16 years ago
Georgi Kodinov	d066fe78e7	merge	16 years ago
Sergey Vojtovich	c37bfe0ae6	Merge fix for BUG39053 to 5.1-bugteam.	16 years ago
Sergey Vojtovich	4aa36ee7b6	BUG#39053 - UNISTALL PLUGIN does not allow the storage engine to cleanup open connections It was possible to UNINSTALL storage engine plugin when binding between THD object and storage engine is still active (e.g. in the middle of transaction). To avoid unclean deactivation (uninstall) of storage engine plugin in the middle of transaction, additional storage engine plugin lock is acquired by thd_set_ha_data(). If ha_data is not null and storage engine plugin was not locked by thd_set_ha_data() in this connection before, storage engine plugin gets locked. If ha_data is null and storage engine plugin was locked by thd_set_ha_data() in this connection before, storage engine plugin lock gets released. If handlerton::close_connection() didn't reset ha_data, server does it immediately after calling handlerton::close_connection(). Note that this is just a framework fix, storage engines must switch to thd_set_ha_data() from thd_ha_data() if they want to see fit. include/mysql/plugin.h: As thd_{get\|set}_ha_data() have some extra logic now, they must be implemented on server side. include/mysql/plugin.h.pp: As thd_{get\|set}_ha_data() have some extra logic now, they must be implemented on server side. sql/handler.cc: Make sure ha_data is reset and ha_data lock is released. sql/handler.h: hton is not supposed to be updated by ha_lock_engine(), make it const. sql/sql_class.cc: As thd_{get\|set}_ha_data() have some extra logic now, they must be implemented on server side. sql/sql_class.h: Added ha_data lock.	16 years ago
Georgi Kodinov	f34a731b6a	Bug #43594 : mysqlhotcopy does not ignore log tables and others in mysql database Added a filter to mysqlhotcopy to filter out the same tables in the 'mysql' database that mysqldump filters out.	16 years ago
Davi Arnaut	97afbf5a27	Backport revision alik@sun.com-20100223131824-comthndat57kx8s5: Add ignore pattern for valgrind messages.	16 years ago
Georgi Kodinov	83dfeb2435	Bug #47095 : Can't open_files_limit really be larger than 65535? Several problems addressed: 1. The maximum value for --open_files_limit on non-windows boxes is now raised to UINT_MAX (the maximum possible without significant changes in the code). The maximum value on windows is kept to be 2048 due to a known limitation (bug 24509). 2. mysqld_safe now supports --open_files_limit=xx in addition to --open-files-limit=xx 3. mysqld_safe always passes through --open[_-]files[_-]limit to the underlying mysqld. It used to pass it through only if it the user running the script has access to the root directory or there was an --user argument specified. 4. Fixed a prototype in my_file.c to match its counterpart in the other #ifdef branch.	16 years ago
Omer BarNir	1008fd89c4	Correction to the disabled.def file in engines/iuds that got overwritten by mistake in previous push	16 years ago
Omer BarNir	9a5d2d63f9	Updates to test files in the 'engines' suite following changes in 5.1.46	16 years ago
Sergey Glukhov	ba229d799a	Bug#52120 create view cause Assertion failed: 0, file .\item_subselect.cc, line 817 We should disable const subselect item evaluation because subselect transformation does not happen in view_prepare_mode and thus val_...() methods can not be called. mysql-test/r/ctype_ucs.result: test case mysql-test/r/view.result: test case mysql-test/t/ctype_ucs.test: test case mysql-test/t/view.test: test case sql/item.cc: disabled const subselect item evaluation in view prepare mode. sql/item_subselect.cc: added Item_subselect::safe_charset_converter which prevents const item evaluation in view prepare mode. sql/item_subselect.h: added Item_subselect::safe_charset_converter which prevents const item evaluation in view prepare mode.	16 years ago
Georgi Kodinov	01fb1c8938	merge	16 years ago
Sergey Vojtovich	377078eaf0	Applying InnoDB snapshot Detailed revision comments: r6900 \| mmakela \| 2010-03-29 13:54:57 +0300 (Mon, 29 Mar 2010) \| 5 lines branches/zip: Merge c6899 from branches/innodb+: Add debug assertions to track down Bug #52360. hash_table_t::magic_n: Add HASH_TABLE_MAGIC_N checks, which were fully absent. ut_hash_ulint(): Assert table_size > 0 before division.	16 years ago
Sergey Vojtovich	ec271fd3c7	Applying InnoDB snapshot Detailed revision comments: r6897 \| mmakela \| 2010-03-29 11:36:19 +0300 (Mon, 29 Mar 2010) \| 3 lines branches/zip: innodb_mutex_show_status(): Fix a condition that was accidentally negated in r6781, making SHOW ENGINE INNODB MUTEX STATUS display only locks with no OS waits.	16 years ago
Sergey Vojtovich	0aa607e414	Applying InnoDB snapshot Detailed revision comments: r6891 \| vdimov \| 2010-03-26 16:19:01 +0200 (Fri, 26 Mar 2010) \| 5 lines Non-functional change: update copyright year to 2010 of the files that have been modified after 2010-01-01 according to svn. for f in $(svn log -v -r{2010-01-01}:HEAD \|grep "^ M " \|cut -b 16- \|sort -u) ; do sed -i "" -E 's/(Copyright $c$ [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done	16 years ago
Sergey Vojtovich	e76abe0c9c	Applying InnoDB snapshot Detailed revision comments: r6875 \| vdimov \| 2010-03-25 18:18:15 +0200 (Thu, 25 Mar 2010) \| 4 lines branches/zip: Wrap line at 78 column in ChangeLog.	16 years ago
Sergey Vojtovich	cfd2537e26	Applying InnoDB snapshot Detailed revision comments: r6874 \| vdimov \| 2010-03-25 17:17:52 +0200 (Thu, 25 Mar 2010) \| 4 lines branches/zip: Wrap ChangeLog at 78th column	16 years ago
Sergey Vojtovich	3689c1280c	Applying InnoDB snapshot Detailed revision comments: r6873 \| vdimov \| 2010-03-25 17:06:56 +0200 (Thu, 25 Mar 2010) \| 4 lines branches/zip: Use Bug#N instead of Bug #N to be consistent with the rest of the fil.	16 years ago
Sergey Vojtovich	e94b0f2ba2	Applying InnoDB snapshot Detailed revision comments: r6872 \| vdimov \| 2010-03-25 17:03:17 +0200 (Thu, 25 Mar 2010) \| 4 lines branches/zip: Fix ChangeLog - write only the bug title in bugs.mysql.com-related entires.	16 years ago
Sergey Vojtovich	ed034065ef	Applying InnoDB snapshot Detailed revision comments: r6871 \| vdimov \| 2010-03-25 16:39:44 +0200 (Thu, 25 Mar 2010) \| 4 lines branches/zip: Whitespace fixup to be consistent with the rest of the file.	16 years ago
Sergey Vojtovich	2b33751d00	Applying InnoDB snapshot Detailed revision comments: r6868 \| mmakela \| 2010-03-25 13:03:08 +0200 (Thu, 25 Mar 2010) \| 1 line branches/zip: page_validate(): Check the buf[] bounds.	16 years ago
Sergey Vojtovich	242f45fd08	Applying InnoDB snapshot Detailed revision comments: r6864 \| mmakela \| 2010-03-24 14:05:53 +0200 (Wed, 24 Mar 2010) \| 1 line branches/zip: dtype_new_store_for_order_and_null_size(): Add ut_ad() on mtype.	16 years ago
Sergey Vojtovich	743aa8780d	Applying InnoDB snapshot Detailed revision comments: r6861 \| vdimov \| 2010-03-23 19:31:02 +0200 (Tue, 23 Mar 2010) \| 36 lines branches/zip: Merge joerg@mysql.com-20100322150231-vdq0afbqtmbs6phy from BZR, Including univ.i before mysql/plugin.h is needed to avoid this compiler error: o This is how gcc puts it: o > > ccache /usr/local/gcc-4.3.2/bin/gcc -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib -g -O3 -march=i686 -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' \|\| echo './'`trx/trx0i_s.c o > > In file included from ./include/univ.i:114, o > > from trx/trx0i_s.c:36: o > > ../../include/my_pthread.h:628: error: expected ')' before '' token o > > In file included from ../../include/my_pthread.h:732, o > > from ./include/univ.i:114, o > > from trx/trx0i_s.c:36: o > > ../../include/mysql/psi/mysql_thread.h💯 error: expected specifier-qualifier-list before 'pthread_rwlock_t' o > > ../../include/mysql/psi/mysql_thread.h:116: error: expected specifier-qualifier-list before 'pthread_rwlock_t' o > > ../../include/mysql/psi/mysql_thread.h: In function 'inline_mysql_rwlock_init': o > > ../../include/mysql/psi/mysql_thread.h:711: error: 'mysql_rwlock_t' has no member named 'm_psi' o > > ../../include/mysql/psi/mysql_thread.h:716: error: 'mysql_rwlock_t' has no member named 'm_rwlock' o > > .... ((continued)) o o Intel's icc gives slightly clearer messages: o > > icc -static-intel -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib -O3 -g -unroll2 -ip -mp -restrict -no-ftz -no-prefetch -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' \|\| echo './'`trx/trx0i_s.c o > > ../../include/my_pthread.h(628): error: identifier "pthread_rwlock_t" is undefined o > > extern int rw_pr_init(rw_pr_lock_t ); o > > ^ o > > o > > ../../include/mysql/psi/mysql_thread.h(100): error: identifier "pthread_rwlock_t" is undefined o > > rw_lock_t m_rwlock; o > > ^ o > > o > > ../../include/mysql/psi/mysql_thread.h(116): error: identifier "pthread_rwlock_t" is undefined o > > rw_pr_lock_t m_prlock; o > > ^	16 years ago
Sergey Vojtovich	7119e7b78c	Applying InnoDB snapshot Detailed revision comments: r6860 \| jyang \| 2010-03-23 18:20:36 +0200 (Tue, 23 Mar 2010) \| 5 lines branches/zip: This is patch from Inaam that uses red-black tree to speed up insertions into the flush_list and thus the recovery process. The patch has been tested by Nokia.	16 years ago

... 2 3 4 5 6 ...

62602 Commits (98406ba452be5fc8b0ee53cf69812342af1c9ffb) All Branches Search

62602 Commits (98406ba452be5fc8b0ee53cf69812342af1c9ffb)

All Branches