diff options
author | unknown <gluh@eagle.(none)> | 2007-10-17 13:26:20 +0500 |
---|---|---|
committer | unknown <gluh@eagle.(none)> | 2007-10-17 13:26:20 +0500 |
commit | 6541906dcd809393f9fcffb12f883fb82a215c98 (patch) | |
tree | b00f1e2b41e0adf4cdc3bc27d973709028d87f63 /libmysql/libmysql.c | |
parent | 5db33c4ecc12f1980acafeb1d64f6175aaed1bff (diff) | |
parent | a48ed6c99b7f63d2724d8d385faa4d6e2fa048c5 (diff) | |
download | mariadb-git-6541906dcd809393f9fcffb12f883fb82a215c98.tar.gz |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
mysql-test/suite/funcs_1/r/innodb__datadict.result:
manual merge
mysql-test/suite/funcs_1/r/myisam__datadict.result:
manual merge
Diffstat (limited to 'libmysql/libmysql.c')
0 files changed, 0 insertions, 0 deletions