Mark Riddoch
fd92b60336
Merge branch 'hholzgra-hartmut-getopt_long' into release-1.0beta-refresh
...
Conflicts:
client/maxadmin.c
Resolved
2014-09-19 17:43:41 +01:00
Mark Riddoch
77896503c8
Merge branch 'hartmut-getopt_long' of https://github.com/hholzgra/MaxScale into hholzgra-hartmut-getopt_long
2014-09-19 17:40:29 +01:00
Mark Riddoch
a16f900d6d
Merge branch 'hholzgra-hartmut-compile-warnings' into release-1.0beta-refresh
...
Conflicts:
server/include/dcb.h
Resolved
2014-09-19 17:37:39 +01:00
Mark Riddoch
13ec9a4073
Merge branch 'hartmut-compile-warnings' of https://github.com/hholzgra/MaxScale into hholzgra-hartmut-compile-warnings
2014-09-19 17:34:48 +01:00
Mark Riddoch
c4fb3e490b
Bug 546 - use of weghtby causes entry in error log
2014-09-19 15:52:44 +01:00
Mark Riddoch
d561ccb089
Merge branch 'release-1.0beta-refresh' into blr
2014-09-19 13:42:37 +01:00
Mark Riddoch
5721df5176
Add initial file number
...
Fix for short binlog file names in rotate
Socket buffering changes
2014-09-19 13:40:38 +01:00
Mark Riddoch
2d2fc28b07
Addition of code to prevent multiple hangup's beign processed on the same
...
DCB
2014-09-19 11:40:16 +01:00
Mark Riddoch
2402d55de6
Some general tidyup plus addition of code to block zombie processing
...
if epoll_wait returned multiple descriptors
2014-09-19 10:50:54 +01:00
Timofey Turenko
72550185ab
add 'rt' to test_filter libs list
2014-09-19 12:35:20 +03:00
Markus Makela
3d030d0c7d
added missing test linker flags
2014-09-19 11:58:22 +03:00
Markus Makela
0f62a1c8a4
Merge remote-tracking branch 'origin/cmake_build' into cmake_build
2014-09-19 11:42:43 +03:00
Markus Makela
c868fedb87
Fixed missing ${EMBEDDED_LIB} variables and changed to the proper template config file.
2014-09-19 11:41:44 +03:00
Mark Riddoch
a5975d8cff
Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh
2014-09-19 08:03:16 +01:00
Timofey Turenko
38475939c4
change install dir to /usr/local/skysql/maxscale
2014-09-18 23:07:13 +03:00
Markus Makela
c97cbd0a7f
fixed typos and old information from files
2014-09-18 15:56:06 +03:00
Markus Makela
942174e94f
removed manual UBUNTU flag and renamed it to DEB_LIKE and made it automated
2014-09-18 15:50:58 +03:00
Markus Makela
b6ab18166e
Debian/Ubuntu install scripts
2014-09-18 15:30:23 +03:00
Markus Makela
83aed02651
fixed wrong debian package architecture
2014-09-18 13:27:06 +03:00
Markus Makela
c2ba3abac2
fixed linker errors in log_manager
2014-09-18 12:55:36 +03:00
Markus Makela
26e2695491
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-18 11:13:24 +03:00
Markus Makela
7471911087
added missing debug compiler flags and tuned library linking flags
2014-09-18 11:05:40 +03:00
VilhoRaatikka
0f3db1c091
First changes for fixing #548 , http://bugs.skysql.com/show_bug.cgi?id=548
...
dcb.c:dcb_process_zombies:added new parameter which tells what DCB the thread will use after calling dcb_process_zombies. Thus, processing that DCB is skipped.
readwritesplit.c:routeQuery:removed double free call for query buffer.
2014-09-17 18:02:44 +03:00
Mark Riddoch
675baad4b1
Fixed typo
2014-09-17 14:54:40 +01:00
Markus Makela
95edddcbe5
Added debug output for dependency searches with -DDEBUG_OUTPUT=Y
2014-09-17 12:59:54 +03:00
VilhoRaatikka
f0b358bea6
Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh
2014-09-17 11:49:39 +03:00
Markus Makela
530d29f96d
Merge branch 'release-1.0beta-refresh' into filter_harness
2014-09-17 11:07:12 +03:00
Markus Makela
3776fdb015
added a 'testall' target which builds and runs the tests
2014-09-17 10:39:47 +03:00
Markus Makela
cde74cfaa5
added missing -lstdc++ flags
2014-09-17 09:16:23 +03:00
Markus Makela
349fc9d6ab
Added missing Pthread and libaio flags to log manager
2014-09-17 04:26:36 +03:00
Markus Makela
8b1afbfe26
fixed tests not working with the normal 'make testall'
2014-09-16 20:02:28 +03:00
Mark Riddoch
3acc2711d6
Merge branch 'release-1.0beta-refresh' into blr
2014-09-16 16:55:47 +01:00
Mark Riddoch
c77807971d
Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh
2014-09-16 16:53:06 +01:00
Markus Makela
81b83f1978
Changed the way the static embedded library is searched
2014-09-16 18:16:20 +03:00
MassimilianoPinto
3b452b4745
Documentation file names change
...
Documentation file names change
2014-09-16 17:12:24 +02:00
Markus Makela
c0112af04e
changed the way static library searching is done
2014-09-16 17:53:36 +03:00
Markus Makela
a5ba0457d0
Merge remote-tracking branch 'origin/release-1.0beta-refresh' into cmake_build
2014-09-16 17:36:35 +03:00
Markus Makela
29bcab368b
removed dynamic library installation when building non-static versions
2014-09-16 17:26:30 +03:00
Markus Makela
be057a4eef
Fixed changing cached values causing linking errors
2014-09-16 17:14:50 +03:00
Markus Makela
e1118fb569
added check for packaging tools
2014-09-16 16:42:46 +03:00
Mark Riddoch
c642af7891
Add binlogrouter back into Makefile following merge
2014-09-16 14:28:47 +01:00
Markus Makela
b3c110d8e6
fix to dependency checks
2014-09-16 15:54:51 +03:00
Markus Makela
77e0cccda6
Fix to query_classifier not being linked at all when using cmake
2014-09-16 15:41:46 +03:00
Mark Riddoch
81d82e9037
Merge branch 'release-1.0beta-refresh' into blr
2014-09-16 13:22:03 +01:00
Markus Makela
0f5cfdbd1a
Added dependency checks, Debian packaging and fixes to various parts of the CMake build files.
2014-09-16 15:02:43 +03:00
VilhoRaatikka
48c25155f5
Completion to fix for http://bugs.skysql.com/show_bug.cgi?id=547
...
server.h:added macro SERVER_IS_ROOT_MASTER for finding valid candidate for root master
readwritesplit.c: wrote open three if conditions in get_root_master_bref for clarity
2014-09-16 14:49:04 +03:00
Mark Riddoch
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
Markus Makela
41226692ac
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-16 12:11:17 +03:00
VilhoRaatikka
7300e58787
Fix to #547 , http://bugs.skysql.com/show_bug.cgi?id=547
...
readwritesplit.c:get_dcb now searches for master if slave is not available
2014-09-16 12:11:08 +03:00
Markus Makela
fdf1271138
Cleaned up RabbitMQ component building.
2014-09-16 11:34:05 +03:00