diff options
author | unknown <msvensson@neptunus.(none)> | 2005-04-01 12:40:54 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-04-01 12:40:54 +0200 |
commit | 382df7a19e42aa07c5d574921b852dfcd93c5bb5 (patch) | |
tree | 00f81f7967f6004ac4a700333bf9c566369d7db2 /sql/field.h | |
parent | ec6ce01565bbb1a56b342a2dd4607869c0d93278 (diff) | |
parent | 0344bf166534fd56095220f06960172937746327 (diff) | |
download | mariadb-git-382df7a19e42aa07c5d574921b852dfcd93c5bb5.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
sql/ha_berkeley.cc:
Auto merged
Diffstat (limited to 'sql/field.h')
0 files changed, 0 insertions, 0 deletions