summaryrefslogtreecommitdiff
path: root/include/mysql.h
diff options
context:
space:
mode:
authorunknown <magnus@neptunus.(none)>2004-09-30 16:12:28 +0200
committerunknown <magnus@neptunus.(none)>2004-09-30 16:12:28 +0200
commitf6f7af7a709db10a68367b34a0116be55315a8c8 (patch)
tree7c3b171c96bcc638eae5de8175be3a8b8806e62b /include/mysql.h
parent8bb1d2ae9b714482e54c664e4cb9e62dff870cb4 (diff)
parentb7c3591b326c3bc4376a84152e9acc6689bf686b (diff)
downloadmariadb-git-f6f7af7a709db10a68367b34a0116be55315a8c8.tar.gz
Merge fixes
mysql-test/mysql-test-run.sh: Auto merged ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged sql/sql_table.cc: Auto merged sql/ha_ndbcluster.cc: Merge: ndb_discover_tables should no longer be called when server is starting
Diffstat (limited to 'include/mysql.h')
0 files changed, 0 insertions, 0 deletions