2408 Commits

Author SHA1 Message Date
Timofey Turenko
885dfb0242 Merge branch 'remove_makefiles' into develop 2015-01-16 18:04:16 +02:00
VilhoRaatikka
113ea8381b Complamentary fix to #694, added error flag reset to readconnrouter as well. 2015-01-16 11:56:20 +02:00
VilhoRaatikka
da77da803b Complementory fix to bug #694, http://bugs.mariadb.com/show_bug.cgi?id=694
Added new error action to router.h, added functionality to reset error flag from DCB in handleError. Error is reset before every new routing call.
2015-01-16 11:13:42 +02:00
VilhoRaatikka
c5c9165a26 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-15 15:21:58 +02:00
VilhoRaatikka
39e4253c81 Fix to bug #694, http://bugs.mariadb.com/show_bug.cgi?id=694
query_classifier.cc: set_query_type lost previous query type if the new was more restrictive. Problem was that if query is both READ and SESSION_WRITE and configuration parameter use_sql_variables_in=all was set, routing target became ambiguous. Replaced call to set_query_type with simply adding new type to type (=bit field) and checking unsupported combinations in readwritesplit.c:get_route_target. If such a case is met, a detailed error is written to error log in readwritesplit.c. mysql_client.c sees the error code and sends an error to client. Then mysql_client.c calls router's handleError which ensures that there are enough backend servers so that the session can continue.
2015-01-15 15:16:22 +02:00
Markus Makela
533042b61a Fixes to coverity defects from 85514 up to 85529. 2015-01-15 14:09:11 +02:00
Markus Makela
88a26f03ab Fix to bug 685: http://bugs.mariadb.com/show_bug.cgi?id=685
Added the missing detection of partial packets in the buffers.
2015-01-15 13:13:09 +02:00
Markus Makela
85c84c9e71 Fixed debug variables being used out of debug blocks. 2015-01-15 05:11:08 +02:00
Markus Makela
30d2742294 Fixed garbled data at end of modutil.c 2015-01-15 04:40:33 +02:00
Markus Makela
b635eb1493 Additional debugging info added to tee filter. 2015-01-14 21:13:52 +02:00
Timofey Turenko
7e05d4d716 Merge branch 'develop' into remove_makefiles 2015-01-14 19:09:43 +02:00
Timofey Turenko
06c2d201e0 remove makefiles and other garbage 2015-01-14 19:08:24 +02:00
Markus Makela
5c210455fa Fixed variable declaration being inside a debug build only block. 2015-01-14 18:20:59 +02:00
VilhoRaatikka
b3824a1eaf Clean up bits and pieces, removed some unnecessary checks. 2015-01-14 14:11:19 +02:00
Markus Makela
df2297aa6c Added missing command types that possibly receive multiple packets to tee.c. 2015-01-13 22:10:47 +02:00
Markus Makela
b4c01cf956 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-13 21:39:41 +02:00
Markus Makela
7f4675cd57 Fix to bug 685: http://bugs.mariadb.com/show_bug.cgi?id=685
Added the missing ERR packet detection to modutil functions.
2015-01-13 21:32:04 +02:00
VilhoRaatikka
61efbfe687 Added comment to mysql_backend.c:process_response_data 2015-01-13 09:52:54 +02:00
Markus Makela
d194af0733 Moved result set processing functions to modutil.c from tee.c. 2015-01-13 09:45:58 +02:00
Markus Makela
e0a460b869 Merge branch 'firewall' into develop 2015-01-13 09:45:33 +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
Markus Makela
c7362cec23 Update to bug 685 fix: http://bugs.mariadb.com/show_bug.cgi?id=685
Fixed results sets not being processed as a set of multiple packets.
2015-01-12 18:52:59 +02:00
VilhoRaatikka
333f79f4db Commented session id logging. 2015-01-12 14:44:53 +02:00
VilhoRaatikka
36178e6c63 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-01-12 14:26:05 +02:00
VilhoRaatikka
6be227f3c4 Added comments, removed non-existing function, cleaned up a bit. 2015-01-12 14:25:37 +02:00
Markus Makela
ec9f575a6e Fix to bug 690: http://bugs.mariadb.com/show_bug.cgi?id=690
Updated the debian/rules file to use mysql_config instead of a hard-coded path.
2015-01-12 11:12:51 +02:00
VilhoRaatikka
ee2876e9a4 Added parameter NULL checks to query_classifier.cc 2015-01-10 21:29:29 +02:00
Markus Makela
4c20ed4c11 Merge branch 'bug_685_fix' into develop 2015-01-09 19:43:49 +02:00
Markus Makela
759b0c2ccb Fix to bug 685: http://bugs.mariadb.com/show_bug.cgi?id=685
Tee filter now supports longer packets and only sends the last GWBUF if both the parent and the child session have send all their bytes.
2015-01-09 19:38:50 +02:00
Timofey Turenko
8572a08cab Merge branch 'master' into develop 2015-01-09 11:23:03 +02:00
Timofey Turenko
39c2c818e0 set version to 1.0.5-unstable 2015-01-09 10:51:22 +02:00
Timofey Turenko
4ee6251872 resolving conflicts 2015-01-09 10:34:56 +02:00
Markus Makela
8ce9cd1cbd Fix to wrong version string being used in the macros.cmake . 2015-01-09 05:10:05 +02:00
Markus Makela
f90b8bdc88 Fixed hint filter tests failing because the testing configuration was not using all the available slaves for testing resulting in unexpected routing decisions. 2015-01-08 21:13:33 +02:00
Markus Makela
7987365bd4 Fix to tee filter tests failing due to the default user not being found in the etc/passwd file. 2015-01-08 20:21:56 +02:00
Timofey Turenko
c8fbe71527 change version number to 1.0.4-stable 2015-01-08 17:51:08 +02:00
Markus Makela
d5f47c250f Added the missing LICENSE, COPYRIGHT, README and SETUP files. 2015-01-08 17:47:08 +02:00
Mark Riddoch
2ee6906ca3 Update to remove incorrect documentation and update release notes 2015-01-08 15:40:55 +00:00
Markus Makela
2a02b2deba Fixed TestUsers failing due to only adding a single user. 2015-01-08 13:48:29 +02:00
Markus Makela
094dfbd4f7 Fixed tests not having environment variables set. 2015-01-08 13:18:14 +02:00
Markus Makela
c4006d43c2 Fix to Coverity defect 85262 2015-01-06 05:28:58 +02:00
Timofey Turenko
f3c62f4846 set version to 1.0.3 2015-01-06 01:22:23 +02:00
Mark Riddoch
59d7ed15ab Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2015-01-05 15:59:13 +00:00
Mark Riddoch
a09c58049c Updated PDF documents with TOC as clickable links 2015-01-05 15:58:39 +00:00
Markus Makela
c5ef6153d5 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2015-01-05 17:42:37 +02:00
Markus Makela
cd99849581 Fix #2 to bug 680: http://bugs.mariadb.com/show_bug.cgi?id=680"
When no users are loaded from backends, instead of counting it as a failure the service is started and the next time a client connects an attempt to load the users from the backends is made.
2015-01-05 17:38:45 +02:00
Mark Riddoch
1926336576 Updates to PDF copies of the documentation 2015-01-05 14:32:43 +00:00
Markus Makela
9717190b4a Added calls to skygw_log_sync_all in the hint, server and user tests before each assertion that might fail. 2015-01-05 15:14:26 +02:00
Markus Makela
17307fcffe Merge branch 'testing_header' into release-1.0GA 2015-01-05 15:12:55 +02:00
Markus Makela
2d8375bb12 Fix to bug 579: http://bugs.mariadb.com/show_bug.cgi?id=579
Added a header which contains the locations for the testing directory and its subfolders which enables
the test to write into the right logfiles. Also added a calls to skygw_log_sync_all before assertions
forcing all logs to be written to disk at the time the test might fail.
2015-01-05 15:06:38 +02:00