diff options
| author | unknown <timour@mysql.com> | 2004-05-11 12:15:58 +0300 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2004-05-11 12:15:58 +0300 |
| commit | d7938b9fef9e67145d6beeef65ae6e316fc01e07 (patch) | |
| tree | 3f8ad56e4d064d753fa3790c37848ff343681e86 /sql/structs.h | |
| parent | 224b9a06211484af1e2db773bce8d117ef9fe45d (diff) | |
| download | mariadb-git-d7938b9fef9e67145d6beeef65ae6e316fc01e07.tar.gz | |
Merge of WL#1469 with latest bk sources.
Diffstat (limited to 'sql/structs.h')
| -rw-r--r-- | sql/structs.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sql/structs.h b/sql/structs.h index 3279428c888..38794c6cd76 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -20,11 +20,21 @@ struct st_table; class Field; -typedef struct lex_string { +typedef struct st_lex_string +{ char *str; uint length; } LEX_STRING; +typedef struct st_lex_string_with_init :public st_lex_string +{ + st_lex_string_with_init(const char *str_arg, uint length_arg) + { + str= (char*) str_arg; + length= length_arg; + } +} LEX_STRING_WITH_INIT; + typedef struct st_date_time_format { uchar positions[8]; @@ -210,7 +220,7 @@ typedef struct user_conn { #define REG_NEW_RECORD 2 /* Write a new record if not found */ #define REG_UPDATE 4 /* Uppdate record */ #define REG_DELETE 8 /* Delete found record */ -#define REG_PROG 16 /* User is updateing database */ +#define REG_PROG 16 /* User is updating database */ #define REG_CLEAR_AFTER_WRITE 32 #define REG_MAY_BE_UPDATED 64 #define REG_AUTO_UPDATE 64 /* Used in D-forms for scroll-tables */ |