diff options
| author | unknown <istruewing@stella.local> | 2008-03-14 12:02:11 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-14 12:02:11 +0100 |
| commit | e79249f81bbb7158fb263455e531bda4117b5fc9 (patch) | |
| tree | b52789d6b0503cf1a56ee2fea977be99a7287207 /sql/partition_info.h | |
| parent | 28eb7e60d50795d110d4fe2d6477acdeb4c725d5 (diff) | |
| parent | 269ebe54211cf96c4e64fa7268a1414588ca1de8 (diff) | |
| download | mariadb-git-e79249f81bbb7158fb263455e531bda4117b5fc9.tar.gz | |
Manual merge
configure.in:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_symlink.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/partition_info.cc:
Auto merged
sql/partition_info.h:
Auto merged
sql/rpl_rli.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_parse.cc:
Manual merge. Needs later fix. New code in create table was not
accepted. Needs to be added to mysql_create_table_no_lock().
Diffstat (limited to 'sql/partition_info.h')
| -rw-r--r-- | sql/partition_info.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/partition_info.h b/sql/partition_info.h index b38e572d3aa..2af7fa1717c 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -290,6 +290,7 @@ private: }; uint32 get_next_partition_id_range(struct st_partition_iter* part_iter); +bool check_partition_dirs(partition_info *part_info); /* Initialize the iterator to return a single partition with given part_id */ |