diff options
| author | unknown <igor@olga.mysql.com> | 2007-06-03 22:52:02 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-06-03 22:52:02 -0700 |
| commit | f4caa3025a437ca818fdef152321c3c02b2dabd6 (patch) | |
| tree | 9bfac4f842371d84eebd379e361ab3df1e3bf0f0 /mysql-test/r/ps_5merge.result | |
| parent | 0484d44eebff70ef5a2c328c7a9d50ac07a89409 (diff) | |
| parent | 92fb5da3728651ee4f2f72d73efa8a89a5d4f764 (diff) | |
| download | mariadb-git-f4caa3025a437ca818fdef152321c3c02b2dabd6.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.1
into olga.mysql.com:/home/igor/mysql-5.1-opt-merge
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/subselect3.test:
Auto merged
sql/field.h:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/ps_2myisam.result:
Manual merge.
mysql-test/r/ps_3innodb.result:
Manual merge.
mysql-test/r/ps_4heap.result:
Manual merge.
mysql-test/r/ps_5merge.result:
Manual merge.
mysql-test/r/ps_7ndb.result:
Manual merge.
sql/sql_table.cc:
Manual merge.
sql/sql_view.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/ps_5merge.result')
0 files changed, 0 insertions, 0 deletions