diff options
| author | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2006-09-23 05:58:48 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2006-09-23 05:58:48 +0200 |
| commit | 14ad51e09ed3bcf80d97f48697c801b4a16c04d5 (patch) | |
| tree | b8cef71fccb849d37d4ccdcf60c9e9850241ccf3 /sql/derror.cc | |
| parent | 82a72ee17e74db84b2c7a5ecfccf8a459c642acc (diff) | |
| parent | 4d147f32850a27052692ad520ed792a2d22027d8 (diff) | |
| download | mariadb-git-14ad51e09ed3bcf80d97f48697c801b4a16c04d5.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
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 'sql/derror.cc')
0 files changed, 0 insertions, 0 deletions