diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-05-28 09:47:58 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-05-28 09:47:58 +0400 |
| commit | 4e633ec2342754594fad8937a2d12615e5e5cb96 (patch) | |
| tree | 88543c956886365a2376e01ce26a0436c38a4454 /sql/handler.h | |
| parent | 87dfc8ef1ddf9cfebf535fbfce70152ce3ee6c23 (diff) | |
| parent | f54464035a4bfae7c7297e7fe1a8ba7e76ea6585 (diff) | |
| download | mariadb-git-4e633ec2342754594fad8937a2d12615e5e5cb96.tar.gz | |
Auto-merge from mysql-trunk.
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 1b5d5f8cb1f..ad26534d91d 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2066,7 +2066,7 @@ extern ulong total_ha, total_ha_2pc; /* lookups */ handlerton *ha_default_handlerton(THD *thd); plugin_ref ha_resolve_by_name(THD *thd, const LEX_STRING *name); -plugin_ref ha_lock_engine(THD *thd, handlerton *hton); +plugin_ref ha_lock_engine(THD *thd, const handlerton *hton); handlerton *ha_resolve_by_legacy_type(THD *thd, enum legacy_db_type db_type); handler *get_new_handler(TABLE_SHARE *share, MEM_ROOT *alloc, handlerton *db_type); |