diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-05-04 22:00:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-04 22:00:24 +0200 |
| commit | 49c853fb948aeaeb5c7e3f02da3f14da51ee4100 (patch) | |
| tree | 8c3d487a02209cc0c6f126144f1340fc5897d527 /sql/opt_subselect.h | |
| parent | ae18a28500974351cf42fa3cac67c83e0647d510 (diff) | |
| parent | 4c87f727734955f9e4a0ffde25aae4d43ec0b2a5 (diff) | |
| download | mariadb-git-49c853fb948aeaeb5c7e3f02da3f14da51ee4100.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/opt_subselect.h')
| -rw-r--r-- | sql/opt_subselect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_subselect.h b/sql/opt_subselect.h index acfbebed6b3..3da94d05521 100644 --- a/sql/opt_subselect.h +++ b/sql/opt_subselect.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2010, 2012, Monty Program Ab + Copyright (c) 2010, 2015, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -299,7 +299,7 @@ public: }; -extern void advance_sj_state(JOIN *join, table_map remaining_tables, uint idx, +void advance_sj_state(JOIN *join, table_map remaining_tables, uint idx, double *current_record_count, double *current_read_time, POSITION *loose_scan_pos); void restore_prev_sj_state(const table_map remaining_tables, |