diff options
| author | unknown <kostja@bodhi.local> | 2006-12-01 13:26:49 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-12-01 13:26:49 +0300 |
| commit | 7c6fe6e7f0f521448971f9d986b959b6064f8812 (patch) | |
| tree | 671086f64b058c11a795f9c47803e599e840652a /vio/viotest-ssl.c | |
| parent | c8100cba20c97561cba5bdc9a2e754217d4dcfc9 (diff) | |
| parent | fe84b016e1fd62d92c9f13a1e21784ea8cb200cd (diff) | |
| download | mariadb-git-7c6fe6e7f0f521448971f9d986b959b6064f8812.tar.gz | |
Merge bodhi.local:/opt/local/work/mysql-5.0-4968
into bodhi.local:/opt/local/work/mysql-5.1-runtime
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
tests/mysql_client_test.c:
Manual merge.
Diffstat (limited to 'vio/viotest-ssl.c')
0 files changed, 0 insertions, 0 deletions