diff options
| author | unknown <magnus@neptunus.(none)> | 2004-09-30 16:12:28 +0200 |
|---|---|---|
| committer | unknown <magnus@neptunus.(none)> | 2004-09-30 16:12:28 +0200 |
| commit | f6f7af7a709db10a68367b34a0116be55315a8c8 (patch) | |
| tree | 7c3b171c96bcc638eae5de8175be3a8b8806e62b /BitKeeper | |
| parent | 8bb1d2ae9b714482e54c664e4cb9e62dff870cb4 (diff) | |
| parent | b7c3591b326c3bc4376a84152e9acc6689bf686b (diff) | |
| download | mariadb-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 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 77c82618446..39b502580d9 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -93,6 +93,7 @@ kostja@oak.local lenz@kallisto.mysql.com lenz@mysql.com magnus@neptunus.(none) +magnus@shellback.(none) marko@hundin.mysql.fi miguel@hegel.(none) miguel@hegel.br |