← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/pars/pars0pars.cc

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/pars/pars0pars.cc
1133
1133
        }
1134
1134
 
1135
1135
        if (type == &pars_int_token) {
1136
 
                ut_a(len == 0);
1137
 
 
1138
 
                dtype_set(dfield_get_type(dfield), DATA_INT, flags, 4);
 
1136
                ut_a((len == 0) || (len == 8));
 
1137
                if (len == 8) {
 
1138
                        dtype_set(dfield_get_type(dfield), DATA_INT, flags, 8);
 
1139
                } else {
 
1140
                        dtype_set(dfield_get_type(dfield), DATA_INT, flags, 4);
 
1141
                }
1139
1142
 
1140
1143
        } else if (type == &pars_char_token) {
1141
1144
                ut_a(len == 0);