diff options
Diffstat (limited to 'innobase/pars')
| -rw-r--r-- | innobase/pars/lexyy.c | 2 | ||||
| -rw-r--r-- | innobase/pars/pars0opt.c | 5 | ||||
| -rw-r--r-- | innobase/pars/pars0pars.c | 11 | ||||
| -rw-r--r-- | innobase/pars/pars0sym.c | 5 |
4 files changed, 11 insertions, 12 deletions
diff --git a/innobase/pars/lexyy.c b/innobase/pars/lexyy.c index 7d3c599b82f..d98d3c9b945 100644 --- a/innobase/pars/lexyy.c +++ b/innobase/pars/lexyy.c @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ + * $Header: /home/heikki/cvsroot/ib/pars/lexyy.c,v 1.2 2003/10/30 20:27:19 heikki Exp $ */ /* This include MUST be first to keep things portable ! */ diff --git a/innobase/pars/pars0opt.c b/innobase/pars/pars0opt.c index 5cc2e39b438..7ba4af15243 100644 --- a/innobase/pars/pars0opt.c +++ b/innobase/pars/pars0opt.c @@ -1231,7 +1231,8 @@ opt_print_query_plan( fputs("Table ", stderr); dict_index_name_print(stderr, plan->index); fprintf(stderr,"; exact m. %lu, match %lu, end conds %lu\n", - plan->n_exact_match, n_fields, - UT_LIST_GET_LEN(plan->end_conds)); + (unsigned long) plan->n_exact_match, + (unsigned long) n_fields, + (unsigned long) UT_LIST_GET_LEN(plan->end_conds)); } } diff --git a/innobase/pars/pars0pars.c b/innobase/pars/pars0pars.c index a4124672df0..e4b388cba82 100644 --- a/innobase/pars/pars0pars.c +++ b/innobase/pars/pars0pars.c @@ -530,7 +530,7 @@ pars_retrieve_table_def( /*====================*/ sym_node_t* sym_node) /* in: table node */ { - char* table_name; + const char* table_name; ut_a(sym_node); ut_a(que_node_get_type(sym_node) == QUE_NODE_SYMBOL); @@ -538,7 +538,7 @@ pars_retrieve_table_def( sym_node->resolved = TRUE; sym_node->token_type = SYM_TABLE; - table_name = (char*) sym_node->name; + table_name = (const char*) sym_node->name; sym_node->table = dict_table_get_low(table_name); @@ -1713,7 +1713,8 @@ Called by yyparse on error. */ void yyerror( /*====*/ - char* s __attribute__((unused))) /* in: error message string */ + const char* s __attribute__((unused))) + /* in: error message string */ { ut_ad(s); @@ -1728,8 +1729,8 @@ Parses an SQL string returning the query graph. */ que_t* pars_sql( /*=====*/ - /* out, own: the query graph */ - char* str) /* in: SQL string */ + /* out, own: the query graph */ + const char* str) /* in: SQL string */ { sym_node_t* sym_node; mem_heap_t* heap; diff --git a/innobase/pars/pars0sym.c b/innobase/pars/pars0sym.c index 1a0608ed142..194e6677183 100644 --- a/innobase/pars/pars0sym.c +++ b/innobase/pars/pars0sym.c @@ -217,13 +217,10 @@ sym_tab_add_id( node->common.type = QUE_NODE_SYMBOL; - node->name = mem_heap_alloc(sym_tab->heap, len + 1); node->resolved = FALSE; node->indirection = NULL; - ut_memcpy(node->name, name, len); - node->name[len] = '\0'; - + node->name = mem_heap_strdupl(sym_tab->heap, name, len + 1); node->name_len = len; UT_LIST_ADD_LAST(sym_list, sym_tab->sym_list, node); |