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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a9ae34b5
Commit
a9ae34b5
authored
Jun 15, 2007
by
tsmith@maint1.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
parents
9f413426
73035c27
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
2 deletions
+15
-2
configure.in
configure.in
+1
-0
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/binlog_tests/binlog.test
+1
-0
mysql-test/extra/binlog_tests/drop_temp_table.test
mysql-test/extra/binlog_tests/drop_temp_table.test
+0
-2
sql/mysqld.cc
sql/mysqld.cc
+13
-0
No files found.
configure.in
View file @
a9ae34b5
...
@@ -734,6 +734,7 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
...
@@ -734,6 +734,7 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h
\
sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h
\
unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h
\
unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h
\
sys/ioctl.h malloc.h sys/malloc.h sys/ipc.h sys/shm.h linux/config.h
\
sys/ioctl.h malloc.h sys/malloc.h sys/ipc.h sys/shm.h linux/config.h
\
sys/prctl.h
\
sys/resource.h sys/param.h port.h
)
sys/resource.h sys/param.h port.h
)
AC_CHECK_HEADERS
([
xfs/xfs.h]
)
AC_CHECK_HEADERS
([
xfs/xfs.h]
)
...
...
mysql-test/extra/binlog_tests/binlog.test
View file @
a9ae34b5
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
# misc binlogging tests that do not require a slave running
# misc binlogging tests that do not require a slave running
#
#
--
source
include
/
have_log_bin
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_log_bin
.
inc
--
source
include
/
have_log_bin
.
inc
...
...
mysql-test/extra/binlog_tests/drop_temp_table.test
View file @
a9ae34b5
--
source
include
/
have_log_bin
.
inc
--
disable_warnings
--
disable_warnings
drop
database
if
exists
`drop-temp+table-test`
;
drop
database
if
exists
`drop-temp+table-test`
;
...
...
sql/mysqld.cc
View file @
a9ae34b5
...
@@ -30,6 +30,10 @@
...
@@ -30,6 +30,10 @@
#include "rpl_injector.h"
#include "rpl_injector.h"
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
#endif
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
#if defined(NOT_ENOUGH_TESTED) \
#if defined(NOT_ENOUGH_TESTED) \
&& defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000
&& defined(NDB_SHM_TRANSPORTER) && MYSQL_VERSION_ID >= 50000
...
@@ -1420,6 +1424,15 @@ static struct passwd *check_user(const char *user)
...
@@ -1420,6 +1424,15 @@ static struct passwd *check_user(const char *user)
err:
err:
sql_print_error
(
"Fatal error: Can't change to run as user '%s' ; Please check that the user exists!
\n
"
,
user
);
sql_print_error
(
"Fatal error: Can't change to run as user '%s' ; Please check that the user exists!
\n
"
,
user
);
unireg_abort
(
1
);
unireg_abort
(
1
);
#ifdef PR_SET_DUMPABLE
if
(
test_flags
&
TEST_CORE_ON_SIGNAL
)
{
/* inform kernel that process is dumpable */
(
void
)
prctl
(
PR_SET_DUMPABLE
,
1
);
}
#endif
#endif
#endif
return
NULL
;
return
NULL
;
}
}
...
...
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