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

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/test/include/UtilTransactions.hpp:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
This commit is contained in:
unknown
2005-07-22 23:15:51 +02:00
parent 17c432c9fa 1c4da828d4
commit 4894026840
8 changed files with 273 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,4 @@
-- require r/have_gbk.require
disable_query_log;
show collation like "gbk_chinese_ci";
enable_query_log;