diff options
author | unknown <kostja@bodhi.(none)> | 2007-10-30 20:10:11 +0300 |
---|---|---|
committer | unknown <kostja@bodhi.(none)> | 2007-10-30 20:10:11 +0300 |
commit | 1430f4ded275728ed747ebe48005c01b40cd3bab (patch) | |
tree | c2548e816a592f05bae2fef620d54c08c61982e6 /include/sql_common.h | |
parent | d4d4ba9a9f49a6abc9cd00924e1e33bfd2278b87 (diff) | |
parent | 2437001234eba37ad821be11052e57f04293d5bd (diff) | |
download | mariadb-git-1430f4ded275728ed747ebe48005c01b40cd3bab.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc-2
sql/sql_connect.cc:
Manual merge.
Diffstat (limited to 'include/sql_common.h')
0 files changed, 0 insertions, 0 deletions