diff options
| author | unknown <igor@rurik.mysql.com> | 2006-05-07 16:24:03 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-05-07 16:24:03 -0700 |
| commit | 47302570e639927b258e10a7c009e6d585ba8adf (patch) | |
| tree | 7811c156251343975ba3296a37d98a6d1e2d2669 /include/sslopt-vars.h | |
| parent | c438e4903c144b52c0094eef194f821dc6cc8505 (diff) | |
| parent | 5aa69d34a73556cccfd6b2762bc0683198637742 (diff) | |
| download | mariadb-git-47302570e639927b258e10a7c009e6d585ba8adf.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
mysql-test/r/rpl_user_variables.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/rpl_user_variables.test:
Manual merge
Diffstat (limited to 'include/sslopt-vars.h')
0 files changed, 0 insertions, 0 deletions