diff options
author | unknown <monty@mashka.mysql.fi> | 2003-10-15 16:23:01 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-10-15 16:23:01 +0300 |
commit | 60fb31ddec27323101ad491bf324da5df2b04ab6 (patch) | |
tree | 38e01149b27f4d0b0b29f436336f67902beb68fa /include/mysql.h | |
parent | 4f5887b22d5d900a0e6166ff26f50d8c09e969f9 (diff) | |
parent | cad75f4a429830e1dd9713a16bd13ace17623dc4 (diff) | |
download | mariadb-git-60fb31ddec27323101ad491bf324da5df2b04ab6.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'include/mysql.h')
0 files changed, 0 insertions, 0 deletions