diff options
author | unknown <bar@bar.intranet.mysql.r18.ru> | 2003-12-19 19:15:55 +0400 |
---|---|---|
committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2003-12-19 19:15:55 +0400 |
commit | bfe77e3398944bed4c919ba0c7477a4318d9f2cc (patch) | |
tree | 8e4d819b493af1ab6db66653dfa2b4994bf9929c /sql/sql_error.cc | |
parent | 778a9029e610f58b2988dc737ffeee70ac1a1f5a (diff) | |
parent | ebf4337470418f17c705125609f84b7dd2961a30 (diff) | |
download | mariadb-git-bfe77e3398944bed4c919ba0c7477a4318d9f2cc.tar.gz |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'sql/sql_error.cc')
0 files changed, 0 insertions, 0 deletions