diff options
| author | unknown <konstantin@mysql.com> | 2006-04-12 18:30:54 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-04-12 18:30:54 +0400 |
| commit | e46a193be82ba9956ac2db8e015fb528c84842da (patch) | |
| tree | 96d659fbe401a4fa1269027a7637692d3bfc1258 /sql/share | |
| parent | 10633fd8397f8450b5076bb98f336f6d20967b5d (diff) | |
| parent | f37d610147cbd51bde10aceac4d18e2f1c415e68 (diff) | |
| download | mariadb-git-e46a193be82ba9956ac2db8e015fb528c84842da.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-16365
into mysql.com:/opt/local/work/mysql-5.0-merge
sql/set_var.cc:
Auto merged
mysql-test/r/ps.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql/item_row.cc:
Manual merge.
sql/item_row.h:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/mysqld.cc:
Manual merge.
sql/set_var.h:
Manual merge.
sql/sql_class.cc:
Manual merge.
sql/sql_class.h:
Manual merge.
sql/sql_prepare.cc:
Manual merge.
Diffstat (limited to 'sql/share')
0 files changed, 0 insertions, 0 deletions