diff options
| author | unknown <tnurnberg@mysql.com/salvation.intern.azundris.com> | 2006-08-07 01:39:05 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com/salvation.intern.azundris.com> | 2006-08-07 01:39:05 +0200 |
| commit | 0447e7982b983708f14d2742892c76929d985ff1 (patch) | |
| tree | 8ee16e156ae667939053af0486811cd5acfa4b4b /sql/mysqld.cc | |
| parent | 73f8dc616be39a716f08a8f9b08c59f96f7b6a3e (diff) | |
| parent | 6768b6454e565537988861b7b08ee625b524cbe9 (diff) | |
| download | mariadb-git-0447e7982b983708f14d2742892c76929d985ff1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/tnurnberg/work/mysql-5.0-maint-20214
mysql-test/r/grant.result:
manual merge
mysql-test/t/grant.test:
manual merge
Diffstat (limited to 'sql/mysqld.cc')
0 files changed, 0 insertions, 0 deletions