diff options
| author | Build Team <bteam@astra04> | 2008-11-25 03:04:58 +0100 |
|---|---|---|
| committer | Build Team <bteam@astra04> | 2008-11-25 03:04:58 +0100 |
| commit | 74b354091946336ea8663652d4744b43a2c996e3 (patch) | |
| tree | 57f8f30a0ae780070c1c0bd5177f2a2a6a3382ee /sql | |
| parent | bfba620e45a74e458dd121f5f2e838760d80cd19 (diff) | |
| download | mariadb-git-74b354091946336ea8663652d4744b43a2c996e3.tar.gz | |
mysql-test/r/partition.result
mysql-test/t/partition.test
sql/ha_partition.cc
Bug#40954: Crash in MyISAM index code with concurrency test using partitioned tables
Problem was usage of read_range_first with an empty key.
Solution was to not to give a key if it was empty. (real author Mattias Jonsson)
storage/archive/archive_reader.c
client/mysqlslap.c
Aligned the copyright texts output from "--version" of tools, to
let internal tools be able to change them if needed.
storage/ndb/test/tools/connect.cpp
storage/ndb/test/run-test/atrt.hpp
Corrected a few GPL headers not restricted to GPL version 2
Makefile.am
Added missing --report-features to the 'test-bt-fast' target
support-files/mysql.spec.sh
Reversed the removal of the "%define license GPL" in as internal
tools depended on it
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_partition.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 4fe143bb9ed..d262fbefbe7 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -4429,7 +4429,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; |