diff options
| author | unknown <mats@mysql.com> | 2006-03-31 13:34:30 +0200 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-03-31 13:34:30 +0200 |
| commit | bb4007a7c5d6c836ab9c96b6e2065894cfbe10f8 (patch) | |
| tree | db70a54e9fc46756ceb789d860967b38aeb9c88e /sql/handler.cc | |
| parent | ff0c472b7e733d3c54c2cb16ff4f5124aa097560 (diff) | |
| parent | f4337c8b62a869faa41b72d087187074964e454c (diff) | |
| download | mariadb-git-bb4007a7c5d6c836ab9c96b6e2065894cfbe10f8.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.1-new
into mysql.com:/home/bk/b18436-mysql-5.1-new
sql/handler.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 80f2f4c0161..808dd0841c5 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3309,6 +3309,13 @@ int handler::ha_write_row(byte *buf) int handler::ha_update_row(const byte *old_data, byte *new_data) { int error; + + /* + Some storage engines require that the new record is in record[0] + (and the old record is in record[1]). + */ + DBUG_ASSERT(new_data == table->record[0]); + if (unlikely(error= update_row(old_data, new_data))) return error; #ifdef HAVE_ROW_BASED_REPLICATION |