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

into light.local:/home/miguel/bk/mysql

Merge miguel@work.mysql.com:/home/bk/mysql
into light.local:/home/miguel/bk/mysql
373e2c4a · miguel@light.local · 14c133fb · bd4c70b8 · 373e2c4a · 373e2c4a
Commit 373e2c4a authored Jun 29, 2001 by miguel@light.local
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