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
e704dc5e
Commit
e704dc5e
authored
21 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1 sql/mysqld.cc: Auto merged
parents
bbc8f836
80f6466c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
33 deletions
+27
-33
cmd-line-utils/libedit/el.c
cmd-line-utils/libedit/el.c
+9
-1
configure.in
configure.in
+4
-19
sql/mysqld.cc
sql/mysqld.cc
+14
-13
No files found.
cmd-line-utils/libedit/el.c
View file @
e704dc5e
...
...
@@ -369,6 +369,14 @@ el_line(EditLine *el)
static
const
char
elpath
[]
=
"/.editrc"
;
#if defined(MAXPATHLEN)
#define LIBEDIT_MAXPATHLEN MAXPATHLEN
#elif defined(PATH_MAX)
#define LIBEDIT_MAXPATHLEN PATH_MAX
#else
#define LIBEDIT_MAXPATHLEN 1024
#endif
/* el_source():
* Source a file
*/
...
...
@@ -377,7 +385,7 @@ el_source(EditLine *el, const char *fname)
{
FILE
*
fp
;
size_t
len
;
char
*
ptr
,
path
[
MAXPATHLEN
];
char
*
ptr
,
path
[
LIBEDIT_
MAXPATHLEN
];
fp
=
NULL
;
if
(
fname
==
NULL
)
{
...
...
This diff is collapsed.
Click to expand it.
configure.in
View file @
e704dc5e
...
...
@@ -701,11 +701,8 @@ AC_SUBST(MYSQLD_USER)
# If we should allow LOAD DATA LOCAL
AC_MSG_CHECKING
(
If we should should
enable
LOAD DATA LOCAL by default
)
AC_ARG_ENABLE
(
local-infile,
Enable LOAD DATA LOCAL INFILE
(
default: disabled
)]
,
[
ENABLED_LOCAL_INFILE
=
$enableval
AC_DEFINE
(
ENABLED_LOCAL_INFILE
)
]
,
[
--enable-local-infile
Enable LOAD DATA LOCAL INFILE
(
default: disabled
)]
,
[
ENABLED_LOCAL_INFILE
=
$enableval
]
,
[
ENABLED_LOCAL_INFILE
=
no
]
)
if
test
"
$ENABLED_LOCAL_INFILE
"
=
"yes"
...
...
@@ -1734,26 +1731,14 @@ MYSQL_PTHREAD_YIELD
# For readline/libedit (We simply move the mimimum amount of stuff from
# the readline/libedit configure.in here)
dnl Checks
for
programs.
AC_PROG_CC
AC_PROG_AWK
AC_PROG_INSTALL
dnl Checks
for
header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS
(
limits.h malloc.h sys/ioctl.h unistd.h sys/cdefs.h sys/types.h
)
dnl Checks
for
typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
AC_CHECK_HEADERS
(
malloc.h sys/cdefs.h
)
dnl Checks
for
library functions.
AC_FUNC_ALLOCA
AC_PROG_GCC_TRADITIONAL
AC_TYPE_SIGNAL
AC_CHECK_FUNCS
(
re_comp regcomp strdup
strerror strstr strtol
)
AC_CHECK_FUNCS
(
re_comp regcomp strdup
)
AC_CHECK_HEADERS
(
vis.h
)
AC_CHECK_FUNCS
(
strlcat strlcpy
)
...
...
This diff is collapsed.
Click to expand it.
sql/mysqld.cc
View file @
e704dc5e
...
...
@@ -2039,6 +2039,20 @@ static int init_common_variables(const char *conf_file_name, int argc,
DBUG_PRINT
(
"info"
,(
"%s Ver %s for %s on %s
\n
"
,
my_progname
,
server_version
,
SYSTEM_TYPE
,
MACHINE_TYPE
));
#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
{
/* Retrieve used stack size; Needed for checking stack overflows */
size_t
stack_size
;
pthread_attr_getstacksize
(
&
connection_attrib
,
&
stack_size
);
if
(
global_system_variables
.
log_warnings
&&
stack_size
!=
thread_stack
)
{
sql_print_error
(
"Warning: Asked for %ld thread stack, but got %ld"
,
thread_stack
,
stack_size
);
thread_stack
=
stack_size
;
}
}
#endif
#if defined( SET_RLIMIT_NOFILE) || defined( OS2)
/* connections and databases needs lots of files */
{
...
...
@@ -2349,19 +2363,6 @@ int main(int argc, char **argv)
if
(
!
(
opt_specialflag
&
SPECIAL_NO_PRIOR
))
my_pthread_setprio
(
pthread_self
(),
CONNECT_PRIOR
);
pthread_attr_setstacksize
(
&
connection_attrib
,
thread_stack
);
#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
{
/* Retrieve used stack size; Needed for checking stack overflows */
size_t
stack_size
;
pthread_attr_getstacksize
(
&
connection_attrib
,
&
stack_size
);
if
(
global_system_variables
.
log_warnings
&&
stack_size
!=
thread_stack
)
{
sql_print_error
(
"Warning: Asked for %ld thread stack, but got %ld"
,
thread_stack
,
stack_size
);
thread_stack
=
stack_size
;
}
}
#endif
(
void
)
thr_setconcurrency
(
concurrency
);
// 10 by default
select_thread
=
pthread_self
();
...
...
This diff is collapsed.
Click to expand it.
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