diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 20:00:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 21:00:41 +0100 |
| commit | 0508d327aef520d3131ff8a85ed610337149fffc (patch) | |
| tree | 7e04769f49b4aded9053adcad442fe00eb487d98 /storage/sequence | |
| parent | bb8c82c66abddf796e8d44f817518e5ab38ae6e4 (diff) | |
| parent | 34db9958e28c325b0f708f78b7ff029de810d5ea (diff) | |
| download | mariadb-git-0508d327aef520d3131ff8a85ed610337149fffc.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/sequence')
| -rw-r--r-- | storage/sequence/sequence.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/sequence/sequence.cc b/storage/sequence/sequence.cc index 599374c6f8c..9585f4f5312 100644 --- a/storage/sequence/sequence.cc +++ b/storage/sequence/sequence.cc @@ -348,7 +348,9 @@ static int discover_table_existence(handlerton *hton, const char *db, return !parse_table_name(table_name, strlen(table_name), &from, &to, &step); } -static int dummy_ret_int() { return 0; } +static int dummy_commit_rollback(handlerton *, THD *, bool) { return 0; } + +static int dummy_savepoint(handlerton *, THD *, void *) { return 0; } /***************************************************************************** Example of a simple group by handler for queries like: @@ -487,10 +489,9 @@ static int init(void *p) hton->create= create_handler; hton->discover_table= discover_table; hton->discover_table_existence= discover_table_existence; - hton->commit= hton->rollback= - (int (*)(handlerton *, THD *, bool)) &dummy_ret_int; + hton->commit= hton->rollback= dummy_commit_rollback; hton->savepoint_set= hton->savepoint_rollback= hton->savepoint_release= - (int (*)(handlerton *, THD *, void *)) &dummy_ret_int; + dummy_savepoint; hton->create_group_by= create_group_by_handler; return 0; } |