← Back to branch summary

~drizzle-developers/ubuntu/karmic/drizzle/ppa

« back to all changes in this revision

Viewing changes to plugin/innobase/include/mtr0mtr.ic

  • Committer: Monty Taylor
  • Date: 2010-11-24 18:44:57 UTC
  • mfrom: (1308.1.31 trunk)
  • Revision ID: mordred@inaugust.com-20101124184457-qd6jvoe2wgnvl3yq
Tags: 2010.11.04-0ubuntu1~karmic1
http://bugs.debian.org/602662
* New upstream release.
* Turn off -Werror for packaging builds. (Closes: #602662)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/mtr0mtr.ic
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1995, 2010, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
70
70
        ut_ad(type <= MTR_MEMO_X_LOCK);
71
71
        ut_ad(mtr);
72
72
        ut_ad(mtr->magic_n == MTR_MAGIC_N);
 
73
        ut_ad(mtr->state == MTR_ACTIVE);
73
74
 
74
75
        memo = &(mtr->memo);
75
76
 
92
93
 
93
94
        ut_ad(mtr);
94
95
        ut_ad(mtr->magic_n == MTR_MAGIC_N);
 
96
        ut_ad(mtr->state == MTR_ACTIVE);
95
97
 
96
98
        memo = &(mtr->memo);
97
99
 
149
151
 
150
152
        ut_ad(mtr);
151
153
        ut_ad(mtr->magic_n == MTR_MAGIC_N);
 
154
        ut_ad(mtr->state == MTR_ACTIVE || mtr->state == MTR_COMMITTING);
152
155
 
153
156
        memo = &(mtr->memo);
154
157