diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-09-03 19:42:54 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-09-03 19:42:54 +0200 |
| commit | c21a7a6bb2bed5f159dfba64e7a5220a5ee78cab (patch) | |
| tree | aab22730a36718adb824289458f98b86006f5c32 /storage/xtradb/rem | |
| parent | 401c69e49babc293da30f833c18673f5f071eca3 (diff) | |
| parent | 9ec2d5b6e510b9a3ad2fd54c37eb302c0121f9e3 (diff) | |
| download | mariadb-git-c21a7a6bb2bed5f159dfba64e7a5220a5ee78cab.tar.gz | |
Merge XtraDB from Percona server 5.1.49-12 into MariaDB.
Diffstat (limited to 'storage/xtradb/rem')
| -rw-r--r-- | storage/xtradb/rem/rem0cmp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/xtradb/rem/rem0cmp.c b/storage/xtradb/rem/rem0cmp.c index 45230f1d7b1..8ee434f85da 100644 --- a/storage/xtradb/rem/rem0cmp.c +++ b/storage/xtradb/rem/rem0cmp.c @@ -706,7 +706,9 @@ cmp_rec_rec_simple( const rec_t* rec2, /*!< in: physical record */ const ulint* offsets1,/*!< in: rec_get_offsets(rec1, ...) */ const ulint* offsets2,/*!< in: rec_get_offsets(rec2, ...) */ - const dict_index_t* index) /*!< in: data dictionary index */ + const dict_index_t* index, /*!< in: data dictionary index */ + ibool* null_eq)/*!< out: set to TRUE if + found matching null values */ { ulint rec1_f_len; /*!< length of current field in rec1 */ const byte* rec1_b_ptr; /*!< pointer to the current byte @@ -753,6 +755,9 @@ cmp_rec_rec_simple( || rec2_f_len == UNIV_SQL_NULL) { if (rec1_f_len == rec2_f_len) { + if (null_eq) { + *null_eq = TRUE; + } goto next_field; |