← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/collation_dictionary/collations.cc

  • Committer: Brian Aker
  • Date: 2010-02-18 17:24:08 UTC
  • mto: (1273.19.13 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1304.
  • Revision ID: brian@gaz-20100218172408-l224655n3lf4h6nd
Revert OSX fix, requiring more cast.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/collation_dictionary/collations.cc
135
135
  push(tmp_cl->csname);
136
136
 
137
137
  /* COLLATION_ID */
138
 
  push(tmp_cl->number);
 
138
  push(static_cast<int64_t>(tmp_cl->number));
139
139
 
140
140
  /* IS_DEFAULT */
141
141
  push((bool)(tmp_cl->state & MY_CS_PRIMARY));
144
144
  push((bool)(tmp_cl->state & MY_CS_COMPILED));
145
145
 
146
146
  /* SORTLEN */
147
 
  push(tmp_cl->strxfrm_multiply);
 
147
  push(static_cast<int64_t>(tmp_cl->strxfrm_multiply));
148
148
}