diff options
author | unknown <serg@serg.mylan> | 2005-04-12 23:12:26 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-04-12 23:12:26 +0200 |
commit | 5630f0731ab020471108c67e7ae962ba6eaef625 (patch) | |
tree | fe052a745fa3bc2e6641777054a25dcbd12458a0 /sql/protocol.h | |
parent | 923b76f8d1632d1214cb3bae34d0927cb6c2d14c (diff) | |
parent | 70d8ae0171b33d874c811243686f28bcd7ab69da (diff) | |
download | mariadb-git-5630f0731ab020471108c67e7ae962ba6eaef625.tar.gz |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/protocol.h')
0 files changed, 0 insertions, 0 deletions