diff options
| author | unknown <kaa@polly.(none)> | 2007-11-09 13:31:48 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-11-09 13:31:48 +0300 |
| commit | b83c00f47548bde1b18218322abcaf744a859ae0 (patch) | |
| tree | f72c06a2f95198e41982ee2f8bf28f72904a509f /libmysql/libmysql.c | |
| parent | fbb0621ada6d174b98b8efa0c741a1f4e63821fb (diff) | |
| parent | bae65dd2e3d1069b9b68d1c702b7821937f4ad54 (diff) | |
| download | mariadb-git-b83c00f47548bde1b18218322abcaf744a859ae0.tar.gz | |
Merge polly.(none):/home/kaa/src/opt/bug32020/my50-bug31445
into polly.(none):/home/kaa/src/opt/bug32020/my51-bug31445
mysql-test/r/skip_grants.result:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
sql/sql_udf.cc:
Auto merged
Diffstat (limited to 'libmysql/libmysql.c')
0 files changed, 0 insertions, 0 deletions