diff options
| author | unknown <jani@linux-th5m.site> | 2007-05-24 19:47:58 +0300 |
|---|---|---|
| committer | unknown <jani@linux-th5m.site> | 2007-05-24 19:47:58 +0300 |
| commit | 635728a6e69f95c0a4008fb4b65992d58486bc51 (patch) | |
| tree | 2958d280359513f6d2b3ce1f9b1dfd0f818bfb98 /sql/sql_yacc.yy | |
| parent | 6356f5631c1b6dab40b747abe54797f1779aef80 (diff) | |
| download | mariadb-git-635728a6e69f95c0a4008fb4b65992d58486bc51.tar.gz | |
Merged from main 5.1
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 113fb33fb9b..5c21adf3c8f 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -10190,7 +10190,8 @@ option_type_value: else qbuff.length= lip->tok_end - sp->m_tmp_query; - if (!(qbuff.str= alloc_root(thd->mem_root, qbuff.length + 5))) + if (!(qbuff.str= (char*) alloc_root(thd->mem_root, + qbuff.length + 5))) MYSQL_YYABORT; strmake(strmake(qbuff.str, "SET ", 4), sp->m_tmp_query, |