mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
6f3e97a6cb
Manual merge from mysql-5.1 into mysql-5.5. Conflicts ========= Text conflict in mysql-test/suite/rpl/t/rpl_row_until.test Text conflict in sql/handler.h Text conflict in storage/archive/ha_archive.cc |
||
---|---|---|
.. | ||
docs | ||
CMakeLists.txt | ||
test-ssl.c | ||
test-sslclient.c | ||
test-sslserver.c | ||
vio.c | ||
vio_priv.h | ||
viosocket.c | ||
viossl.c | ||
viosslfactories.c | ||
viotest-ssl.c | ||
viotest-sslconnect.cc | ||
viotest.cc |