← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/table.cc

  • Committer: Monty Taylor
  • Date: 2010-10-30 01:19:00 UTC
  • mto: (1892.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1893.
  • Revision ID: mordred@inaugust.com-20101030011900-2tdt8w9vt7a6pbk0
Fixed things to make things compile with clang

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/table.cc
203
203
    path length on success, 0 on failure
204
204
*/
205
205
 
206
 
size_t TableIdentifier::build_table_filename(std::string &path, const std::string &db, const std::string &table_name, bool is_tmp)
 
206
size_t TableIdentifier::build_table_filename(std::string &in_path, const std::string &in_db, const std::string &in_table_name, bool is_tmp)
207
207
{
208
208
  bool conversion_error= false;
209
209
 
210
 
  conversion_error= tablename_to_filename(db, path);
 
210
  conversion_error= tablename_to_filename(in_db, in_path);
211
211
  if (conversion_error)
212
212
  {
213
213
    errmsg_printf(ERRMSG_LVL_ERROR,
216
216
    return 0;
217
217
  }
218
218
 
219
 
  path.append(FN_ROOTDIR);
 
219
  in_path.append(FN_ROOTDIR);
220
220
 
221
221
  if (is_tmp) // It a conversion tmp
222
222
  {
223
 
    path.append(table_name);
 
223
    in_path.append(in_table_name);
224
224
  }
225
225
  else
226
226
  {
227
 
    conversion_error= tablename_to_filename(table_name, path);
 
227
    conversion_error= tablename_to_filename(in_table_name, in_path);
228
228
    if (conversion_error)
229
229
    {
230
230
      errmsg_printf(ERRMSG_LVL_ERROR,
234
234
    }
235
235
  }
236
236
   
237
 
  return path.length();
 
237
  return in_path.length();
238
238
}
239
239
 
240
240