diff options
| author | unknown <dlenev@mockturtle.local> | 2006-09-29 10:55:03 +0400 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2006-09-29 10:55:03 +0400 |
| commit | 10c66c6ac7a046ddf363916ee868924be6382a6b (patch) | |
| tree | d8ead16d04f76d57f33c217ab7782d7f850e10f7 /sql/opt_range.cc | |
| parent | ca48feceee0737619aed37232df3ba8811a8394d (diff) | |
| parent | c316933e602dbd8144e13254bc517f4e108032c3 (diff) | |
| download | mariadb-git-10c66c6ac7a046ddf363916ee868924be6382a6b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
BitKeeper/etc/collapsed:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/r/sp.result:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 6189d0412b3..79cfbc72fe7 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1034,10 +1034,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler) } THD *thd= current_thd; - if (!(file= get_new_handler(head, thd->mem_root, head->s->db_type))) - goto failure; - DBUG_PRINT("info", ("Allocated new handler %p", file)); - if (file->ha_open(head->s->path, head->db_stat, HA_OPEN_IGNORE_IF_LOCKED)) + if (!(file= head->file->clone(thd->mem_root))) { /* Caller will free the memory */ goto failure; @@ -6724,7 +6721,6 @@ int QUICK_RANGE_SELECT::get_next() } } - /* Get the next record with a different prefix. @@ -9378,7 +9374,6 @@ static void print_ror_scans_arr(TABLE *table, const char *msg, DBUG_VOID_RETURN; } - /***************************************************************************** ** Print a quick range for debugging ** TODO: |