diff options
author | unknown <msvensson@neptunus.homeip.net> | 2005-02-03 09:33:48 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.homeip.net> | 2005-02-03 09:33:48 +0100 |
commit | 2b0a3dbe9e935762db81f9d08721417584197ff4 (patch) | |
tree | 124933fc3f5e4d884003ee7d669c299d2fef2fb1 /BitKeeper | |
parent | f32743b7046eb04849aa6ca1cda6d40eef54ddd1 (diff) | |
parent | 38e395aa325eb418cf92a6ce62646959ee2ed477 (diff) | |
download | mariadb-git-2b0a3dbe9e935762db81f9d08721417584197ff4.tar.gz |
Merged "query cache for ndb" to 5.0
BitKeeper/etc/logging_ok:
auto-union
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/ha_innodb.h:
Hand merged
sql/ha_ndbcluster.cc:
Merge with gathering of stats
sql/sql_cache.cc:
Use new table def cache
sql/table.h:
table.h had been cleaned up
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/logging_ok | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 6f99987bd9b..0f5a715c521 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -152,6 +152,7 @@ mronstrom@build.mysql.com mronstrom@mysql.com mskold@mysql.com msvensson@build.mysql.com +msvensson@neptunus.homeip.net mwagner@cash.mwagner.org mwagner@evoq.mwagner.org mwagner@here.mwagner.org @@ -160,6 +161,7 @@ mwagner@work.mysql.com mydev@mysql.com mysql@home.(none) mysql@mc04.(none) +mysqldev@bk-internal.mysql.com mysqldev@build.mysql2.com mysqldev@melody.local mysqldev@mysql.com |