mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
Merge mysql-5.1 to mysql-5.5.
This commit is contained in:
commit
780babc06a
1 changed files with 2 additions and 1 deletions
|
@ -217,7 +217,8 @@ row_sel_sec_rec_is_for_clust_rec(
|
|||
|
||||
len = clust_len;
|
||||
|
||||
if (ifield->prefix_len > 0 && len != UNIV_SQL_NULL) {
|
||||
if (ifield->prefix_len > 0 && len != UNIV_SQL_NULL
|
||||
&& sec_len != UNIV_SQL_NULL) {
|
||||
|
||||
if (rec_offs_nth_extern(clust_offs, clust_pos)) {
|
||||
len -= BTR_EXTERN_FIELD_REF_SIZE;
|
||||
|
|
Loading…
Add table
Reference in a new issue