mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union mysql-test/mysql-test-run.pl: Auto merged netware/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/mysql_priv.h: Auto merged tests/Makefile.am: Auto merged mysql-test/install_test_db.sh: Manual merge sql/sql_acl.h: Manual merge
This commit is contained in:
commit
be1fb16006
12 changed files with 50 additions and 317 deletions
|
|
@ -31,7 +31,7 @@ EXTRA_DIST = auto_increment.res auto_increment.tst \
|
|||
insert_and_repair.pl \
|
||||
grant.pl grant.res test_delayed_insert.pl \
|
||||
pmail.pl mail_to_db.pl table_types.pl \
|
||||
udf_test udf_test.res myisam-big-rows.tst \
|
||||
myisam-big-rows.tst \
|
||||
CMakeLists.txt
|
||||
|
||||
bin_PROGRAMS = mysql_client_test
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue