diff options
| author | unknown <kostja@bodhi.local> | 2006-08-31 12:34:06 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-08-31 12:34:06 +0400 |
| commit | 1a22b9c1f62f2e24a8a8899fac32bd29503ee3e8 (patch) | |
| tree | d4ab6a36efa202b09b1767575c74be071e36aedc /server-tools | |
| parent | cdf1d8433f1bfdb1c03b8d53d9986089772e645c (diff) | |
| parent | 3fb2ee35719c3e67bc74a9d806991b445f115fd2 (diff) | |
| download | mariadb-git-1a22b9c1f62f2e24a8a8899fac32bd29503ee3e8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-14897
configure.in:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'server-tools')
0 files changed, 0 insertions, 0 deletions