diff options
| author | unknown <svoj@june.mysql.com> | 2007-06-07 13:53:23 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-06-07 13:53:23 +0500 |
| commit | 97a7a6d45cef9b9a202a4ba184ca1dc0d8cffc18 (patch) | |
| tree | e968dc9a6540caeb50868196c6c51bc43da534d5 /client | |
| parent | f05626f1e4e167c74f08b006a317053aa34b7a1a (diff) | |
| parent | 3ee66aa65ec69355f17e3589d927f5f8109c2e21 (diff) | |
| download | mariadb-git-97a7a6d45cef9b9a202a4ba184ca1dc0d8cffc18.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
mysql-test/r/key_cache.result:
Auto merged
mysql-test/r/lock.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/preload.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/repair.result:
Auto merged
mysql-test/r/rpl_failed_optimize.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
storage/myisammrg/myrg_def.h:
Auto merged
storage/myisammrg/myrg_open.c:
Auto merged
mysql-test/r/backup.result:
Use local.
mysql-test/r/sp.result:
Use local.
sql/sql_error.cc:
Use local.
sql/sql_error.h:
Use local.
sql/share/errmsg.txt:
Manual merge.
sql/sql_table.cc:
Manual merge.
storage/myisam/ha_myisam.cc:
Manual merge.
storage/myisammrg/ha_myisammrg.cc:
Manual merge.
storage/myisammrg/ha_myisammrg.h:
Manual merge.
Diffstat (limited to 'client')
0 files changed, 0 insertions, 0 deletions