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

testmain.c

Browse Source 
Removed embedded server startup parameter '--skip-innodb' and replaced TRUE, and FALSE with true and false, respectively.
gateway.c
	Removed embedded server startup parameter '--skip-innodb' because libmysqld inside MariaDB 5.5.33 + doesn't start with that paramter.
This commit is contained in:
vraatikka
2013-10-15 18:18:09 +03:00
parent b5da527555
commit 52644db8ce
2 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
query_classifier/test/testmain.c
View File

@ -10,7 +10,7 @@
static char* server_options[] = { static char* server_options[] = {
"raatikka", "raatikka",
"--datadir=/home/raatikka/data/skygw_parse/", "--datadir=/home/raatikka/data/skygw_parse/",
"--skip-innodb", // "--skip-innodb",
"--default-storage-engine=myisam", "--default-storage-engine=myisam",
NULL NULL
}; };
@ -20,7 +20,7 @@ const int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
static char* server_groups[] = { static char* server_groups[] = {
"embedded", "embedded",
"server", "server",
"server", // "server",
"server", "server",
NULL NULL
}; };
@ -118,7 +118,7 @@ int main(int argc, char** argv)
query_test_t* qtest; query_test_t* qtest;
skygw_query_type_t qtype; skygw_query_type_t qtype;
bool succp; bool succp;
bool failp = TRUE; bool failp = true;
unsigned int f = 0; unsigned int f = 0;
int nsucc = 0; int nsucc = 0;
int nfail = 0; int nfail = 0;
@ -131,56 +131,56 @@ int main(int argc, char** argv)
q = "SELECT user from mysql.user"; q = "SELECT user from mysql.user";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_READ, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_READ, false, true));
q = "select tt1.id, tt2.id from t1 tt1, t2 tt2 where tt1.name is " q = "select tt1.id, tt2.id from t1 tt1, t2 tt2 where tt1.name is "
"not null and tt2.name is not null"; "not null and tt2.name is not null";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_READ, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_READ, false, false));
/** SELECT ..INTO clauses > session updates */ /** SELECT ..INTO clauses > session updates */
q = "SELECT user from mysql.user INTO DUMPFILE '/tmp/dump1'"; q = "SELECT user from mysql.user INTO DUMPFILE '/tmp/dump1'";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, false));
q = "SELECT user INTO DUMPFILE '/tmp/dump2 ' from mysql.user"; q = "SELECT user INTO DUMPFILE '/tmp/dump2 ' from mysql.user";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, false));
q = "SELECT user from mysql.user INTO OUTFILE '/tmp/out1'"; q = "SELECT user from mysql.user INTO OUTFILE '/tmp/out1'";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, false));
/** Database and table name must be separated by a dot */ /** Database and table name must be separated by a dot */
q = "SELECT user INTO OUTFILE '/tmp/out2 ' from mysql-user"; q = "SELECT user INTO OUTFILE '/tmp/out2 ' from mysql-user";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, TRUE, FALSE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, true, false));
/** Database and table name must be separated by a dot */ /** Database and table name must be separated by a dot */
q = "SELECT user INTO OUTFILE '/tmp/out2 ' from mysql_foo_user"; q = "SELECT user INTO OUTFILE '/tmp/out2 ' from mysql_foo_user";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, false));
q = "SELECT user FROM mysql.user limit 1 INTO @local_variable"; q = "SELECT user FROM mysql.user limit 1 INTO @local_variable";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, false));
q = "SELECT user INTO @local_variable FROM mysql.user limit 1"; q = "SELECT user INTO @local_variable FROM mysql.user limit 1";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, false));
q = "SELECT non_existent_attr INTO @d FROM non_existent_table"; q = "SELECT non_existent_attr INTO @d FROM non_existent_table";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, false));
q = "select * from table1 " q = "select * from table1 "
"where table1.field IN " "where table1.field IN "
@ -191,56 +191,56 @@ int main(int argc, char** argv)
"select * from table3"; "select * from table3";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, true));
/** Functions */ /** Functions */
q = "SELECT NOW()"; q = "SELECT NOW()";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_READ, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_READ, false, false));
q = "SELECT SOUNDEX('Hello')"; q = "SELECT SOUNDEX('Hello')";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_READ, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_READ, false, false));
q = "SELECT MY_UDF('Hello')"; q = "SELECT MY_UDF('Hello')";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_READ, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_READ, false, true));
/** RENAME TABLEs */ /** RENAME TABLEs */
q = "RENAME TABLE T1 to T2"; q = "RENAME TABLE T1 to T2";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_WRITE, false, false));
/** INSERTs */ /** INSERTs */
q = "INSERT INTO T1 (SELECT * FROM T2)"; q = "INSERT INTO T1 (SELECT * FROM T2)";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_WRITE, false, true));
q = "INSERT INTO T1 VALUES(2, 'foo', 'toomanyattributes')"; q = "INSERT INTO T1 VALUES(2, 'foo', 'toomanyattributes')";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_WRITE, false, true));
q = "INSERT INTO T2 VALUES(1, 'sthrgey')"; q = "INSERT INTO T2 VALUES(1, 'sthrgey')";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_WRITE, false, false));
q = "INSERT INTO T2 VALUES(8, 'ergstrhe')"; q = "INSERT INTO T2 VALUES(8, 'ergstrhe')";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_WRITE, false, false));
q = "INSERT INTO T2 VALUES(9, NULL)"; q = "INSERT INTO T2 VALUES(9, NULL)";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_WRITE, false, false));
/** Ok, delimeter is client-side parameter which shouldn't be handled /** Ok, delimeter is client-side parameter which shouldn't be handled
@ -249,18 +249,18 @@ int main(int argc, char** argv)
q = "delimiter //"; q = "delimiter //";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, TRUE, TRUE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, true, true));
/** SETs, USEs > Session updates */ /** SETs, USEs > Session updates */
q = "SET @a=1"; q = "SET @a=1";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, true));
q = "USE TEST"; q = "USE TEST";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, false));
/** Object creation statements */ /** Object creation statements */
@ -268,48 +268,48 @@ int main(int argc, char** argv)
"into param1 from t1; \nend"; "into param1 from t1; \nend";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_WRITE, false, true));
q = "CREATE TABLE T1 (id integer primary key, name varchar(10))"; q = "CREATE TABLE T1 (id integer primary key, name varchar(10))";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_WRITE, false, true));
q = "DROP TABLE T1"; q = "DROP TABLE T1";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_WRITE, false, false));
q = "ALTER TABLE T1 ADD COLUMN WHYME INTEGER NOT NULL"; q = "ALTER TABLE T1 ADD COLUMN WHYME INTEGER NOT NULL";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_WRITE, false, false));
q = "TRUNCATE TABLE T1"; q = "TRUNCATE TABLE T1";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, FALSE)); query_test_init(q, QUERY_TYPE_WRITE, false, false));
q = "DROP SERVER IF EXISTS VICTIMSRV"; q = "DROP SERVER IF EXISTS VICTIMSRV";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, true));
q = "CREATE USER FOO IDENTIFIED BY 'BAR'"; q = "CREATE USER FOO IDENTIFIED BY 'BAR'";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_WRITE, false, true));
q = "OPTIMIZE NO_WRITE_TO_BINLOG TABLE T1"; q = "OPTIMIZE NO_WRITE_TO_BINLOG TABLE T1";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_WRITE, false, true));
q = "SELECT NOW();CREATE TABLE T1 (ID INTEGER);" q = "SELECT NOW();CREATE TABLE T1 (ID INTEGER);"
"SET sql_log_bin=0;CREATE TABLE T2 (ID INTEGER)"; "SET sql_log_bin=0;CREATE TABLE T2 (ID INTEGER)";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_WRITE, false, true));
/** Setting database makes this SESSION_WRITE */ /** Setting database makes this SESSION_WRITE */
@ -317,7 +317,7 @@ int main(int argc, char** argv)
"SET sql_log_bin=0;CREATE TABLE T2 (ID INTEGER)"; "SET sql_log_bin=0;CREATE TABLE T2 (ID INTEGER)";
slcursor_add_case( slcursor_add_case(
c, c,
query_test_init(q, QUERY_TYPE_SESSION_WRITE, FALSE, TRUE)); query_test_init(q, QUERY_TYPE_SESSION_WRITE, false, true));
/** /**
* Init libmysqld. * Init libmysqld.

2
server/core/gateway.c
View File

@ -66,7 +66,6 @@
static char* server_options[] = { static char* server_options[] = {
"SkySQL Gateway", "SkySQL Gateway",
"--datadir=", "--datadir=",
"--skip-innodb",
"--default-storage-engine=myisam", "--default-storage-engine=myisam",
NULL NULL
}; };
@ -77,7 +76,6 @@ static char* server_groups[] = {
"embedded", "embedded",
"server", "server",
"server", "server",
"server",
NULL NULL
}; };