diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-05-13 00:37:45 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-05-13 00:37:45 +0500 |
| commit | 07343d013ffc230a6c7cf9e284615a0afc503de1 (patch) | |
| tree | 7a72be60619a2a6c56eecb436d4e8a59d79c6a7e /extra/resolveip.c | |
| parent | 9592070014671b54f7a763bd8bf1e2b91a69c056 (diff) | |
| parent | e7e49eb69ee6ca949d8f885505da572bb1d394c4 (diff) | |
| download | mariadb-git-07343d013ffc230a6c7cf9e284615a0afc503de1.tar.gz | |
Merge host.loc:/work/bugs/5.0-bugteam-36055
into host.loc:/work/bk/5.1-bugteam
sql/handler.cc:
Auto merged
mysql-test/r/repair.result:
Merge with 5.0-bugteam (bug#36055).
mysql-test/t/repair.test:
Merge with 5.0-bugteam (bug#36055).
sql/sql_table.cc:
Merge with 5.0-bugteam (bug#36055).
Diffstat (limited to 'extra/resolveip.c')
0 files changed, 0 insertions, 0 deletions