diff options
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 10 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 4 | ||||
| -rwxr-xr-x | vio/test-ssl | bin | 42160 -> 0 bytes |
6 files changed, 12 insertions, 10 deletions
diff --git a/.bzrignore b/.bzrignore index de39fc474c6..bfb1710d33d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -410,3 +410,5 @@ libmysqld/examples/mysqltest.c libmysqld/examples/readline.cc libmysqld/examples/sql_string.cc libmysqld/examples/sql_string.h +libmysqld/examples/mysql +libmysqld/examples/mysqltest diff --git a/configure.in b/configure.in index a0b6b0bbacb..e2d7ec89a7e 100644 --- a/configure.in +++ b/configure.in @@ -688,7 +688,6 @@ int main() [USE_PSTACK=yes]) pstack_libs= pstack_dirs= - pstack_makefile= if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$MACHINE_TYPE" = "i686" then have_libiberty= have_libbfd= @@ -704,7 +703,6 @@ dnl I have no idea if this is a good test - can not find docs for libiberty then pstack_dirs='$(top_srcdir)'/pstack pstack_libs="$pstack_dirs/libpstack.a -lbfd -liberty" - pstack_makefile=pstack/Makefile AC_SUBST([pstack_dirs]) AC_SUBST([pstack_libs]) AC_DEFINE([USE_PSTACK]) @@ -2222,7 +2220,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \ man/Makefile readline/Makefile vio/Makefile \ libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile \ libmysql/Makefile client/Makefile \ - $pstack_makefile sql/Makefile sql/share/Makefile \ + pstack/Makefile sql/Makefile sql/share/Makefile \ merge/Makefile dbug/Makefile scripts/Makefile \ include/Makefile sql-bench/Makefile tools/Makefile \ tests/Makefile Docs/Makefile support-files/Makefile \ diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index feeec6225fd..1f0b15d15b6 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -32,7 +32,7 @@ INCLUDES = @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include -I../include \ ## XXX: should we use client or server LDFLAGS for libmysqld? LDADD = @CLIENT_EXTRA_LDFLAGS@ libmysqld.la pkglib_LTLIBRARIES = libmysqld.la -SUBDIRS = examples +SUBDIRS = . examples libmysqld_la_SOURCES= libmysqld.c lib_sql.cc lib_load.cc libmysqlsources = errmsg.c get_password.c password.c diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 2a8ac304e9a..9fc4c12835e 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -1,5 +1,6 @@ -bin_PROGRAMS = mysqltest mysql +noinst_PROGRAMS = mysqltest mysql client_sources = $(mysqltest_SOURCES) $(mysql_SOURCES) + link_sources: for f in $(client_sources); do \ rm -f $(srcdir)/$$f; \ @@ -8,7 +9,7 @@ link_sources: DEFS = -DEMBEDDED_SERVER INCLUDES = -I$(top_srcdir)/include $(openssl_includes) \ - -I$(srcdir) -I$(top_srcdir) -I.. + -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client LIBS = @LIBS@ LDADD = $(top_builddir)/libmysqld/libmysqld.la \ $(top_builddir)/isam/libnisam.a \ @@ -20,7 +21,7 @@ LDADD = $(top_builddir)/libmysqld/libmysqld.la \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/regex/libregex.a + $(top_builddir)/regex/libregex.a @LIBDL@ mysqltest_DEPENDENCIES = ../libmysqld.la mysqltest_SOURCES = mysqltest.c @@ -31,3 +32,6 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) clean: rm -f $(client_sources) + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8501bd57b6e..c6e23eb927a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2017,8 +2017,6 @@ mysql_execute_command(void) case SQLCOM_REVOKE: case SQLCOM_GRANT: { - if (tables && !tables->db) - tables->db=thd->db; if (check_access(thd, lex->grant | lex->grant_tot_col | GRANT_ACL, tables && tables->db ? tables->db : select_lex->db, tables ? &tables->grant.privilege : 0, @@ -2205,7 +2203,7 @@ check_access(THD *thd,uint want_access,const char *db, uint *save_priv, else save_priv= &dummy; - if (!db[0] && !thd->db && !dont_check_global_grants) + if ((!db || !db[0]) && !thd->db && !dont_check_global_grants) { send_error(&thd->net,ER_NO_DB_ERROR); /* purecov: tested */ return TRUE; /* purecov: tested */ diff --git a/vio/test-ssl b/vio/test-ssl Binary files differdeleted file mode 100755 index 0a3e73a819d..00000000000 --- a/vio/test-ssl +++ /dev/null |