← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2009-07-16 19:30:03 UTC
  • mfrom: (1093.1.17 captain)
  • Revision ID: brian@gaz-20090716193003-gwt4i1le2g02ay0j
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
1250
1250
             pos != end ;
1251
1251
             pos++)
1252
1252
        {
1253
 
#ifdef USE_MB
1254
1253
          if (use_mb(res_charset))
1255
1254
          {
1256
1255
            int l;
1260
1259
              continue;
1261
1260
            }
1262
1261
          }
1263
 
#endif
1264
1262
 
1265
1263
          /*
1266
1264
            Special case when dumping BINARY/VARBINARY/BLOB values
2047
2045
bool Session::open_normal_and_derived_tables(TableList *tables, uint32_t flags)
2048
2046
{
2049
2047
  uint32_t counter;
2050
 
  assert(!(fill_derived_tables()));
 
2048
  bool ret= fill_derived_tables();
 
2049
  assert(ret == false);
2051
2050
  if (open_tables_from_list(&tables, &counter, flags) ||
2052
2051
      mysql_handle_derived(lex, &mysql_derived_prepare))
2053
2052
    return true; /* purecov: inspected */