diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_partition.cc | 8 | ||||
| -rw-r--r-- | sql/ha_partition.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 83eb6e050c5..5bcd3b8eb52 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -69,6 +69,10 @@ static PARTITION_SHARE *get_share(const char *table_name, TABLE * table); static handlerton partition_hton = { "partition", + SHOW_OPTION_YES, + "", /* A comment used by SHOW to describe an engine */ + DB_TYPE_PARTITION_DB, + 0, /* Method that initizlizes a storage engine */ 0, /* slot */ 0, /* savepoint size */ NULL /*ndbcluster_close_connection*/, @@ -1048,7 +1052,7 @@ THR_LOCK_DATA **ha_partition::store_lock(THD *thd, } -int ha_partition::start_stmt(THD *thd) +int ha_partition::start_stmt(THD *thd, thr_lock_type lock_type) { int error= 0; handler **file; @@ -1056,7 +1060,7 @@ int ha_partition::start_stmt(THD *thd) file= m_file; do { - if ((error= (*file)->start_stmt(thd))) + if ((error= (*file)->start_stmt(thd, lock_type))) break; } while (*(++file)); DBUG_RETURN(error); diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 858bf09ecaa..841719bddf4 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -228,7 +228,7 @@ public: When table is locked a statement is started by calling start_stmt instead of external_lock */ - virtual int start_stmt(THD * thd); + virtual int start_stmt(THD * thd, thr_lock_type lock_type); /* Lock count is number of locked underlying handlers (I assume) */ |