database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merged from mysql-4.1 to mysql-5.0

Browse Source 
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
client/mysqldump.c:
  Merge from 4.1 to 5.0
mysql-test/r/ndb_autodiscover.result:
  Merge
ndb/test/ndbapi/create_tab.cpp:
  Merge
sql/ha_ndbcluster.cc:
  Merge
sql/handler.cc:
  Merge
sql/handler.h:
  Merge
sql/sql_base.cc:
  Merge
sql/sql_table.cc:
  Merge
This commit is contained in:
unknown
2005-06-22 14:10:02 +02:00
parent 73ea278f6a 19f51d3fa5
commit 4db138f91a
20 changed files with 658 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/not_openssl.inc Normal file
View File

@ -0,0 +1,4 @@
-- require r/not_openssl.require
disable_query_log;
show variables like "have_openssl";
enable_query_log;