diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-12 12:52:34 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-12 12:52:34 +0200 |
| commit | 6af90061f42a0cbdc4f59e5390471b008e24d252 (patch) | |
| tree | b54fecadb68c73afdbd6200942aba915902f2d84 /sql/sp_head.h | |
| parent | 10633fd8397f8450b5076bb98f336f6d20967b5d (diff) | |
| parent | b2d5243e97b7395d38bd6afc4767199703cf7f7c (diff) | |
| download | mariadb-git-6af90061f42a0cbdc4f59e5390471b008e24d252.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.h')
0 files changed, 0 insertions, 0 deletions