← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_key.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/mi_key.cc
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
/* Functions to handle keys */
17
17
 
18
18
#include "myisam_priv.h"
19
 
#include <drizzled/charset_info.h>
 
19
#include "drizzled/charset_info.h"
20
20
#ifdef HAVE_IEEEFP_H
21
21
#include <ieeefp.h>
22
22
#endif
23
23
#include <math.h>
24
24
#include <cassert>
25
25
 
26
 
using namespace drizzled;
27
 
using namespace std;
28
 
 
29
26
#define CHECK_KEYS                              /* Enable safety checks */
30
27
 
31
28
#define FIX_LENGTH(cs, pos, length, char_length)                            \
456
453
  case drizzled::HA_KEYTYPE_ULONG_INT:
457
454
    value=(uint64_t) uint4korr(key);
458
455
    break;
 
456
  case drizzled::HA_KEYTYPE_UINT24:
 
457
    value=(uint64_t) uint3korr(key);
 
458
    break;
459
459
  case drizzled::HA_KEYTYPE_DOUBLE:                       /* This shouldn't be used */
460
460
  {
461
461
    double f_1;