hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,085 Commits 1 Branch 0 Tags
Commit Graph

150 Commits

Author SHA1 Message Date
Markus Makela
a5ece62327 Merge branch 'develop' into firewall 
Conflicts:
	server/modules/filter/test/harness.h
	server/modules/filter/test/harness_common.c
 2014-11-17 18:45:01 +02:00
VilhoRaatikka
6bda88f252 Addition to fix to bug #597, http://bugs.skysql.com/show_bug.cgi?id=597 2014-11-17 15:15:34 +02:00
VilhoRaatikka
1c4ffd2599 Fix to bug #597, http://bugs.skysql.com/show_bug.cgi?id=597 
Changed the order of include directives in query_classifier.cc
 2014-11-17 14:55:13 +02:00
Markus Makela
ca13e18f53 Added query operation type requirements on where clauses and fixed a bug with regex rules. 2014-11-14 16:28:20 +02:00
Markus Makela
afb8859b43 Merge branch 'develop' into firewall 2014-11-13 09:50:02 +02:00
Markus Makela
fb9d792859 Fix to Coverity defect 76134 2014-11-13 09:02:56 +02:00
Markus Makela
4a8f97d2e2 Merge branch 'develop' into firewall 2014-11-11 14:18:44 +02:00
Markus Makela
9cb2be9605 Fixes to Coverity erros 75748 and 76132. 2014-11-11 13:42:12 +02:00
Markus Makela
9accebdc37 Merge branch 'develop' into firewall 2014-11-10 09:08:39 +02:00
Markus Makela
a4caac55c8 Fixes to Coverity errors: 
72662
72702
72724
73397
73410
73414
73422
75424
75748
75789
75938
75939

Also includes a fix to a bug caused by a previous Coverity error change in canonizer.c
 2014-11-07 11:52:40 +02:00
Markus Makela
474f018cee Fixes to minor Coverity errors: 
75424
73422
72724
72702
72662
 2014-11-07 11:12:26 +02:00
Markus Makela
c4d51f54cd Fixes to Coverity bugs: 
72743
73407
73408
73409
73415
73419
 2014-11-06 15:40:11 +02:00
VilhoRaatikka
e7b6ec644c Fix to Coverity issue 72741 2014-11-05 16:05:35 +02:00
Markus Makela
4f5bda7a8b Merge branch 'develop' into firewall 2014-11-05 15:28:22 +02:00
Markus Makela
36c6a61330 Fixes to coverity bugs: 
72670: query_classifier/query_classifier.cc
72682: server/modules/filter/qlafilter.c
72679: server/modules/filter/tee.c
72716: server/modules/protocol/maxscaled.c
72694: server/modules/protocol/telnetd.c
71743: server/modules/routing/readwritesplit/readwritesplit.c
 2014-11-05 14:18:38 +02:00
Markus Makela
17f87e29af Fixes to some Coverity issues. 2014-11-05 11:57:42 +02:00
Markus Makela
f378c61948 Merge branch 'develop' into firewall 2014-11-04 18:42:35 +02:00
Markus Makela
e7feba6964 Fixed canonical query tests 2014-11-03 13:00:46 +02:00
VilhoRaatikka
ca816743e8 Returned #include <my_config.h> and updated server name. 2014-11-03 11:33:41 +02:00
Markus Makela
b7f9819407 Merge branch 'develop' into firewall 2014-11-03 09:26:31 +02:00
VilhoRaatikka
b15ac9c019 Revert to 54d389e329a860add1f609508c676761521a8ad0 due to erroneous fix. 2014-11-03 08:57:02 +02:00
VilhoRaatikka
fb02e44e7e Fix to #605, http://bugs.mariadb.com/show_bug.cgi?id=605 
Main assumed multi-byte characters in memory allocation but not outside of it so I removed that code and made it consistently assume single-byte characters.
Terminating character was added always to the last byte of string buffer regardless of the length of the string. Removed it and replaced malloc with calloc.
Moved variable introductions from the middle of the function to the beginning of it.
 2014-11-02 22:33:12 +02:00
VilhoRaatikka
aaa727bcc2 Fix to bug #605, http://bugs.mariadb.com/show_bug.cgi?id=605 
String buffer allocation didn't allocate space for terminating char. It also assumed that character size may vary but the rest of the code didn't support multi-byte characters so I changed it consistently assume single-byte characters.
 2014-11-02 22:11:28 +02:00
