diff options
author | Michael Widenius <monty@askmonty.org> | 2012-06-05 14:09:18 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-06-05 14:09:18 +0300 |
commit | 56ea8e9c0539a4dc95659ab4ba4b94956c7119e7 (patch) | |
tree | f1064496ed78c4ee1c4270ede3dcba94cf1a02ec /storage/maria | |
parent | b889f6999367c9415f5806d2ea6ec104387ba1ff (diff) | |
download | mariadb-git-56ea8e9c0539a4dc95659ab4ba4b94956c7119e7.tar.gz |
Fixed build failures found by buildbot
- Added suppression of warnings
- Fixed some test cases
BUILD/FINISH.sh:
Added AM_EXTRA_MAKEFLAGS
BUILD/SETUP.sh:
Added option --extra-makeflags
client/mysqldump.c:
Added suppression
mysql-test/r/mysql.result:
Updated results
mysql-test/r/mysql_upgrade.result:
Updated results
mysql-test/r/partition_innodb_plugin.result:
Updated results
mysql-test/r/partition_open_files_limit.result:
Updated results
mysql-test/r/symlink.result:
Updated results
mysql-test/suite/innodb/r/innodb-create-options.result:
Updated results
mysql-test/suite/innodb/t/innodb-create-options.test:
Don't print error message (as it's varies on different system)
mysql-test/t/mysql.test:
Don't print error message (as it's varies on different system)
mysql-test/t/mysql_upgrade.test:
Fixed checking of error number
mysql-test/t/partition_innodb_plugin.test:
Don't print error message (as it's varies on different system)
plugin/semisync/semisync_master.cc:
Added suppression
sql/ha_partition.cc:
Added suppression
sql/item_subselect.cc:
Added suppression
sql/multi_range_read.cc:
Added suppression
sql/sql_parse.cc:
Added suppression
sql/sql_select.cc:
Added suppression
storage/innobase/handler/ha_innodb.cc:
Removed not used variable
storage/maria/ma_delete.c:
Added suppression
storage/maria/ma_key_recover.c:
Added suppression
storage/maria/ma_write.c:
Added suppression
strings/ctype-ucs2.c:
Added suppression
support-files/compiler_warnings.supp:
Added suppressions
unittest/mysys/my_vsnprintf-t.c:
Fixed test case with %M to also work on Solaris
Diffstat (limited to 'storage/maria')
-rw-r--r-- | storage/maria/ma_delete.c | 2 | ||||
-rw-r--r-- | storage/maria/ma_key_recover.c | 3 | ||||
-rw-r--r-- | storage/maria/ma_write.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/storage/maria/ma_delete.c b/storage/maria/ma_delete.c index 069d73b553c..5b8d0e01677 100644 --- a/storage/maria/ma_delete.c +++ b/storage/maria/ma_delete.c @@ -163,6 +163,8 @@ my_bool _ma_ck_delete(MARIA_HA *info, MARIA_KEY *key) MARIA_KEY org_key; DBUG_ENTER("_ma_ck_delete"); + LINT_INIT_STRUCT(org_key); + save_key_data= key->data; if (share->now_transactional) { diff --git a/storage/maria/ma_key_recover.c b/storage/maria/ma_key_recover.c index 9ff2d954a60..8b2dc4a1e07 100644 --- a/storage/maria/ma_key_recover.c +++ b/storage/maria/ma_key_recover.c @@ -945,7 +945,8 @@ uint _ma_apply_redo_index(MARIA_HA *info, const uchar *header_end= header + head_length; uint page_offset= 0, org_page_length; uint page_length, keypage_header, keynr; - uint max_page_size= share->max_index_block_size, new_page_length= 0; + uint max_page_size= share->max_index_block_size; + uint __attribute__((unused)) new_page_length= 0; int result; MARIA_PAGE page; DBUG_ENTER("_ma_apply_redo_index"); diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c index 74c1a106df2..f1649083105 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_write.c @@ -478,6 +478,8 @@ static my_bool _ma_ck_write_btree_with_log(MARIA_HA *info, MARIA_KEY *key, my_bool transactional= share->now_transactional; DBUG_ENTER("_ma_ck_write_btree_with_log"); + LINT_INIT_STRUCT(org_key); + if (transactional) { /* Save original value as the key may change */ |