← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/myxt_xt.cc

  • Committer: lbieber
  • Date: 2010-09-22 21:12:51 UTC
  • mfrom: (1782.4.3 refactor)
  • mto: This revision was merged to the branch mainline in revision 1787.
  • Revision ID: lbieber@orisndriz08-20100922211251-yuy3nkgpzb3t8jrd
Merge Brian - Remove 3 byte indexes

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/myxt_xt.cc
1132
1132
#endif
1133
1133
                        case HA_KEYTYPE_LONG_INT:
1134
1134
                        case HA_KEYTYPE_ULONG_INT:
1135
 
                        case HA_KEYTYPE_UINT24:
1136
1135
                        case HA_KEYTYPE_DOUBLE:
1137
1136
                        case HA_KEYTYPE_LONGLONG:
1138
1137
                        case HA_KEYTYPE_ULONGLONG:
1343
1342
                                b += keyseg->length;
1344
1343
                                break;
1345
1344
                        }
1346
 
#endif
1347
1345
                        case HA_KEYTYPE_UINT24: {
1348
1346
                                int32_t l_1 = uint3korr(a);
1349
1347
                                int32_t l_2 = uint3korr(b);
1353
1351
                                b += keyseg->length;
1354
1352
                                break;
1355
1353
                        }
1356
 
#ifndef DRIZZLED
1357
1354
                        case HA_KEYTYPE_FLOAT: {
1358
1355
                                float f_1, f_2;
1359
1356
 
1521
1518
                case HA_KEYTYPE_USHORT_INT:
1522
1519
                case HA_KEYTYPE_INT24:
1523
1520
                case HA_KEYTYPE_FLOAT:
 
1521
                case HA_KEYTYPE_UINT24:
1524
1522
#endif          
1525
1523
                case HA_KEYTYPE_LONG_INT:
1526
1524
                case HA_KEYTYPE_ULONG_INT:
1527
 
                case HA_KEYTYPE_UINT24:
1528
1525
                case HA_KEYTYPE_DOUBLE:
1529
1526
                        break;
1530
1527
#ifndef DRIZZLED
2245
2242
#else
2246
2243
                                        seg->type = HA_KEYTYPE_USHORT_INT;
2247
2244
                                        break;
2248
 
#endif
2249
2245
                                case 3:
2250
2246
                                        seg->type = HA_KEYTYPE_UINT24;
2251
2247
                                        break;
 
2248
#endif
2252
2249
                        }
2253
2250
                }
2254
2251
#endif