diff options
author | monty@mysql.com <> | 2005-01-03 23:04:52 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2005-01-03 23:04:52 +0200 |
commit | 309b1a2b6ca36ed76753057cb032b6f4179bdc9b (patch) | |
tree | 0f73878fcf058ff862f3f7eb305aafae2ad3465d /BitKeeper | |
parent | a9853184d3b69a3802984e0994282dc3a3320296 (diff) | |
parent | 530a104eec3abc0620ee6c3b649f9a425306bfe1 (diff) | |
download | mariadb-git-309b1a2b6ca36ed76753057cb032b6f4179bdc9b.tar.gz |
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
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 de75db9dd21..40db2499a81 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -171,6 +171,7 @@ paul@frost.snake.net paul@ice.local paul@ice.snake.net paul@kite-hub.kitebird.com +paul@snake-hub.snake.net paul@teton.kitebird.com pekka@mysql.com pem@mysql.com |