summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2014-02-06 16:14:09 +0200
committerMichael Widenius <monty@askmonty.org>2014-02-06 16:14:09 +0200
commit313f18be5a4b9c56d9c7331227f72e3f2fa4f9fe (patch)
tree6427fe4c05a8fa7025db373ba8e684b0286ce3c1 /strings
parent1695fc45326434806ea747dd63fee4481e545493 (diff)
downloadmariadb-git-313f18be5a4b9c56d9c7331227f72e3f2fa4f9fe.tar.gz
Fixed errors and warnings found by buildbot
mysql-test/r/lowercase_table2.result: Updated result (The change happend because we don't try to open the table anymore as part of create table) mysql-test/suite/rpl/r/create_or_replace_mix.result: Fixed result file mysql-test/suite/rpl/r/create_or_replace_row.result: Fixed result file mysql-test/suite/rpl/r/create_or_replace_statement.result: Fixed result file mysql-test/suite/rpl/t/create_or_replace.inc: Drop open temporary table mysys/my_delete.c: Added missing newline plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result: Fixed result (Lock names was before off by one. Was corrected by my previous patch) sql/sql_select.cc: Fixed compiler warnings by adding missing casts storage/connect/ha_connect.cc: Fixed compiler warnings storage/innobase/os/os0file.cc: Fixed compiler warnings storage/xtradb/btr/btr0btr.cc: Fixed compiler warnings storage/xtradb/handler/ha_innodb.cc: removed not used function strings/ctype-uca.c: Fixed compiler warnings support-files/compiler_warnings.supp: Added suppression for warnings that are wrong or are not serious andthat we don't plan to fix.
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-uca.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 87c441bf40b..02b3334a0c7 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -22467,7 +22467,7 @@ wstr_to_str(char *str, size_t length, my_wc_t *wc, size_t wlength)
static void
my_charset_loader_error_for_rule(MY_CHARSET_LOADER *loader,
- const MY_COLL_RULE *r,
+ const MY_COLL_RULE *r __attribute__((unused)),
const char *name,
my_wc_t *wc, size_t wlength)
{