diff options
| author | unknown <konstantin@mysql.com> | 2006-02-07 15:26:58 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-07 15:26:58 +0300 |
| commit | 02576c95d14d84f2a991bc0443d159afb11e24b7 (patch) | |
| tree | 087c30fed4aea55f1567d7a6f6e3c1d5b35ca8b0 /mysql-test/r/rpl_failed_optimize.result | |
| parent | 6a9a35c0d451429a71ddbfd3c4b1db1700be9ad3 (diff) | |
| parent | ef0cd2f58a785113cda84bb774f39428b99de0ef (diff) | |
| download | mariadb-git-02576c95d14d84f2a991bc0443d159afb11e24b7.tar.gz | |
Merge mysql.com:/home/kostja/mysql/tmp_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
mysql-test/r/information_schema_db.result:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/information_schema.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/rpl_failed_optimize.result')
0 files changed, 0 insertions, 0 deletions