Skip to content

Commit 6eaf0b5

Browse files
author
Sergei Golubchik
committed
backport of dbug extensions from 6.0:
function/ syntax glob(7) wildcards unit tests
1 parent 96f31b3 commit 6eaf0b5

29 files changed

+1317
-789
lines changed

.bzrignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3066,3 +3066,5 @@ sql/share/ukrainian
30663066
libmysqld/examples/mysqltest.cc
30673067
libmysqld/sql_signal.cc
30683068
libmysqld/debug_sync.cc
3069+
libmysqld/rpl_handler.cc
3070+
dbug/tests

client/mysqltest.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,6 @@ void free_used_memory()
11681168
mysql_server_end();
11691169

11701170
/* Don't use DBUG after mysql_server_end() */
1171-
DBUG_VIOLATION_HELPER_LEAVE;
11721171
return;
11731172
}
11741173

dbug/.cvsignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

dbug/Makefile.am

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@ libdbug_a_SOURCES = dbug.c sanity.c
2323
EXTRA_DIST = CMakeLists.txt example1.c example2.c example3.c \
2424
user.r monty.doc dbug_add_tags.pl \
2525
my_main.c main.c factorial.c dbug_analyze.c \
26-
CMakeLists.txt
26+
CMakeLists.txt tests.c tests-t.pl
2727
NROFF_INC = example1.r example2.r example3.r main.r \
2828
factorial.r output1.r output2.r output3.r \
2929
output4.r output5.r
30-
CLEANFILES = $(NROFF_INC) user.t user.ps
30+
CLEANFILES = $(NROFF_INC) user.t user.ps tests-t
3131

3232

3333
# Must be linked with libs that are not compiled yet
34-
noinst_PROGRAMS = factorial dbug_analyze
34+
noinst_PROGRAMS = factorial dbug_analyze tests
3535
factorial_SOURCES = my_main.c factorial.c
36+
tests_SOURCES = tests.c
3637
dbug_analyze_SOURCES = dbug_analyze.c
3738

38-
all: user.t user.ps
39+
all: user.t user.ps tests-t
3940

4041
user.t: user.r $(NROFF_INC)
4142
-nroff -mm user.r > $@
@@ -61,5 +62,7 @@ output5.r: factorial
6162
@RM@ -f $@
6263
@SED@ -e 's!\\!\\\\!g' $< > $@
6364

64-
# Don't update the files from bitkeeper
65-
%::SCCS/s.%
65+
# a hack to have executable in builddir, not in srcdir
66+
tests-t: tests-t.pl
67+
cp -f $(srcdir)/tests-t.pl ./tests-t
68+

0 commit comments

Comments
 (0)