diff options
| author | unknown <jimw@mysql.com> | 2005-01-24 13:48:48 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-24 13:48:48 -0800 |
| commit | c312cf2762cfc68abaebd87294331f599a522436 (patch) | |
| tree | c3a261433ebe14a453233665edd8251485c39c4a /tests | |
| parent | 712f3f677b97a89bc1a2ff6a67cbda00a2be25ca (diff) | |
| parent | 844fe1ea6d8a14d04e78751be1e77838aa2bbd7d (diff) | |
| download | mariadb-git-c312cf2762cfc68abaebd87294331f599a522436.tar.gz | |
Merge
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysqld.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/mysql_client_test.c (renamed from tests/client_test.c) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index b3693aedecb..e66637de0aa 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,7 +26,7 @@ EXTRA_DIST = auto_increment.res auto_increment.tst \ pmail.pl mail_to_db.pl table_types.pl \ udf_test udf_test.res myisam-big-rows.tst -bin_PROGRAMS = client_test +bin_PROGRAMS = mysql_client_test noinst_PROGRAMS = insert_test select_test thread_test # @@ -38,7 +38,7 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql/libmysqlclient.la client_test_LDADD= $(LDADD) $(CXXLDFLAGS) \ $(top_builddir)/mysys/libmysys.a -client_test_SOURCES= client_test.c +client_test_SOURCES= mysql_client_test.c insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) diff --git a/tests/client_test.c b/tests/mysql_client_test.c index 3cbc9918d6c..3cbc9918d6c 100644 --- a/tests/client_test.c +++ b/tests/mysql_client_test.c |