Seppo Jaakola 7b791250a1 References lp:1051808 - merged with lp:maria/5.5 ...

bzr merge lp:maria/5.5
...
Text conflict in CMakeLists.txt
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_class.h
Text conflict in sql/sql_truncate.cc
4 conflicts encountered.

2012-09-17 12:31:38 +03:00

..

atomic

MDEV-417 - fix typo that prevented use of atomic instructions on Windows

2012-07-30 20:13:23 +02:00

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

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

ft_global.h

mysql-5.5.18 merge

2011-11-03 19:17:05 +01:00

hash.h

Initail merge with MySQL 5.1 (XtraDB still needs to be merged)

2011-11-21 19:13:14 +02:00

heap.h

Updated/added copyright headers

2012-02-15 17:13:47 +01:00

keycache.h

Merge 5.3 -> 5.5

2012-06-20 15:01:28 +04:00

lf.h

1. fix an old typo. A purgatory must be cleaned on every LF_PURGATORY_SIZE freeing,

2012-09-04 12:12:28 +02:00

m_ctype.h

merge

2012-04-07 15:58:46 +02:00

m_string.h

Merge from 5.2.

2012-08-24 15:39:34 +02:00

ma_dyncol.h

portability fix: avoid anonymous structs and unions in C

2011-09-22 11:04:00 +02:00

maria.h

5.3 merge

2012-05-04 07:16:38 +02:00

my_aes.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

my_alarm.h

5.3 merge

2012-01-13 15:50:02 +01:00

my_alloc.h

mysql-5.5.18 merge

2011-11-03 19:17:05 +01:00

my_atomic.h

mysql-5.5.18 merge

2011-11-03 19:17:05 +01:00

my_attribute.h

mysql-5.5.18 merge

2011-11-03 19:17:05 +01:00

my_base.h

c

2012-05-21 15:30:25 +02:00

my_bit.h

merge with 5.3

2011-10-19 21:45:18 +02:00

my_bitmap.h

5.3 merge

2012-01-13 15:50:02 +01:00

my_compare.h

5.3->5.5 merge

2011-11-22 18:04:38 +01:00

my_compiler.h

merge with 5.3

2011-10-19 21:45:18 +02:00

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

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

my_getopt.h

merge with MySQL 5.1.65

2012-08-22 11:40:39 +02:00

my_global.h

MDEV-419 ensure that all HAVE_XXX constants can be set by cmake

2012-07-31 19:29:07 +02:00

my_libwrap.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

my_list.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

my_md5.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02:00

my_net.h

MDEV-419 ensure that all HAVE_XXX constants can be set by cmake

2012-07-31 19:29:07 +02:00

my_nosys.h

mysql-5.5.18 merge

2011-11-03 19:17:05 +01:00

my_pthread.h

MDEV-419 ensure that all HAVE_XXX constants can be set by cmake

2012-07-31 19:29:07 +02:00

my_rdtsc.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

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

5.3 merge

2012-08-31 14:15:52 +02:00

my_time.h

5.3 merge

2012-01-13 15:50:02 +01:00

my_tree.h

mysql-5.5.18 merge

2011-11-03 19:17:05 +01:00

my_uctype.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

my_user.h

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

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

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

myisam.h

mysql-5.5.22 merge

2012-03-28 01:04:46 +02:00

myisamchk.h

5.3->5.5 merge

2011-11-22 18:04:38 +01:00

myisammrg.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

myisampack.h

mysql-5.5.18 merge

2011-11-03 19:17:05 +01: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

Fix package names, by removing a trailing "-MariaDB" ,as we already have leading "mariadb-".

2011-11-23 19:02:08 +01:00

mysql.h

undo the fix for MySQL Bug#12998841

2012-08-08 12:32:34 +02:00

mysql.h.pp

undo the fix for MySQL Bug#12998841

2012-08-08 12:32:34 +02:00

mysys_err.h

5.3 merge

2012-01-13 15:50:02 +01:00

password.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

probes_mysql_nodtrace.h

merge mysql-5.1->mysql-5.5

2011-07-07 12:42:14 +03:00

probes_mysql.d.base

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

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

queues.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

rijndael.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

service_versions.h

debug_sync is now a service, available to dynamically loaded plugins.

2012-03-28 19:26:00 +02:00

sha1.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

sha2.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

sql_common.h

5.2 merge.

2012-08-22 16:45:25 +02:00

sslopt-case.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

sslopt-longopts.h

5.3 merge

2012-01-13 15:50:02 +01:00

sslopt-vars.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

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

mysql-5.5 merge

2012-06-14 20:05:31 +02:00

waiting_threads.h

use PSI wrappers in aria and other non-MySQL code

2011-07-13 21:10:18 +02:00

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