2238 Commits

Author SHA1 Message Date
Mark Riddoch
a655e394ac Merge branch 'blr' into release-1.0GA
Conflicts:
	server/core/service.c
2014-12-16 15:44:19 +00:00
Mark Riddoch
203e83d508 Update to COM_STATISTICS to show master connection state 2014-12-16 15:35:39 +00:00
Mark Riddoch
5ef7ddfe1f Bug 653 - Memory overwrite 2014-12-16 15:34:06 +00:00
Markus Makela
6013009c13 Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324 2014-12-16 14:34:06 +02:00
Markus Makela
e4042019e1 Fixed client session termination due to wrong packet sequence numbers. 2014-12-16 14:33:05 +02:00
VilhoRaatikka
f861d67b7f Removed all references to use_sql_variables_in variable where it is used in dbshard.
Commented out dead code.
Fixed some indentations.
2014-12-16 14:14:57 +02:00
Mark Riddoch
909518fac7 Improved error messages
Support for running out of disk space in the binlog router

Support for COM_PING & COM_STATISTICS added in the binlog router

Addition of binlogdir router option
2014-12-16 10:38:09 +00:00
Markus Makela
1e43102eea Merge branch 'release-1.0GA' into firewall 2014-12-16 11:10:02 +02:00
VilhoRaatikka
ef94b7ee54 dbshard.c:get_shard_route_target global system variables weren't routed to all servers because an invalid variable was used determine whether statement should be routed to all or to master only. 2014-12-15 23:31:07 +02:00
VilhoRaatikka
8f570082eb poll.c:poll_add_event_to_dcb didn't update pollStats.evq_pending when added event became pending. That may cause threads to run in poll loop with minimal timeout infinitely. Added counter update. 2014-12-15 22:21:23 +02:00
VilhoRaatikka
69e131e9c4 Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324 2014-12-15 22:10:36 +02:00
VilhoRaatikka
7fed679f40 poll.c:poll_add_event_to_dcb did not increase the pollStats.evq_pending counter which caused it to go negative, which, inturn caused all threads to spinloop with minimal timeout. 2014-12-15 22:09:23 +02:00
Markus Makela
319b9150dc Fixed missing ignore_databases causing a false warning. 2014-12-15 16:24:18 +02:00
VilhoRaatikka
7271586701 Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324
Conflicts:
	server/modules/routing/dbshard/dbshard.c
2014-12-15 15:24:56 +02:00
Markus Makela
3dd1f70109 Added a function that generates a custom result set for SHOW DATABASES.
Fixed SHOW TABLES not using the current database.
2014-12-15 15:06:06 +02:00
VilhoRaatikka
82407ceaf4 Fix to #650, http://bugs.mariadb.com/show_bug.cgi?id=650
Added checks.
2014-12-15 15:03:47 +02:00
VilhoRaatikka
6f6df39e62 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-15 11:41:12 +02:00
VilhoRaatikka
4dd6f1b9c0 Added comment to assertion regarding to bref->bref_pending_cmd which is a one-slot buffer for database query. If sessoin command cursor is active when query is routed, instead of routing the query to backend it is stored to bref_pending_cmd to wait until previous (session) command is completed. The assertion traps if there is a command already in the bref_pending_cmd.
Situation is wrong because client shouldn't send new query before the previous (the pending one) is executed in backend and the reply is sent to the client.
2014-12-15 11:35:07 +02:00
Markus Makela
04a92e40df Fixes to Coverity defects 84879 84878 72752 72742 2014-12-15 06:28:47 +02:00
VilhoRaatikka
a4968f2521 Complete fix candidate for #645, http://bugs.skysql.com/show_bug.cgi?id=645 and #648, http://bugs.skysql.com/show_bug.cgi?id=648
tee.c:closeSession removed unnecessary dcb_free, router/service closes all backend DCBs and the client DCB, and client DCB is the one that was tried to free in closeSession.
readwritesplit.c:routeQuery now handles untyped and typed GWBUFs. Untyped means that read buffer may consist of incomplete and multiple MySQL packets. Typed buffer always consists of a single MySQL packet (which can be split to many buffers inside GWBUF).
Fixed Coverity cases #84840 and #84841
2014-12-14 11:26:15 +02:00
Markus Makela
a91845b324 Re-enabled the ignore list, it uses the parameter 'ignore databases=<list of db names>'.
Added routing of trivial queries and ignored databases to the first available backend.
2014-12-13 07:47:46 +02:00
VilhoRaatikka
c31f971999 Fix candidate for #645, http://bugs.skysql.com/show_bug.cgi?id=645 and #648, http://bugs.skysql.com/show_bug.cgi?id=648
If readwritesplit.c:routeQuery gets a GWBUF whose type is UNDEFINED, then each MySQL packet is extracted from input buffer and passed to new function, route_single_stmt. Each extracted packet is stored in separate GWBUF and added types GWBUF_TYPE_MYSQL and GWBUG_TYPE_SINGLE_STMT which makes it possible to execute session commands and process reply packets properly.

