diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-09-15 04:45:20 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-09-15 04:45:20 +0200 |
| commit | 362f6feb736a221ad3816c113d192c50c8c7f6d2 (patch) | |
| tree | 28572ba8a4ea5db35b3b2971f18422597f5a6511 /sql/nt_servc.cc | |
| parent | a3c8d7b777e1d02fc42db140aea26dbd43948d63 (diff) | |
| parent | 78653bdf697b3047069affb8eb263a6058ab58ce (diff) | |
| download | mariadb-git-362f6feb736a221ad3816c113d192c50c8c7f6d2.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/tnurnberg/15327/50-15327
client/mysql.cc:
Auto merged
client/mysql_upgrade.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'sql/nt_servc.cc')
0 files changed, 0 insertions, 0 deletions