summaryrefslogtreecommitdiff
path: root/sql/key.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-05-11 13:59:17 +0300
committerMichael Widenius <monty@askmonty.org>2011-05-11 13:59:17 +0300
commit8d52c2cffe0ff75ea9a4313c776cc5441e70aef3 (patch)
tree3207cd9a232e3eea31aa0976436290d221fe3299 /sql/key.cc
parent052d1bfb1a215d927e31bbe521a7e29d5da8a384 (diff)
downloadmariadb-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 'sql/key.cc')
-rw-r--r--sql/key.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/key.cc b/sql/key.cc
index f7966140cdf..7f484bee32b 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -761,6 +761,7 @@ bool key_buf_cmp(KEY *key_info, uint used_key_parts,
LINT_INIT(cs);
LINT_INIT(length1);
LINT_INIT(length2);
+ LINT_INIT(pack_length);
key1+= key_part->length;
key2+= key_part->length;