Code nedes still cleaning but this is for testing atm.
2014-12-13 01:55:40 +02:00
VilhoRaatikka
339f604d73 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-12 21:18:13 +02:00
VilhoRaatikka
600d29a6d1 Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324
Conflicts:
	server/modules/routing/dbshard/dbshard.c
2014-12-12 21:08:21 +02:00
VilhoRaatikka
52db8ce15e Removed useless comments 2014-12-12 21:06:59 +02:00
Markus Makela
4c9307bbf2 Updated MaxScale_test.cnf 2014-12-12 17:15:11 +02:00
Markus Makela
175756c478 Fixed some missing return values and added database change routing to right shard. 2014-12-12 16:25:19 +02:00
VilhoRaatikka
e55c70b329 Session status wasn't updated in tee filter's closeSession 2014-12-12 14:36:05 +02:00
Mark Riddoch
1fc063b437 Added pepared statements and field lsit support to the command types
to duplciate
2014-12-12 10:02:24 +00:00
Mark Riddoch
680f7ef2c1 Add fix for duplicating COM_QUIT, COM_INIT_DB and COM_CHANGE_USER packets 2014-12-12 09:45:52 +00:00
Mark Riddoch
3ffa585fe4 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-11 13:49:01 +00:00
Mark Riddoch
573cf6040c Check for the duplciate service being the same as the service that is using the
tee filter. I.e. trap simple recursive definitions.
2014-12-11 13:45:21 +00:00
VilhoRaatikka
63def8d002 Fix to bug #644, http://bugs.mariadb.com/show_bug.cgi?id=644
Initialized the lock variable in gwbuf_clone
2014-12-11 15:28:41 +02:00
Markus Makela
a7cc40dc6a Added error message generation for non-existent databases and backend status checks. 2014-12-11 11:45:40 +02:00
Markus Makela
c75ba90f6f Fixes to Coverity defect 84478 and to 72759 which has reappeared. 2014-12-11 09:43:59 +02:00
Markus Makela
89ccc7c927 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-10 18:06:48 +02:00
Markus Makela
2a623c6ec3 Fixed a typo in config.c 2014-12-10 18:05:58 +02:00
Mark Riddoch
df1ff25be4 Changes for file system full detection 2014-12-10 09:07:14 +00:00
VilhoRaatikka
0967a09b5c Added severity keyword to error log messages 2014-12-09 14:26:33 +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
Markus Makela
78d09c35cb Added functions for shard runtime updating. 2014-12-09 14:12:12 +02:00
Mark Riddoch
0fb1918887 Improved error handlign for binlog directory and files 2014-12-09 09:55:05 +00:00
Mark Riddoch
26e3486966 Fix for router instance creation failure 2014-12-09 09:54:04 +00:00
VilhoRaatikka
968b67dd71 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-09 11:03:43 +02:00
VilhoRaatikka
b98a563f46 Fix to bug #641, http://bugs.mariadb.com/show_bug.cgi?id=641
Removed HTTPD Router and replaced module CLI with cli
2014-12-09 11:03:02 +02:00
MassimilianoPinto
19cf44bd59 Coverity fixes: 72650, 72665
Coverity fixes: 72650, 72665
2014-12-09 08:58:52 +01:00
Markus Makela
8b51d4fee2 Fix to bug 640: http://bugs.mariadb.com/show_bug.cgi?id=640
Added a check for the case when createInstance returns NULL.
Added messages to error log if router instance creation fails or if the service fails to start for any reason.
2014-12-09 06:31:53 +02:00
VilhoRaatikka
cf40cbfbf0 Aadded some of the code from routeQuery to its own function, change_current_db, which extracts db name, tests if the name can be found among cached database names (hashtable) and if it does, change the db. Otherwise create an error message and add it to poll eventqueue like it was sent from some of the backends. 2014-12-08 23:37:21 +02:00
VilhoRaatikka
5a2688e0a5 Fix to bug #640, http://bugs.mariadb.com/show_bug.cgi?id=640 2014-12-08 23:36:06 +02:00
VilhoRaatikka
bc104c0ef1 Merge branch 'release-1.0GA' into MAX-324 2014-12-08 22:37:15 +02:00