Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
09ddf79d
Commit
09ddf79d
authored
Jan 09, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
parents
8fd14af8
352d943b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
6 deletions
+31
-6
config/ac-macros/yassl.m4
config/ac-macros/yassl.m4
+3
-1
include/Makefile.am
include/Makefile.am
+2
-1
libmysql_r/Makefile.am
libmysql_r/Makefile.am
+2
-2
mysql-test/r/grant.result
mysql-test/r/grant.result
+9
-0
mysql-test/t/grant.test
mysql-test/t/grant.test
+12
-0
sql/sql_acl.cc
sql/sql_acl.cc
+3
-2
No files found.
config/ac-macros/yassl.m4
View file @
09ddf79d
...
@@ -30,7 +30,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
...
@@ -30,7 +30,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
;;
;;
esac
esac
AC_SUBST([yassl_taocrypt_extra_cxxflags])
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
else
yassl_dir=""
yassl_dir=""
AC_MSG_RESULT(no)
AC_MSG_RESULT(no)
...
...
include/Makefile.am
View file @
09ddf79d
...
@@ -33,7 +33,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
...
@@ -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.in my_handler.h my_time.h decimal.h
# mysql_version.h are generated
# 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
# Some include files that may be moved and patched by configure
DISTCLEANFILES
=
sched.h
$(CLEANFILES)
DISTCLEANFILES
=
sched.h
$(CLEANFILES)
...
@@ -41,6 +41,7 @@ DISTCLEANFILES = sched.h $(CLEANFILES)
...
@@ -41,6 +41,7 @@ DISTCLEANFILES = sched.h $(CLEANFILES)
link_sources
:
link_sources
:
-
$(RM)
-fr
readline
-
$(RM)
-fr
readline
@
readline_h_ln_cmd@
@
readline_h_ln_cmd@
@
yassl_h_ln_cmd@
my_config.h
:
../config.h
my_config.h
:
../config.h
$(CP)
../config.h my_config.h
$(CP)
../config.h my_config.h
...
...
libmysql_r/Makefile.am
View file @
09ddf79d
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
target
=
libmysqlclient_r.la
target
=
libmysqlclient_r.la
target_defs
=
-DDONT_USE_RAID
-DMYSQL_CLIENT
@LIB_EXTRA_CCFLAGS@
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
\
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
\
$(openssl_includes)
$(yassl_includes)
@ZLIB_INCLUDES@
$(openssl_includes)
$(yassl_includes)
@ZLIB_INCLUDES@
...
@@ -32,7 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.shared
...
@@ -32,7 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.shared
libmysql_dir
=
$(top_srcdir)
/libmysql
libmysql_dir
=
$(top_srcdir)
/libmysql
libmysqlclient_r_la_SOURCES
=
$(target_sources)
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)
libmysqlclient_r_la_LDFLAGS
=
$(target_ldflags)
# This is called from the toplevel makefile
# This is called from the toplevel makefile
...
...
mysql-test/r/grant.result
View file @
09ddf79d
...
@@ -615,3 +615,12 @@ show grants for root@localhost;
...
@@ -615,3 +615,12 @@ show grants for root@localhost;
Grants for root@localhost
Grants for root@localhost
GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
set names latin1;
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
View file @
09ddf79d
...
@@ -499,4 +499,16 @@ revoke all privileges on
...
@@ -499,4 +499,16 @@ revoke all privileges on
show
grants
for
root
@
localhost
;
show
grants
for
root
@
localhost
;
set
names
latin1
;
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
# End of 4.1 tests
sql/sql_acl.cc
View file @
09ddf79d
...
@@ -1543,7 +1543,8 @@ find_acl_user(const char *host, const char *user, my_bool exact)
...
@@ -1543,7 +1543,8 @@ find_acl_user(const char *host, const char *user, my_bool exact)
acl_user
->
user
&&
!
strcmp
(
user
,
acl_user
->
user
))
acl_user
->
user
&&
!
strcmp
(
user
,
acl_user
->
user
))
{
{
if
(
exact
?
!
my_strcasecmp
(
&
my_charset_latin1
,
host
,
if
(
exact
?
!
my_strcasecmp
(
&
my_charset_latin1
,
host
,
acl_user
->
host
.
hostname
)
:
acl_user
->
host
.
hostname
?
acl_user
->
host
.
hostname
:
""
)
:
compare_hostname
(
&
acl_user
->
host
,
host
,
host
))
compare_hostname
(
&
acl_user
->
host
,
host
,
host
))
{
{
DBUG_RETURN
(
acl_user
);
DBUG_RETURN
(
acl_user
);
...
@@ -4638,7 +4639,7 @@ ACL_USER *check_acl_user(LEX_USER *user_name,
...
@@ -4638,7 +4639,7 @@ ACL_USER *check_acl_user(LEX_USER *user_name,
if
(
!
(
user
=
acl_user
->
user
))
if
(
!
(
user
=
acl_user
->
user
))
user
=
""
;
user
=
""
;
if
(
!
(
host
=
acl_user
->
host
.
hostname
))
if
(
!
(
host
=
acl_user
->
host
.
hostname
))
host
=
"
%
"
;
host
=
""
;
if
(
!
strcmp
(
user_name
->
user
.
str
,
user
)
&&
if
(
!
strcmp
(
user_name
->
user
.
str
,
user
)
&&
!
my_strcasecmp
(
system_charset_info
,
user_name
->
host
.
str
,
host
))
!
my_strcasecmp
(
system_charset_info
,
user_name
->
host
.
str
,
host
))
break
;
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment