unknown
cfcafcf5c4
Bug#56632 - The warning code related to KEY_BLOCK_SIZE and ROW_FORMAT when innodb_strict_mode=OFF is improved in order to take into account whether the KEY_BLOCK_SIZE is specified on the current ALTER statement or the previous CREATE statement.
...
The testcase shows the expected results of 12 different combinations of these settings.
2010-10-12 12:07:09 -05:00
Jimmy Yang
5c15a5a103
Merge from mysql-5.1-innodb to mysql-5.5-innodb
2010-10-11 05:56:44 -07:00
Jimmy Yang
820e1bc6f4
A more complete fix for bug #57345 btr_pcur_store_position abort for load
...
with concurrent lock/unlock tables
Approved by Marko
2010-10-11 05:36:13 -07:00
Calvin Sun
8cf10ed177
Merge from bk-internal.mysql.com/bzrroot/server/mysql-5.5-innodb/
...
to local repo.
2010-10-05 13:49:17 -05:00
Calvin Sun
7381a8a38f
bug#56318: Replication aborts with ER_TOO_BIG_ROWSIZE if innodb
...
parameters don't match
Revert the changes of the default values of innodb_file_per_table
and innobase_file_format in 5.5, until WL#5135 is implemented.
2010-10-05 13:38:30 -05:00
Vasil Dimov
1852090266
Merge mysql-5.5-innodb from bk-internal to my local tree
2010-10-04 13:46:41 +03:00
Marko Mäkelä
80961a0a25
Merge Bug#56716 from 5.1
2010-10-04 13:38:05 +03:00
Marko Mäkelä
678bc90ed8
Bug#56716 InnoDB locks a record gap without locking the table
...
row_search_for_mysql(): Acquire an intention lock on the table
before locking the first record gap.
2010-10-04 13:05:21 +03:00
Vasil Dimov
1f1c2e22eb
Merge mysql-5.5-innodb -> mysql-5.5-bugteam
2010-10-01 16:36:35 +03:00
Vasil Dimov
75fc5b6a33
Fix a potential bug when using __sync_lock_test_and_set()
...
This is a manual merge from mysql-5.1-innodb of:
revision-id: vasil.dimov@oracle.com-20100930102618-s9f9ytbytr3eqw9h
committer: Vasil Dimov <vasil.dimov@oracle.com>
timestamp: Thu 2010-09-30 13:26:18 +0300
message:
Fix a potential bug when using __sync_lock_test_and_set()
TYPE __sync_lock_test_and_set (TYPE *ptr, TYPE value, ...)
it is not documented what happens if the two arguments are of different
type like it was before: the first one was lock_word_t (byte) and the
second one was 1 or 0 (int).
Approved by: Marko (via IRC)
2010-10-01 14:51:00 +03:00
Vasil Dimov
f7c8352193
Fix Bug#56340 innodb updates index stats too frequently after non-index updates
...
This is a manual merge from mysql-5.1-innodb of:
revno: 3618
revision-id: vasil.dimov@oracle.com-20100930124844-yglojy7c3vaji6dx
parent: vasil.dimov@oracle.com-20100930102618-s9f9ytbytr3eqw9h
committer: Vasil Dimov <vasil.dimov@oracle.com>
branch nick: mysql-5.1-innodb
timestamp: Thu 2010-09-30 15:48:44 +0300
message:
Fix Bug#56340 innodb updates index stats too frequently after non-index updates
This is a simple optimization issue. All stats are related to only indexed
columns, index size or number of rows in the whole table. UPDATEs that touch
only non-indexed columns cannot affect stats and we can avoid calling the
function row_update_statistics_if_needed() which may result in unnecessary I/O.
Approved by: Marko (rb://466)
In addition to the above message: we know that
row_update_cascade_for_mysql() (the other place where
row_update_statistics_if_needed is called) always updates indexed
columns (FK-related), so there is no need to add this cond there.
2010-10-01 10:34:21 +03:00
Vasil Dimov
eaaea8eb7d
Fix Bug#56340 innodb updates index stats too frequently after non-index updates
...
This is a simple optimization issue. All stats are related to only indexed
columns, index size or number of rows in the whole table. UPDATEs that touch
only non-indexed columns cannot affect stats and we can avoid calling the
function row_update_statistics_if_needed() which may result in unnecessary I/O.
Approved by: Marko (rb://466)
2010-09-30 15:48:44 +03:00
Vasil Dimov
fbeb571369
Manually merge a GCC warning fix from 5.1 to 5.5:
...
------------------------------------------------------------
revno: 3615
revision-id: vasil.dimov@oracle.com-20100928081234-22qbm6cwht521484
parent: vasil.dimov@oracle.com-20100928063833-snn6cjwgksa6gk3b
committer: Vasil Dimov <vasil.dimov@oracle.com>
branch nick: mysql-5.1-innodb
timestamp: Tue 2010-09-28 11:12:34 +0300
message:
Silence a GCC warning about reaching the end of non-void func
Spotted by: Marko
2010-09-28 11:14:42 +03:00
Vasil Dimov
b9f144fa4b
Use C-style comment instead of C++ in a C header.
...
Spotted by: Davi Arnaut
2010-09-27 20:08:12 +03:00
Sunny Bains
064fed3b25
This patch comes from Michael: See bug#56933.
2010-09-24 08:37:09 +10:00
Mark Leith
14c7c747a5
Bug#56922 SHOW ENGINE INNODB STATUS truncation limit is too strict and not instrumented
...
rb://459 approved by Jimmuy / Inaam
2010-09-23 09:12:09 +01:00
Vasil Dimov
f482bce2c1
(ut0rnd.ic:88) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:41:58 +03:00
Vasil Dimov
a6cc6cd617
(trx0undo.c:1873) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:40:44 +03:00
Vasil Dimov
4d79dc6fab
(trx0undo.c:1075) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:40:13 +03:00
Vasil Dimov
01e095df37
(trx0trx.c:1801) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:39:35 +03:00
Vasil Dimov
cbf60280af
(trx0sys.c:252) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:37:53 +03:00
Vasil Dimov
154ea4f4c5
(trx0roll.c:746) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:36:08 +03:00
Vasil Dimov
f7af534a56
(trx0roll.c:747) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:35:13 +03:00
Vasil Dimov
9cf5e1de92
(trx0purge.c:1082) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:34:39 +03:00
Vasil Dimov
74162b2092
(trx0purge.c:674) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:33:38 +03:00
Vasil Dimov
81e539f3bc
(trx0purge.c:316) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:32:35 +03:00
Vasil Dimov
d75e5995d1
(trx0purge.c:318) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:30:44 +03:00
Vasil Dimov
70a486c7e7
(row0vers.c:74) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:17:20 +03:00
Vasil Dimov
d4a2abcd2f
(row0umod.c:117) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:10:33 +03:00
Vasil Dimov
17cc7b76be
(row0purge.c:789) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:09:30 +03:00
Vasil Dimov
11a3945ef0
(i_s.cc:1111) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:07:54 +03:00
Vasil Dimov
86d0e51a9e
(ha_innodb.cc:9037) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:04:14 +03:00
Vasil Dimov
ce3e9093d6
(ha_innodb.cc:7202) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:03:05 +03:00
Vasil Dimov
0f6113f6a3
(que0que.c:1286) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:01:14 +03:00
Vasil Dimov
ac67443afe
(os0file.c:1485) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:00:28 +03:00
Vasil Dimov
b69c8895c9
(os0file.c:1486) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:57:36 +03:00
Vasil Dimov
70330ca917
(log0recv.c:2905) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:55:54 +03:00
Vasil Dimov
191b594322
(log0recv.c:1660) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:53:07 +03:00
Vasil Dimov
0b59b891c2
(log0recv.c:572) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:51:51 +03:00
Vasil Dimov
2efc8b2221
(ibuf0ibuf.c:1300) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:51:11 +03:00
Vasil Dimov
6dfcadafc9
Remove redundant variable
2010-09-20 18:48:38 +03:00
Vasil Dimov
6101698651
(eval0eval.c:388) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:47:51 +03:00
Vasil Dimov
666c01419d
(dict0dict.c:4458) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:47:15 +03:00
Vasil Dimov
80226874dd
(dict0crea.c:630) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:46:24 +03:00
Vasil Dimov
288a543332
(buf0flu.c:136) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:45:40 +03:00
Vasil Dimov
ef76f25d26
(btr0sea.c:1510) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:43:15 +03:00
Vasil Dimov
633971d464
(btr0pcur.c:455) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:42:13 +03:00
Vasil Dimov
dd7989d2b4
(btr0cur.c:4559) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:38:43 +03:00
Vasil Dimov
530a8c6f35
(btr0cur.c:1957) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:33:39 +03:00
Vasil Dimov
17d6947180
(btr0btr.c:2566) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:31:58 +03:00