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
9f3660c6e5
Silence a GCC warning about reaching the end of non-void func
...
Spotted by: Marko
2010-09-28 11:12:34 +03:00
Vasil Dimov
394aa46d37
Merge mysql-5.5-bugfixing -> mysql-5.5-innodb
2010-09-28 09:40:57 +03:00
Vasil Dimov
57f59c738e
Merge mysql-5.1-bugteam -> mysql-5.1-innodb
2010-09-28 09:38:33 +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
Davi Arnaut
d63db001b6
Merge of mysql-5.1-bugteam into mysql-5.5-merge.
2010-09-24 19:19:30 -03:00
Davi Arnaut
58dfba2899
Bug#45288: pb2 returns a lot of compilation warnings on linux
...
Use UNINIT_VAR workaround instead of LINT_INIT. The former can
also be used to silence false-positives in non-debug builds as
it actually does not cause new code to be generated.
2010-09-24 19:13:51 -03:00
Jon Olav Hauglid
bf1d4487fb
Merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
2010-09-24 08:46:43 +02: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
Vasil Dimov
ab8cec7774
(btr0btr.c:1900) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 18:16:19 +03:00
Vasil Dimov
c37573590d
(btr0btr.c:606) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
2010-09-20 17:59:59 +03:00
Vasil Dimov
aad1419981
Whitespace fixup on ha_innodb.cc:2612
2010-09-20 17:14:21 +03:00
Vasil Dimov
f043b95262
Whitespace fixup on ha_innodb.cc:1274
2010-09-20 15:50:34 +03:00
Vasil Dimov
fe55bb0054
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
Joerg Bruehe
f4444c0016
Merge 5.5.6-rc to the main tree.
2010-09-19 22:01:12 +02:00
