diff options
| author | kostja@bodhi.local <> | 2006-07-26 23:33:25 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-07-26 23:33:25 +0400 |
| commit | 73189969f358be1530a1421fe38ea5cd183cfe10 (patch) | |
| tree | 9127bb933b3774974a321dce0ca111f0e8ac8991 /sql/sql_lex.h | |
| parent | bea330494ce2ef65fcdb0c74c646af7df8a0d778 (diff) | |
| parent | bd183d42dcf66432d2e8051e030919a4669eaf8c (diff) | |
| download | mariadb-git-73189969f358be1530a1421fe38ea5cd183cfe10.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 85264638551..f42f70d4397 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -937,7 +937,7 @@ typedef struct st_lex : public Query_tables_list List<Name_resolution_context> context_stack; List<LEX_STRING> db_list; - SQL_LIST proc_list, auxilliary_table_list, save_list; + SQL_LIST proc_list, auxiliary_table_list, save_list; create_field *last_field; Item_sum *in_sum_func; udf_func udf; |