diff options
| author | unknown <hf@deer.(none)> | 2003-07-14 16:38:51 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-07-14 16:38:51 +0500 |
| commit | 90091dee465cef6cd50ef85ed9dd67b06a0edfd2 (patch) | |
| tree | cfa7135a5a38a92eb1b6324c0848682301a164a4 /libmysqld | |
| parent | caeb95a3abfe47be742a77390177bddd50b841e6 (diff) | |
| download | mariadb-git-90091dee465cef6cd50ef85ed9dd67b06a0edfd2.tar.gz | |
Some mistakes fixed
libmysql/libmysql.c:
was removed by mistake during merging
libmysqld/Makefile.am:
link should be removed first
libmysqld/libmysqld.c:
We don't need this line here
sql-common/pack.c:
Function was moved to old place
sql/sql_client.cc:
we do need this function
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 1 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index d87bf3c9b52..e61e7833451 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -115,6 +115,7 @@ link_sources: rm -f $(srcdir)/$$f; \ @LN_CP_F@ $(srcdir)/../libmysql/$$f $(srcdir)/$$f; \ done; \ + rm -f $(srcdir)/client_settings.h; \ @LN_CP_F@ $(srcdir)/../libmysql/client_settings.h $(srcdir)/client_settings.h; diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 16be7d884fa..0a096a88889 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -46,7 +46,6 @@ #define INADDR_NONE -1 #endif -const char *not_error_sqlstate= "00000"; #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | CLIENT_PROTOCOL_41) #if defined(MSDOS) || defined(__WIN__) |