diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-16 20:44:37 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-16 20:44:37 +0400 |
| commit | 17c238a15ba436b6165bcba8aa0fd2530b23688b (patch) | |
| tree | e36aca98ec6cb0808339df3b316090de3d48301a /client/mysqladmin.cc | |
| parent | 6bd194d7ca9942a5926fe98dd8f59bd5213f24fd (diff) | |
| parent | e56742d7a964008a06aa134ed98fa7bfd2895b19 (diff) | |
| download | mariadb-git-17c238a15ba436b6165bcba8aa0fd2530b23688b.tar.gz | |
Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1-mrg
include/mysql.h:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/rename.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_class.h:
Auto merged
Makefile.am:
merging
client/mysqltest.c:
merging
mysql-test/t/mysql_client.test:
merging
Diffstat (limited to 'client/mysqladmin.cc')
0 files changed, 0 insertions, 0 deletions