diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-09 13:59:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-09 13:59:02 +0300 |
| commit | 34baff7743df3f6fb67c8e4bffa58e9758b0c86b (patch) | |
| tree | 101964bf97b7c8f5be085d3e7ecee1892edcaafd /storage/innobase/btr/btr0cur.c | |
| parent | 92a017d324c38e9e52586c85bf5a4745b6fab78f (diff) | |
| parent | 6348b7375a506bfe340a390ed6ac832d1e224333 (diff) | |
| download | mariadb-git-34baff7743df3f6fb67c8e4bffa58e9758b0c86b.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/btr/btr0cur.c')
| -rw-r--r-- | storage/innobase/btr/btr0cur.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c index 2aff65e0bf6..b93dc1b9238 100644 --- a/storage/innobase/btr/btr0cur.c +++ b/storage/innobase/btr/btr0cur.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -1989,6 +1989,9 @@ btr_cur_optimistic_update( heap = mem_heap_create(1024); offsets = rec_get_offsets(rec, index, NULL, ULINT_UNDEFINED, &heap); +#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG + ut_a(!rec_offs_any_null_extern(rec, offsets)); +#endif /* UNIV_DEBUG || UNIV_BLOB_LIGHT_DEBUG */ #ifdef UNIV_DEBUG if (btr_cur_print_record_ops && thr) { |