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
73238029
Commit
73238029
authored
Nov 27, 2006
by
monty@mysql.com/nosik.monty.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disabled syncronization test at it fails on multiple platforms. (Bug #24529)
Fixed that test_thr_alarm works
parent
0e149b71
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
7 deletions
+9
-7
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-1
mysql-test/r/synchronization.result
mysql-test/r/synchronization.result
+1
-1
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+1
-0
mysql-test/t/synchronization.test
mysql-test/t/synchronization.test
+1
-1
mysys/Makefile.am
mysys/Makefile.am
+1
-1
mysys/thr_alarm.c
mysys/thr_alarm.c
+4
-3
No files found.
mysql-test/mysql-test-run.pl
View file @
73238029
...
...
@@ -1235,7 +1235,7 @@ sub command_line_setup () {
# But a fairly safe range seems to be 5001 - 32767
#
sub
set_mtr_build_thread_ports
()
{
sub
set_mtr_build_thread_ports
(
$
)
{
my
$mtr_build_thread
=
shift
;
# Up to two masters, up to three slaves
...
...
mysql-test/r/synchronization.result
View file @
73238029
drop table if exists t1;
drop table if exists t1
,t2
;
CREATE TABLE t1 (x1 int);
ALTER TABLE t1 CHANGE x1 x2 int;
CREATE TABLE t2 LIKE t1;
...
...
mysql-test/t/disabled.def
View file @
73238029
...
...
@@ -30,6 +30,7 @@ rpl_ndb_myisam2ndb : Bug #19710 Cluster replication to partition table fa
rpl_row_blob_innodb : BUG#18980 2006-04-10 kent Test fails randomly
rpl_sp : BUG#16456 2006-02-16 jmiller
rpl_multi_engine : BUG#22583 2006-09-23 lars
synchronization : Bug#24529 Test 'synchronization' fails on Mac pushbuild; Also on Linux 64 bit.
# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
#ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events
...
...
mysql-test/t/synchronization.test
View file @
73238029
...
...
@@ -4,7 +4,7 @@
#
--
disable_warnings
drop
table
if
exists
t1
;
drop
table
if
exists
t1
,
t2
;
--
enable_warnings
connect
(
con1
,
localhost
,
root
,,);
...
...
mysys/Makefile.am
View file @
73238029
...
...
@@ -20,7 +20,7 @@ MYSQLBASEdir= $(prefix)
INCLUDES
=
@ZLIB_INCLUDES@
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/include
-I
$(srcdir)
pkglib_LIBRARIES
=
libmysys.a
LDADD
=
libmysys.a
$(top_builddir)
/strings/libmystrings.a
LDADD
=
libmysys.a
$(top_builddir)
/strings/libmystrings.a
$(top_builddir)
/dbug/libdbug.a
noinst_HEADERS
=
mysys_priv.h my_static.h
libmysys_a_SOURCES
=
my_init.c my_getwd.c mf_getdate.c my_mmap.c
\
mf_path.c mf_loadpath.c my_file.c
\
...
...
mysys/thr_alarm.c
View file @
73238029
...
...
@@ -276,7 +276,7 @@ sig_handler process_alarm(int sig __attribute__((unused)))
if
(
!
pthread_equal
(
pthread_self
(),
alarm_thread
))
{
#if defined(MAIN) && !defined(__bsdi__)
printf
(
"thread_alarm
\n
"
);
fflush
(
stdout
);
printf
(
"thread_alarm
in process_alarm
\n
"
);
fflush
(
stdout
);
#endif
#ifdef DONT_REMEMBER_SIGNAL
my_sigset
(
THR_CLIENT_ALARM
,
process_alarm
);
/* int. thread system calls */
...
...
@@ -848,8 +848,9 @@ int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
MY_INIT
(
argv
[
0
]);
if
(
argc
>
1
&&
argv
[
1
][
0
]
==
'-'
&&
argv
[
1
][
1
]
==
'#'
)
{
DBUG_PUSH
(
argv
[
1
]
+
2
);
}
pthread_mutex_init
(
&
LOCK_thread_count
,
MY_MUTEX_INIT_FAST
);
pthread_cond_init
(
&
COND_thread_count
,
NULL
);
...
...
@@ -917,8 +918,8 @@ int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
}
}
pthread_mutex_unlock
(
&
LOCK_thread_count
);
end_thr_alarm
(
1
);
thr_alarm_info
(
&
alarm_info
);
end_thr_alarm
(
1
);
printf
(
"Main_thread: Alarms: %u max_alarms: %u next_alarm_time: %lu
\n
"
,
alarm_info
.
active_alarms
,
alarm_info
.
max_used_alarms
,
alarm_info
.
next_alarm_time
);
...
...
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