← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/row/row0mysql.c

  • Committer: Grant Limberg
  • Date: 2008-08-12 21:13:01 UTC
  • mto: (322.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: grant@glsoftware.net-20080812211301-ym3wsowelkgp16s2
renamed all instances of MYSQL_ to DRIZZLE_

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/row/row0mysql.c
286
286
                    || type == DATA_VARMYSQL
287
287
                    || type == DATA_BINARY)) {
288
288
 
289
 
                if (dtype_get_mysql_type(dtype) == DATA_MYSQL_TRUE_VARCHAR) {
 
289
                if (dtype_get_mysql_type(dtype) == DATA_DRIZZLE_TRUE_VARCHAR) {
290
290
                        /* The length of the actual data is stored to 1 or 2
291
291
                        bytes at the start of the field */
292
292
 
388
388
                                        field type information is already
389
389
                                        copied there! */
390
390
        row_prebuilt_t* prebuilt,       /* in: prebuilt struct where template
391
 
                                        must be of type ROW_MYSQL_WHOLE_ROW */
 
391
                                        must be of type ROW_DRIZZLE_WHOLE_ROW */
392
392
        byte*           mysql_rec)      /* in: row in the MySQL format;
393
393
                                        NOTE: do not discard as long as
394
394
                                        row is used, as row may contain
398
398
        dfield_t*               dfield;
399
399
        ulint                   i;
400
400
 
401
 
        ut_ad(prebuilt->template_type == ROW_MYSQL_WHOLE_ROW);
 
401
        ut_ad(prebuilt->template_type == ROW_DRIZZLE_WHOLE_ROW);
402
402
        ut_ad(prebuilt->mysql_template);
403
403
 
404
404
        for (i = 0; i < prebuilt->n_template; i++) {
645
645
 
646
646
        prebuilt->clust_ref = ref;
647
647
 
648
 
        for (i = 0; i < MYSQL_FETCH_CACHE_SIZE; i++) {
 
648
        for (i = 0; i < DRIZZLE_FETCH_CACHE_SIZE; i++) {
649
649
                prebuilt->fetch_cache[i] = NULL;
650
650
        }
651
651
 
716
716
                mem_heap_free(prebuilt->old_vers_heap);
717
717
        }
718
718
 
719
 
        for (i = 0; i < MYSQL_FETCH_CACHE_SIZE; i++) {
 
719
        for (i = 0; i < DRIZZLE_FETCH_CACHE_SIZE; i++) {
720
720
                if (prebuilt->fetch_cache[i] != NULL) {
721
721
 
722
722
                        if ((ROW_PREBUILT_FETCH_MAGIC_N != mach_read_from_4(
3851
3851
 
3852
3852
        prebuilt->index = index;
3853
3853
        prebuilt->sql_stat_start = TRUE;
3854
 
        prebuilt->template_type = ROW_MYSQL_DUMMY_TEMPLATE;
 
3854
        prebuilt->template_type = ROW_DRIZZLE_DUMMY_TEMPLATE;
3855
3855
        prebuilt->n_template = 0;
3856
3856
        prebuilt->need_to_access_clustered = FALSE;
3857
3857