summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-06-04 00:40:27 +0300
committerunknown <monty@hundin.mysql.fi>2002-06-04 00:40:27 +0300
commitb9b92e4efd4011440deb61538ccd9967a1f690da (patch)
tree675836bfd2d520dcffdb4499ac8cf51045c407f2 /vio
parent7daf5a5d0ee7b52508943c7095a2cc150abcf616 (diff)
downloadmariadb-git-b9b92e4efd4011440deb61538ccd9967a1f690da.tar.gz
Enable LOAD DATA LOCAL INFILE in mysql_test
Added syntax for column comments (for compability with 4.1) Fix of ALTER TABLE RENAME Docs/manual.texi: Changelog client/mysqltest.c: Enable LOAD DATA LOCAL INFILE mysql-test/r/alter_table.result: Test of syntax for column comments mysql-test/r/func_math.result: Fixed test of new truncate mysql-test/t/alter_table.test: Test of syntax for column comments mysys/my_gethostbyname.c: Portability fix sql/hostname.cc: Fixed pointer bug sql/item_cmpfunc.cc: Optimizing LIKE code sql/item_cmpfunc.h: Cleanup sql/mysqld.cc: Avoid warning of duplicate calls to mysql_thread_init() sql/sql_analyse.cc: Removed warning from DBUG sql/sql_parse.cc: Avoid warning of duplicate calls to mysql_thread_init() sql/sql_table.cc: Fix of ALTER TABLE RENAME sql/sql_yacc.yy: Added syntax for field comments vio/test-sslserver.c: Cleanup
Diffstat (limited to 'vio')
-rw-r--r--vio/test-sslserver.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/vio/test-sslserver.c b/vio/test-sslserver.c
index a9e28ac7a58..f0116a2817d 100644
--- a/vio/test-sslserver.c
+++ b/vio/test-sslserver.c
@@ -36,12 +36,14 @@ const char *VER="0.2";
const char *default_dbug_option="d:t:O,-";
#endif
+#if 0
static void
fatal_error( const char* r)
{
perror(r);
exit(0);
}
+#endif
typedef struct {
int sd;
@@ -70,13 +72,13 @@ do_ssl_stuff( TH_ARGS* args)
static void*
client_thread( void* arg)
{
- my_thread_init();
- do_ssl_stuff((TH_ARGS*)arg);
+ my_thread_init();
+ do_ssl_stuff((TH_ARGS*)arg);
+ return 0;
}
int
-main( int argc __attribute__((unused)),
- char** argv)
+main(int argc __attribute__((unused)), char** argv)
{
char server_key[] = "../SSL/server-key.pem",
server_cert[] = "../SSL/server-cert.pem";