hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-01-07 10:52:07 +02:00
parent cf9ac9004e 0859f3caff
commit f0f9c21d1c
67 changed files with 777 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/test/canonical_tests/alter.expected
View File

@ -9,7 +9,7 @@ ALTER EVENT e1 DO SELECT ?;
ALTER EVENT e1 ON SCHEDULE AT ? ON COMPLETION PRESERVE DISABLE;
ALTER TABLE `@0023sql1` RENAME `#sql-1`;
ALTER TABLE t1 ADD INDEX (c13) COMMENT ?;
ALTER TABLE t1 ADD PARTITION IF NOT EXISTS(PARTITION `p5` VALUES LESS THAN (?)COMMENT \'?);
ALTER TABLE t1 ADD PARTITION IF NOT EXISTS(PARTITION `p5` VALUES LESS THAN (?)COMMENT ?);
ALTER TABLE `t1` ADD PRIMARY KEY (`a`);
alter table t1 change a a enum(?,?,?,?,?,?,?,?) character set utf16;
alter table t1 change a a int `FKEY1`=?;

10
server/core/test/rest-api/test/core.js
View File

@ -35,5 +35,15 @@ describe("Core Parameters", function() {
.should.be.fulfilled
})
it("will not modify static parameters", function() {
return set_value("threads", "1")
.should.be.rejected
})
it("does not accept unknown parameters", function() {
return set_value("quantum_compute", "yes, please")
.should.be.rejected
})
after(stopMaxScale)
});