diff options
author | unknown <tulin@dl145c.mysql.com> | 2005-09-12 14:11:28 +0200 |
---|---|---|
committer | unknown <tulin@dl145c.mysql.com> | 2005-09-12 14:11:28 +0200 |
commit | 4efcca023b47e9d8fff148da2c65254ddbee6c9b (patch) | |
tree | 3277672a0e0bb82fb801050c58afbe0ef04aef26 /sql/sql_error.cc | |
parent | 2eb6b134a6e95ca354e7fa124d863b41e7a89976 (diff) | |
parent | 0a3202bedfbe3666e29690b12ce94123e73f8945 (diff) | |
download | mariadb-git-4efcca023b47e9d8fff148da2c65254ddbee6c9b.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
mysql-test/t/rpl_slave_status.test:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
Diffstat (limited to 'sql/sql_error.cc')
0 files changed, 0 insertions, 0 deletions