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
bef1d7d3
Commit
bef1d7d3
authored
Oct 02, 2002
by
monty@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for building shared libraries with a patched glibc
Don't require UPDATE_ACL for REPLACE
parent
39c55409
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
13 deletions
+12
-13
Docs/manual.texi
Docs/manual.texi
+5
-0
configure.in
configure.in
+4
-10
sql/sql_parse.cc
sql/sql_parse.cc
+3
-3
No files found.
Docs/manual.texi
View file @
bef1d7d3
...
@@ -35217,6 +35217,9 @@ In other words, you can't access the values of the old row from a
...
@@ -35217,6 +35217,9 @@ In other words, you can't access the values of the old row from a
@code{REPLACE} statement. In some old MySQL versions it appeared that
@code{REPLACE} statement. In some old MySQL versions it appeared that
you could do this, but that was a bug that has been corrected.
you could do this, but that was a bug that has been corrected.
To be able to use @code{REPLACE} you must have @code{INSERT} and
@code{DELETE} privileges for the table.
When you use a @code{REPLACE} command, @code{mysql_affected_rows()}
When you use a @code{REPLACE} command, @code{mysql_affected_rows()}
will return 2 if the new row replaced an old row. This is because
will return 2 if the new row replaced an old row. This is because
one row was inserted and then the duplicate was deleted.
one row was inserted and then the duplicate was deleted.
...
@@ -50237,6 +50240,8 @@ each individual 4.0.x release.
...
@@ -50237,6 +50240,8 @@ each individual 4.0.x release.
@item
@item
Give error if one has more than 2 ^ 32 rows in a MyISAM MERGE file and one
Give error if one has more than 2 ^ 32 rows in a MyISAM MERGE file and one
has not compiled MySQL with @code{-DBIG_TABLES}.
has not compiled MySQL with @code{-DBIG_TABLES}.
@item
Don't require @code{UPDATE} privilege when using @code{REPLACE}.
@end itemize
@end itemize
@node News-4.0.4, News-4.0.3, News-4.0.5, News-4.0.x
@node News-4.0.4, News-4.0.3, News-4.0.5, News-4.0.x
configure.in
View file @
bef1d7d3
...
@@ -481,7 +481,7 @@ AC_ARG_WITH(other-libc,
...
@@ -481,7 +481,7 @@ AC_ARG_WITH(other-libc,
# we need special flags, but we will have to add those later
# we need special flags, but we will have to add those later
STATIC_NSS_FLAGS
=
"-lc -lnss_files -lnss_dns -lresolv"
STATIC_NSS_FLAGS
=
"-lc -lnss_files -lnss_dns -lresolv"
STATIC_NSS_FLAGS
=
"
$STATIC_NSS_FLAGS
$STATIC_NSS_FLAGS
"
STATIC_NSS_FLAGS
=
"
$STATIC_NSS_FLAGS
$STATIC_NSS_FLAGS
"
OTHER_LIBC_LIB
=
"-L
$other_libc_lib
"
OTHER_LIBC_LIB
=
"-
static -
L
$other_libc_lib
"
static_nss
=
1
static_nss
=
1
else
else
# this is a dirty hack. We if we detect static nss glibc in the special
# this is a dirty hack. We if we detect static nss glibc in the special
...
@@ -2241,10 +2241,7 @@ then
...
@@ -2241,10 +2241,7 @@ then
AC_DEFINE
(
THREAD_SAFE_CLIENT
)
AC_DEFINE
(
THREAD_SAFE_CLIENT
)
fi
fi
if
test
"
$static_nss
"
=
"1"
CLIENT_LIBS
=
"
$CLIENT_LIBS
$STATIC_NSS_FLAGS
"
then
CLIENT_LIBS
=
"
$CLIENT_LIBS
$STATIC_NSS_FLAGS
"
fi
AC_SUBST
(
CLIENT_LIBS
)
AC_SUBST
(
CLIENT_LIBS
)
AC_SUBST
(
sql_client_dirs
)
AC_SUBST
(
sql_client_dirs
)
...
@@ -2391,11 +2388,8 @@ fi
...
@@ -2391,11 +2388,8 @@ fi
# I know to add the static NSS magic if we have static NSS libraries with
# I know to add the static NSS magic if we have static NSS libraries with
# glibc - Sasha
# glibc - Sasha
if
test
"
$static_nss
"
=
"1"
LDFLAGS
=
"
$LDFLAGS
$OTHER_LIBC_LIB
"
then
LIBS
=
"
$LIBS
$STATIC_NSS_FLAGS
"
LDFLAGS
=
"
$LDFLAGS
-static
$OTHER_LIBC_LIB
"
LIBS
=
"
$LIBS
$STATIC_NSS_FLAGS
"
fi
AC_SUBST
(
sql_server_dirs
)
AC_SUBST
(
sql_server_dirs
)
AC_SUBST
(
thread_dirs
)
AC_SUBST
(
thread_dirs
)
...
...
sql/sql_parse.cc
View file @
bef1d7d3
...
@@ -1878,10 +1878,10 @@ mysql_execute_command(void)
...
@@ -1878,10 +1878,10 @@ mysql_execute_command(void)
lex
->
lock_option
);
lex
->
lock_option
);
break
;
break
;
case
SQLCOM_REPLACE
:
case
SQLCOM_REPLACE
:
if
(
check_access
(
thd
,
INSERT_ACL
|
UPDATE_ACL
|
DELETE_ACL
,
if
(
check_access
(
thd
,
INSERT_ACL
|
DELETE_ACL
,
tables
->
db
,
&
tables
->
grant
.
privilege
))
tables
->
db
,
&
tables
->
grant
.
privilege
))
goto
error
;
/* purecov: inspected */
goto
error
;
/* purecov: inspected */
if
(
grant_option
&&
check_grant
(
thd
,
INSERT_ACL
|
UPDATE_ACL
|
DELETE_ACL
,
if
(
grant_option
&&
check_grant
(
thd
,
INSERT_ACL
|
DELETE_ACL
,
tables
))
tables
))
goto
error
;
goto
error
;
...
@@ -1899,7 +1899,7 @@ mysql_execute_command(void)
...
@@ -1899,7 +1899,7 @@ mysql_execute_command(void)
*/
*/
{
{
ulong
privilege
=
(
lex
->
sql_command
==
SQLCOM_INSERT_SELECT
?
ulong
privilege
=
(
lex
->
sql_command
==
SQLCOM_INSERT_SELECT
?
INSERT_ACL
:
INSERT_ACL
|
UPDATE_ACL
|
DELETE_ACL
);
INSERT_ACL
:
INSERT_ACL
|
DELETE_ACL
);
TABLE_LIST
*
save_next
=
tables
->
next
;
TABLE_LIST
*
save_next
=
tables
->
next
;
tables
->
next
=
0
;
tables
->
next
=
0
;
if
(
check_access
(
thd
,
privilege
,
if
(
check_access
(
thd
,
privilege
,
...
...
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