Markus Makela db1ea422a0 Merge branch 'develop' into MAX-324 ...

Conflicts:
	server/core/modutil.c

2015-01-20 04:25:40 +02:00

..

.gitignore

Updated gitignore files

2014-02-05 14:49:05 +01:00

adminusers.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

atomic.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

buffer.h

Fix to bug #678, http://bugs.skysql.com/show_bug.cgi?id=678

2015-01-02 18:32:57 +02:00

config.h

Merge branch 'blr' into develop

2014-11-19 12:00:55 +00:00

dbusers.h

MySQL Auth with dbname check

2014-10-16 19:17:15 +02:00

dcb.h

tee.c:

2014-12-30 17:40:47 +02:00

filter.h

Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale'

2014-09-30 13:15:03 +03:00

gw.h

Bug 515 Conditional arguemnt to gw_write

2014-11-19 16:43:21 +00:00

gwbitmask.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

hashtable.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

hint.h

Renamed all occurences of SkySQL to MariaDB Corporation

2014-09-30 13:02:10 +03:00

housekeeper.h

Merge branch 'blr' into develop

2014-11-19 12:00:55 +00:00

maxscale.h

Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale'

2014-09-30 13:15:03 +03:00

memlog.h

Added the ability to have a non-auto-flushing memlog. Flush is then a

2014-10-14 11:40:23 +01:00

modinfo.h

Renamed all occurences of SkySQL to MariaDB Corporation

2014-09-30 13:02:10 +03:00

modules.h

Merge branch 'blr' into develop

2014-11-19 12:00:55 +00:00

modutil.h

Merge branch 'develop' into MAX-324

2015-01-20 04:25:40 +02:00

monitor.h

Addition of timeout for connect,read,write

2014-11-10 15:13:26 +01:00

poll.h

Merge branch 'blr' into develop

2014-11-19 12:00:55 +00:00

rdtsc.h

Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale'

2014-09-30 13:15:03 +03:00

router.h

Complementary fix to #694,http://bugs.mariadb.com/show_bug.cgi?id=694

2015-01-17 22:40:52 +02:00

secrets.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

server.h

Fix #2 to bug 680: http://bugs.mariadb.com/show_bug.cgi?id=680"

2015-01-05 17:38:45 +02:00

service.h

Fix #2 to bug 680: http://bugs.mariadb.com/show_bug.cgi?id=680"

2015-01-05 17:38:45 +02:00

session.h

Partial fix to bug #657, http://bugs.mariadb.com/show_bug.cgi?id=657

2014-12-22 16:24:07 +02:00

spinlock.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

thread.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

users.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

version.h.in

added the missing version.h template file

2014-09-11 20:19:10 +03:00