summaryrefslogtreecommitdiff
path: root/sql/protocol.h
diff options
context:
space:
mode:
authorhf@deer.mysql.r18.ru <>2003-01-15 13:15:35 +0400
committerhf@deer.mysql.r18.ru <>2003-01-15 13:15:35 +0400
commit96089e2b3a013c83e812672284bf10a34ba9d11c (patch)
tree937beb6f27e5e7958081a4a5ba13ceb2f5251396 /sql/protocol.h
parentc59bff7c96bf90c9c4dafdb80684fb438bb43734 (diff)
parent809af00b0672242cc1b0fee114a34f414ec9055a (diff)
downloadmariadb-git-96089e2b3a013c83e812672284bf10a34ba9d11c.tar.gz
resolving conflicts
Diffstat (limited to 'sql/protocol.h')
0 files changed, 0 insertions, 0 deletions