diff options
| author | unknown <petr/cps@owlet.> | 2006-08-02 17:49:27 +0400 |
|---|---|---|
| committer | unknown <petr/cps@owlet.> | 2006-08-02 17:49:27 +0400 |
| commit | ad73be2eb754a348099d51f4315f9a7b1d638e6f (patch) | |
| tree | c81c3472457ddbdfd867da6be2121f3b0ac48cc6 /sql/sql_base.cc | |
| parent | a13b3c49293f350def614c54a10092dba1f4cdf8 (diff) | |
| parent | c57617507b487dbb6ec499fde25b0a8fcacc3e3f (diff) | |
| download | mariadb-git-ad73be2eb754a348099d51f4315f9a7b1d638e6f.tar.gz | |
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
0 files changed, 0 insertions, 0 deletions