diff options
| author | unknown <istruewing@chilla.local> | 2006-09-20 08:33:46 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-09-20 08:33:46 +0200 |
| commit | f6951675f9246c7da71bb64c7058c494821ac01f (patch) | |
| tree | c5d55ac909d923b7567a72723ef59e8f30caa83c /mysql-test/r/rpl_variables.result | |
| parent | 186573b3d6301532b5d5fa9b470335e19f49769c (diff) | |
| parent | 82a72ee17e74db84b2c7a5ecfccf8a459c642acc (diff) | |
| download | mariadb-git-f6951675f9246c7da71bb64c7058c494821ac01f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/rpl_variables.result')
0 files changed, 0 insertions, 0 deletions