← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2009-08-05 07:19:17 UTC
  • mto: This revision was merged to the branch mainline in revision 1111.
  • Revision ID: brian@gaz-20090805071917-ukm39wpvfesxthiz
More Table refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
46
46
/* Prototypes */
47
47
static bool append_file_to_dir(Session *session, const char **filename_ptr,
48
48
                               const char *table_name);
 
49
static bool reload_cache(Session *session, ulong options, TableList *tables);
49
50
 
50
51
bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
51
52
 
2273
2274
    @retval !=0  Error; session->killed is set or session->is_error() is true
2274
2275
*/
2275
2276
 
2276
 
bool reload_cache(Session *session, ulong options, TableList *tables)
 
2277
static bool reload_cache(Session *session, ulong options, TableList *tables)
2277
2278
{
2278
2279
  bool result=0;
2279
2280
 
2292
2293
    {
2293
2294
      if (lock_global_read_lock(session))
2294
2295
        return true;                               // Killed
2295
 
      result= close_cached_tables(session, tables, (options & REFRESH_FAST) ?
2296
 
                                  false : true, true);
 
2296
      result= session->close_cached_tables(tables, (options & REFRESH_FAST) ?  false : true, true);
2297
2297
      if (make_global_read_lock_block_commit(session)) // Killed
2298
2298
      {
2299
2299
        /* Don't leave things in a half-locked state */
2303
2303
      }
2304
2304
    }
2305
2305
    else
2306
 
      result= close_cached_tables(session, tables, (options & REFRESH_FAST) ?
2307
 
                                  false : true, false);
 
2306
      result= session->close_cached_tables(tables, (options & REFRESH_FAST) ?  false : true, false);
2308
2307
  }
2309
2308
  if (session && (options & REFRESH_STATUS))
2310
2309
    session->refresh_status();