diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-07 11:36:46 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-07 11:36:46 +0300 |
| commit | 5b82bc6644fb766c7a04b49d60e70c474450ce28 (patch) | |
| tree | 31264d4e59f24a6566d1a7dc4cba2b63d805bc53 /sql/sql_yacc.yy | |
| parent | 61e96be77fdc0eee96c86903b5b66f8edf6b9238 (diff) | |
| parent | 640fefffa7996b5ee68761472fa3000e6e7abc88 (diff) | |
| download | mariadb-git-5b82bc6644fb766c7a04b49d60e70c474450ce28.tar.gz | |
merge
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ce5af7ae35e..546f6b41632 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2423,8 +2423,8 @@ create_select: else if (lex->sql_command == SQLCOM_REPLACE) lex->sql_command= SQLCOM_REPLACE_SELECT; /* - following work only with local list, global list is - created correctly in this case + The following work only with the local list, the global list + is created correctly in this case */ lex->current_select->table_list.save_and_clear(&lex->save_list); mysql_init_select(lex); @@ -2437,8 +2437,8 @@ create_select: opt_select_from { /* - following work only with local list, global list is - created correctly in this case + The following work only with the local list, the global list + is created correctly in this case */ Lex->current_select->table_list.push_front(&Lex->save_list); } |