Vasil Dimov
8b22035f63
Disable innodb.innodb_bug38231 in embedded mode
...
The --send command does not seem to work as expected in that mode.
2010-05-12 10:42:28 +03:00
Marko Mäkelä
8079d0d635
Merge from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3459
revision-id: marko.makela@oracle.com-20100511105308-grp2t3prh3tqivw0
parent: marko.makela@oracle.com-20100511105012-b2t7wvz6mu6bll74
parent: marko.makela@oracle.com-20100505123901-xjxu93h1xnbkfkq0
committer: Marko Mäkelä <marko.makela@oracle.com >
branch nick: mysql-5.1-innodb
timestamp: Tue 2010-05-11 13:53:08 +0300
message:
Merge a patch from Facebook to fix Bug #53290
commit e759bc64eb5c5eed4f75677ad67246797d486460
Author: Ryan Mack
Date: 3 days ago
Bugfix for 53290, fast unique index creation fails on duplicate null values
Summary:
Bug in the fast index creation code incorrectly considers null
values to be duplicates during block merging. Innodb policy is that
multiple null values are allowed in a unique index. Null duplicates
were correctly ignored while sorting individual blocks and with slow
index creation.
Test Plan:
mtr, including new test, load dbs using deferred index creation
License:
Copyright (C) 2009-2010 Facebook, Inc. All Rights Reserved.
Dual licensed under BSD license and GPLv2.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY FACEBOOK, INC. ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT SHALL FACEBOOK, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
------------------------------------------------------------
revno: 3453.2.1
revision-id: marko.makela@oracle.com-20100505123901-xjxu93h1xnbkfkq0
parent: marko.makela@oracle.com-20100505120555-ukoq1gklpheslrxs
committer: Marko Mäkelä <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-05-05 15:39:01 +0300
message:
Merge a contribution from Ryan Mack at Facebook:
Bugfix for 53290, fast unique index creation fails on duplicate null values
Summary:
Bug in the fast index creation code incorrectly considers null
values to be duplicates during block merging. Innodb policy is that
multiple null values are allowed in a unique index. Null duplicates
were correctly ignored while sorting individual blocks and with slow
index creation.
Test Plan:
mtr, including new test, load dbs using deferred index creation
DiffCamp Revision: 110840
Reviewed By: mcallaghan
CC: mcallaghan, mysql-devel@lists
Revert Plan:
OK
2010-05-11 19:18:28 +03:00
Marko Mäkelä
65c34aaf41
Merge from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3459
revision-id: marko.makela@oracle.com-20100511105308-grp2t3prh3tqivw0
parent: marko.makela@oracle.com-20100511105012-b2t7wvz6mu6bll74
parent: marko.makela@oracle.com-20100505123901-xjxu93h1xnbkfkq0
committer: Marko Mäkelä <marko.makela@oracle.com >
branch nick: mysql-5.1-innodb
timestamp: Tue 2010-05-11 13:53:08 +0300
message:
Merge a patch from Facebook to fix Bug #53290
commit e759bc64eb5c5eed4f75677ad67246797d486460
Author: Ryan Mack
Date: 3 days ago
Bugfix for 53290, fast unique index creation fails on duplicate null values
Summary:
Bug in the fast index creation code incorrectly considers null
values to be duplicates during block merging. Innodb policy is that
multiple null values are allowed in a unique index. Null duplicates
were correctly ignored while sorting individual blocks and with slow
index creation.
Test Plan:
mtr, including new test, load dbs using deferred index creation
License:
Copyright (C) 2009-2010 Facebook, Inc. All Rights Reserved.
Dual licensed under BSD license and GPLv2.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY FACEBOOK, INC. ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT SHALL FACEBOOK, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
------------------------------------------------------------
revno: 3453.2.1
revision-id: marko.makela@oracle.com-20100505123901-xjxu93h1xnbkfkq0
parent: marko.makela@oracle.com-20100505120555-ukoq1gklpheslrxs
committer: Marko Mäkelä <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-05-05 15:39:01 +0300
message:
Merge a contribution from Ryan Mack at Facebook:
Bugfix for 53290, fast unique index creation fails on duplicate null values
Summary:
Bug in the fast index creation code incorrectly considers null
values to be duplicates during block merging. Innodb policy is that
multiple null values are allowed in a unique index. Null duplicates
were correctly ignored while sorting individual blocks and with slow
index creation.
Test Plan:
mtr, including new test, load dbs using deferred index creation
DiffCamp Revision: 110840
Reviewed By: mcallaghan
CC: mcallaghan, mysql-devel@lists
Revert Plan:
OK
2010-05-11 19:18:28 +03:00
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 .
2010-05-10 15:14:45 +02:00
Marko Makela
a2ea94bac7
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 .
2010-05-10 15:14:45 +02:00
Marko Makela
6b062319d4
Add an innodb test case for Bug #49164 .
2010-05-10 13:37:52 +02:00
Marko Makela
b092cd2f15
Add an innodb test case for Bug #49164 .
2010-05-10 13:37:52 +02:00
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
2010-05-05 14:03:14 +03:00
Marko Mäkelä
bc7dcdc0b1
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
2010-05-05 14:03:14 +03:00
Marko Mäkelä
e73feed2d8
Factor out innodb_multi_update.test from innodb.test
2010-05-05 13:40:01 +03:00
Marko Mäkelä
f9a7a32414
Factor out innodb_multi_update.test from innodb.test
2010-05-05 13:40:01 +03:00
Vasil Dimov
e4bf42a10a
Fix path to include file in innodb_bug52745.test
2010-05-05 13:13:58 +03:00
Vasil Dimov
781debb59b
Fix path to include file in innodb_bug52745.test
2010-05-05 13:13:58 +03:00
Vasil Dimov
eede696ad8
Fix path to include file.
2010-05-05 13:13:05 +03:00
Vasil Dimov
484741475e
Fix path to include file.
2010-05-05 13:13:05 +03:00
Marko Mäkelä
304daa7431
fsp_init_file_page_low(): Zero out the page. (Bug #53306 )
2010-05-04 16:13:58 +03:00
Marko Mäkelä
dc29792ff2
fsp_init_file_page_low(): Zero out the page. (Bug #53306 )
2010-05-04 16:13:58 +03:00
Vasil Dimov
a5db3eff62
Merge from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3419
revision-id: marko.makela@oracle.com-20100426110856-14tc8re1f5kp5j3g
parent: marko.makela@oracle.com-20100426105215-2e9nzq8z0nfwxjky
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Mon 2010-04-26 14:08:56 +0300
message:
Add a test case for Bug #52745 .
added:
mysql-test/suite/innodb_plugin/r/innodb_bug52745.result innodb_bug52745.resu-20100426110444-2211220xcgz0el4v-1
mysql-test/suite/innodb_plugin/t/innodb_bug52745.test innodb_bug52745.test-20100426110444-2211220xcgz0el4v-2
------------------------------------------------------------
2010-05-04 13:15:46 +03:00
Vasil Dimov
f6181a3e76
Merge from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3419
revision-id: marko.makela@oracle.com-20100426110856-14tc8re1f5kp5j3g
parent: marko.makela@oracle.com-20100426105215-2e9nzq8z0nfwxjky
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Mon 2010-04-26 14:08:56 +0300
message:
Add a test case for Bug #52745 .
added:
mysql-test/suite/innodb_plugin/r/innodb_bug52745.result innodb_bug52745.resu-20100426110444-2211220xcgz0el4v-1
mysql-test/suite/innodb_plugin/t/innodb_bug52745.test innodb_bug52745.test-20100426110444-2211220xcgz0el4v-2
------------------------------------------------------------
2010-05-04 13:15:46 +03:00
Vasil Dimov
f18d97ace8
Merge from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3417
revision-id: marko.makela@oracle.com-20100426102725-as2vc44ddykg1786
parent: marko.makela@oracle.com-20100426073949-txnbqldrl9fdlapx
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Mon 2010-04-26 13:27:25 +0300
message:
row_search_for_mysql(): Never try semi-consistent read in unique searches.
They are only useful in table scans. (Bug #52663 )
added:
mysql-test/suite/innodb/r/innodb_bug52663.result innodb_bug52663.resu-20100426102328-fymyevkummgyc3gm-1
mysql-test/suite/innodb/t/innodb_bug52663-master.opt innodb_bug52663maste-20100426102328-fymyevkummgyc3gm-2
mysql-test/suite/innodb/t/innodb_bug52663.test innodb_bug52663.test-20100426102328-fymyevkummgyc3gm-3
mysql-test/suite/innodb_plugin/r/innodb_bug52663.result innodb_bug52663.resu-20100426102328-fymyevkummgyc3gm-4
mysql-test/suite/innodb_plugin/t/innodb_bug52663.test innodb_bug52663.test-20100426102328-fymyevkummgyc3gm-5
modified:
storage/innobase/row/row0sel.c 2@cee13dc7-1704-0410-992b-c9b4543f1246:trunk%2Frow%2Frow0sel.c
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/row/row0sel.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frow%2Frow0sel.c
------------------------------------------------------------
2010-05-04 12:51:25 +03:00
Vasil Dimov
5d2f6e7c94
Merge from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3417
revision-id: marko.makela@oracle.com-20100426102725-as2vc44ddykg1786
parent: marko.makela@oracle.com-20100426073949-txnbqldrl9fdlapx
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Mon 2010-04-26 13:27:25 +0300
message:
row_search_for_mysql(): Never try semi-consistent read in unique searches.
They are only useful in table scans. (Bug #52663 )
added:
mysql-test/suite/innodb/r/innodb_bug52663.result innodb_bug52663.resu-20100426102328-fymyevkummgyc3gm-1
mysql-test/suite/innodb/t/innodb_bug52663-master.opt innodb_bug52663maste-20100426102328-fymyevkummgyc3gm-2
mysql-test/suite/innodb/t/innodb_bug52663.test innodb_bug52663.test-20100426102328-fymyevkummgyc3gm-3
mysql-test/suite/innodb_plugin/r/innodb_bug52663.result innodb_bug52663.resu-20100426102328-fymyevkummgyc3gm-4
mysql-test/suite/innodb_plugin/t/innodb_bug52663.test innodb_bug52663.test-20100426102328-fymyevkummgyc3gm-5
modified:
storage/innobase/row/row0sel.c 2@cee13dc7-1704-0410-992b-c9b4543f1246:trunk%2Frow%2Frow0sel.c
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/row/row0sel.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frow%2Frow0sel.c
------------------------------------------------------------
2010-05-04 12:51:25 +03:00
Vasil Dimov
08c8407439
Merge from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3415
revision-id: calvin.sun@oracle.com-20100422191614-2atswbilyyxep6rm
parent: marko.makela@oracle.com-20100422093342-jf9ojlzdqsdebohn
committer: Calvin Sun <calvin.sun@oracle.com >
branch nick: mysql-5.1-innodb
timestamp: Thu 2010-04-22 14:16:14 -0500
message:
mysql-5.1-innodb: add error codes to innodb_bug51920.test
kill of active connection yields different error code
depending on platform.
modified:
mysql-test/suite/innodb/r/innodb_bug51920.result 6918@cee13dc7-1704-0410-992b-c9b4543f1246:branches%2F5.1%2Fmysql-test%2Finnodb_bug51920.result
mysql-test/suite/innodb/t/innodb_bug51920.test 6918@cee13dc7-1704-0410-992b-c9b4543f1246:branches%2F5.1%2Fmysql-test%2Finnodb_bug51920.test
mysql-test/suite/innodb_plugin/r/innodb_bug51920.result 6919@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug51920.result
mysql-test/suite/innodb_plugin/t/innodb_bug51920.test 6919@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug51920.test
------------------------------------------------------------
2010-05-04 12:40:41 +03:00
Vasil Dimov
46b1ee7330
Merge from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3415
revision-id: calvin.sun@oracle.com-20100422191614-2atswbilyyxep6rm
parent: marko.makela@oracle.com-20100422093342-jf9ojlzdqsdebohn
committer: Calvin Sun <calvin.sun@oracle.com >
branch nick: mysql-5.1-innodb
timestamp: Thu 2010-04-22 14:16:14 -0500
message:
mysql-5.1-innodb: add error codes to innodb_bug51920.test
kill of active connection yields different error code
depending on platform.
modified:
mysql-test/suite/innodb/r/innodb_bug51920.result 6918@cee13dc7-1704-0410-992b-c9b4543f1246:branches%2F5.1%2Fmysql-test%2Finnodb_bug51920.result
mysql-test/suite/innodb/t/innodb_bug51920.test 6918@cee13dc7-1704-0410-992b-c9b4543f1246:branches%2F5.1%2Fmysql-test%2Finnodb_bug51920.test
mysql-test/suite/innodb_plugin/r/innodb_bug51920.result 6919@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug51920.result
mysql-test/suite/innodb_plugin/t/innodb_bug51920.test 6919@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug51920.test
------------------------------------------------------------
2010-05-04 12:40:41 +03:00
Sunny Bains
f232dfbf82
Fix failing tests.
2010-05-01 07:54:14 +10:00
Sunny Bains
49b2c09248
Fix failing tests.
2010-05-01 07:54:14 +10:00
Vasil Dimov
3bffc40a24
Disable innodb.innodb, main.ps_3innodb and main.partition_innodb_plugin
...
mysql-tests because those emit (spurious?) valgrind warnings.
2010-04-30 13:02:36 +03:00
Vasil Dimov
8e6e163473
Disable innodb.innodb, main.ps_3innodb and main.partition_innodb_plugin
...
mysql-tests because those emit (spurious?) valgrind warnings.
2010-04-30 13:02:36 +03:00
unknown
b1e00b6be8
Merge MySQL 5.1.46 into MariaDB.
...
Still two test failures to be solved: main.myisam and main.subselect.
2010-04-28 14:52:24 +02:00
Vasil Dimov
c5ca0da1e8
Merge 3417..3421 from mysql-5.1-innodb
2010-04-27 09:16:45 +03:00
Vasil Dimov
e3dc155d60
Merge 3417..3421 from mysql-5.1-innodb
2010-04-27 09:16:45 +03:00
Vasil Dimov
777c194cda
Split the innodb.innodb mysql-test.
...
Extract part of innodb.innodb into innodb.innodb_misc1
This is needed in order to be able to more easily debug this test,
under valgrind, it is too huge.
2010-04-27 09:09:08 +03:00
Vasil Dimov
2a97503d06
Split the innodb.innodb mysql-test.
...
Extract part of innodb.innodb into innodb.innodb_misc1
This is needed in order to be able to more easily debug this test,
under valgrind, it is too huge.
2010-04-27 09:09:08 +03:00
Marko Mäkelä
063928ba05
row_search_for_mysql(): Never try semi-consistent read in unique searches.
...
They are only useful in table scans. (Bug #52663 )
2010-04-26 13:27:25 +03:00
Marko Mäkelä
30b15fae14
row_search_for_mysql(): Never try semi-consistent read in unique searches.
...
They are only useful in table scans. (Bug #52663 )
2010-04-26 13:27:25 +03:00
Vasil Dimov
75d28784f8
Fix typo in comment in innodb_bug38231.test
2010-04-23 17:12:56 +03:00
Vasil Dimov
e54c2e009d
Fix typo in comment in innodb_bug38231.test
2010-04-23 17:12:56 +03:00
Calvin Sun
44bac2ea9c
mysql-5.1-innodb: add error codes to innodb_bug51920.test
...
kill of active connection yields different error code
depending on platform.
2010-04-22 14:16:14 -05:00
Calvin Sun
5bad43c1ff
mysql-5.1-innodb: add error codes to innodb_bug51920.test
...
kill of active connection yields different error code
depending on platform.
2010-04-22 14:16:14 -05:00
Vasil Dimov
66b4a1e614
Merge r3403..3414 from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3414
revision-id: marko.makela@oracle.com-20100422093342-jf9ojlzdqsdebohn
parent: marko.makela@oracle.com-20100421185359-8qaxoa2yyrpzwdd7
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Thu 2010-04-22 12:33:42 +0300
message:
Correct the definition of DICT_SYS_INDEXES_NAME_FIELD.
When row_merge_drop_temp_indexes() was reworked to drop the indexes
via the data dictionary cache, the code was broken because it would
read the index name from the wrong field.
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/dict/dict0boot.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0boot.c
storage/innodb_plugin/include/dict0boot.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0boot.h
------------------------------------------------------------
revno: 3413
revision-id: marko.makela@oracle.com-20100421185359-8qaxoa2yyrpzwdd7
parent: marko.makela@oracle.com-20100421102723-0i80uezbyu0ekj5d
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 21:53:59 +0300
message:
btr_page_split_and_insert(): Avoid an infinite loop. (Bug #52964 )
btr_page_tuple_smaller(): New function, refactored from
btr_page_split_and_insert().
btr_page_get_split_rec(): Renamed from btr_page_get_sure_split_rec().
Note that a NULL return may mean that the tuple is to be inserted into
either the lower or upper page, to be determined by btr_page_tuple_smaller().
btr_page_split_and_insert(): When btr_page_get_split_rec() returns NULL,
invoke btr_page_tuple_smaller() to determine which half-page the tuple
belongs to.
Reviewed by Sunny Bains
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
------------------------------------------------------------
revno: 3412
revision-id: marko.makela@oracle.com-20100421102723-0i80uezbyu0ekj5d
parent: marko.makela@oracle.com-20100421100029-mji6lmdgvuqh96qq
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 13:27:23 +0300
message:
dict_create_index_step(): Be strict about DYNAMIC and COMPRESSED tables.
Bug #50495 is about REDUNDANT and COMPACT tables, after all.
modified:
mysql-test/suite/innodb_plugin/r/innodb-zip.result 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.result
mysql-test/suite/innodb_plugin/t/innodb-zip.test 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.test
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/dict/dict0crea.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0crea.c
------------------------------------------------------------
revno: 3411
revision-id: marko.makela@oracle.com-20100421100029-mji6lmdgvuqh96qq
parent: marko.makela@oracle.com-20100421095033-0acvzxb8um8cms0a
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 13:00:29 +0300
message:
ha_innobase::add_index(): Only check for duplicate indexes
when the data dictionary is locked.
This fixes a UNIV_DEBUG assertion failure in innodb-index.test.
modified:
storage/innodb_plugin/handler/handler0alter.cc 1845@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fhandler%2Fhandler0alter.cc
------------------------------------------------------------
revno: 3410
revision-id: marko.makela@oracle.com-20100421095033-0acvzxb8um8cms0a
parent: marko.makela@oracle.com-20100421094032-ir4glqk46qvg2ywn
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 12:50:33 +0300
message:
dtuple_convert_big_rec(): Store locally any fields whose maximum length
is less than 256 bytes. (Bug #52745 )
Add related comments and debug assertions to the "offsets"
functions in rem0rec.c.
Approved by Sunny Bains
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/data/data0data.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdata%2Fdata0data.c
storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c
------------------------------------------------------------
revno: 3409
revision-id: marko.makela@oracle.com-20100421094032-ir4glqk46qvg2ywn
parent: marko.makela@oracle.com-20100421091611-uu46iygmv5sizjru
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 12:40:32 +0300
message:
Adjust tests for the Bug #50495 fix.
modified:
mysql-test/suite/innodb_plugin/r/innodb-zip.result 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.result
mysql-test/suite/innodb_plugin/t/innodb-zip.test 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.test
mysql-test/suite/innodb_plugin/t/innodb_bug36169.test 2418@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug36169.test
------------------------------------------------------------
revno: 3408
revision-id: marko.makela@oracle.com-20100421091611-uu46iygmv5sizjru
parent: marko.makela@oracle.com-20100421063916-h3gwjea7jzjilyww
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 12:16:11 +0300
message:
rec_convert_dtuple_to_rec(): Correct the debug check.
The "extern" accessor functions return zero or nonzero, not 0 or 1.
modified:
storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c
------------------------------------------------------------
revno: 3407
revision-id: marko.makela@oracle.com-20100421063916-h3gwjea7jzjilyww
parent: marko.makela@oracle.com-20100420201550-cax1xywvlcdshgfg
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 09:39:16 +0300
message:
rec_convert_dtuple_to_rec(): Add a debug check.
modified:
storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c
------------------------------------------------------------
revno: 3406
revision-id: marko.makela@oracle.com-20100420201550-cax1xywvlcdshgfg
parent: marko.makela@oracle.com-20100420114222-diq7h2hiom9ww6me
committer: Marko Makela <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Tue 2010-04-20 23:15:50 +0300
message:
btr_cur_optimistic_insert(): Remove unused variable "heap".
modified:
storage/innodb_plugin/btr/btr0cur.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0cur.c
------------------------------------------------------------
revno: 3405
revision-id: marko.makela@oracle.com-20100420114222-diq7h2hiom9ww6me
parent: marko.makela@oracle.com-20100420082908-tpako8jd4imkh1xb
committer: Marko Makela <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Tue 2010-04-20 14:42:22 +0300
message:
dict_create_index_step(): Invoke dict_index_add_to_cache()
in strict mode only if innodb_strict_mode is set. (Bug #50495 )
trx_is_strict(): New function, for checking innodb_strict_mode.
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/dict/dict0crea.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0crea.c
storage/innodb_plugin/handler/ha_innodb.cc 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
storage/innodb_plugin/include/trx0trx.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Ftrx0trx.h
------------------------------------------------------------
revno: 3404
revision-id: marko.makela@oracle.com-20100420082908-tpako8jd4imkh1xb
parent: marko.makela@oracle.com-20100419103603-u5pz4qc6hfhx4nua
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Tue 2010-04-20 11:29:08 +0300
message:
Implement UNIV_BTR_AVOID_COPY, an optimization of page splits.
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
storage/innodb_plugin/include/univ.i 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i
------------------------------------------------------------
revno: 3403
revision-id: marko.makela@oracle.com-20100419103603-u5pz4qc6hfhx4nua
parent: marko.makela@oracle.com-20100419094405-fd3xwadullishv07
committer: Marko =?ISO-8859-1?Q?M=E4kel=E4?= <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Mon 2010-04-19 13:36:03 +0300
message:
Enable UNIV_DEBUG_VALGRIND when HAVE_purify is set.
modified:
storage/innobase/include/univ.i 2@cee13dc7-1704-0410-992b-c9b4543f1246:trunk%2Finclude%2Funiv.i
storage/innodb_plugin/include/univ.i 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i
2010-04-22 14:24:42 +03:00
Vasil Dimov
0ecec12df3
Merge r3403..3414 from mysql-5.1-innodb:
...
------------------------------------------------------------
revno: 3414
revision-id: marko.makela@oracle.com-20100422093342-jf9ojlzdqsdebohn
parent: marko.makela@oracle.com-20100421185359-8qaxoa2yyrpzwdd7
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Thu 2010-04-22 12:33:42 +0300
message:
Correct the definition of DICT_SYS_INDEXES_NAME_FIELD.
When row_merge_drop_temp_indexes() was reworked to drop the indexes
via the data dictionary cache, the code was broken because it would
read the index name from the wrong field.
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/dict/dict0boot.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0boot.c
storage/innodb_plugin/include/dict0boot.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0boot.h
------------------------------------------------------------
revno: 3413
revision-id: marko.makela@oracle.com-20100421185359-8qaxoa2yyrpzwdd7
parent: marko.makela@oracle.com-20100421102723-0i80uezbyu0ekj5d
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 21:53:59 +0300
message:
btr_page_split_and_insert(): Avoid an infinite loop. (Bug #52964 )
btr_page_tuple_smaller(): New function, refactored from
btr_page_split_and_insert().
btr_page_get_split_rec(): Renamed from btr_page_get_sure_split_rec().
Note that a NULL return may mean that the tuple is to be inserted into
either the lower or upper page, to be determined by btr_page_tuple_smaller().
btr_page_split_and_insert(): When btr_page_get_split_rec() returns NULL,
invoke btr_page_tuple_smaller() to determine which half-page the tuple
belongs to.
Reviewed by Sunny Bains
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
------------------------------------------------------------
revno: 3412
revision-id: marko.makela@oracle.com-20100421102723-0i80uezbyu0ekj5d
parent: marko.makela@oracle.com-20100421100029-mji6lmdgvuqh96qq
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 13:27:23 +0300
message:
dict_create_index_step(): Be strict about DYNAMIC and COMPRESSED tables.
Bug #50495 is about REDUNDANT and COMPACT tables, after all.
modified:
mysql-test/suite/innodb_plugin/r/innodb-zip.result 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.result
mysql-test/suite/innodb_plugin/t/innodb-zip.test 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.test
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/dict/dict0crea.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0crea.c
------------------------------------------------------------
revno: 3411
revision-id: marko.makela@oracle.com-20100421100029-mji6lmdgvuqh96qq
parent: marko.makela@oracle.com-20100421095033-0acvzxb8um8cms0a
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 13:00:29 +0300
message:
ha_innobase::add_index(): Only check for duplicate indexes
when the data dictionary is locked.
This fixes a UNIV_DEBUG assertion failure in innodb-index.test.
modified:
storage/innodb_plugin/handler/handler0alter.cc 1845@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fhandler%2Fhandler0alter.cc
------------------------------------------------------------
revno: 3410
revision-id: marko.makela@oracle.com-20100421095033-0acvzxb8um8cms0a
parent: marko.makela@oracle.com-20100421094032-ir4glqk46qvg2ywn
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 12:50:33 +0300
message:
dtuple_convert_big_rec(): Store locally any fields whose maximum length
is less than 256 bytes. (Bug #52745 )
Add related comments and debug assertions to the "offsets"
functions in rem0rec.c.
Approved by Sunny Bains
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/data/data0data.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdata%2Fdata0data.c
storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c
------------------------------------------------------------
revno: 3409
revision-id: marko.makela@oracle.com-20100421094032-ir4glqk46qvg2ywn
parent: marko.makela@oracle.com-20100421091611-uu46iygmv5sizjru
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 12:40:32 +0300
message:
Adjust tests for the Bug #50495 fix.
modified:
mysql-test/suite/innodb_plugin/r/innodb-zip.result 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.result
mysql-test/suite/innodb_plugin/t/innodb-zip.test 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.test
mysql-test/suite/innodb_plugin/t/innodb_bug36169.test 2418@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug36169.test
------------------------------------------------------------
revno: 3408
revision-id: marko.makela@oracle.com-20100421091611-uu46iygmv5sizjru
parent: marko.makela@oracle.com-20100421063916-h3gwjea7jzjilyww
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 12:16:11 +0300
message:
rec_convert_dtuple_to_rec(): Correct the debug check.
The "extern" accessor functions return zero or nonzero, not 0 or 1.
modified:
storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c
------------------------------------------------------------
revno: 3407
revision-id: marko.makela@oracle.com-20100421063916-h3gwjea7jzjilyww
parent: marko.makela@oracle.com-20100420201550-cax1xywvlcdshgfg
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 09:39:16 +0300
message:
rec_convert_dtuple_to_rec(): Add a debug check.
modified:
storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c
------------------------------------------------------------
revno: 3406
revision-id: marko.makela@oracle.com-20100420201550-cax1xywvlcdshgfg
parent: marko.makela@oracle.com-20100420114222-diq7h2hiom9ww6me
committer: Marko Makela <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Tue 2010-04-20 23:15:50 +0300
message:
btr_cur_optimistic_insert(): Remove unused variable "heap".
modified:
storage/innodb_plugin/btr/btr0cur.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0cur.c
------------------------------------------------------------
revno: 3405
revision-id: marko.makela@oracle.com-20100420114222-diq7h2hiom9ww6me
parent: marko.makela@oracle.com-20100420082908-tpako8jd4imkh1xb
committer: Marko Makela <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Tue 2010-04-20 14:42:22 +0300
message:
dict_create_index_step(): Invoke dict_index_add_to_cache()
in strict mode only if innodb_strict_mode is set. (Bug #50495 )
trx_is_strict(): New function, for checking innodb_strict_mode.
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/dict/dict0crea.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0crea.c
storage/innodb_plugin/handler/ha_innodb.cc 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
storage/innodb_plugin/include/trx0trx.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Ftrx0trx.h
------------------------------------------------------------
revno: 3404
revision-id: marko.makela@oracle.com-20100420082908-tpako8jd4imkh1xb
parent: marko.makela@oracle.com-20100419103603-u5pz4qc6hfhx4nua
committer: Marko M?kel? <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Tue 2010-04-20 11:29:08 +0300
message:
Implement UNIV_BTR_AVOID_COPY, an optimization of page splits.
modified:
storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
storage/innodb_plugin/include/univ.i 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i
------------------------------------------------------------
revno: 3403
revision-id: marko.makela@oracle.com-20100419103603-u5pz4qc6hfhx4nua
parent: marko.makela@oracle.com-20100419094405-fd3xwadullishv07
committer: Marko =?ISO-8859-1?Q?M=E4kel=E4?= <marko.makela@oracle.com >
branch nick: 5.1-innodb
timestamp: Mon 2010-04-19 13:36:03 +0300
message:
Enable UNIV_DEBUG_VALGRIND when HAVE_purify is set.
modified:
storage/innobase/include/univ.i 2@cee13dc7-1704-0410-992b-c9b4543f1246:trunk%2Finclude%2Funiv.i
storage/innodb_plugin/include/univ.i 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i
2010-04-22 14:24:42 +03:00
Vasil Dimov
49dc3a7b32
Refactor the innodb_bug38231 mysql-test to conform with the
...
newly introduced metadata locks.
Previously the behavior was deterministic and if several LOCKs were
waiting the first one of them was released by UNLOCK (in chronological
order).
Now (with MDLs) the behavior is undefined and since we do not know in
what order to --reap the connections we simply disconnect them without
reaping.
2010-04-19 19:58:12 +03:00
Vasil Dimov
4e87ba75b8
Refactor the innodb_bug38231 mysql-test to conform with the
...
newly introduced metadata locks.
Previously the behavior was deterministic and if several LOCKs were
waiting the first one of them was released by UNLOCK (in chronological
order).
Now (with MDLs) the behavior is undefined and since we do not know in
what order to --reap the connections we simply disconnect them without
reaping.
2010-04-19 19:58:12 +03:00
Vasil Dimov
c3c58082a8
Fix typo in comment.
2010-04-19 14:27:41 +03:00
Vasil Dimov
210510f472
Fix typo in comment.
2010-04-19 14:27:41 +03:00
Vasil Dimov
d27387d3f1
Re-enable tests that have been fixed and update the innodb test to the
...
latest behavior after it has been disabled for a long time.
2010-04-19 14:07:35 +03:00
Vasil Dimov
0f0e5a9106
Re-enable tests that have been fixed and update the innodb test to the
...
latest behavior after it has been disabled for a long time.
2010-04-19 14:07:35 +03:00
Vasil Dimov
eaadb377af
Move InnoDB mysql-tests to the innodb suite.
2010-04-16 19:19:07 +03:00
Vasil Dimov
7670eb5241
Move InnoDB mysql-tests to the innodb suite.
2010-04-16 19:19:07 +03:00
Vasil Dimov
f5692f21f9
Remove outdated InnoDB Plugin tests from mysql-test/suite/innodb,
...
the InnoDB Plugin tests are now in mysql-test/suite/innodb_plugin.
Move InnoDB tests to the innodb suite at mysql-test/suite/innodb.
2010-04-12 14:56:24 +03:00
Vasil Dimov
ceaca681a6
Remove outdated InnoDB Plugin tests from mysql-test/suite/innodb,
...
the InnoDB Plugin tests are now in mysql-test/suite/innodb_plugin.
Move InnoDB tests to the innodb suite at mysql-test/suite/innodb.
2010-04-12 14:56:24 +03:00