diff options
| author | unknown <kent@mysql.com> | 2005-12-18 18:11:19 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-18 18:11:19 +0100 |
| commit | a5ecdebac3b38ca7948d9db774107d6a35a41726 (patch) | |
| tree | 1ca0d28c71d28d724dff4b9f4f3199ee9db00288 /support-files | |
| parent | 6642eb0581cec439c2e783f6a9d99bb938e1f6b6 (diff) | |
| parent | 2de5c141627638ad375c1911f9a4a0b378599f4f (diff) | |
| download | mariadb-git-a5ecdebac3b38ca7948d9db774107d6a35a41726.tar.gz | |
Merge
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/r/ndb_multi.result:
Auto merged
mysql-test/r/skip_name_resolve.result:
Auto merged
mysql-test/r/type_time.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_multi.test:
Auto merged
mysql-test/t/skip_name_resolve.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
zlib/Makefile.am:
Auto merged
Diffstat (limited to 'support-files')
0 files changed, 0 insertions, 0 deletions