diff options
| author | unknown <anozdrin/alik@station.> | 2007-10-09 14:32:43 +0400 |
|---|---|---|
| committer | unknown <anozdrin/alik@station.> | 2007-10-09 14:32:43 +0400 |
| commit | 2e53f3631164bf88471f63cafc884072d4167686 (patch) | |
| tree | 48d5e25662c23157e4c32bcb77d378e57b6b3ccc /sql/sql_connect.cc | |
| parent | 4b7f527270951a6c490556ccc6a1d735cc746f37 (diff) | |
| parent | db50f37ae044487e88cf0275b97424ca748f92d1 (diff) | |
| download | mariadb-git-2e53f3631164bf88471f63cafc884072d4167686.tar.gz | |
Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Manual merge/
Diffstat (limited to 'sql/sql_connect.cc')
0 files changed, 0 insertions, 0 deletions