diff options
author | unknown <jimw@mysql.com> | 2005-02-22 16:39:21 -0800 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-02-22 16:39:21 -0800 |
commit | 7d4ea5cfc2c9288f9f3d75e4477f85db86e90313 (patch) | |
tree | 8a25c021a98aa2011d4e88525cb7455a924912f0 /sql/log.cc | |
parent | c0cb1faa7cf59104bcc7a985b957c957e18bcdb6 (diff) | |
parent | 8776230074184a255e8df4c5c4eb45e66fc81fe0 (diff) | |
download | mariadb-git-7d4ea5cfc2c9288f9f3d75e4477f85db86e90313.tar.gz |
Merge
extra/perror.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Merge change in warning message
sql/sql_parse.cc:
Hand-merge
Diffstat (limited to 'sql/log.cc')
0 files changed, 0 insertions, 0 deletions