48489234be
Merge branch 'develop' into MAX-268
2014-10-03 16:28:38 +02: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
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
c3dd8d973a
Code cleanup
...
Code cleanup
2014-09-30 13:19:03 +02: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
5f6d04e7db
Match for Class C,B,A in hosts with %
...
Match for Class C,B,A in hosts with %
2014-09-29 16:50:21 +02:00
76320c056b
Match Class C,B,A addresses
...
Match Class C,B,A addresses
2014-09-29 12:08:10 +02:00
1d14129edf
Merge branch 'develop' into MAX-268
2014-09-29 09:51:57 +02: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
3fdfc5db8d
Code cleanup
...
Code cleanup
2014-09-25 13:13:52 +02:00
717f24ce48
Added first support for user@x.y.z.%
...
Added first support for user@x.y.z.%
2014-09-25 13:08:12 +02: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
f3429dac1b
Fix for double free if incorrect password is passed
2014-09-24 11:13:33 +01:00
0e23979609
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-24 12:27:20 +03: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
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
5721df5176
Add initial file number
...
Fix for short binlog file names in rotate
Socket buffering changes
2014-09-19 13:40:38 +01:00
26e2695491
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-18 11:13:24 +03:00
f3d32087d8
Performance improvement or streaming large result sets.
...
-bash-4.1$ time mysql -h 127.0.0.1 -P4007 -umassi -pmassi information_schema -q -e "select * from engines a, engines b, engines c, engines d, engines e;" > /dev/null
real 1m16.137s
user 0m0.660s
sys 0m0.392s
-bash-4.1$ time mysql -h 127.0.0.1 -P4007 -umassi -pmassi information_schema -q -e "select * from engines a, engines b, engines c, engines d, engines e;" > /dev/null
real 0m0.980s
user 0m0.944s
sys 0m0.027s
2014-09-16 12:37:57 +01:00
41226692ac
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-16 12:11:17 +03:00
c8fc5b712b
Merge branch 'hholzgra-hartmut-gitignore' into release-1.0beta-refresh
2014-09-15 13:22:46 +01:00
1f56db310d
Changed variable names to closer match their usage
...
Changed the default values to the same as in makefiles
Added configured versions of maxscale.conf and maxscale init.d script
2014-09-15 14:12:55 +03:00
4c41dea6fb
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-15 09:43:24 +03:00
c2847c7ddb
Clean up.
2014-09-14 10:17:09 +03:00
8e5d852dde
Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh
2014-09-13 21:29:36 +03:00
2012dfdd35
Fix to bug #541 , http://bugs.skysql.com/show_bug.cgi?id=541
...
Long ~0.5MB queries blocked MaxScale.
mysql_client.c:gw_read_client_event: Fixed packet reading logic. Reading didn't work when packet exceeded read buffer size.
mysql_common.c:gw_MySQL_get_next_packet: number of bytes to be copied to continuous buffer was calculated wrong, thus resulting in broken packet.
readwritesplit.c:disabled creation of canonical query in debug build because it slows down the processing too much with long queries
2014-09-13 21:16:44 +03:00
acdc2968c7
Added LogFile entry for failed match
...
Added LogFile entry for failed match
2014-09-12 17:34:13 +02:00
7108add6f5
code cleanup localhost_match_wildcard_host
...
code cleanup for localhost_match_wildcard_host
2014-09-12 17:21:34 +02:00
5a28a73fcb
gwbuf_append's return value wasn't read in gw_read_client_event
2014-09-12 18:10:42 +03:00
8818f23176
Added localhost_match_wildcard_host parameter
...
Added localhost_match_wildcard_host parameter to service
2014-09-12 16:24:55 +02:00
3bb614d9eb
brand release-1.0beta-refresh merged
...
brand release-1.0beta-refresh merged
2014-09-12 16:00:36 +02:00
b3ce971020
initial implementation of the CMake build system
2014-09-11 18:24:41 +03:00
8b5b4a17fe
Merge from Z3
...
Merge from Z3
2014-09-11 12:51:16 +02:00
7245d1baa1
blr branch merge
...
blr branch merge
2014-09-11 12:20:42 +02:00
f15815c6bb
New service parameter localhost_match_any
...
New service parameter ‘localhost_match_any’ allows localhost matching
the wildcard host.
Default value is 0, don’t match.
It may be changed if backend servers don’t have the anonymous user
‘’@localhost
2014-09-10 17:12:25 +02:00
f9aece5113
Remove queuing that is no longer required
...
Fixed bug in mysql_backend.c that lost up to 4 bytes of data in rare
circumstances.
2014-09-10 15:51:53 +01:00
e74da1c630
Added chmod 0777 for unix sockets
...
Added chmod 0777 for unix sockets
2014-09-09 10:00:49 +02:00
c273988e51
Fixed for EPOLLHUP events
...
Possible double free in maxscaled on close
binlog router debugging/tracing
2014-09-05 17:29:17 +01:00
4a30626974
Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2
...
Conflicts:
client/Makefile
server/core/buffer.c
server/core/test/makefile
server/include/buffer.h
server/modules/filter/Makefile
server/modules/routing/webserver.c
2014-08-29 16:21:08 +03:00
81e1dd8719
Merge branch 'develop' into blr
...
Add instrumentation
Remove mutexes
Improve gwbuf_append performance
Conflicts:
server/core/dcb.c
server/modules/protocol/mysql_backend.c
2014-08-28 11:41:26 +01:00
d355e07e2d
gitignore cleanup
...
* ignore typical backup files created by common editors
* move general ignore rules like "*.o" or "depend.mk" to top level gitignore
* ignore executables and test directories in target dir gitignore
as these are local and there's no general catch-all pattern for them
2014-08-18 09:39:29 +00:00
087c4720bb
Merge pull request #23 from hholzgra/hartmut-DEL
...
Hartmut del
2014-08-18 09:20:03 +03:00
fb87f68368
consistently use DEL instead of rm in Makefiles
2014-08-17 21:02:24 +00:00
677a44f497
Merge from release-1.0beta to Z2
2014-08-15 18:00:39 +03:00
