mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix test suite so that it works when doing configure --without-uca

Browse source 
Simplify testing of needed characterset
Remove ndb from --with-plugins=max build
mysqlbug now sends email to maria-developers@lists.launchpad.net

client/mysqltest.cc:
  SKIP now expands variables (for better error messages)
mysql-test/include/have_big5.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_collation.inc:
  Test if '$collation' is supported
mysql-test/include/have_cp1250_ch.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_cp1251.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_cp866.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_cp932.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_eucjpms.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_euckr.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_gb2312.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_gbk.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_koi8r.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_latin2_ch.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_sjis.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_tis620.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_ucs2.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_ujis.inc:
  Simplify by using have_collation.inc
mysql-test/include/have_utf8.inc:
  Simplify by using have_collation.inc
mysql-test/r/create-uca.result:
  Create tests that uses unicode
mysql-test/r/create.result:
  Move test with unicode to create-uca.test
mysql-test/r/have_big5.require:
  Not needed anymore
mysql-test/r/have_cp1250_ch.require:
  Not needed anymore
mysql-test/r/have_cp1251.require:
  Not needed anymore
mysql-test/r/have_cp866.require:
  Not needed anymore
mysql-test/r/have_cp932.require:
  Not needed anymore
mysql-test/r/have_eucjpms.require:
  Not needed anymore
mysql-test/r/have_euckr.require:
  Not needed anymore
mysql-test/r/have_gb2312.require:
  Not needed anymore
mysql-test/r/have_gbk.require:
  Not needed anymore
mysql-test/r/have_koi8r.require:
  Not needed anymore
mysql-test/r/have_latin2_ch.require:
  Not needed anymore
mysql-test/r/have_sjis.require:
  Not needed anymore
mysql-test/r/have_tis620.require:
  Not needed anymore
mysql-test/r/have_ucs2.require:
  Not needed anymore
mysql-test/r/have_ujis.require:
  Not needed anymore
mysql-test/r/have_utf8.require:
  Not needed anymore
mysql-test/r/innodb.result:
  Move tests that depends on unicode to innodb_utf8.test
mysql-test/r/innodb_utf8.result:
  Test moved from innodb.test
mysql-test/suite/rpl/t/rpl_ignore_table.test:
  Test for required collations
mysql-test/t/create-uca.test:
  Create tests that uses unicode
mysql-test/t/create.test:
  Move test with unicode to create-uca.test
mysql-test/t/ctype_utf8.test:
  Test that require unicode
mysql-test/t/ddl_i18n_koi8r.test:
  Test for required collations
mysql-test/t/ddl_i18n_utf8.test:
  Test for required collations
mysql-test/t/fulltext.test:
  Test for required collations
mysql-test/t/fulltext2.test:
  Test for required collations
mysql-test/t/innodb.test:
  Move tests that depends on unicode to innodb_utf8.test
mysql-test/t/innodb_utf8.test:
  Tests that uses unicode
mysql-test/t/query_cache_ps_no_prot.test:
  Test for required collations
mysql-test/t/query_cache_ps_ps_prot.test:
  Test for required collations
scripts/mysqlbug.sh:
  Send emails to maria-developers@lists.launchpad.net
storage/ndb/plug.in:
  Don't include ndb in 'max' builds
This commit is contained in:
Michael Widenius 2009-12-27 15:54:41 +02:00
parent b7f11d1068
commit 85d78b62cc
52 changed files with 158 additions and 226 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/mysqltest.cc
View file

