← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_show.cc

  • Committer: Mats Kindahl
  • Date: 2008-08-25 11:54:47 UTC
  • mto: (489.1.2 codestyle)
  • mto: This revision was merged to the branch mainline in revision 372.
  • Revision ID: mats@mysql.com-20080825115447-tg73zkyjnldm7p4c
Hiding THD::proc_info field and providing a setter and getter.
Replacing use of swap_variables() in C++ code with std::swap().
Moving swap_variables() into C files where it is used.
Replacing some function-like macros with inline functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_show.cc
21
21
#include "repl_failsafe.h"
22
22
#include <mysys/my_dir.h>
23
23
 
24
 
#define STR_OR_NIL(S) ((S) ? (S) : "<nil>")
 
24
inline const char *
 
25
str_or_nil(const char *str)
 
26
{
 
27
  return str ? str : "<nil>";
 
28
}
25
29
 
26
30
/* Match the values of enum ha_choice */
27
31
static const char *ha_choice_values[] = {"", "0", "1"};
1161
1165
                                        "Writing to net" :
1162
1166
                                        thd_info->command == COM_SLEEP ? NullS :
1163
1167
                                        "Reading from net") :
1164
 
                                       tmp->proc_info ? tmp->proc_info :
 
1168
                                       tmp->get_proc_info() ? tmp->get_proc_info() :
1165
1169
                                       tmp->mysys_var &&
1166
1170
                                       tmp->mysys_var->current_cond ?
1167
1171
                                       "Waiting on cond" : NullS);
1271
1275
                     "Writing to net" :
1272
1276
                     tmp->command == COM_SLEEP ? NullS :
1273
1277
                     "Reading from net") :
1274
 
                    tmp->proc_info ? tmp->proc_info :
 
1278
                    tmp->get_proc_info() ? tmp->get_proc_info() :
1275
1279
                    tmp->mysys_var &&
1276
1280
                    tmp->mysys_var->current_cond ?
1277
1281
                    "Waiting on cond" : NullS);