diff options
author | unknown <serg@serg.mysql.com> | 2001-05-15 20:55:40 +0200 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2001-05-15 20:55:40 +0200 |
commit | 83e3058c3e6ebd1ec2ffa03854eaf1388bb4c484 (patch) | |
tree | 21f17a4416a7c26597c585fb17a174dfc40da50e /sql/sql_parse.cc | |
parent | fe983ca7b3eed46e8cda130ad24d86f2609afdfb (diff) | |
parent | 5e52875b8fbce141f7a544da69ecf8c6c23ed6db (diff) | |
download | mariadb-git-83e3058c3e6ebd1ec2ffa03854eaf1388bb4c484.tar.gz |
Merge
Docs/manual.texi:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 916af73acae..3dda8d1cff7 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1393,7 +1393,8 @@ mysql_execute_command(void) tables, lex->create_list, lex->key_list, lex->drop_list, lex->alter_list, (ORDER *) lex->order_list.first, - lex->drop_primary, lex->duplicates); + lex->drop_primary, lex->duplicates, + lex->alter_keys_onoff, lex->simple_alter); break; } #endif |