diff options
| author | unknown <konstantin@mysql.com> | 2006-02-02 12:03:35 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-02 12:03:35 +0300 |
| commit | f0263ac452817f83d28047a20399fdef1e232e9a (patch) | |
| tree | 72eba57e7d347ae15c6a57558fd619c2afc05b31 /include/config-netware.h | |
| parent | 7088b39da895cf22a2b71d21a8313cbf0dda3760 (diff) | |
| parent | 13f908c23e8a663f265bdcb16f6ec5c4a45bb470 (diff) | |
| download | mariadb-git-f0263ac452817f83d28047a20399fdef1e232e9a.tar.gz | |
Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
client/mysqltest.c:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/mysql-test-run.pl:
SCCS merged
sql/sql_yacc.yy:
Manual merge: resolve the conflict with moved sp_if rule
Diffstat (limited to 'include/config-netware.h')
0 files changed, 0 insertions, 0 deletions