mariadb

Tree: d9a95a5500

Author	SHA1	Message	Date
unknown	d9a95a5500	Merged MySQL 5.1.46 GPLed documentation into MariaDB.	16 years ago
unknown	f7f9227744	Imported MySQL documentation files from ../mysql-5.1.46	16 years ago
unknown	c3a2a2d771	(Hopefully) better fix for Windows warning on redefined TAILQ_EMPTY; the previous attempt broke build on Debian4.	16 years ago
unknown	b1e00b6be8	Merge MySQL 5.1.46 into MariaDB. Still two test failures to be solved: main.myisam and main.subselect.	16 years ago
Kristian Nielsen	1f683a7270	Fix buffer overflow in COM_FIELD_LIST. sql/sql_base.cc: Replace strmov() with strnmov() to remove the possibility for buffer overflow. sql/sql_parse.cc: Reject COM_FIELD_LIST with too-big table or wildcard argument. (libmysqlclient doesn't allow sending too long arguments anyway, but we need this to protect against buffer overflow exploits).	16 years ago
Bo Thorsen	e432151e9c	Fix a bunch of Windows warnings	16 years ago
bo.thorsen	ecf23c1533	Remove unnecessary redefinition of TAILQ_EMPTY	16 years ago
bo.thorsen	006afc4908	Remove unnecessary redefinition of TAILQ_EMPTY	16 years ago
bo.thorsen	f48e47ea50	Fix Windows compile	16 years ago
Igor Babaev	5b8c42d91d	Fixed a problem of merge from mysql-5.1 baseline.	16 years ago
Michael Widenius	4a4627104d	Fixed race condition in safe_process.cc which may have caused some mysqltests to be reported as failed even if they succeded. mysql-test/lib/My/SafeProcess/safe_process.cc: Fixed race condition when getting a signal while calling waitpid() Don't send kill on killed processes Return different exit codes depending on how we die.	16 years ago
Michael Widenius	04ff96f789	Fixed syntax error and some timeing issues in test suite mysql-test/r/func_time.result: Updated result mysql-test/t/func_time.test: sysdate() could be same even with one sleep(1) in between. storage/maria/ma_loghandler.c: Fixed syntax error	16 years ago
Michael Widenius	b34262264a	Fixed suppression of compiler/test warnings Fixed some timing issues in test suite mysql-test/mysql-test-run.pl: Added suppression of errors that comes when master is killed before slave has connect (like with rpl_udf.test) mysql-test/suite/funcs_1/datadict/processlist_priv.inc: Wait for check thread to end mysql-test/suite/pbxt/t/status.test: Added longer sleep to avoid timing issue support-files/compiler_warnings.supp: Fixed wrong suppression	16 years ago
Michael Widenius	1bee590347	Removed compiler warnings Removed random failures from test suite mysql-test/extra/rpl_tests/rpl_insert_id_pk.test: Make test predicatable. mysql-test/include/maria_empty_logs.inc: We can't use 'Threads_connected' for syncronization, as the 'check_warnings' thread that just quit may still be counted in 'Threads_connected' Now we just wait until MySQLD answers again, which should be good enough for our purposes mysql-test/suite/binlog/r/binlog_index.result: Updated results file mysql-test/suite/binlog/t/binlog_index-master.opt: Added option file to not get stack traces in .err file. mysql-test/suite/binlog/t/binlog_index.test: Added 'flush tables' to remove warning about crashed suppression file from logs mysql-test/suite/pbxt/r/multi_statement.result: Updated results mysql-test/suite/pbxt/t/multi_statement-master.opt: Added options so that slow query testing makes sense sql/events.cc: Don't write Event Scheduler startup message if warnings are turned off. sql/handler.cc: Removed compiler warning sql/log.cc: Removed compiler warning sql/mysqld.cc: Added option 'test-expect-abort'; If this is set, we don't write message to log in case of 'DBUG_ABORT'. (Gives us smaller, easier to read log files) sql/set_var.cc: Removed compiler warning sql/slave.cc: Removed compiler warning sql/sql_plugin.cc: Don't write warnings about disabled plugin if using --log_warnings=0 storage/xtradb/include/ut0lst.h: Removed compiler warning support-files/compiler_warnings.supp: Supress warning from xtradb	16 years ago
Georgi Kodinov	c9cfd2df5f	merge	16 years ago
Georgi Kodinov	e1dbabba15	merge	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
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
Sergey Vojtovich	c16f76bed6	Applying InnoDB snapshot Detailed revision comments: r6858 \| mmakela \| 2010-03-23 14:09:24 +0200 (Tue, 23 Mar 2010) \| 1 line branches/zip: innodb_read_ahead_threshold: Add missing space to help string.	16 years ago
Sergey Vojtovich	4da9286ddd	Applying InnoDB snapshot Detailed revision comments: r6857 \| mmakela \| 2010-03-23 14:07:53 +0200 (Tue, 23 Mar 2010) \| 1 line branches/zip: innodb_change_buffering: Correct the documentation.	16 years ago
Sergey Vojtovich	ba580ebcf3	Applying InnoDB snapshot Detailed revision comments: r6853 \| marko \| 2010-03-22 13:35:29 +0200 (Mon, 22 Mar 2010) \| 1 line branches/zip: mutex_own(), rw_lock_own(): Add attribute((warn_unused_result)).	16 years ago
Sergey Vojtovich	b48174e6fe	Applying InnoDB snapshot, fixes BUG#52102. Detailed revision comments: r6840 \| calvin \| 2010-03-19 00:32:23 +0200 (Fri, 19 Mar 2010) \| 6 lines branches/zip: Fix Bug #52102 InnoDB Plugin shows performance drop comparing to builtin InnoDB (Windows only). Disable Windows atomics by default. Approved by: Inaam	16 years ago
Sergey Vojtovich	b5fb2639d8	Applying InnoDB snapshot Detailed revision comments: r6830 \| marko \| 2010-03-18 09:48:18 +0200 (Thu, 18 Mar 2010) \| 3 lines branches/zip: buf_page_peek_if_too_old(): Use 32-bit arithmetics when comparing the age of access_time to buf_LRU_old_threshold_ms. This fixes a bug on 64-bit systems.	16 years ago
Sergey Vojtovich	51af103725	Applying InnoDB snapshot Detailed revision comments: r6828 \| calvin \| 2010-03-17 17:16:38 +0200 (Wed, 17 Mar 2010) \| 7 lines branches/zip: rename IB_HAVE_PAUSE_INSTRUCTION to HAVE_IB_PAUSE_INSTRUCTION in CMakeLists.txt. The rename was done as r5871, but CMakeLists.txt was forgotten. Also, add INNODB_RW_LOCKS_USE_ATOMICS to CMake.	16 years ago
Sergey Vojtovich	9e8ffa495a	Applying InnoDB snapshot Detailed revision comments: r6805 \| inaam \| 2010-03-11 23:15:17 +0200 (Thu, 11 Mar 2010) \| 6 lines branches/zip issue#463 Fixed compiler warning about uninitialized variable. Non-functional change.	16 years ago
Sergey Vojtovich	624f088457	Applying InnoDB snapshot Detailed revision comments: r6801 \| marko \| 2010-03-11 13:34:28 +0200 (Thu, 11 Mar 2010) \| 2 lines branches/zip: mtr_memo_contains(): Relax the assertion of r6800, allowing mtr->state == MTR_COMMITTING.	16 years ago
Sergey Vojtovich	923d34a97f	Applying InnoDB snapshot Detailed revision comments: r6800 \| marko \| 2010-03-11 12:02:57 +0200 (Thu, 11 Mar 2010) \| 1 line branches/zip: Add ut_ad(mtr->state == MTR_ACTIVE) to various places.	16 years ago
Sergey Vojtovich	eb450e18a5	Applying InnoDB snapshot Detailed revision comments: r6799 \| jyang \| 2010-03-11 09:59:42 +0200 (Thu, 11 Mar 2010) \| 5 lines branches/zip: Once change in bug #47621 merges into zip branch, zip only test innodb_bug44571 needs to be updated to reflect the column name change would be successful be done in InnoDB as well.	16 years ago
Sergey Vojtovich	56ce1fc0d1	Applying InnoDB snapshot Detailed revision comments: r6798 \| marko \| 2010-03-11 09:53:01 +0200 (Thu, 11 Mar 2010) \| 14 lines branches/zip: Fix and clarify the latching of some buf_block_t members. buf_block_t::check_index_page_at_flush: Note that this field is not protected by any mutex. Make it a separate field, not a bitfield that could share the machine word with other fields. buf_block_t::lock_hash_val: Note that this field is protected by buf_block_t::lock (or during block creation, by buf_pool_mutex and buf_block_t::mutex). buf_block_get_lock_hash_val(): Assert that block->lock is held by the current thread. Issue #465, rb://267 approved by Inaam Rana	16 years ago
Sergey Vojtovich	2b38090990	Applying InnoDB snapshot Detailed revision comments: r6792 \| marko \| 2010-03-10 13:56:41 +0200 (Wed, 10 Mar 2010) \| 1 line branches/zip: Copy tests from branches/5.1 that were lost in some merge. r6793 \| marko \| 2010-03-10 14:02:19 +0200 (Wed, 10 Mar 2010) \| 60 lines branches/zip: Merge revisions 6669:6788 from branches/5.1: ------------------------------------------------------------------------ r6774 \| calvin \| 2010-03-03 23:56:10 +0200 (Wed, 03 Mar 2010) \| 2 lines Changed paths: M /branches/5.1/trx/trx0sys.c branches/5.1: fix bug#51653: outdated reference to set-variable Non functional change. ------------------------------------------------------------------------ r6780 \| vasil \| 2010-03-08 19:13:20 +0200 (Mon, 08 Mar 2010) \| 4 lines Changed paths: M /branches/5.1/plug.in branches/5.1: Whitespace fixup. ------------------------------------------------------------------------ r6783 \| jyang \| 2010-03-09 17:54:14 +0200 (Tue, 09 Mar 2010) \| 9 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb_bug21704.result A /branches/5.1/mysql-test/innodb_bug47621.result A /branches/5.1/mysql-test/innodb_bug47621.test branches/5.1: Fix bug #47621 "MySQL and InnoDB data dictionaries will become out of sync when renaming columns". MySQL does not provide new column name information to storage engine to update the system table. To avoid column name mismatch, we shall just request a table copy for now. rb://246 approved by Marko. ------------------------------------------------------------------------ r6785 \| vasil \| 2010-03-10 09:04:38 +0200 (Wed, 10 Mar 2010) \| 11 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug38231.test branches/5.1: Add the missing --reap statements in innodb_bug38231.test. Probably MySQL enforced the presence of those recently and the test started failing like: main.innodb_bug38231 [ fail ] Test ended at 2010-03-10 08:48:32 CURRENT_TEST: main.innodb_bug38231 mysqltest: At line 49: Cannot run query on connection between send and reap ------------------------------------------------------------------------ r6788 \| vasil \| 2010-03-10 10:53:21 +0200 (Wed, 10 Mar 2010) \| 8 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug38231.test branches/5.1: In innodb_bug38231.test: replace the fragile sleep 0.2 that depends on timing with a more robust condition which waits for the TRUNCATE and LOCK commands to appear in information_schema.processlist. This could also break if there are other sessions executing the same SQL commands, but there are none during the execution of the mysql test. ------------------------------------------------------------------------	16 years ago
Sergey Vojtovich	96322594b2	Applying InnoDB snapshot Detailed revision comments: r6791 \| marko \| 2010-03-10 13:39:06 +0200 (Wed, 10 Mar 2010) \| 1 line branches/zip: Add ChangeLog entries for r6789, r6790.	16 years ago
Sergey Vojtovich	1fb843587c	Applying InnoDB snapshot, fixes BUG#51356. Detailed revision comments: r6790 \| jyang \| 2010-03-10 13:09:41 +0200 (Wed, 10 Mar 2010) \| 7 lines branches/zip: Fix bug #51356: "many valgrind errors in error messages with concurrent ddl". Null terminate the name string returned from innobase_convert_identifier() call when reporting DB_DUPLICATE_KEY error in create_table_def(). rb://266 approved by Marko	16 years ago
Sergey Vojtovich	5676876884	Applying InnoDB snapshot, fixes BUG#51378. Detailed revision comments: r6789 \| jyang \| 2010-03-10 11:18:18 +0200 (Wed, 10 Mar 2010) \| 10 lines branches/zip: If a unique index is on a column prefix, such unique index cannot be upgrade to primary index even if there is no primary index already defined. Also fix possible corruption when initialize "ref_length" value in case there is a mismatch between MySQL and InnoDB primary key. Fix bug #51378: "Init 'ref_length' to correct value, in case an out of bound MySQL primary_key". rb://262 approved by Marko.	16 years ago
Sergey Vojtovich	179b3380b3	Applying InnoDB snapshot Detailed revision comments: r6787 \| marko \| 2010-03-10 10:35:06 +0200 (Wed, 10 Mar 2010) \| 10 lines branches/zip: recv_parse_log_rec(): Remove a bogus assertion about page_no. TODO: We might also consider removing recv_max_parsed_page_no, because it does not make much sense with *.ibd files. recv_report_corrupt_log(), recv_scan_log_recs(): Abort when a corrupted log record has been found, unless innodb_force_recovery has been set. This fixes Issue #464. rb://265 approved by Heikki Tuuri	16 years ago

1 2 3 4 5 ...

61064 Commits (d9a95a550055727983472cc530f9d27872293cb6) All Branches Search

61064 Commits (d9a95a550055727983472cc530f9d27872293cb6)

All Branches