VilhoRaatikka
b3824a1eaf
Clean up bits and pieces, removed some unnecessary checks.
2015-01-14 14:11:19 +02:00
Markus Makela
2b4e6bb594
Merge branch 'develop' into firewall
...
Conflicts:
server/modules/filter/test/CMakeLists.txt
2015-01-13 07:48:43 +02:00
VilhoRaatikka
ee2876e9a4
Added parameter NULL checks to query_classifier.cc
2015-01-10 21:29:29 +02:00
Markus Makela
8729413655
Fixed build issues due to missing headers.
2015-01-05 11:37:37 +02:00
Markus Makela
ba009e5fd3
Fixes to Coverity defects 85010 84878 72752 72742 72719 and 73418.
...
skygw_utils.cc: Added function is_valid_posix_path that checks if a path is POSIX-compliant.
2015-01-05 06:05:56 +02:00
Markus Makela
1e43102eea
Merge branch 'release-1.0GA' into firewall
2014-12-16 11:10:02 +02:00
Markus Makela
04a92e40df
Fixes to Coverity defects 84879 84878 72752 72742
2014-12-15 06:28:47 +02:00
Markus Makela
f2cec6e51e
Merge branch 'release-1.0GA' into firewall
...
Conflicts:
query_classifier/query_classifier.cc
2014-12-09 14:23:07 +02:00
VilhoRaatikka
01b1b0a304
Fixes to Coverity issues 84388, 84386, 84385
...
mysql_mon.c: Added back server state logging to Debug build.
query_classifier.cc: removed some extra debug code, cleaned up a bit function documentation.
mysql_client_server_protocol.h, mysql_backend.c, mysql_common.c: changed some variables to signed ones to enable checking of calculations in the code.
skygw_utils.cc: removed erroneous debug assertion.
2014-12-05 23:39:14 +02:00
Markus Makela
12d6d81fa8
Merge branch 'release-1.0GA' into firewall
...
Conflicts:
log_manager/log_manager.cc
2014-12-04 17:13:41 +02:00
VilhoRaatikka
b106560317
Fix to bug # 634, http://bugs.skysql.com/show_bug.cgi?id=634
...
COM_SHOW_SLAVE_STAT wasn't classified but it was treated as 'unknown' and thus routed to master.
2014-12-03 13:27:31 +02:00
Markus Makela
0900b5dbce
Merge branch 'develop' into firewall
...
Conflicts:
server/modules/filter/test/harness_common.c
2014-11-25 17:56:26 +02:00
VilhoRaatikka
fd11e6a7f5
Session-specific logging. Added functions
...
void session_enable_log(SESSION* ses, logfile_id_t id)
and
void session_disable_log(SESSION* ses, logfile_id_t id)
Which switch specific log type on/off if the log type in question is not generally enabled.
Each thread carries a thread-specific struct log_info_t which includes members for current session id and bitfield for enabled log types for the current session. That information is checked before actual log write functions are called.
Each file where session-specific logging is used, must include the following exports:
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
2014-11-19 00:08:59 +02:00
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