diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-07-03 11:56:30 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-07-03 11:56:30 +0300 |
| commit | a9df65e595d6beda3057c9ef37dc3700379500a1 (patch) | |
| tree | 95e4a764cfe8f03084d7c19f157c57a699ed4536 /sql/sql_yacc.yy | |
| parent | 2373397e13d4004816b61df38a234906eb361e0d (diff) | |
| parent | adcd7be93515460327127e189a7b5ca5b63f232e (diff) | |
| download | mariadb-git-a9df65e595d6beda3057c9ef37dc3700379500a1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 94beff074c5..b07dca91a20 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -762,7 +762,7 @@ create: lex->create_info.db_type= (enum db_type) lex->thd->variables.table_type; } create2 - {} + {Lex->select= &Lex->select_lex;} | CREATE opt_unique_or_fulltext INDEX ident ON table_ident { LEX *lex=Lex; @@ -2587,6 +2587,7 @@ insert: opt_ignore insert2 { set_lock_for_tables($3); + Lex->select= &Lex->select_lex; } insert_field_spec {} @@ -2602,6 +2603,7 @@ replace: replace_lock_option insert2 { set_lock_for_tables($3); + Lex->select= &Lex->select_lex; } insert_field_spec {} @@ -3685,7 +3687,7 @@ grant: lex->select->db= 0; lex->ssl_type= SSL_TYPE_NOT_SPECIFIED; lex->ssl_cipher= lex->x509_subject= lex->x509_issuer= 0; - bzero(&(lex->mqh),sizeof(lex->mqh)); + bzero((char *)&(lex->mqh),sizeof(lex->mqh)); } grant_privileges ON opt_table TO_SYM user_list require_clause grant_options |