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
a0d2a621
Commit
a0d2a621
authored
Feb 27, 2003
by
monty@narttu.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added detection if pthread_attr_getstacksize() exists
Fixed bug in RAND() usage in mysqlbinlog
parent
fa195bc8
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
12 additions
and
11 deletions
+12
-11
configure.in
configure.in
+1
-0
include/thr_lock.h
include/thr_lock.h
+2
-2
sql/log_event.cc
sql/log_event.cc
+2
-2
sql/mysqld.cc
sql/mysqld.cc
+2
-0
sql/repl_failsafe.cc
sql/repl_failsafe.cc
+1
-1
sql/slave.cc
sql/slave.cc
+1
-1
sql/sql_class.cc
sql/sql_class.cc
+1
-1
sql/sql_insert.cc
sql/sql_insert.cc
+1
-0
sql/sql_show.cc
sql/sql_show.cc
+1
-4
No files found.
configure.in
View file @
a0d2a621
...
@@ -1796,6 +1796,7 @@ AC_CHECK_FUNCS(alarm bmove \
...
@@ -1796,6 +1796,7 @@ AC_CHECK_FUNCS(alarm bmove \
sigset sigthreadmask pthread_sigmask pthread_setprio pthread_setprio_np
\
sigset sigthreadmask pthread_sigmask pthread_setprio pthread_setprio_np
\
pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam
\
pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam
\
pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize
\
pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize
\
pthread_attr_getstacksize
\
pthread_condattr_create rwlock_init pthread_rwlock_rdlock
\
pthread_condattr_create rwlock_init pthread_rwlock_rdlock
\
fchmod getpass getpassphrase initgroups mlockall
)
fchmod getpass getpassphrase initgroups mlockall
)
...
...
include/thr_lock.h
View file @
a0d2a621
...
@@ -43,8 +43,8 @@ enum thr_lock_type { TL_IGNORE=-1,
...
@@ -43,8 +43,8 @@ enum thr_lock_type { TL_IGNORE=-1,
*/
*/
TL_WRITE_ALLOW_WRITE
,
TL_WRITE_ALLOW_WRITE
,
/*
/*
Write lock, but allow other threads to read
/ write
.
Write lock, but allow other threads to read.
Used by ALTER TABLE in MySQL to
mark to
allow readers
Used by ALTER TABLE in MySQL to allow readers
to use the table until ALTER TABLE is finished.
to use the table until ALTER TABLE is finished.
*/
*/
TL_WRITE_ALLOW_READ
,
TL_WRITE_ALLOW_READ
,
...
...
sql/log_event.cc
View file @
a0d2a621
...
@@ -972,14 +972,14 @@ int Rand_log_event::write_data(IO_CACHE* file)
...
@@ -972,14 +972,14 @@ int Rand_log_event::write_data(IO_CACHE* file)
#ifdef MYSQL_CLIENT
#ifdef MYSQL_CLIENT
void
Rand_log_event
::
print
(
FILE
*
file
,
bool
short_form
,
char
*
last_db
)
void
Rand_log_event
::
print
(
FILE
*
file
,
bool
short_form
,
char
*
last_db
)
{
{
char
llbuff
[
22
];
char
llbuff
[
22
]
,
llbuff2
[
22
]
;
if
(
!
short_form
)
if
(
!
short_form
)
{
{
print_header
(
file
);
print_header
(
file
);
fprintf
(
file
,
"
\t
Rand
\n
"
);
fprintf
(
file
,
"
\t
Rand
\n
"
);
}
}
fprintf
(
file
,
"SET @@RAND_SEED1=%s, @@RAND_SEED2=%s;
\n
"
,
fprintf
(
file
,
"SET @@RAND_SEED1=%s, @@RAND_SEED2=%s;
\n
"
,
llstr
(
seed1
,
llbuff
),
llstr
(
seed2
,
llbuff
));
llstr
(
seed1
,
llbuff
),
llstr
(
seed2
,
llbuff
2
));
fflush
(
file
);
fflush
(
file
);
}
}
#endif
#endif
...
...
sql/mysqld.cc
View file @
a0d2a621
...
@@ -2099,6 +2099,7 @@ int main(int argc, char **argv)
...
@@ -2099,6 +2099,7 @@ int main(int argc, char **argv)
(
void
)
pthread_attr_setdetachstate
(
&
connection_attrib
,
(
void
)
pthread_attr_setdetachstate
(
&
connection_attrib
,
PTHREAD_CREATE_DETACHED
);
PTHREAD_CREATE_DETACHED
);
pthread_attr_setstacksize
(
&
connection_attrib
,
thread_stack
);
pthread_attr_setstacksize
(
&
connection_attrib
,
thread_stack
);
#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
{
{
/* Retrieve used stack size; Needed for checking stack overflows */
/* Retrieve used stack size; Needed for checking stack overflows */
size_t
stack_size
;
size_t
stack_size
;
...
@@ -2110,6 +2111,7 @@ int main(int argc, char **argv)
...
@@ -2110,6 +2111,7 @@ int main(int argc, char **argv)
thread_stack
=
stack_size
;
thread_stack
=
stack_size
;
}
}
}
}
#endif
if
(
!
(
opt_specialflag
&
SPECIAL_NO_PRIOR
))
if
(
!
(
opt_specialflag
&
SPECIAL_NO_PRIOR
))
my_pthread_attr_setprio
(
&
connection_attrib
,
WAIT_PRIOR
);
my_pthread_attr_setprio
(
&
connection_attrib
,
WAIT_PRIOR
);
pthread_attr_setscope
(
&
connection_attrib
,
PTHREAD_SCOPE_SYSTEM
);
pthread_attr_setscope
(
&
connection_attrib
,
PTHREAD_SCOPE_SYSTEM
);
...
...
sql/repl_failsafe.cc
View file @
a0d2a621
...
@@ -57,13 +57,13 @@ static int init_failsafe_rpl_thread(THD* thd)
...
@@ -57,13 +57,13 @@ static int init_failsafe_rpl_thread(THD* thd)
{
{
DBUG_ENTER
(
"init_failsafe_rpl_thread"
);
DBUG_ENTER
(
"init_failsafe_rpl_thread"
);
thd
->
system_thread
=
thd
->
bootstrap
=
1
;
thd
->
system_thread
=
thd
->
bootstrap
=
1
;
thd
->
host_or_ip
=
""
;
thd
->
client_capabilities
=
0
;
thd
->
client_capabilities
=
0
;
my_net_init
(
&
thd
->
net
,
0
);
my_net_init
(
&
thd
->
net
,
0
);
thd
->
net
.
read_timeout
=
slave_net_timeout
;
thd
->
net
.
read_timeout
=
slave_net_timeout
;
thd
->
max_client_packet_length
=
thd
->
net
.
max_packet
;
thd
->
max_client_packet_length
=
thd
->
net
.
max_packet
;
thd
->
master_access
=
~
0
;
thd
->
master_access
=
~
0
;
thd
->
priv_user
=
0
;
thd
->
priv_user
=
0
;
thd
->
system_thread
=
1
;
pthread_mutex_lock
(
&
LOCK_thread_count
);
pthread_mutex_lock
(
&
LOCK_thread_count
);
thd
->
thread_id
=
thread_id
++
;
thd
->
thread_id
=
thread_id
++
;
pthread_mutex_unlock
(
&
LOCK_thread_count
);
pthread_mutex_unlock
(
&
LOCK_thread_count
);
...
...
sql/slave.cc
View file @
a0d2a621
...
@@ -1783,6 +1783,7 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
...
@@ -1783,6 +1783,7 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
{
{
DBUG_ENTER
(
"init_slave_thread"
);
DBUG_ENTER
(
"init_slave_thread"
);
thd
->
system_thread
=
thd
->
bootstrap
=
1
;
thd
->
system_thread
=
thd
->
bootstrap
=
1
;
thd
->
host_or_ip
=
""
;
thd
->
client_capabilities
=
0
;
thd
->
client_capabilities
=
0
;
my_net_init
(
&
thd
->
net
,
0
);
my_net_init
(
&
thd
->
net
,
0
);
thd
->
net
.
read_timeout
=
slave_net_timeout
;
thd
->
net
.
read_timeout
=
slave_net_timeout
;
...
@@ -1790,7 +1791,6 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
...
@@ -1790,7 +1791,6 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
thd
->
priv_user
=
0
;
thd
->
priv_user
=
0
;
thd
->
slave_thread
=
1
;
thd
->
slave_thread
=
1
;
thd
->
options
=
(((
opt_log_slave_updates
)
?
OPTION_BIN_LOG
:
0
)
|
OPTION_AUTO_IS_NULL
)
;
thd
->
options
=
(((
opt_log_slave_updates
)
?
OPTION_BIN_LOG
:
0
)
|
OPTION_AUTO_IS_NULL
)
;
thd
->
system_thread
=
1
;
thd
->
client_capabilities
=
CLIENT_LOCAL_FILES
;
thd
->
client_capabilities
=
CLIENT_LOCAL_FILES
;
thd
->
real_id
=
pthread_self
();
thd
->
real_id
=
pthread_self
();
pthread_mutex_lock
(
&
LOCK_thread_count
);
pthread_mutex_lock
(
&
LOCK_thread_count
);
...
...
sql/sql_class.cc
View file @
a0d2a621
...
@@ -83,7 +83,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
...
@@ -83,7 +83,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
global_read_lock
(
0
),
bootstrap
(
0
)
global_read_lock
(
0
),
bootstrap
(
0
)
{
{
host
=
user
=
priv_user
=
db
=
query
=
ip
=
0
;
host
=
user
=
priv_user
=
db
=
query
=
ip
=
0
;
host_or_ip
=
"unknown ip
"
;
host_or_ip
=
"connecting host
"
;
locked
=
killed
=
count_cuted_fields
=
some_tables_deleted
=
no_errors
=
password
=
locked
=
killed
=
count_cuted_fields
=
some_tables_deleted
=
no_errors
=
password
=
query_start_used
=
safe_to_cache_query
=
0
;
query_start_used
=
safe_to_cache_query
=
0
;
db_length
=
query_length
=
col_access
=
0
;
db_length
=
query_length
=
col_access
=
0
;
...
...
sql/sql_insert.cc
View file @
a0d2a621
...
@@ -535,6 +535,7 @@ public:
...
@@ -535,6 +535,7 @@ public:
bzero
((
char
*
)
&
thd
.
net
,
sizeof
(
thd
.
net
));
// Safety
bzero
((
char
*
)
&
thd
.
net
,
sizeof
(
thd
.
net
));
// Safety
thd
.
system_thread
=
1
;
thd
.
system_thread
=
1
;
thd
.
host_or_ip
=
""
;
bzero
((
char
*
)
&
info
,
sizeof
(
info
));
bzero
((
char
*
)
&
info
,
sizeof
(
info
));
pthread_mutex_init
(
&
mutex
,
MY_MUTEX_INIT_FAST
);
pthread_mutex_init
(
&
mutex
,
MY_MUTEX_INIT_FAST
);
pthread_cond_init
(
&
cond
,
NULL
);
pthread_cond_init
(
&
cond
,
NULL
);
...
...
sql/sql_show.cc
View file @
a0d2a621
...
@@ -1059,10 +1059,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
...
@@ -1059,10 +1059,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
thd_info
->
user
=
thd
->
strdup
(
tmp
->
user
?
tmp
->
user
:
thd_info
->
user
=
thd
->
strdup
(
tmp
->
user
?
tmp
->
user
:
(
tmp
->
system_thread
?
(
tmp
->
system_thread
?
"system user"
:
"unauthenticated user"
));
"system user"
:
"unauthenticated user"
));
thd_info
->
host
=
thd
->
strdup
(
tmp
->
host
?
tmp
->
host
:
thd_info
->
host
=
thd
->
strdup
(
tmp
->
host_or_ip
);
(
tmp
->
ip
?
tmp
->
ip
:
(
tmp
->
system_thread
?
"none"
:
"connecting host"
)));
if
((
thd_info
->
db
=
tmp
->
db
))
// Safe test
if
((
thd_info
->
db
=
tmp
->
db
))
// Safe test
thd_info
->
db
=
thd
->
strdup
(
thd_info
->
db
);
thd_info
->
db
=
thd
->
strdup
(
thd_info
->
db
);
thd_info
->
command
=
(
int
)
tmp
->
command
;
thd_info
->
command
=
(
int
)
tmp
->
command
;
...
...
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