diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-12 13:56:07 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-12 13:56:07 +0200 |
| commit | 2bb0501d655bfc072dfc7a80e337904cd7865073 (patch) | |
| tree | 5f053dd50effadde3efbece9a9d1399ad9d4e578 /sql/sql_show.cc | |
| parent | 20fdedb7569f11787f142629c81228439c1895b7 (diff) | |
| download | mariadb-git-2bb0501d655bfc072dfc7a80e337904cd7865073.tar.gz | |
Always test ssl and compress
- Updated after review
client/mysqltest.c:
Updated after review.
Fix "connect" command to take SSL and/or COMPRESS as options instead of enable/disable_ssl and enable/disable_compress
Commented do_connect, added test cases etc.
Fix safe_get_param to make it possible to call it once for every argument without having any checks inbetween.
Make a copy for query->first_argument since safe_get_param will modify query string. Now connect works inside a while loop as well.
mysql-test/mysql-test-run.pl:
Updated after review
mysql-test/r/connect.result:
Enable test that was previolsy disabled because of "no error handling" in connect
mysql-test/r/mysqltest.result:
Added tests for "connect"
mysql-test/t/compress.test:
Updated after review, use the option argument to connect
mysql-test/t/connect.test:
Enable test that was previolsy disabled because of "no error handling" in connect
Now it's possible to use "--error" before connect, so let's use it.
mysql-test/t/information_schema.test:
Connection user4 was already used
mysql-test/t/myisam.test:
Disconnect con1 so the name can be reused
mysql-test/t/mysqltest.test:
Added tests for "connect"
mysql-test/t/openssl_1.test:
Updated after review, use the option argument to connect
mysql-test/t/sp-security.test:
Disconnect user1 connection so the name can be reused
mysql-test/t/ssl.test:
Updated after review, use the option argument to connect
mysql-test/t/ssl_compress.test:
Updated after review, use the option argument to connect
sql/mysqld.cc:
Updated after review, Compression variable is always available
sql/sql_show.cc:
Updated after review, Compression variable is always available
sql/structs.h:
Updated after review, Compression variable is always available
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 4b3242cbe12..e7acf00dc4e 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1632,11 +1632,9 @@ static bool show_status_array(THD *thd, const char *wild, value= (value-(char*) &dflt_key_cache_var)+ (char*) dflt_key_cache; end= longlong10_to_str(*(longlong*) value, buff, 10); break; -#ifdef HAVE_COMPRESS case SHOW_NET_COMPRESSION: end= strmov(buff, thd->net.compress ? "ON" : "OFF"); break; -#endif /* HAVE_COMPRESS */ case SHOW_UNDEF: // Show never happen case SHOW_SYS: break; // Return empty string |