Commit Graph

612 Commits

Author SHA1 Message Date
637d5c57b3 Merge branch 'develop' into filter_harness 2014-10-09 15:34:20 +03:00
29e53e150a Fix to bug # 565, http://bugs.mariadb.com/show_bug.cgi?id=565
Client flags are now copied to each backend and used in their connections.

log_manager.cc: fixed string allocation where one byte was missing.
mysql_client.c: fixed string allocation where one byte was missing.
2014-10-08 22:27:28 +03:00
153a1cd385 Fixed the fix: invalid packet test removed. 2014-10-07 18:41:53 +03:00
93dc40bcb9 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2014-10-07 18:25:31 +03:00
07fc5162a0 Fix to bug #562, http://bugs.mariadb.com/show_bug.cgi?id=562
mysql_client.c, added functions create_auth_fail_str, and get_username_from_auth to implement creation of similar error msg with MySQL. There is one difference left, because MaxScale prints IP address instead of hostname in error message.
2014-10-07 18:00:22 +03:00
3cd8e29c4c Changed the way some CMake functions are used to support older versions of CMake. 2014-10-07 14:09:22 +03:00
b5188a7643 Merge branch 'develop' into filter_harness 2014-10-06 14:04:23 +03:00
b03b886c3f added independent testing of the hint filter 2014-10-06 13:24:09 +03:00
aca8596efa mysql_client.c:gw_client_close didn't close client session in cases where session->state == SESSION_STATE_STOPPING. That is a bug and lead to situation where session wasn't closed at all.
Also changed 'authorization failed' to 'access denied'
mysql_common.c: fixed memory leak in gw_receive_backend_auth, and replaced error code '2800' with '28000'.
readconnroute.c:handleError didn't set *succp pointer so uninitialized value was used in caller's context.
makefile.inc: added -lm to linker flags
mysql_backend.c: added a few comments
2014-10-06 11:46:12 +03:00
68580af95f Modifications to building 2014-10-06 10:41:56 +03:00
1adc6ac5e8 Merge remote-tracking branch 'origin/develop' into filter_harness 2014-10-06 09:43:42 +03:00
524f693991 Split the filter testing harness into two different versions, the interactive and command line tool. 2014-10-06 09:41:21 +03:00
f3c77d6ec9 Reverting commit b102d69ef9a7b5310602773b0be2d4ea3032dce0 due to the bug being a duplicate and the correct fix being different. 2014-10-03 10:16:12 +03:00
b102d69ef9 Fix to bug 562 (http://bugs.mariadb.com/show_bug.cgi?id=562)
mysql_client.c: Changed the error message and, in the case of a failed auth while using a password, set the first byte to 1 in dcb->data->client_sha1
2014-10-02 18:40:25 +03:00
c4ca1ddb13 Updated non-source files with new company name. 2014-10-01 15:21:47 +03:00
b0683d9b4d Updated the licensing year from 2013 to 2013-2014 2014-10-01 14:37:12 +03:00
dfeca42788 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2014-10-01 13:50:54 +03:00
0acb8fe05d Renaming missed SkySQL references. 2014-10-01 13:48:00 +03:00
bff2d794e0 Removed unnecessary linking commands to libmysqld.a 2014-10-01 13:29:26 +03:00
52c0d0c768 Merge remote-tracking branch 'origin/develop' into header_rename 2014-10-01 05:24:02 +03:00
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
f4e591e382 Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale' 2014-09-30 13:15:03 +03:00
c344231f80 Renamed all occurences of SkySQL to MariaDB Corporation 2014-09-30 13:02:10 +03:00
dd5c3c1d0f Removal of binlog router from Makefile 2014-09-26 18:13:30 +03:00
2801aa851e Merge branch 'blr' of https://github.com/skysql/MaxScale into blr 2014-09-26 15:44:18 +03:00
5ec1a83f3b Fix to #478, http://bugs.skysql.com/show_bug.cgi?id=478
Execution of session commands failed because session commands and normal sql statements were executed in a wrong order if backend was executing previous session command while new sql stmt was routed to that backend. There was a window where ordering went wrong.
It is possible that one normal sql stmt arrives while previous sescmds are still being executed.

Introduced a new member in backend_ref_t structure, bref_pending_cmd where new sql stmt pointer is stored in that case. When sescmds are executed completely, that command is automatically executed next.
2014-09-26 15:40:32 +03:00
3430fc99d2 Shutdown fix in housekeeper
In memory logging in blr_master
2014-09-26 12:36:59 +01:00
06596a0bc3 Add binlog router back into Makefiles 2014-09-25 17:35:27 +01:00
5bef5d8f53 Removed binlogrouter from the build process. 2014-09-25 21:25:46 +03:00
63252e94f2 Merge branch 'release-1.0beta-refresh' into blr
Fix conflict and remove some redundant code

Conflicts:
	server/core/poll.c
2014-09-24 16:49:12 +01:00
a85c3fe97a Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 14:34:04 +03:00
7da4aa1400 Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh 2014-09-24 11:14:10 +01:00
f3429dac1b Fix for double free if incorrect password is passed 2014-09-24 11:13:33 +01:00
99cf637e03 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 12:59:47 +03:00
315b5b92df Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh 2014-09-24 12:55:19 +03:00
fd95acdcbf Monitor checks weren't done if interval%100<100. Fixed. 2014-09-24 12:54:07 +03:00
0e23979609 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 12:27:20 +03:00
a82ea9def3 Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh 2014-09-24 10:22:03 +01:00
e8b5c2cbdf Updates to maxadmin to prevent hang when maxscale shuts down
Addition of maxadmin test script
2014-09-24 10:04:36 +01:00
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
4743b2e5bf Merge branch 'release-1.0beta-refresh' into filter_harness 2014-09-24 09:26:20 +03:00
eae2c03924 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 09:25:50 +03:00
7562d49a95 Addition rtdsc for tracing purposes 2014-09-23 22:09:36 +01:00
45f8585804 Fix to bug #549, http://bugs.skysql.com/show_bug.cgi?id=549
Each monitor loops 10 times/second (sleep 100ms) and perform monitoring checks only when monitor's interval is spent. Monitors notice faster if the shutdown flag is set and thus overall shutdown is faster.
hint.c:added missing header
Changed interval from unsigned long to size_t which is guaranteed to be of same size also in windows (if possible).
2014-09-23 11:26:15 +03:00
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
3f0de666ac Changed the order of linking to resolve some debug build bugs and added the missing parent directory of the MYSQL_DIR into the included directories. 2014-09-20 19:44:30 +03:00
d561ccb089 Merge branch 'release-1.0beta-refresh' into blr 2014-09-19 13:42:37 +01:00
5721df5176 Add initial file number
Fix for short binlog file names in rotate

Socket buffering changes
2014-09-19 13:40:38 +01:00
c868fedb87 Fixed missing ${EMBEDDED_LIB} variables and changed to the proper template config file. 2014-09-19 11:41:44 +03:00
26e2695491 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-18 11:13:24 +03:00