diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-02 13:50:54 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-02 13:50:54 +0200 |
| commit | 8e6bba3ec603ed53f8fe55cec15a96a61b6273ef (patch) | |
| tree | 8b734e52007cff29f232d2d651394090730c1ebe /storage | |
| parent | d87a29bea98cd0e7fbf9d1cb8b290213f905a217 (diff) | |
| parent | a96c87206ba99377b5337a241c75ddcfc7b92afd (diff) | |
| download | mariadb-git-8e6bba3ec603ed53f8fe55cec15a96a61b6273ef.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c index d42f21241ca..4f0ae27d595 100644 --- a/storage/innobase/row/row0merge.c +++ b/storage/innobase/row/row0merge.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2005, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2012, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -582,7 +582,7 @@ row_merge_buf_write( REC_STATUS_ORDINARY, entry, n_fields, &extra_size); - ut_ad(size > extra_size); + ut_ad(size >= extra_size); ut_ad(extra_size >= REC_N_NEW_EXTRA_BYTES); extra_size -= REC_N_NEW_EXTRA_BYTES; size -= REC_N_NEW_EXTRA_BYTES; |