Commit 09ddf79d authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/mysql-5.0 

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
parents 8fd14af8 352d943b

config/ac-macros/yassl.m4

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
        ;;

    esac

    AC_SUBST([yassl_taocrypt_extra_cxxflags])



    # Link extra/yassl/include/openssl subdir to include/

    yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl"

    AC_SUBST(yassl_h_ln_cmd)

  else

    yassl_dir=""

    AC_MSG_RESULT(no)

include/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \ 
			mysql_version.h.in my_handler.h my_time.h decimal.h



# mysql_version.h are generated

CLEANFILES =            mysql_version.h my_config.h readline

CLEANFILES =            mysql_version.h my_config.h readline openssl



# Some include files that may be moved and patched by configure

DISTCLEANFILES =	sched.h $(CLEANFILES)
@@ -41,6 +41,7 @@ DISTCLEANFILES = sched.h $(CLEANFILES) 
link_sources:

	-$(RM) -fr readline

	@readline_h_ln_cmd@

	@yassl_h_ln_cmd@



my_config.h: ../config.h

	$(CP) ../config.h my_config.h

libmysql_r/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


target = libmysqlclient_r.la

target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@

LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @yassl_libs@

LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@



INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include \

		$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
@@ -32,7 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.shared 
libmysql_dir = $(top_srcdir)/libmysql



libmysqlclient_r_la_SOURCES = $(target_sources)

libmysqlclient_r_la_LIBADD = $(target_libadd)

libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)

libmysqlclient_r_la_LDFLAGS = $(target_ldflags)



# This is called from the toplevel makefile

mysql-test/r/grant.result

+9 −0
Original line number Diff line number Diff line
@@ -615,3 +615,12 @@ show grants for root@localhost; 
Grants for root@localhost

GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION

set names latin1;

create user mysqltest_7@;

set password for mysqltest_7@ = password('systpass');

show grants for mysqltest_7@;

Grants for mysqltest_7@

GRANT USAGE ON *.* TO 'mysqltest_7'@'' IDENTIFIED BY PASSWORD '*2FB071A056F9BB745219D9C876814231DAF46517'

drop user mysqltest_7@;

flush privileges;

show grants for mysqltest_7@;

ERROR 42000: There is no such grant defined for user 'mysqltest_7' on host ''

mysql-test/t/grant.test

+12 −0
Original line number Diff line number Diff line
@@ -499,4 +499,16 @@ revoke all privileges on 
show grants for root@localhost;

set names latin1;



#

# Bug #15598 Server crashes in specific case during setting new password

# - Caused by a user with host ''

#

create user mysqltest_7@;

set password for mysqltest_7@ = password('systpass');

show grants for mysqltest_7@;

drop user mysqltest_7@;

flush privileges; # BUG#16297(flush should be removed when that bug is fixed)

--error 1141

show grants for mysqltest_7@;



# End of 4.1 tests