diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-10 02:41:21 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-10 02:41:21 +0200 |
| commit | 73c56ba8a59e87500aede58b2931223799cf153d (patch) | |
| tree | 3e27ef8c0485471122ab10b90ea64fc023d860fe /extra | |
| parent | 2282ec0f81360b477c2dec81e25a4bdafd0bce69 (diff) | |
| parent | 9450b41d57b0f723a907e29a9b7cb3a60cb430f2 (diff) | |
| download | mariadb-git-73c56ba8a59e87500aede58b2931223799cf153d.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prepared-4.1
mysql-test/r/derived.result:
Auto merged
mysql-test/t/derived.test:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'extra')
0 files changed, 0 insertions, 0 deletions