diff options
| author | serg@serg.mysql.com <> | 2001-04-15 20:14:40 +0200 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2001-04-15 20:14:40 +0200 |
| commit | 5d86c27a2d4e5a4851720b27f8ef733b174cb778 (patch) | |
| tree | b8726fd9a65296176ce63f6bacfb6002311f5418 /sql | |
| parent | 6a41e1f3a5a4fbe08e4e5743060a62964b8f6f40 (diff) | |
| download | mariadb-git-5d86c27a2d4e5a4851720b27f8ef733b174cb778.tar.gz | |
mysqltest bugfix
typo/bad merge fixed
chmod a-x for man/*.1 files
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/Makefile.am | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 2fc621090b3..5af1b2900ff 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -41,7 +41,7 @@ LDADD = ../isam/libnisam.a \ ../regex/libregex.a \ ../strings/libmystrings.a mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ - @bdb_libs@ @innobase_libs@ @pstack_libs@ \ + @bdb_libs@ @innodb_libs@ @pstack_libs@ \ @gemini_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ef271bb888e..357ba41046c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -444,7 +444,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token TINYINT %token TINYTEXT %token UNSIGNED ->>>>>>> BitKeeper/tmp/sql_yacc.yy_serg@1.85 %token VARBINARY %token VARCHAR %token VARIABLES @@ -2185,7 +2184,7 @@ values: /* Update rows in a table */ update: - UPDATE_SYM opt_low_priority opt_ignore table + UPDATE_SYM opt_low_priority opt_ignore table_name SET update_list where_clause opt_order_clause @@ -2224,7 +2223,7 @@ delete: Lex->order_list.first=0; Lex->order_list.next= (byte**) &Lex->order_list.first; } - opt_delete_options FROM table + opt_delete_options FROM table_name where_clause opt_order_clause delete_limit_clause @@ -2237,7 +2236,7 @@ opt_delete_option: | LOW_PRIORITY { Lex->lock_option= TL_WRITE_LOW_PRIORITY; } truncate: - TRUNCATE_SYM opt_table_sym table + TRUNCATE_SYM opt_table_sym table_name { LEX* lex = Lex; lex->sql_command= SQLCOM_TRUNCATE; |