← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/my_handler.cc

  • Committer: Jay Pipes
  • Date: 2010-03-09 20:02:29 UTC
  • mto: This revision was merged to the branch mainline in revision 1339.
  • Revision ID: jpipes@serialcoder-20100309200229-dfrliy4fads9vyf4
https://launchpad.net/bugs/535296
Fixes Bug #535296 by only incrementing ha_commit_count when its a normal transaction commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/my_handler.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
 
#include <drizzled/charset_info.h>
 
22
#include "drizzled/charset_info.h"
23
23
#include <drizzled/base.h>
24
24
#include <plugin/myisam/my_handler.h>
25
 
#include <drizzled/internal/my_sys.h>
 
25
#include "drizzled/internal/my_sys.h"
26
26
 
27
27
#include <cassert>
28
28
#include <algorithm>
297
297
      a=  end;
298
298
      b+= 4; /* sizeof(long int); */
299
299
      break;
 
300
    case HA_KEYTYPE_UINT24:
 
301
      l_1=mi_uint3korr(a);
 
302
      l_2=mi_uint3korr(b);
 
303
      if (piks && (flag = CMP_NUM(l_1,l_2)))
 
304
        return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);
 
305
      a=  end;
 
306
      b+= 3;
 
307
      break;
300
308
    case HA_KEYTYPE_DOUBLE:
301
309
      mi_float8get(d_1,a);
302
310
      mi_float8get(d_2,b);
420
428
      }
421
429
    case HA_KEYTYPE_LONG_INT:
422
430
    case HA_KEYTYPE_ULONG_INT:
 
431
    case HA_KEYTYPE_UINT24:
423
432
    case HA_KEYTYPE_LONGLONG:
424
433
    case HA_KEYTYPE_ULONGLONG:
425
434
    case HA_KEYTYPE_DOUBLE: