summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-10-25 16:41:43 +0200
committerSergei Golubchik <serg@mariadb.org>2016-10-25 16:41:43 +0200
commit12c3e16dfa872f19186761da28590c2703c96a6b (patch)
treee026ac1661b03e2048ca3eca043fd61dea37eee2 /storage
parent39dceaae607e2c9f53146d5b23f8dee330643cb2 (diff)
parent6e257274d98843b228e5bd08da74031f6f3a202d (diff)
downloadmariadb-git-12c3e16dfa872f19186761da28590c2703c96a6b.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'storage')
-rw-r--r--storage/xtradb/handler/ha_innodb.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index e1aa5bf1658..c804c7433c3 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -792,7 +792,7 @@ int
innobase_get_parent_fk_list(
THD* thd,
const char* path,
- List<FOREIGN_KEY_INFO>* f_key_list);
+ List<FOREIGN_KEY_INFO>* f_key_list) __attribute__((unused));
/******************************************************************//**
Maps a MySQL trx isolation level code to the InnoDB isolation level code