diff options
| author | unknown <andrey@example.com> | 2006-08-17 19:09:55 +0200 |
|---|---|---|
| committer | unknown <andrey@example.com> | 2006-08-17 19:09:55 +0200 |
| commit | 96aef62c73d35a4a1c1efe6a782f515419fd18c1 (patch) | |
| tree | a72b07c504f84d3ab7a7de9ae2646e648f2c85cc /mysql-test/t/ps_1general.test | |
| parent | 5768d57013eefa5f744963996a73c1ab5a15e388 (diff) | |
| parent | 728a924c66d90aa78d49a36a20b578b41e9bd4d4 (diff) | |
| download | mariadb-git-96aef62c73d35a4a1c1efe6a782f515419fd18c1.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into example.com:/work/mysql-5.1-runtime
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/ps_1general.test')
0 files changed, 0 insertions, 0 deletions