diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-11-25 10:05:48 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-11-25 10:05:48 +0100 |
| commit | 3c1e153a82a48fdb75c99ecb449239a79af2aa9f (patch) | |
| tree | e8511387b5502ea685ee2d0ca54646ec0af6df6a /sql | |
| parent | d55161b75a640c1532da9c55d67d5e8128f97426 (diff) | |
| download | mariadb-git-3c1e153a82a48fdb75c99ecb449239a79af2aa9f.tar.gz | |
Manually applying the patch for BUG40954 "Crash in MyISAM index code with concurrency test using partitioned tables"
so that it stops crashing pushbuild2/5.1-maria and we can see the other failures which it hid.
mysql-test/r/partition.result:
Manually applying the patch for BUG40954 "Crash in MyISAM index code with concurrency test using partitioned tables"
mysql-test/t/partition.test:
Manually applying the patch for BUG40954 "Crash in MyISAM index code with concurrency test using partitioned tables"
sql/ha_partition.cc:
Manually applying the patch for BUG40954 "Crash in MyISAM index code with concurrency test using partitioned tables"
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 fe09ce3107e..178237404c1 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -4457,7 +4457,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; |