diff options
author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-09-15 05:12:02 +0200 |
---|---|---|
committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-09-15 05:12:02 +0200 |
commit | 82b1033880137126a88d3788d07964702e1bf067 (patch) | |
tree | dac824d5a046aa0ae331c72bd20721e861592563 /support-files/SCO | |
parent | ecee2de17f72890a51911c36f6b700d98445a541 (diff) | |
parent | 3bc5123e824e0b4c696dacac5847606ea208f053 (diff) | |
download | mariadb-git-82b1033880137126a88d3788d07964702e1bf067.tar.gz |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/tnurnberg/15327/51-15327
configure.in:
Auto merged
client/mysql.cc:
Auto merged
client/mysql_upgrade.c:
Auto merged
client/mysqladmin.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
scripts/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'support-files/SCO')
0 files changed, 0 insertions, 0 deletions