diff options
| author | unknown <konstantin@mysql.com> | 2005-07-14 20:02:32 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-14 20:02:32 +0400 |
| commit | 5858a8cd42392832a443e19ce12abb8aabad12e6 (patch) | |
| tree | f9d3af9a30fe2cd38664ddcef3096d663741dc68 /configure.in | |
| parent | 20d8170adc735d49acc95981845ebd0844c00653 (diff) | |
| parent | 69ecbbcbf31aeb5165c9134d8fa1180f42d91da1 (diff) | |
| download | mariadb-git-5858a8cd42392832a443e19ce12abb8aabad12e6.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/field.cc:
manual merge
tests/mysql_client_test.c:
manual merge
mysql-test/r/select.result:
manual merge
mysql-test/t/select.test:
manual merge
sql/sql_select.cc:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'configure.in')
0 files changed, 0 insertions, 0 deletions