diff options
| author | unknown <timothy.smith@sun.com> | 2008-11-27 00:02:10 +0100 |
|---|---|---|
| committer | Build Team <bteam@astra04> | 2008-11-27 00:02:10 +0100 |
| commit | 96e0bf50d942258722b25e9d17d209d40eaacd28 (patch) | |
| tree | 8b74eb8ccd3df7d27cd2c237daeafaf3222fb7eb /sql/ha_partition.cc | |
| parent | 3d0798d07de937c857c255ce9bfb8c24e10b25e4 (diff) | |
| parent | 74b354091946336ea8663652d4744b43a2c996e3 (diff) | |
| download | mariadb-git-96e0bf50d942258722b25e9d17d209d40eaacd28.tar.gz | |
Merge from mysql-5.1.30-release
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 3324bbc2f45..d5e7828c57e 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB +/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc. 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 @@ -4456,7 +4456,8 @@ int ha_partition::handle_ordered_index_scan(uchar *buf, bool reverse_order) This can only read record to table->record[0], as it was set when the table was being opened. We have to memcpy data ourselves. */ - error= file->read_range_first(&m_start_key, end_range, eq_range, TRUE); + error= file->read_range_first(m_start_key.key? &m_start_key: NULL, + end_range, eq_range, TRUE); memcpy(rec_buf_ptr, table->record[0], m_rec_length); reverse_order= FALSE; break; |