mariadb

Tree: a633c45592

Author	SHA1	Message	Date
Vasil Dimov	a633c45592	Convert InnoDB Plugin tests to include have_innodb_plugin.inc. This also instructs mtr to transparently load the plugin.	16 years ago
Vasil Dimov	02c597e731	Fix mtr warning in innodb-autoinc-44030.test	16 years ago
Vasil Dimov	537b806cc8	Fix a failure of innodb_plugin.innodb-autoinc-44030 now that MySQL and InnoDB dictionaries do not get out of sync.	16 years ago
Vasil Dimov	edaca4bd50	Fix a mtr warning in innodb_plugin.innodb-autoinc	16 years ago
Vasil Dimov	67b9324860	Merge from innodb-branches-zip	16 years ago
Vasil Dimov	a995f3dd0a	Merge from innodb-branches-zip	16 years ago
Vasil Dimov	164dedbad0	Move the InnoDB Plugin tests from storage/innodb_plugin/mysql-test/ where they are ignored to a new test suite "innodb_plugin". Remove a hack in mtr that was deployed to run the builtin InnoDB tests against the InnoDB Plugin. Also detect if a test is an 'innodb plugin test' and if so then transparently replace the builtin InnoDB with the InnoDB Plugin.	16 years ago
Vasil Dimov	91600911d9	Adjust mysql-test/suite/binlog/t/binlog_killed.test after a change in behavior in InnoDB. The change in behavior was introduced by this changeset: ------------------------------------------------------------ revno: 3370 revision-id: vasil.dimov@oracle.com-20100331130613-8ja7n0vh36a80457 parent: vasil.dimov@oracle.com-20100331130440-l0y517y3mjsjqy4v parent: vasil.dimov@oracle.com-20100331113119-2kbgkaz1d426a43c committer: Vasil Dimov <vasil.dimov@oracle.com> branch nick: mysql-5.1-innodb timestamp: Wed 2010-03-31 16:06:13 +0300 message: Merge from innodb-branches-5.1 ------------------------------------------------------------ revno: 0.1.819 revision-id: vasil.dimov@oracle.com-20100331113119-2kbgkaz1d426a43c parent: vasil.dimov@oracle.com-20100331064722-9rc3wypzmer7d6jj parent: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6918 committer: Vasil Dimov <vasil.dimov@oracle.com> branch nick: innodb-branches-5.1 timestamp: Wed 2010-03-31 14:31:19 +0300 message: Merge from SVN ------------------------------------------------------------ revno: 0.2.1 revision-id: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6918 parent: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6912 committer: mmakela timestamp: Wed 2010-03-31 07:14:51 +0000 message: branches/5.1: Obey KILL during a lock wait (Bug #51920). srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread(): Check trx_is_interrupted() in addition to checking the lock wait timeout. rb://279 approved by Sunny Bains	16 years ago
vdimov	ed21e31ebc	branches/zip: Adjust the innodb test after change in behavior in MySQL The change in behavior was introduced by this changeset: ------------------------------------------------------------ revno: 3405 revision-id: joro@sun.com-20100317141846-es0qyf5zcqb0hu1c parent: davi.arnaut@sun.com-20100309125156-z2c4uyqque49v61k committer: Georgi Kodinov <joro@sun.com> branch nick: B49838-5.1-bugteam timestamp: Wed 2010-03-17 16:18:46 +0200 message: Bug #49838: DROP INDEX and ADD UNIQUE INDEX for same index may corrupt definition at engine If a single ALTER TABLE contains both DROP INDEX and ADD INDEX using the same index name (a.k.a. index modification) we need to disable in-place alter table because we can't ask the storage engine to have two copies of the index with the same name even temporarily (if we first do the ADD INDEX and then DROP INDEX) and we can't modify indexes that are needed by e.g. foreign keys if we first do DROP INDEX and then ADD INDEX. Fixed the problem by disabling in-place ALTER TABLE for these cases. modified: mysql-test/r/innodb_mysql.result sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv mysql-test/t/innodb_mysql.test sp1f-innodb_mysql.test-20060816102624-6ymo37d3nyhvbqyzqn5ohsfuydwo426k sql/sql_table.cc sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu	16 years ago
Vasil Dimov	bb4e5b5484	Merge from innodb-branches-zip	16 years ago
Vasil Dimov	ed4ab4fd16	Merge from SVN	16 years ago
Vasil Dimov	e351c94ab5	Merge from innodb-branches-zip	16 years ago
Vasil Dimov	a4588d748c	Merge from innodb-branches-5.1	16 years ago
Vasil Dimov	ea028cddd2	Merge from SVN	16 years ago
Vasil Dimov	f3483f24e7	Merge from SVN	16 years ago
vdimov	55e4eb782b	branches/zip: Whitespace fixup in univ.i	16 years ago
Vasil Dimov	8bfeb4d181	Repply changes to storage/innodb_plugin/plug.in that were made by MySQL	16 years ago
Vasil Dimov	ebb514f809	Repply changes to storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt that were made by MySQL	16 years ago
csun	75b7e1b5a7	branches/zip: fix compiler errors on Windows. Move ut_ad() to after declarations for C file.	16 years ago
Vasil Dimov	b844d6acaa	Repply changes to storage/innodb_plugin/mysql-test/*.opt that were made by MySQL	16 years ago
Vasil Dimov	5ce66fdde6	Repply changes to storage/innodb_plugin/handler/ha_innodb.cc that were made by MySQL	16 years ago
Vasil Dimov	793a8e95cb	Repply changes to storage/innodb_plugin/Makefile.am that were made by MySQL	16 years ago
Vasil Dimov	3c2335be17	Reapply changes to storage/innodb_plugin/CMakeLists.txt that were made by MySQL	16 years ago
Vasil Dimov	c834fa0260	Import branches/zip@r6960 from SVN on top of storage/innodb_plugin	16 years ago
Vasil Dimov	46e5bbaa24	Merge from mysql-5.1-innodb	16 years ago
Vasil Dimov	2bfc788f7f	Merge from mysql-5.1	16 years ago
Vasil Dimov	167b68fecb	Move everything into a subdirectory xyz/	16 years ago
mmakela	c2ecefe6e8	branches/zip: innobase_init(): Correct the error message about wrong innodb_change_buffering value. Reported by Ranger.	16 years ago
mmakela	3124fbadbb	branches/zip: buf_flush_block_cmp(): Do not mix declarations and code. Stick to C90, because some build platforms are not C99 yet.	16 years ago
vdimov	3f41e58cfb	branches/zip: Whitespace fixup	16 years ago
vdimov	aff2d59043	Change the BZR property	16 years ago
vdimov	9af0bc75a7	Set some experimental properties	16 years ago
vdimov	750fc84b89	Set some experimental properties that could help with the merge into BZR.	16 years ago
vdimov	da0fe73f2d	branches/5.1: Fix ./export.sh to honor ENDREV	16 years ago
hery.ramilison@sun.com	e86bfa891d	Raise version number after cloning 5.1.46	16 years ago
mmakela	a9b806e470	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	200366a123	merge	16 years ago
Georgi Kodinov	344e45e9c9	merge	16 years ago
mmakela	60ab209323	branches/zip: trx0sys.ic: Correct a typo in a comment.	16 years ago
Sergey Glukhov	416f32050a	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.	16 years ago
Gleb Shchepa	99a0ace460	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.	16 years ago
Anurag Shekhar	92a4196045	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.	16 years ago
Sergey Vojtovich	645ee41e26	Merge fix for BUG40980 to mysql-5.1-bugteam.	16 years ago
Sergey Vojtovich	c9ed4d0bfc	Merge innodb-zip-ss6900 to mysql-5.1-bugteam.	16 years ago
Sergey Vojtovich	4050910f03	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.	16 years ago
Sergey Vojtovich	f770db5185	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	7324f7628e	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	a47cb8f055	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	905c3d993e	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	a244b1d34f	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

1 2 3 4 5 ...

62445 Commits (a633c45592338fa193df7cb89e2fc774a1ed48c2) All Branches Search

62445 Commits (a633c45592338fa193df7cb89e2fc774a1ed48c2)

All Branches