@ -1267,6 +1267,7 @@ void abort_not_supported_test(const char *fmt, ...)
DBUG_ENTER("abort_not_supported_test");
/* Print include filestack */
fflush(stdout);
fprintf(stderr, "The test '%s' is not supported by this installation\n",
file_stack->file_name);
fprintf(stderr, "Detected in file %s at line %d\n",
@ -8098,7 +8099,10 @@ int main(int argc, char **argv)
abort_flag= 1;
break;
case Q_SKIP:
abort_not_supported_test("%s", command->first_argument);
/* Eval the query, thus replacing all environment variables */
dynstr_set(&ds_res, 0);
do_eval(&ds_res, command->first_argument, command->end, FALSE);
abort_not_supported_test("%s",ds_res.str);
break;
case Q_RESULT:

6
mysql-test/include/have_big5.inc
View file

@ -1,4 +1,2 @@
-- require r/have_big5.require
disable_query_log;
show collation like 'big5_chinese_ci';
enable_query_log;
let collation=big5_chinese_ci;
--source include/have_collation.inc

3
mysql-test/include/have_collation.inc Normal file
View file

@ -0,0 +1,3 @@
if (!`SELECT count(*) AS 'true' FROM information_schema.collations WHERE collation_name LIKE '$collation'`) {
skip Test needs character set '$collation';
}

6
mysql-test/include/have_cp1250_ch.inc
View file

@ -1,4 +1,2 @@
-- require r/have_cp1250_ch.require
disable_query_log;
show collation like 'cp1250_czech_cs';
enable_query_log;
let collation=cp1250_czech_cs;
--source include/have_collation.inc

9
mysql-test/include/have_cp1251.inc
View file

@ -1,7 +1,2 @@
--require r/have_cp1251.require
--disable_query_log
SHOW COLLATION LIKE 'cp1251_general_ci';
--enable_query_log
let collation=cp1251_general_ci;
--source include/have_collation.inc

9
mysql-test/include/have_cp866.inc
View file

@ -1,7 +1,2 @@
--require r/have_cp866.require
--disable_query_log
SHOW COLLATION LIKE 'cp866_general_ci';
--enable_query_log
let collation=cp866_general_ci;
--source include/have_collation.inc

6
mysql-test/include/have_cp932.inc
View file

@ -1,4 +1,2 @@
-- require r/have_cp932.require
disable_query_log;
show collation like 'cp932_japanese_ci';
enable_query_log;
let collation=cp932_japanese_ci;
--source include/have_collation.inc

6
mysql-test/include/have_eucjpms.inc
View file

@ -1,4 +1,2 @@
-- require r/have_eucjpms.require
disable_query_log;
show collation like 'eucjpms_japanese_ci';
enable_query_log;
let collation=eucjpms_japanese_ci;
--source include/have_collation.inc

6
mysql-test/include/have_euckr.inc
View file

@ -1,4 +1,2 @@
-- require r/have_euckr.require
disable_query_log;
show collation like 'euckr_korean_ci';
enable_query_log;
let collation=euckr_korean_ci;
--source include/have_collation.inc

6
mysql-test/include/have_gb2312.inc
View file

@ -1,4 +1,2 @@
-- require r/have_gb2312.require
disable_query_log;
show collation like 'gb2312_chinese_ci';
enable_query_log;
let collation=gb2312_chinese_ci;
--source include/have_collation.inc

6
mysql-test/include/have_gbk.inc
View file

@ -1,4 +1,2 @@
-- require r/have_gbk.require
disable_query_log;
show collation like 'gbk_chinese_ci';
enable_query_log;
let collation=gbk_chinese_ci;
--source include/have_collation.inc

9
mysql-test/include/have_koi8r.inc
View file

@ -1,7 +1,2 @@
--require r/have_koi8r.require
--disable_query_log
SHOW COLLATION LIKE 'koi8r_general_ci';
--enable_query_log
let collation=koi8r_general_ci;
--source include/have_collation.inc

6
mysql-test/include/have_latin2_ch.inc
View file

@ -1,4 +1,2 @@
-- require r/have_latin2_ch.require
disable_query_log;
show collation like 'latin2_czech_cs';
enable_query_log;
let collation=latin2_czech_cs;
--source include/have_collation.inc

6
mysql-test/include/have_sjis.inc
View file

@ -1,4 +1,2 @@
-- require r/have_sjis.require
disable_query_log;
show collation like 'sjis_japanese_ci';
enable_query_log;
let collation=sjis_japanese_ci;
--source include/have_collation.inc

6
mysql-test/include/have_tis620.inc
View file

@ -1,4 +1,2 @@
-- require r/have_tis620.require
disable_query_log;
show collation like 'tis620_thai_ci';
enable_query_log;
let collation=tis620_thai_ci;
--source include/have_collation.inc

6
mysql-test/include/have_ucs2.inc
View file

@ -1,4 +1,2 @@
-- require r/have_ucs2.require
disable_query_log;
show collation like 'ucs2_general_ci';
enable_query_log;
let collation=ucs2_general_ci;
--source include/have_collation.inc

6
mysql-test/include/have_ujis.inc
View file

@ -1,4 +1,2 @@
-- require r/have_ujis.require
disable_query_log;
show collation like 'ujis_japanese_ci';
enable_query_log;
let collation=ujis_japanese_ci;
--source include/have_collation.inc

9
mysql-test/include/have_utf8.inc
View file

@ -1,7 +1,2 @@
--require r/have_utf8.require
--disable_query_log
SHOW COLLATION LIKE 'utf8_general_ci';
--enable_query_log
let collation=utf8_general_ci;
--source include/have_collation.inc

31
mysql-test/r/create-uca.result Normal file
View file

@ -0,0 +1,31 @@
drop table if exists t1,t2;
CREATE TABLE t1(
c1 INT DEFAULT 12 COMMENT 'column1',
c2 INT NULL COMMENT 'column2',
c3 INT NOT NULL COMMENT 'column3',
c4 VARCHAR(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
c5 VARCHAR(255) COLLATE utf8_unicode_ci NULL DEFAULT 'b',
c6 VARCHAR(255))
COLLATE latin1_bin;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) DEFAULT '12' COMMENT 'column1',
`c2` int(11) DEFAULT NULL COMMENT 'column2',
`c3` int(11) NOT NULL COMMENT 'column3',
`c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
`c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
`c6` varchar(255) COLLATE latin1_bin DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
CREATE TABLE t2 AS SELECT * FROM t1;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
`c1` int(11) DEFAULT '12' COMMENT 'column1',
`c2` int(11) DEFAULT NULL COMMENT 'column2',
`c3` int(11) NOT NULL COMMENT 'column3',
`c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
`c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
`c6` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1,t2;

46
mysql-test/r/create.result
View file

@ -1792,52 +1792,6 @@ t1 CREATE TABLE `t1` (
) ENGINE=MEMORY DEFAULT CHARSET=utf8
drop table t1;
# --
# -- Bug#21380: DEFAULT definition not always transfered by CREATE
# -- TABLE/SELECT to the new table.
# --
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
CREATE TABLE t1(
c1 INT DEFAULT 12 COMMENT 'column1',
c2 INT NULL COMMENT 'column2',
c3 INT NOT NULL COMMENT 'column3',
c4 VARCHAR(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
c5 VARCHAR(255) COLLATE utf8_unicode_ci NULL DEFAULT 'b',
c6 VARCHAR(255))
COLLATE latin1_bin;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) DEFAULT '12' COMMENT 'column1',
`c2` int(11) DEFAULT NULL COMMENT 'column2',
`c3` int(11) NOT NULL COMMENT 'column3',
`c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
`c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
`c6` varchar(255) COLLATE latin1_bin DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
CREATE TABLE t2 AS SELECT * FROM t1;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
`c1` int(11) DEFAULT '12' COMMENT 'column1',
`c2` int(11) DEFAULT NULL COMMENT 'column2',
`c3` int(11) NOT NULL COMMENT 'column3',
`c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
`c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
`c6` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t2;
DROP TABLE t1;
# -- End of test case for Bug#21380.
# --
# -- Bug#18834: ALTER TABLE ADD INDEX on table with two timestamp fields
# --

2
mysql-test/r/have_big5.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
big5_chinese_ci big5 1 Yes Yes 1

2
mysql-test/r/have_cp1250_ch.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
cp1250_czech_cs cp1250 34 Yes 2

2
mysql-test/r/have_cp1251.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
cp1251_general_ci cp1251 51 Yes 0

2
mysql-test/r/have_cp866.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
cp866_general_ci cp866 36 Yes 0

2
mysql-test/r/have_cp932.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
cp932_japanese_ci cp932 95 Yes Yes 1

2
mysql-test/r/have_eucjpms.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
eucjpms_japanese_ci eucjpms 97 Yes Yes 1

2
mysql-test/r/have_euckr.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
euckr_korean_ci euckr 19 Yes Yes 1

2
mysql-test/r/have_gb2312.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
gb2312_chinese_ci gb2312 24 Yes Yes 1

2
mysql-test/r/have_gbk.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
gbk_chinese_ci gbk 28 Yes Yes 1

2
mysql-test/r/have_koi8r.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
koi8r_general_ci koi8r 7 Yes 0

2
mysql-test/r/have_latin2_ch.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
latin2_czech_cs latin2 2 Yes 4

2
mysql-test/r/have_sjis.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
sjis_japanese_ci sjis 13 Yes Yes 1

2
mysql-test/r/have_tis620.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
tis620_thai_ci tis620 18 Yes Yes 4

2
mysql-test/r/have_ucs2.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
ucs2_general_ci ucs2 35 Yes Yes 1

2
mysql-test/r/have_ujis.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
ujis_japanese_ci ujis 12 Yes Yes 1

2
mysql-test/r/have_utf8.require
View file

@ -1,2 +0,0 @@
Collation Charset Id Default Compiled Sortlen
utf8_general_ci utf8 33 Yes Yes 1

9
mysql-test/r/innodb.result
View file

@ -3160,15 +3160,6 @@ ALTER TABLE t2 MODIFY a INT NOT NULL;
ERROR HY000: Error on rename of '#sql-temporary' to './test/t2' (errno: 150)
DELETE FROM t1;
DROP TABLE t2,t1;
CREATE TABLE t1 (a VARCHAR(5) COLLATE utf8_unicode_ci PRIMARY KEY)
ENGINE=InnoDB;
INSERT INTO t1 VALUES (0xEFBCA4EFBCA4EFBCA4);
DELETE FROM t1;
INSERT INTO t1 VALUES ('DDD');
SELECT * FROM t1;
a
DDD
DROP TABLE t1;
CREATE TABLE t1 (id int PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB
AUTO_INCREMENT=42;
INSERT INTO t1 VALUES (0),(347),(0);

10
mysql-test/r/innodb_utf8.result Normal file
View file

@ -0,0 +1,10 @@
drop table if exists t1;
CREATE TABLE t1 (a VARCHAR(5) COLLATE utf8_unicode_ci PRIMARY KEY)
ENGINE=InnoDB;
INSERT INTO t1 VALUES (0xEFBCA4EFBCA4EFBCA4);
DELETE FROM t1;
INSERT INTO t1 VALUES ('DDD');
SELECT * FROM t1;
a
DDD
DROP TABLE t1;

2
mysql-test/suite/rpl/t/rpl_ignore_table.test
View file

@ -1,4 +1,6 @@
source include/master-slave.inc;
let collation=utf8_unicode_ci;
--source include/have_collation.inc
#
# BUG#16487

26
mysql-test/t/create-uca.test Normal file
View file

@ -0,0 +1,26 @@
# Prerequisites
let collation=utf8_unicode_ci;
--source include/have_collation.inc
# Initial cleanup
--disable_warnings
drop table if exists t1,t2;
--enable_warnings
#
# Bug#21380: DEFAULT definition not always transfered by CREATE
# TABLE/SELECT to the new table.
#
CREATE TABLE t1(
c1 INT DEFAULT 12 COMMENT 'column1',
c2 INT NULL COMMENT 'column2',
c3 INT NOT NULL COMMENT 'column3',
c4 VARCHAR(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
c5 VARCHAR(255) COLLATE utf8_unicode_ci NULL DEFAULT 'b',
c6 VARCHAR(255))
COLLATE latin1_bin;
SHOW CREATE TABLE t1;
CREATE TABLE t2 AS SELECT * FROM t1;
SHOW CREATE TABLE t2;
DROP TABLE t1,t2;

46
mysql-test/t/create.test
View file

@ -1398,52 +1398,6 @@ drop table t1;
###########################################################################
--echo
--echo # --
--echo # -- Bug#21380: DEFAULT definition not always transfered by CREATE
--echo # -- TABLE/SELECT to the new table.
--echo # --
--echo
--disable_warnings
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
--enable_warnings
--echo
CREATE TABLE t1(
c1 INT DEFAULT 12 COMMENT 'column1',
c2 INT NULL COMMENT 'column2',
c3 INT NOT NULL COMMENT 'column3',
c4 VARCHAR(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
c5 VARCHAR(255) COLLATE utf8_unicode_ci NULL DEFAULT 'b',
c6 VARCHAR(255))
COLLATE latin1_bin;
--echo
SHOW CREATE TABLE t1;
--echo
CREATE TABLE t2 AS SELECT * FROM t1;
--echo
SHOW CREATE TABLE t2;
--echo
DROP TABLE t2;
DROP TABLE t1;
--echo
--echo # -- End of test case for Bug#21380.
###########################################################################
--echo
--echo # --
--echo # -- Bug#18834: ALTER TABLE ADD INDEX on table with two timestamp fields

9
mysql-test/t/ctype_utf8.test
View file

@ -2,6 +2,15 @@
# Tests with the utf8 character set
#
let collation=utf8_unicode_ci;
--source include/have_collation.inc
--disable_warnings
drop table if exists t1,t2,t3,t4;
drop database if exists mysqltest;
--enable_warnings
--disable_warnings
drop table if exists t1,t2;
--enable_warnings

2
mysql-test/t/ddl_i18n_koi8r.test
View file

@ -36,6 +36,8 @@
--source include/have_cp866.inc
--source include/have_cp1251.inc
--source include/have_koi8r.inc
let collation=utf8_unicode_ci;
--source include/have_collation.inc
###########################################################################

2
mysql-test/t/ddl_i18n_utf8.test
View file

@ -36,6 +36,8 @@
--source include/have_cp866.inc
--source include/have_cp1251.inc
--source include/have_koi8r.inc
let collation=utf8_unicode_ci;
--source include/have_collation.inc
###########################################################################

3
mysql-test/t/fulltext.test
View file

@ -2,6 +2,9 @@
# Test of fulltext index
#
let collation=utf8_unicode_ci;
--source include/have_collation.inc
--disable_warnings
drop table if exists t1,t2,t3;
--enable_warnings

3
mysql-test/t/fulltext2.test
View file

@ -2,6 +2,9 @@
# test of new fulltext search features
#
let collation=utf8_unicode_ci;
--source include/have_collation.inc
#
# two-level tree
#

12
mysql-test/t/innodb.test
View file

@ -2352,18 +2352,6 @@ ALTER TABLE t2 MODIFY a INT NOT NULL;
DELETE FROM t1;
DROP TABLE t2,t1;
#
# Bug #26835: table corruption after delete+insert
#
CREATE TABLE t1 (a VARCHAR(5) COLLATE utf8_unicode_ci PRIMARY KEY)
ENGINE=InnoDB;
INSERT INTO t1 VALUES (0xEFBCA4EFBCA4EFBCA4);
DELETE FROM t1;
INSERT INTO t1 VALUES ('DDD');
SELECT * FROM t1;
DROP TABLE t1;
#
# Bug #23313 (AUTO_INCREMENT=# not reported back for InnoDB tables)
# Bug #21404 (AUTO_INCREMENT value reset when Adding FKEY (or ALTER?))

24
mysql-test/t/innodb_utf8.test Normal file
View file

@ -0,0 +1,24 @@
#
# Tests for innodb that requires not default character sets
#
--source include/have_innodb.inc
let collation=utf8_unicode_ci;
--source include/have_collation.inc
# Setup
--disable_warnings
drop table if exists t1;
--enable_warnings
#
# Bug #26835: table corruption after delete+insert
#
CREATE TABLE t1 (a VARCHAR(5) COLLATE utf8_unicode_ci PRIMARY KEY)
ENGINE=InnoDB;
INSERT INTO t1 VALUES (0xEFBCA4EFBCA4EFBCA4);
DELETE FROM t1;
INSERT INTO t1 VALUES ('DDD');
SELECT * FROM t1;
DROP TABLE t1;

3
mysql-test/t/query_cache_ps_no_prot.test
View file

@ -11,8 +11,9 @@
# We cannot run on embedded server because we use multiple sessions.
--source include/not_embedded.inc
--source include/have_query_cache.inc
let collation=utf8_unicode_ci;
--source include/have_collation.inc
# The file with expected results fits only to a run without
# ps-protocol/sp-protocol/cursor-protocol/view-protocol.

3
mysql-test/t/query_cache_ps_ps_prot.test
View file

@ -11,8 +11,9 @@
# We cannot run on embedded server because we use multiple sessions.
--source include/not_embedded.inc
--source include/have_query_cache.inc
let collation=utf8_unicode_ci;
--source include/have_collation.inc
# The file with expected results fits only to a run with "--ps-protocol".
if (`SELECT $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0

2
scripts/mysqlbug.sh
View file

@ -21,7 +21,7 @@ echo "Finding system information for a MySQL bug report"
VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@"
COMPILATION_COMMENT="@COMPILATION_COMMENT@"
BUGmysql="mysql@lists.mysql.com"
BUGmysql="maria-developers@lists.launchpad.net"
# This is set by configure
COMP_CALL_INFO="CC='@SAVE_CC@' CFLAGS='@SAVE_CFLAGS@' CXX='@SAVE_CXX@' CXXFLAGS='@SAVE_CXXFLAGS@' LDFLAGS='@SAVE_LDFLAGS@' ASFLAGS='@SAVE_ASFLAGS@'"
COMP_RUN_INFO="CC='@CC@' CFLAGS='@CFLAGS@' CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'"

2
storage/ndb/plug.in
View file

@ -1,5 +1,5 @@
MYSQL_STORAGE_ENGINE(ndbcluster, ndbcluster, [Cluster Storage Engine],
[High Availability Clustered tables], [max])
[High Availability Clustered tables],)
MYSQL_PLUGIN_DIRECTORY(ndbcluster,[storage/ndb])
MYSQL_PLUGIN_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])
MYSQL_PLUGIN_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])