diff options
author | unknown <monty@mysql.com> | 2005-03-16 01:30:28 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-03-16 01:30:28 +0200 |
commit | 362249ea71849a4ebd6402c0fb8b0cf904b46266 (patch) | |
tree | c680b6659c731b31ebcbfdc22e12c4daa3cf567d /sql/sql_error.cc | |
parent | 4585fbe473538a1af684c14526ce32ebc5ad2d0e (diff) | |
parent | 4939e9a6f54634a9121589cd0c74b673c63ee7cc (diff) | |
download | mariadb-git-362249ea71849a4ebd6402c0fb8b0cf904b46266.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_error.cc')
0 files changed, 0 insertions, 0 deletions