diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-23 15:22:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-23 15:22:21 +0400 |
| commit | 069d78c06714233dcdc6011fa3262a54df6a1ed4 (patch) | |
| tree | 9a94748e3f29d58645ae7979faaf09464080033d /sql/ha_partition.h | |
| parent | 40c0ae812965d86406f8e44fc0c4af0914858d46 (diff) | |
| parent | 2f5413ebc5a47ed45abe0d3c660cfbf673c666e2 (diff) | |
| download | mariadb-git-069d78c06714233dcdc6011fa3262a54df6a1ed4.tar.gz | |
Merge from mysql-next-mr.
Diffstat (limited to 'sql/ha_partition.h')
| -rw-r--r-- | sql/ha_partition.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 29509515d23..3124848e7b7 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -368,7 +368,8 @@ public: virtual int end_bulk_insert(); private: ha_rows guess_bulk_insert_rows(); - void start_part_bulk_insert(uint part_id); + void start_part_bulk_insert(THD *thd, uint part_id); + long estimate_read_buffer_size(long original_size); public: virtual bool is_fatal_error(int error, uint flags) @@ -773,10 +774,10 @@ public: if (m_handler_status < handler_initialized || m_handler_status >= handler_closed) DBUG_RETURN(PARTITION_ENABLED_TABLE_FLAGS); - else - DBUG_RETURN((m_file[0]->ha_table_flags() & - ~(PARTITION_DISABLED_TABLE_FLAGS)) | - (PARTITION_ENABLED_TABLE_FLAGS)); + + DBUG_RETURN((m_file[0]->ha_table_flags() & + ~(PARTITION_DISABLED_TABLE_FLAGS)) | + (PARTITION_ENABLED_TABLE_FLAGS)); } /* |