diff options
| author | unknown <serg@janus.mylan> | 2007-10-22 20:05:06 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-10-22 20:05:06 +0200 |
| commit | e3bd02cfbfdaa467cc69c2183bb1b437006fb2b2 (patch) | |
| tree | 33cce67b2e6cc3df13415b46772f315da6eeead0 /tests/ssl_test.c | |
| parent | bdab4dcefe7ba9ba44a7a8cbc9cd32d282cf3ee6 (diff) | |
| parent | fc800ff76d0c1f47126645c7ec742ae07434056b (diff) | |
| download | mariadb-git-e3bd02cfbfdaa467cc69c2183bb1b437006fb2b2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
mysql-test/r/innodb_mysql.result:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/table.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'tests/ssl_test.c')
0 files changed, 0 insertions, 0 deletions