← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Brian Aker
  • Date: 2008-11-18 23:19:19 UTC
  • mfrom: (584.1.16 devel)
  • Revision ID: brian@tangent.org-20081118231919-w9sr347dtiwhccml
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
26
26
#include <drizzled/gettext.h>
27
27
#include <drizzled/util/convert.h>
28
28
#include <drizzled/error.h>
29
 
#include <string>
30
29
#include <drizzled/tztime.h>
31
30
#include <drizzled/data_home.h>
 
31
#include <drizzled/item/cmpfunc.h>
 
32
#include <drizzled/virtual_column_info.h>
 
33
#include <drizzled/sql_base.h>
 
34
#include <drizzled/db.h>
 
35
 
 
36
#include <string>
32
37
 
33
38
inline const char *
34
39
str_or_nil(const char *str)
1176
1181
        {
1177
1182
          /* 
1178
1183
            query_length is always set to 0 when we set query = NULL; see
1179
 
            the comment in sql_class.h why this prevents crashes in possible
 
1184
                  the comment in session.h why this prevents crashes in possible
1180
1185
            races with query_length
1181
1186
          */
1182
1187
          uint32_t length= cmin((uint32_t)max_query_length, tmp->query_length);