diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-11 13:59:17 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-11 13:59:17 +0300 |
| commit | 8d52c2cffe0ff75ea9a4313c776cc5441e70aef3 (patch) | |
| tree | 3207cd9a232e3eea31aa0976436290d221fe3299 /mysys/ma_dyncol.c | |
| parent | 052d1bfb1a215d927e31bbe521a7e29d5da8a384 (diff) | |
| download | mariadb-git-8d52c2cffe0ff75ea9a4313c776cc5441e70aef3.tar.gz | |
Fixed compiler warnings and test cases problems found by buildbot
mysql-test/r/dyncol.result:
Updated test results
mysql-test/r/index_intersect.result:
Updated results
mysql-test/r/index_intersect_innodb.result:
Updated results
mysql-test/t/dyncol.test:
Added replace_result for floating point results that are different on windows
Added round() around a result to get same result on all platforms.
mysql-test/t/index_intersect.test:
Added replace_result to fix that index_merge may put key names in different order.
mysys/ma_dyncol.c:
Fixed compiler warnings on Solaris
sql/key.cc:
Fixed compiler warnings on Solaris
sql/mysqld.cc:
Fixed compiler warning on windows
support-files/compiler_warnings.supp:
Suppressed an unintersting warning on Solaris
Diffstat (limited to 'mysys/ma_dyncol.c')
| -rw-r--r-- | mysys/ma_dyncol.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index 71eacc6b319..6a8e4d689f3 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -905,6 +905,7 @@ static void type_and_offset_read(DYNAMIC_COLUMN_TYPE *type, uchar *place, size_t offset_size) { ulong val; + LINT_INIT(val); place+= COLUMN_NUMBER_SIZE; /* skip column number */ switch (offset_size) { @@ -1611,6 +1612,7 @@ find_place(uint num, uchar *header, size_t entry_size, { uint mid, start, end, val; int flag; + LINT_INIT(flag); /* 100 % safe */ start= 0; end= column_count -1; |