← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/flush.cc

Cleaned up a few global tests which aren't happy now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/flush.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2009 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2009 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
22
 
 
 
21
#include <drizzled/server_includes.h>
23
22
#include <drizzled/show.h>
24
23
#include <drizzled/session.h>
25
24
#include <drizzled/lock.h>
26
25
#include <drizzled/statement/flush.h>
27
 
#include "drizzled/sql_table.h"
28
 
#include "drizzled/plugin/logging.h"
29
 
#include "drizzled/plugin/storage_engine.h"
30
26
 
31
27
namespace drizzled
32
28
{
37
33
   * reloadCache() will tell us if we are allowed to write to the
38
34
   * binlog or not.
39
35
   */
40
 
  if (not reloadCache())
 
36
  if (! reloadCache())
41
37
  {
42
38
    /*
43
39
     * We WANT to write and we CAN write.
45
41
     *
46
42
     * Presumably, RESET and binlog writing doesn't require synchronization
47
43
     */
48
 
    write_bin_log(getSession(), *getSession()->getQueryString());
49
 
    getSession()->my_ok();
 
44
    write_bin_log(session, session->query, session->query_length);
 
45
    session->my_ok();
50
46
  }
51
47
 
52
48
  return false;
55
51
bool statement::Flush::reloadCache()
56
52
{
57
53
  bool result= false;
58
 
  TableList *tables= (TableList *) getSession()->lex->select_lex.table_list.first;
 
54
  ulong options= session->lex->type;
 
55
  TableList *tables= (TableList *) session->lex->select_lex.table_list.first;
59
56
 
60
 
  if (flush_log)
 
57
  if (options & REFRESH_LOG)
61
58
  {
62
59
    if (plugin::StorageEngine::flushLogs(NULL))
63
60
    {
68
65
    Note that if REFRESH_READ_LOCK bit is set then REFRESH_TABLES is set too
69
66
    (see sql_yacc.yy)
70
67
  */
71
 
  if (flush_tables || flush_tables_with_read_lock)
 
68
  if (options & (REFRESH_TABLES | REFRESH_READ_LOCK))
72
69
  {
73
 
    if (getSession() && flush_tables_with_read_lock)
 
70
    if ((options & REFRESH_READ_LOCK) && session)
74
71
    {
75
 
      if (getSession()->lockGlobalReadLock())
 
72
      if (lock_global_read_lock(session))
76
73
      {
77
74
        return true; /* Killed */
78
75
      }
79
 
      result= getSession()->close_cached_tables(tables, true, true);
80
 
 
81
 
      if (getSession()->makeGlobalReadLockBlockCommit()) /* Killed */
 
76
      result= session->close_cached_tables(tables, 
 
77
                                           (options & REFRESH_FAST) ?  false : true, 
 
78
                                           true);
 
79
      if (make_global_read_lock_block_commit(session)) /* Killed */
82
80
      {
83
81
        /* Don't leave things in a half-locked state */
84
 
        getSession()->unlockGlobalReadLock();
 
82
        unlock_global_read_lock(session);
85
83
        return true;
86
84
      }
87
85
    }
88
86
    else
89
87
    {
90
 
      result= getSession()->close_cached_tables(tables, true, false);
 
88
      result= session->close_cached_tables(tables, 
 
89
                                           (options & REFRESH_FAST) ?  false : true, 
 
90
                                           false);
91
91
    }
92
92
  }
93
93
 
94
 
  if (getSession() && flush_status)
95
 
  {
96
 
    getSession()->refresh_status();
97
 
  }
98
 
 
99
 
  if (getSession() && flush_global_status)
100
 
  {
101
 
    memset(&current_global_counters, 0, sizeof(current_global_counters));
102
 
    plugin::Logging::resetStats(getSession());
103
 
    getSession()->refresh_status();
104
 
  }
105
 
 
106
 
  return result;
 
94
  if (session && (options & REFRESH_STATUS))
 
95
  {
 
96
    session->refresh_status();
 
97
  }
 
98
 
 
99
 return result;
107
100
}
108
101
 
109
102
}