Commit Graph

2203 Commits

Author SHA1 Message Date
175756c478 Fixed some missing return values and added database change routing to right shard. 2014-12-12 16:25:19 +02:00
a7cc40dc6a Added error message generation for non-existent databases and backend status checks. 2014-12-11 11:45:40 +02:00
78d09c35cb Added functions for shard runtime updating. 2014-12-09 14:12:12 +02:00
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
5a2688e0a5 Fix to bug #640, http://bugs.mariadb.com/show_bug.cgi?id=640 2014-12-08 23:36:06 +02:00
bc104c0ef1 Merge branch 'release-1.0GA' into MAX-324 2014-12-08 22:37:15 +02:00
c1de3db7a3 Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324 2014-12-08 21:21:37 +02:00
2ff3939ba2 Active databases are only updated if they are found in the router's hashtable. 2014-12-08 16:35:47 +02:00
6a54d888de Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-08 16:04:27 +02:00
5264a1abc9 Added function documentation, moved one non-error log entry to message log, cleaned up a bit. 2014-12-08 16:02:16 +02:00
7ed253ecae Cleanup 2014-12-08 11:21:46 +02:00
8fed527ac9 Merge branch 'release-1.0GA' into blr 2014-12-08 09:21:38 +00:00
ce056dccd8 Update modue status of all GA modules 2014-12-08 09:19:35 +00:00
e76215bf07 Added detection of COM_INIT_DB 2014-12-08 11:15:10 +02:00
4c1ed65617 Added dbshard template to MaxScale_template.cnf
Added NULL-check to createInstance to avoid NULL-pointer reference if user/pwd is missing from config.
Removed unnecessary code, added error messages, fixed intendation.
2014-12-07 23:34:47 +02:00
0348df5147 Fixed databases being queried without a username or password and ignored the default databases when checking for shards. 2014-12-07 13:16:53 +02:00
15a96f037d Merge remote-tracking branch 'origin/MAX-324' into MAX-324
Conflicts:
	server/modules/routing/dbshard/dbshard.c
2014-12-07 06:11:24 +02:00
68fc849c6e query_classifier.cc:cleaned up some intendentions and brackets.
dbshard.h:removed unnecessary code
dbshard.c:removed unnecessary code, cleaned up a bit and made some required changes
readwritesplit.c:removed two unnecessary variable assignments.
2014-12-07 00:34:23 +02:00
a580799eb2 Added messages about missing usernames and passwords for servers. 2014-12-07 00:07:58 +02:00
94b6fc8ff1 Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324 2014-12-06 12:48:37 +02:00
06578c95a5 Updates to dbshard router:
Added a parsing function to query classifier that returns an array of database names the query uses.
Added a check if the query targets a sharded database. If so, a hint is added that routes the query to the named server.
2014-12-06 11:30:07 +02:00
b1eaaea961 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-05 23:57:02 +02:00
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
cce35d9035 Add event name in show service 2014-12-05 13:49:41 +00:00
a0cebae0ec Make building the binlog router conditional 2014-12-05 11:43:06 +00:00
e102d56e69 Merge branch 'blr' into release-1.0GA
Conflicts:
	server/modules/protocol/mysql_backend.c
	server/modules/routing/binlog/blr_master.c
2014-12-05 11:42:02 +00:00
2b998eb17f Merging binlog router into beta refresh 2014-12-05 11:30:03 +00:00
de3b2db904 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-05 09:06:05 +00:00
2d4073267c Added support for a.%, a.%.% and a.b.%
Added support for a.%, a.%.% and a.b.% in dbusers.c
2014-12-04 19:01:17 +01:00
4db86a5520 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-04 16:57:57 +00:00
36aea7454f Updates for new logging definitions 2014-12-04 16:56:33 +00:00
c133a42bbd Skip log for "Master available" with MAINTENANCE
Skip logging “A Master Server is now available” message when the server
has SERVER_MAINT bit value
2014-12-04 15:25:04 +01:00
0171a7dc7b Revert "Fix to buf 553 http://bugs.mariadb.com/show_bug.cgi?id=553"
This reverts commit 5cfbfe39ac942e406de719612257ef797dca9c7f.
2014-12-04 14:30:23 +02:00
5cfbfe39ac Fix to buf 553 http://bugs.mariadb.com/show_bug.cgi?id=553
Added command line argument for '-f <filename>' that executes the commands found in the file.
2014-12-04 14:16:45 +02:00
84679a48ff Fixes to Coverity defects 84335 84336 84337 2014-12-04 10:13:41 +02:00
30c928c326 Switched to /dev/random instead of time(NULL) in secrets.c 2014-12-04 10:07:06 +02:00
e4c379bbdc Fix to bug 583 http://bugs.mariadb.com/show_bug.cgi?id=583
Changed rwsplit.sh to explicitly use /bin/bash
2014-12-03 19:41:06 +02:00
1baff3dfbb Bug 459 - change auth parameter to passwd parameter 2014-12-03 16:18:14 +00:00
1e2027f4dc Fixes to Coverity defects 83027 73421 72714 72671 72646 72642 2014-12-03 17:56:22 +02:00
89c3b01925 Fixed the first log write after moving a cleared block buffer being written in the block buffer that was just moved. 2014-12-03 17:11:52 +02:00
5251ada377 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-03 16:09:54 +02:00
f23ce6c7d5 Added log manager extra debug flags to CMake. 2014-12-03 16:09:33 +02:00
6d98df0c37 Added error check to mysql_backend.c to prevent unnecessary logging. 2014-12-03 15:42:04 +02:00
730cd67992 Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-03 13:28:41 +02:00
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
3230eab37c Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA 2014-12-03 09:53:42 +00:00
fdb9c5e6dc Switch to thread safe versions of localtime and asctime 2014-12-03 09:53:17 +00:00
1e5bc37780 Use strtok_r rather than strtok 2014-12-03 09:33:55 +00:00
7079cb4749 Cleaned a bit 2014-12-03 10:35:34 +02:00
e696651ad6 Merge branch 'release-1.0GA' into MAX-324 2014-12-03 10:13:05 +02:00