diff options
| author | unknown <evgen@moonbone.local> | 2006-01-16 16:57:15 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-01-16 16:57:15 +0300 |
| commit | 9422fee7de29504c9b1bbd02e49173e3a130a9b3 (patch) | |
| tree | cb6f888f350fe4c923d070ac254cf224753512ea /mysql-test/include | |
| parent | 99ebd49555bd1993ccb3745eb3b55f4ea38ec49d (diff) | |
| parent | 85f2158b95520b3833732e18ead9c74856b05ff6 (diff) | |
| download | mariadb-git-9422fee7de29504c9b1bbd02e49173e3a130a9b3.tar.gz | |
Manually merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/innobase/os/os0thread.c:
Auto merged
storage/myisam/myisam_ftdump.c:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_euckr.inc | 4 | ||||
| -rw-r--r-- | mysql-test/include/have_gb2312.inc | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/include/have_euckr.inc b/mysql-test/include/have_euckr.inc new file mode 100644 index 00000000000..af794aafc04 --- /dev/null +++ b/mysql-test/include/have_euckr.inc @@ -0,0 +1,4 @@ +-- require r/have_euckr.require +disable_query_log; +show collation like "euckr_korean_ci"; +enable_query_log; diff --git a/mysql-test/include/have_gb2312.inc b/mysql-test/include/have_gb2312.inc new file mode 100644 index 00000000000..4328bc67639 --- /dev/null +++ b/mysql-test/include/have_gb2312.inc @@ -0,0 +1,4 @@ +-- require r/have_gb2312.require +disable_query_log; +show collation like "gb2312_chinese_ci"; +enable_query_log; |