database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/structs.h:
  Auto merged
This commit is contained in:
unknown
2005-10-28 11:00:54 +02:00
parent a397d1f714 69d1cce20a
commit 0ae18e4899
25 changed files with 8779 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_show.cc
View File

@@ -1642,6 +1642,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;
case SHOW_NET_COMPRESSION:
end= strmov(buff, thd->net.compress ? "ON" : "OFF");
break;
case SHOW_UNDEF: // Show never happen
case SHOW_SYS:
break; // Return empty string