diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-04-21 08:50:58 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-04-21 08:50:58 +0200 |
| commit | 53cbbcc87e9687d12f1f4f0cbeb6320431d63f7c (patch) | |
| tree | 22736d4084e775161b77936a27b59750e0495bc6 /storage | |
| parent | ac7873663866e74fb7572c0b2a5f2548a2897420 (diff) | |
| parent | b5c45fb624c3d7d97dc394986a6b77165ebc1aeb (diff) | |
| download | mariadb-git-53cbbcc87e9687d12f1f4f0cbeb6320431d63f7c.tar.gz | |
merge from mysql-trunk-bugfixing
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/i_s.cc | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 3debf2805b6..d1cd508a674 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -114,8 +114,6 @@ extern "C" { # endif /* MYSQL_PLUGIN_IMPORT */ #if MYSQL_VERSION_ID < 50124 -/* this is defined in mysql_priv.h inside #ifdef MYSQL_SERVER -but we need it here */ bool check_global_access(THD *thd, ulong want_access); #endif /* MYSQL_VERSION_ID < 50124 */ diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc index 7d8b4a8dd40..fdcec7811d0 100644 --- a/storage/innobase/handler/i_s.cc +++ b/storage/innobase/handler/i_s.cc @@ -109,11 +109,6 @@ time_t MYSQL_TYPE_DATETIME --------------------------------- */ -/* XXX these are defined in mysql_priv.h inside #ifdef MYSQL_SERVER */ -bool schema_table_store_record(THD *thd, TABLE *table); -void localtime_to_TIME(MYSQL_TIME *to, struct tm *from); -bool check_global_access(THD *thd, ulong want_access); - /*******************************************************************//** Common function to fill any of the dynamic tables: INFORMATION_SCHEMA.innodb_trx |