diff options
| author | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-10-23 07:00:13 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-10-23 07:00:13 +0200 |
| commit | a06c4b535308d641b354615f6a4c0ff06c3f9d0e (patch) | |
| tree | 15cace7a69a5b588dbd5475c283afae69f75d1e4 /libmysqld | |
| parent | 89cca4b3696a7a958eaae030aeff38b47a9fd7d1 (diff) | |
| parent | f9d068bc09c3b415e8212897692b93a9fee5aae1 (diff) | |
| download | mariadb-git-a06c4b535308d641b354615f6a4c0ff06c3f9d0e.tar.gz | |
Merge mysql.com:/scratch/tnurnberg/20901/41-20901
into mysql.com:/scratch/tnurnberg/20901/50-20901
mysql-test/r/grant.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/create.result:
SCCS merged
Diffstat (limited to 'libmysqld')
0 files changed, 0 insertions, 0 deletions