diff options
| author | unknown <anozdrin/alik@ibm.> | 2007-07-27 21:30:43 +0400 |
|---|---|---|
| committer | unknown <anozdrin/alik@ibm.> | 2007-07-27 21:30:43 +0400 |
| commit | 4596ef83e7705c8d8ff408eaa9fb930a43775171 (patch) | |
| tree | 77417998cc4a176a743cb99b4445355f370bc033 /mysql-test/r/not_ndb.require | |
| parent | 818b0b84e0268e38a563dcf2c6ce0c3c2cf2f7f7 (diff) | |
| parent | 2612fc43b53a69320ba41011aa632ec35b734211 (diff) | |
| download | mariadb-git-4596ef83e7705c8d8ff408eaa9fb930a43775171.tar.gz | |
Merge ibm.:/home/alik/Documents/MySQL/devel/5.0-rt
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merge
mysql-test/r/mysqldump-max.result:
Auto merged
mysql-test/r/openssl_1.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
client/mysqldump.c:
Manual merge.
mysql-test/r/mysqldump.result:
Manual merge + use local.
Diffstat (limited to 'mysql-test/r/not_ndb.require')
0 files changed, 0 insertions, 0 deletions