diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-24 13:08:01 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-24 13:08:01 +0200 |
| commit | 5018e6660f673ec2ec72ee30a489bfea0c79e405 (patch) | |
| tree | f828fb6baae07c64b6d5c23f79cdd4196cbcf57a /include/my_sys.h | |
| parent | 5ceab2fe7ad58e4b13cd510e9396ffb4ff814d0e (diff) | |
| parent | 90bb6c54f2c79b4e40b73c5aba63e693b2eb59a2 (diff) | |
| download | mariadb-git-5018e6660f673ec2ec72ee30a489bfea0c79e405.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'include/my_sys.h')
0 files changed, 0 insertions, 0 deletions