diff options
| author | unknown <miguel@hegel.txg> | 2004-06-18 01:43:25 -0300 |
|---|---|---|
| committer | unknown <miguel@hegel.txg> | 2004-06-18 01:43:25 -0300 |
| commit | 20985f3e90a80328c3290b5a630a631337946ea7 (patch) | |
| tree | 030455fe6296ff78733dd34dff4b21dc505660ee | |
| parent | 81ceac59f86534882a5db48ce2dd24de66fd410e (diff) | |
| parent | 0badf47d5ac97106f87eee379e438f405579abe7 (diff) | |
| download | mariadb-git-20985f3e90a80328c3290b5a630a631337946ea7.tar.gz | |
Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0
into hegel.txg:/home/miguel/bk/mysql-4.0
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | extra/perror.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 708b6f1e3fb..d46ab7a3cdf 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -65,6 +65,7 @@ marko@hundin.mysql.fi miguel@hegel.(none) miguel@hegel.br miguel@hegel.local +miguel@hegel.txg miguel@light. miguel@light.local miguel@sartre.local diff --git a/extra/perror.c b/extra/perror.c index b4405fdc5dd..b4aeaf00671 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -233,7 +233,7 @@ int main(int argc,char *argv[]) else { if (verbose) - printf("MySql error: %3d = %s\n",code,msg); + printf("MySQL error: %3d = %s\n",code,msg); else puts(msg); } |