diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
| commit | 711c318c072f6d5fd5c2877ccc736c7673d1711d (patch) | |
| tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /sql/Makefile.am | |
| parent | 00538253b592522babe3609af29cb3eb87218b64 (diff) | |
| parent | fd64a0db45705ca5eb2ad34ffc2ed1d9ef961017 (diff) | |
| download | mariadb-git-711c318c072f6d5fd5c2877ccc736c7673d1711d.tar.gz | |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 0616893a014..4b1ecbbc8da 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -135,8 +135,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ item_row.cc item_geofunc.cc item_xmlfunc.cc \ field.cc strfunc.cc key.cc sql_class.cc sql_list.cc \ net_serv.cc protocol.cc sql_state.c \ - lock.cc my_lock.c \ - sql_string.cc sql_manager.cc sql_map.cc \ + lock.cc sql_string.cc sql_manager.cc sql_map.cc \ main.cc mysqld.cc password.c hash_filo.cc hostname.cc \ sql_connect.cc scheduler.cc sql_parse.cc \ keycaches.cc set_var.cc sql_yacc.yy sys_vars.cc \ |