Seppo Jaakola b96af9a3ab references lp:1011983 ... Merged latest MariaDB development in: bzr merge lp:maria/5.5 => Text conflict in CMakeLists.txt Text conflict in sql/handler.h Text conflict in support-files/CMakeLists.txt 3 conflicts		2012-06-12 16:34:18 +03:00
..
atomic
mysql	5.3 merge	2012-05-04 07:16:38 +02:00
base64.h
CMakeLists.txt	Building RPMs with CPack	2012-05-22 11:04:32 +02:00
decimal.h	merge	2012-04-05 23:07:18 +02:00
errmsg.h
ft_global.h
hash.h
heap.h	Updated/added copyright headers	2012-02-15 17:13:47 +01:00
keycache.h
lf.h
m_ctype.h	merge	2012-04-07 15:58:46 +02:00
m_string.h	merge	2012-04-05 23:07:18 +02:00
ma_dyncol.h
maria.h	5.3 merge	2012-05-04 07:16:38 +02:00
my_aes.h
my_alarm.h	5.3 merge	2012-01-13 15:50:02 +01:00
my_alloc.h
my_atomic.h
my_attribute.h
my_base.h	c	2012-05-21 15:30:25 +02:00
my_bit.h
my_bitmap.h	5.3 merge	2012-01-13 15:50:02 +01:00
my_compare.h
my_compiler.h
my_context.h	MWL#192 after-merge fixes.	2012-02-23 15:42:21 +01:00
my_dbug.h	Merge MWL#192: Non-blocking client library, into MariaDB 5.5.	2012-02-21 22:15:44 +01:00
my_decimal_limits.h	5.3 merge	2012-01-13 15:50:02 +01:00
my_dir.h
my_getopt.h	5.3 merge	2012-01-13 15:50:02 +01:00
my_global.h	more portable fix for lp:942266 - 5.5 builds fail with systemtap-sdt-dev installed on Ubuntu	2012-05-11 09:18:00 +02:00
my_libwrap.h
my_list.h
my_md5.h
my_net.h
my_nosys.h
my_pthread.h
my_rdtsc.h
my_stacktrace.h	Define dummy my_init_stacktrace() to allow one to call it without #ifdef HAVE_STACKTRACE	2012-04-03 15:48:56 +03:00
my_sys.h	debug_sync is now a service, available to dynamically loaded plugins.	2012-03-28 19:26:00 +02:00
my_time.h	5.3 merge	2012-01-13 15:50:02 +01:00
my_tree.h
my_uctype.h
my_user.h
my_valgrind.h	Do not use Valgrind client requests in a normal release build, they have a small but noticable performance impact.	2012-03-22 12:31:09 +01:00
my_xml.h
myisam.h	mysql-5.5.22 merge	2012-03-28 01:04:46 +02:00
myisamchk.h
myisammrg.h
myisampack.h
mysql.h	Merge MWL#192: Non-blocking client library, into MariaDB 5.5.	2012-02-21 22:15:44 +01:00
mysql.h.pp	a couple of minor post-5.5-merge cleanups	2012-03-26 12:33:49 +02:00
mysql_async.h	Fix non-ssl build.	2012-01-08 10:13:39 +01:00
mysql_com.h	a couple of minor post-5.5-merge cleanups	2012-03-26 12:33:49 +02:00
mysql_embed.h	5.3 merge	2012-01-13 15:50:02 +01:00
mysql_time.h
mysql_version.h.in
mysys_err.h	5.3 merge	2012-01-13 15:50:02 +01:00
password.h
probes_mysql.d.base
probes_mysql.h	more portable fix for lp:942266 - 5.5 builds fail with systemtap-sdt-dev installed on Ubuntu	2012-05-11 09:18:00 +02:00
probes_mysql_nodtrace.h
queues.h
rijndael.h
service_versions.h	debug_sync is now a service, available to dynamically loaded plugins.	2012-03-28 19:26:00 +02:00
sha1.h
sha2.h
sql_common.h	Merge MWL#192: Non-blocking client library, into MariaDB 5.5.	2012-02-21 22:15:44 +01:00
sslopt-case.h
sslopt-longopts.h	5.3 merge	2012-01-13 15:50:02 +01:00
sslopt-vars.h
t_ctype.h
thr_alarm.h	further reduce diffs to 5.5, monty review	2012-01-24 19:18:22 +01:00
thr_lock.h	Initial push of codership-wsrep API implementation for MariaDB.	2012-04-13 01:33:24 +03:00
thread_pool_priv.h	5.3 merge	2012-05-04 07:16:38 +02:00
typelib.h	MDEV-69 SET optimizer_switch = REPLACE(...) causes ER_WRONG_VALUE_FOR_VAR	2012-01-17 10:55:27 +01:00
violite.h	c	2012-05-21 15:30:25 +02:00
waiting_threads.h
welcome_copyright_notice.h	mysql-5.5.22 merge	2012-03-28 01:04:46 +02:00
wqueue.h	fix the include guards and add missing gplv2 headers	2012-02-17 12:19:38 +01:00