diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-17 20:47:20 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-17 20:47:20 +0200 |
| commit | 4fff4025063b0408a917f2b0c5809ab84d6a00a1 (patch) | |
| tree | 9189968dca2f68cfe5634ccd7ac1cd1a8a6228d2 /sql/Makefile.am | |
| parent | 1fe5615f52ce8e59e6e7cf55eb3e6e59647b6923 (diff) | |
| parent | 75db3094c2432f809031465bb277fb4b6b51b7ae (diff) | |
| download | mariadb-git-4fff4025063b0408a917f2b0c5809ab84d6a00a1.tar.gz | |
merge with 3.23.47 (DO statement)
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Docs/manual.texi:
merge
sql/Makefile.am:
merge
sql/mysql_priv.h:
merge
sql/sql_lex.h:
merge
sql/sql_yacc.yy:
merge
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 8238160d652..88306098107 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -67,7 +67,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ mysqld.cc password.c hash_filo.cc hostname.cc \ convert.cc sql_parse.cc sql_yacc.yy \ sql_base.cc table.cc sql_select.cc sql_insert.cc \ - sql_update.cc sql_delete.cc uniques.cc \ + sql_update.cc sql_delete.cc uniques.cc sql_do.cc \ procedure.cc item_uniq.cc sql_test.cc \ log.cc log_event.cc init.cc derror.cc sql_acl.cc \ unireg.cc des_key_file.cc \ |