diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-13 14:42:50 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-13 14:42:50 +0400 |
| commit | ef9e4ab6aa8ffa5a82205ab25f099477e04a6c10 (patch) | |
| tree | ec9baa569eb605ee0185b8313c87de1ddcc6d2c7 /sql/mysqld.cc | |
| parent | 16f2de1df2e585182ed558b01dd0f3ed0d1ae549 (diff) | |
| parent | 380aa281dd3a620c80374d39374d2660171c1cea (diff) | |
| download | mariadb-git-ef9e4ab6aa8ffa5a82205ab25f099477e04a6c10.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real
include/violite.h:
SCCS merged
sql/net_serv.cc:
SCCS merged
vio/viosocket.c:
SCCS merged
Diffstat (limited to 'sql/mysqld.cc')
0 files changed, 0 insertions, 0 deletions