diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-10 14:33:46 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-10 14:33:46 +0500 |
| commit | 2dd78add6b3ddba7cd5f8aa823b4890421e05ff1 (patch) | |
| tree | be27a41d9919878aab7f994971b1cdffe0b4c9fa /sql/ha_partition.cc | |
| parent | 03bef972d3b508013cfcad2de294569ecdf16158 (diff) | |
| parent | 9676a86aede349d76697198f9aa4c160824568bc (diff) | |
| download | mariadb-git-2dd78add6b3ddba7cd5f8aa823b4890421e05ff1.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
libmysql/libmysql.c:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
sql/field.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 200e8a97c67..4f81255b154 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -2924,12 +2924,7 @@ void ha_partition::start_bulk_insert(ha_rows rows) handler **file; DBUG_ENTER("ha_partition::start_bulk_insert"); - if (!rows) - { - /* Avoid allocation big caches in all underlaying handlers */ - DBUG_VOID_RETURN; - } - rows= rows/m_tot_parts + 1; + rows= rows ? rows/m_tot_parts + 1 : 0; file= m_file; do { |