diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 19:36:33 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 19:36:33 +0100 |
| commit | 15ee97214da759f5b30232081fb71331d9369102 (patch) | |
| tree | 62a5742e75e71e934ffe8a2f16861735e8d82d8b /storage/innobase/include/btr0pcur.ic | |
| parent | f92058a23e5c33815ce123ff314308839407f149 (diff) | |
| parent | eeb7091e14d7feda093c7fa04bb2b0373a05e87f (diff) | |
| download | mariadb-git-15ee97214da759f5b30232081fb71331d9369102.tar.gz | |
InnoDB 5.6.15 merge.
update test results
Diffstat (limited to 'storage/innobase/include/btr0pcur.ic')
| -rw-r--r-- | storage/innobase/include/btr0pcur.ic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic index 79afd7c322e..29f2fc722a2 100644 --- a/storage/innobase/include/btr0pcur.ic +++ b/storage/innobase/include/btr0pcur.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2013, 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 @@ -379,7 +379,7 @@ btr_pcur_commit_specify_mtr( btr_pcur_t* pcur, /*!< in: persistent cursor */ mtr_t* mtr) /*!< in: mtr to commit */ { - ut_a(pcur->pos_state == BTR_PCUR_IS_POSITIONED); + ut_ad(pcur->pos_state == BTR_PCUR_IS_POSITIONED); pcur->latch_mode = BTR_NO_LATCHES; |