Vasil Dimov
64ef6416bf
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
3a43a2e265
Merge mysql-5.5-bugfixing -> mysql-5.5-innodb
2010-09-28 09:40:57 +03:00
Marc Alff
6a707718b9
Added missing paterns
2010-09-27 18:23:54 -06:00
Vasil Dimov
f661c09dd4
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
ae1f1a6798
This patch comes from Michael: See bug#56933.
2010-09-24 08:37:09 +10:00
Mats Kindahl
246b7b0b7d
Merging into mysql-5.5-bugfixing.
2010-09-23 14:38:24 +02:00
Mark Leith
693f13463f
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
Mats Kindahl
48ac52a861
Merging into mysql-5.5-bugfixing.
2010-09-21 23:24:29 +02:00
Evgeny Potemkin
cd8710fe8a
Auto-merged.
2010-09-21 13:37:31 +04:00
Vasil Dimov
5af0e024ae
(ut0rnd.ic:88) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:41:58 +03:00
Vasil Dimov
32e9abebd5
(trx0undo.c:1873) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:40:44 +03:00
Vasil Dimov
a5975d4304
(trx0undo.c:1075) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:40:13 +03:00
Vasil Dimov
862caf5d5c
(trx0trx.c:1801) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:39:35 +03:00
Vasil Dimov
f5d1b4787a
(trx0sys.c:252) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:37:53 +03:00
Vasil Dimov
53be9a8204
(trx0roll.c:746) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:36:08 +03:00
Vasil Dimov
c2fc573435
(trx0roll.c:747) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:35:13 +03:00
Vasil Dimov
19a4c1429f
(trx0purge.c:1082) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:34:39 +03:00
Vasil Dimov
202cebad7c
(trx0purge.c:674) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:33:38 +03:00
Vasil Dimov
0babdaf233
(trx0purge.c:316) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:32:35 +03:00
Vasil Dimov
78d7f7b19a
(trx0purge.c:318) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:30:44 +03:00
Vasil Dimov
6f082344d5
(row0vers.c:74) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:17:20 +03:00
Vasil Dimov
7f1ffcfbb3
(row0umod.c:117) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:10:33 +03:00
Vasil Dimov
60cd54f3ec
(row0purge.c:789) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:09:30 +03:00
Vasil Dimov
c07b437ffe
(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
5f5bc71fcb
(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
8fe3d04e6c
(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
1bcb1d2da3
(que0que.c:1286) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:01:14 +03:00
Vasil Dimov
16215b6c1d
(os0file.c:1485) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 19:00:28 +03:00
Vasil Dimov
4883683668
(os0file.c:1486) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:57:36 +03:00
Vasil Dimov
fb1338558d
(log0recv.c:2905) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:55:54 +03:00
Vasil Dimov
07427cd8fb
(log0recv.c:1660) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:53:07 +03:00
Vasil Dimov
e2b4074d82
(log0recv.c:572) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:51:51 +03:00
Vasil Dimov
4cce243414
(ibuf0ibuf.c:1300) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:51:11 +03:00
Vasil Dimov
d9d20d93c6
Remove redundant variable
2010-09-20 18:48:38 +03:00
Vasil Dimov
10ec98ca0e
(eval0eval.c:388) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:47:51 +03:00
Vasil Dimov
72a65da579
(dict0dict.c:4458) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:47:15 +03:00
Vasil Dimov
977d0e0524
(dict0crea.c:630) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:46:24 +03:00
Vasil Dimov
2460ca43d9
(buf0flu.c:136) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:45:40 +03:00
Vasil Dimov
31d79a481e
(btr0sea.c:1510) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:43:15 +03:00
Vasil Dimov
63072c7324
(btr0pcur.c:455) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:42:13 +03:00
Vasil Dimov
38c61d65a4
(btr0cur.c:4559) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:38:43 +03:00
Vasil Dimov
318b075cac
(btr0cur.c:1957) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:33:39 +03:00
Vasil Dimov
88c3af8d9a
(btr0btr.c:2566) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:31:58 +03:00
Vasil Dimov
c36871e59f
(btr0btr.c:1900) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:16:19 +03:00
Vasil Dimov
d3c82da63e
(btr0btr.c:606) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 17:59:59 +03:00
Vasil Dimov
3374d5bb1d
Whitespace fixup on ha_innodb.cc:2612
2010-09-20 17:14:21 +03:00
Vasil Dimov
bc889d6ef3
Whitespace fixup on ha_innodb.cc:1274
2010-09-20 15:50:34 +03:00
Vasil Dimov
5cf9dab765
Increment InnoDB version from 1.1.2 to 1.1.3
...
InnoDB 1.1.2 was released with MySQL 5.5.6-rc
2010-09-20 15:31:34 +03:00
Marc Alff
fa4c505eda
Bug#50557 checksum table crashes server when used in performance_schema
...
CHECKSUM TABLE for performance schema tables could cause uninitialized
memory reads.
The root cause is a design flaw in the implementation of
mysql_checksum_table(), which do not honor null fields.
However, fixing this bug in CHECKSUM TABLE is risky, as it can cause the
checksum value to change.
This fix implements a work around, to systematically reset fields values
even for null fields, so that the field memory representation is always
initialized with a known value.
2010-09-17 13:03:09 -06:00
Marc Alff
ba7dec4a2d
local merge
2010-09-17 10:21:53 -06:00
