diff options
| author | unknown <kaa@kaamos.(none)> | 2008-01-19 21:09:22 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-01-19 21:09:22 +0300 |
| commit | 153771ed7f62d1db025c4b2569b524d8b57a40eb (patch) | |
| tree | 74c8bb3c5cc29e998382c2b7310b2082c5b2ec4b /mysql-test/t/odbc.test | |
| parent | a4339cae85c7603c4655795cf038f0773ebc4718 (diff) | |
| parent | 35b035cfcb9fa1dbb99ae239280b8a9b9868f81d (diff) | |
| download | mariadb-git-153771ed7f62d1db025c4b2569b524d8b57a40eb.tar.gz | |
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
into kaamos.(none):/data/src/opt/mysql-5.1-opt
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/subselect.result:
Manual merge.
mysql-test/t/group_by.test:
Manual merge.
mysql-test/t/subselect.test:
Manual merge.
mysql-test/t/view.test:
Manual merge.
Diffstat (limited to 'mysql-test/t/odbc.test')
0 files changed, 0 insertions, 0 deletions