diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-11-13 10:17:53 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-11-13 10:17:53 +0000 |
| commit | 27b1c660e3f654d1d616fc4c03c9c74716acf9e0 (patch) | |
| tree | 5107afeb0f71e17a7fcdff3685ea606313d1aa3c /client | |
| parent | 794ccfc378e7476b14c0648a7473fe2ff8b618c8 (diff) | |
| parent | 7d3708636a7296206ca2f49b62a16c0c5ad7f7ef (diff) | |
| download | mariadb-git-27b1c660e3f654d1d616fc4c03c9c74716acf9e0.tar.gz | |
manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)
CONFLICTS
=========
Text conflict in sql/sql_yacc.yy
1 conflicts encountered.
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index ccd0d8aada0..9acf075d396 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -34,7 +34,7 @@ LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \ noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \ client_priv.h -EXTRA_DIST = get_password.c CMakeLists.txt echo.c +EXTRA_DIST = echo.c BUILT_SOURCES = link_sources |