diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-20 04:54:10 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-20 04:54:10 +0300 |
| commit | 5a2419eb89d2f617e94ebef64ffbef72417ec94c (patch) | |
| tree | 9809b1ec91af01ed8cc76e542fe1a102e239d9b1 /sql/sql_yacc.yy | |
| parent | 5a4aa474d879ac9598941665bef6f0938efc91e1 (diff) | |
| download | mariadb-git-5a2419eb89d2f617e94ebef64ffbef72417ec94c.tar.gz | |
Small bug fixes + code for DELETE QUICK
Docs/manual.texi:
Change log + bug fixes from the mailing list
configure.in:
added mlockall
include/config-win.h:
Fix to use SAFE_MUTEX
include/ft_global.h:
Free memory
include/my_pthread.h:
Fix for SAFE_MUTEX on windows
myisam/Makefile.am:
Fix modes
myisam/ft_static.c:
Fix language problem with fulltext
myisam/ft_stopwords.c:
Free memory at end
myisam/mi_create.c:
Fix language problem with fulltext
myisam/mi_delete.c:
Added optimization to not join blocks when using delete with QUICK
myisam/mi_panic.c:
Added freeing of memorty
myisam/mi_test2.c:
Added quick mode
myisam/myisamchk.c:
Fixed help text
myisam/myisamdef.h:
Added optimization to not join blocks when using delete with QUICK
mysys/mf_format.c:
Don't change case for extension
mysys/my_wincond.c:
Fix for safe mutex
mysys/thr_mutex.c:
Fix for safe mutex
sql-bench/test-insert.sh:
Split delete test to get more information about the times
sql/ChangeLog:
Changelog
sql/ha_myisam.cc:
Better OPTIMIZE handling
sql/log.cc:
Cleanup
sql/mysql_priv.h:
Fix for safe mutex
sql/mysqld.cc:
Added define for --one-thread option
sql/sql_class.h:
Fixed lock_time in slow_log
sql/sql_delete.cc:
Fix for safe mutex
sql/sql_parse.cc:
Fix processlist message for new process
sql/sql_table.cc:
Fix windows problem med CREATE INDEX
sql/sql_yacc.yy:
Fix for safe mutex
sql/table.cc:
Made code simpler
strings/bmove512.c:
Small speed fix
support-files/mysql.server.sh:
Fixed awk usage
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 5e6863178b9..ead4e38628d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -501,6 +501,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); grant revoke set lock unlock string_list field_options field_option field_opt_list opt_binary table_lock_list table_lock varchar references opt_on_delete opt_on_delete_list opt_on_delete_item use + opt_delete_options opt_delete_option opt_outer table_list table opt_option opt_place opt_low_priority opt_attribute opt_attribute_list attribute column_list column_list_id opt_column_list grant_privileges opt_table user_list grant_option @@ -2085,10 +2086,21 @@ opt_low_priority: /* Delete rows from a table */ delete: - DELETE_SYM opt_low_priority FROM table where_clause delete_limit_clause - { Lex->sql_command= SQLCOM_DELETE; } + DELETE_SYM + { Lex->sql_command= SQLCOM_DELETE; Lex->options=0; + Lex->lock_option= current_thd->update_lock_default; } + opt_delete_options FROM table + where_clause delete_limit_clause +opt_delete_options: + /* empty */ {} + | opt_delete_option opt_delete_options {} + +opt_delete_option: + QUICK { Lex->options|= OPTION_QUICK; } + | LOW_PRIORITY { Lex->lock_option= TL_WRITE_LOW_PRIORITY; } + /* Show things */ show: SHOW { Lex->wild=0;} show_param |