diff options
| author | unknown <serg@serg.mysql.com> | 2002-11-29 12:29:27 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-11-29 12:29:27 +0100 |
| commit | 76a634b763fc78b70e6109ab065127c33944f4d5 (patch) | |
| tree | 7bd85dfa2f699c367585b08758f9f5fb3944e5b0 /sql | |
| parent | b226e15a096ad9493162f2d8dc81e40c69f848c7 (diff) | |
| download | mariadb-git-76a634b763fc78b70e6109ab065127c33944f4d5.tar.gz | |
s/SQLCOM_MULTI_UPDATE/SQLCOM_UPDATE_MULTI/ to be in line with SQLCOM_DELETE_MULTI
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_lex.h | 6 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 4c5ca88b7b0..f4475b26a0a 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -50,9 +50,9 @@ enum enum_sql_command { SQLCOM_SHOW_CREATE_DB, SQLCOM_LOAD,SQLCOM_SET_OPTION,SQLCOM_LOCK_TABLES,SQLCOM_UNLOCK_TABLES, - SQLCOM_GRANT, + SQLCOM_GRANT, SQLCOM_CHANGE_DB, SQLCOM_CREATE_DB, SQLCOM_DROP_DB, SQLCOM_ALTER_DB, - SQLCOM_REPAIR, SQLCOM_REPLACE, SQLCOM_REPLACE_SELECT, + SQLCOM_REPAIR, SQLCOM_REPLACE, SQLCOM_REPLACE_SELECT, SQLCOM_CREATE_FUNCTION, SQLCOM_DROP_FUNCTION, SQLCOM_REVOKE,SQLCOM_OPTIMIZE, SQLCOM_CHECK, SQLCOM_FLUSH, SQLCOM_KILL, SQLCOM_ANALYZE, @@ -62,7 +62,7 @@ enum enum_sql_command { SQLCOM_RESET, SQLCOM_PURGE, SQLCOM_SHOW_BINLOGS, SQLCOM_SHOW_OPEN_TABLES, SQLCOM_LOAD_MASTER_DATA, SQLCOM_HA_OPEN, SQLCOM_HA_CLOSE, SQLCOM_HA_READ, - SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_DELETE_MULTI, SQLCOM_MULTI_UPDATE, + SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_DELETE_MULTI, SQLCOM_UPDATE_MULTI, SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER, SQLCOM_DO, SQLCOM_SHOW_WARNS, SQLCOM_EMPTY_QUERY, SQLCOM_SHOW_ERRORS, SQLCOM_SHOW_COLUMN_TYPES, SQLCOM_SHOW_TABLE_TYPES, SQLCOM_SHOW_PRIVILEGES, diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2e8a431d212..11f1c59fd45 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -362,7 +362,7 @@ void init_update_queries(void) uc_update_queries[SQLCOM_RESTORE_TABLE]=1; uc_update_queries[SQLCOM_DELETE_MULTI]=1; uc_update_queries[SQLCOM_DROP_INDEX]=1; - uc_update_queries[SQLCOM_MULTI_UPDATE]=1; + uc_update_queries[SQLCOM_UPDATE_MULTI]=1; } @@ -1911,7 +1911,7 @@ mysql_execute_command(THD *thd) TABLE_LIST *auxi; const char *msg=0; - lex->sql_command=SQLCOM_MULTI_UPDATE; + lex->sql_command=SQLCOM_UPDATE_MULTI; for (auxi= (TABLE_LIST*) tables, table_count=0 ; auxi ; auxi=auxi->next) table_count++; @@ -2056,11 +2056,11 @@ mysql_execute_command(THD *thd) /* sql_yacc guarantees that tables and aux_tables are not zero */ if (check_db_used(thd, tables) || check_db_used(thd,aux_tables) || - check_table_access(thd,SELECT_ACL, tables) || + check_table_access(thd,SELECT_ACL, tables) || check_table_access(thd,DELETE_ACL, aux_tables)) goto error; if ((thd->options & OPTION_SAFE_UPDATES) && !select_lex->where) - { + { send_error(thd,ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE); goto error; } |