Merge miguel@work.mysql.com:/home/bk/mysql

into light.local:/home/miguel/bk/mysql BitKeeper/etc/logging_ok: auto-union

Merge miguel@work.mysql.com:/home/bk/mysql
into light.local:/home/miguel/bk/mysql BitKeeper/etc/logging_ok: auto-union
55ffd19f · unknown · 83c16814 · 3e9169c7 · 55ffd19f · 55ffd19f
Commit 55ffd19f authored Jun 29, 2001 by unknown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 124 additions and 123 deletions

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +4 -3

sql/share/spanish/errmsg.txt sql/share/spanish/errmsg.txt +120 -120

No files found.
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
 heikki@donna.mysql.fi
 jani@janikt.pp.saunalahti.fi
+miguel@light.local
+monty@hundin.mysql.fi
 monty@tik.mysql.fi
+monty@work.mysql.com
 mwagner@evoq.mwagner.org
+paul@central.snake.net
 paul@teton.kitebird.com
-monty@hundin.mysql.fi
 sasha@mysql.sashanet.com
-monty@work.mysql.com
-paul@central.snake.net
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt