← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lex_string.h

  • Committer: Stewart Smith
  • Date: 2011-01-21 01:09:12 UTC
  • mfrom: (2099 staging)
  • mto: (2099.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2100.
  • Revision ID: stewart@flamingspork.com-20110121010912-x5ogi8rm08nortxp
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lex_string.h
30
30
*/
31
31
 
32
32
/* This definition must match the one given in mysql/plugin.h */
33
 
typedef struct drizzle_lex_string
 
33
typedef struct lex_string_t
34
34
{
35
35
  char *str;
36
36
  size_t length;
37
37
} LEX_STRING;
38
38
 
39
 
struct execute_string_t : public drizzle_lex_string
 
39
struct execute_string_t : public lex_string_t
40
40
{
41
41
private:
42
42
  bool is_variable;
47
47
    return is_variable;
48
48
  }
49
49
 
50
 
  void set(const drizzle_lex_string& ptr, bool is_variable_arg= false)
 
50
  void set(const lex_string_t& ptr, bool is_variable_arg= false)
51
51
  {
52
52
    is_variable= is_variable_arg;
53
53
    str= ptr.str;