diff options
| author | unknown <evgen@moonbone.local> | 2006-09-29 01:01:52 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-09-29 01:01:52 +0400 |
| commit | 0954261761d474a77bc68360eb62fc9bd87a6fe8 (patch) | |
| tree | 2c2858c5657986daf9a5775690df805aaaf7c4c8 /mysql-test/r/default.result | |
| parent | d30536dc9df8069473c7b1c138cdf02ff8e63c7f (diff) | |
| parent | d332c37c584e294aa22e570808d8c3ac44f743ba (diff) | |
| download | mariadb-git-0954261761d474a77bc68360eb62fc9bd87a6fe8.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/5505-bug-5.0-opt-mysql
sql/share/errmsg.txt:
Auto merged
sql/sql_base.cc:
Auto merged
mysql-test/r/view.result:
Manual merge
mysql-test/t/view.test:
Manual merge
Diffstat (limited to 'mysql-test/r/default.result')
0 files changed, 0 insertions, 0 deletions