← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Monty Taylor
  • Date: 2009-02-09 20:45:49 UTC
  • mfrom: (864 drizzle)
  • mto: This revision was merged to the branch mainline in revision 865.
  • Revision ID: mordred@inaugust.com-20090209204549-hcaonir5zwelh0t9
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
363
363
      table_options.block_size() : 0;
364
364
 
365
365
    share->table_charset= get_charset(table_options.has_collation_id()?
366
 
                                      table_options.collation_id() : 0,
367
 
                                      MYF(0));
 
366
                                      table_options.collation_id() : 0);
368
367
 
369
368
    if (!share->table_charset)
370
369
    {
1038
1037
      {
1039
1038
        if (!strpos[14])
1040
1039
          charset= &my_charset_bin;
1041
 
        else if (!(charset=get_charset((uint) strpos[14], MYF(0))))
 
1040
        else if (!(charset=get_charset((uint) strpos[14])))
1042
1041
        {
1043
1042
          error= 5; // Unknown or unavailable charset
1044
1043
          errarg= (int) strpos[14];
1115
1114
        if (!f_is_blob(pack_flag))
1116
1115
        {
1117
1116
          // 3.23 or 4.0 string
1118
 
          if (!(charset= get_charset_by_csname(share->table_charset->csname,
1119
 
                                               MY_CS_BINSORT, MYF(0))))
 
1117
          if (!(charset= get_charset_by_csname(share->table_charset->csname, MY_CS_BINSORT)))
1120
1118
            charset= &my_charset_bin;
1121
1119
        }
1122
1120
        else