VilhoRaatikka
5a2d492fe8 Fixed use of uninitialized memory. 2014-10-31 23:47:33 +02:00
Markus Makela
effe8f3297 Switched over to hashtables for users and columns. 2014-10-15 15:23:14 +03:00
Markus Makela
9abe270da8 added checking for where clause on queries 2014-10-13 13:48:07 +03:00
Markus Makela
75117f2482 Merge branch 'develop' into firewall 
Conflicts:
	server/modules/filter/CMakeLists.txt
 2014-10-12 10:13:54 +03:00
Markus Makela
be08f22ae1 Changed old references to SkySQL to MariaDB Corporation and Gateway to MaxScale. 2014-10-10 16:38:54 +03:00
Markus Makela
ebb3b52fdb Included the my_config.h header before any system headers if mysql headers were used. 2014-10-10 12:30:21 +03:00
Markus Makela
9a6b884ff9 Merge branch 'query_classifier_test' into develop 2014-10-09 15:36:40 +03:00
Markus Makela
4bea21f464 Merge branch 'develop' into query_classifier_test 2014-10-09 15:34:10 +03:00
Markus Makela
e02bed1f14 Initial implementation of the firewall filter. 2014-10-09 13:22:38 +03:00
Markus Makela
3cd8e29c4c Changed the way some CMake functions are used to support older versions of CMake. 2014-10-07 14:09:22 +03:00
Markus Makela
3d7c23cf0b added more test cases 2014-10-06 14:03:13 +03:00
Markus Makela
b22ab90d66 Changed the way query classifier test is run. 
Now the test is a single executable, which should make it easier to use with CMake.
 2014-10-04 10:19:00 +03:00
Markus Makela
3b0e3d04dc Merge branch 'develop' into query_classifier_test 
Conflicts:
	README
	macros.cmake
 2014-10-03 11:38:47 +03:00
VilhoRaatikka
bff2d794e0 Removed unnecessary linking commands to libmysqld.a 2014-10-01 13:29:26 +03:00
Markus Makela
52c0d0c768 Merge remote-tracking branch 'origin/develop' into header_rename 2014-10-01 05:24:02 +03:00
VilhoRaatikka
c055a3c0d2 Addition to fix of #557, Removal of confusing and erroneous log message. 2014-09-30 17:04:43 +03:00
VilhoRaatikka
ca7ae0bb64 Fix to bug #557, http://bugs.mariadb.com/show_bug.cgi?id=557 
query_classifier.cc: added function for printing combined query type from a bit field.
query_classifier.h: identify query types SHOW DATABASE, and SHOW TABLES to make log entries more understandable.
mysql_common.c: moved some trace log commands to debug log.
readwritesplit.c: moved some trace logs to debug log, added trace log commands to gather routing, query type and session information to one log entry.
skygw_debug.h: added string macros for several query and hint types.
 2014-09-30 16:31:30 +03:00
Markus Makela
f4e591e382 Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale' 2014-09-30 13:15:03 +03:00
Markus Makela
c344231f80 Renamed all occurences of SkySQL to MariaDB Corporation 2014-09-30 13:02:10 +03:00
Markus Makela
25850c056f Added tests to cmake 2014-09-25 10:14:42 +03:00
Markus Makela
0e23979609 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 12:27:20 +03:00
Markus Makela
1cf3fa367c test executable now works 2014-09-24 12:25:53 +03:00
VilhoRaatikka
2b147a9ea4 Monitors waited monitor check interval time before checking backend servers for the first time. Removed wait for the first check. 
Added extra debugging to query_classifier to assist in issue resolution regarding to optimized MaxScale builds and pthread_mutex_lock in sql/sql_class.h
 2014-09-24 12:03:04 +03:00
Markus Makela
b0514e9d9f Merge branch 'cmake_build' into query_classifier_test 2014-09-22 14:42:12 +03:00
Markus Makela
07d1265acf test implementation 2014-09-22 14:38:55 +03:00
Markus Makela
fc848665e5 Added variables for RabbitMQ headers and libraries, added more error checks. 
modified:   CMakeLists.txt
	modified:   README
	modified:   macros.cmake
	modified:   query_classifier/test/canonical_tests/CMakeLists.txt
	modified:   rabbitmq_consumer/CMakeLists.txt
	modified:   server/modules/filter/CMakeLists.txt
 2014-09-22 13:14:53 +03:00
Markus Makela
8b1afbfe26 fixed tests not working with the normal 'make testall' 2014-09-16 20:02:28 +03:00