Jon Olav Hauglid 4a348c5656 Merge from mysql-5.1 to mysql-5.5 ...

Text conflict in include/my_bit.h
Text conflict in include/my_bitmap.h
Text conflict in mysys/my_bitmap.c

2011-02-16 16:33:02 +01:00

..

atomic

Bug#56760: my_atomics failures on osx10.5-x86-64bit

2010-11-30 21:19:49 -02:00

mysql

Merge mysql-5.5-bugteam -> mysql-5.5-innodb

2010-12-27 19:24:05 +02:00

base64.h

…

CMakeLists.txt

Remove configuration preprocessor symbols 'THREAD'

2011-01-11 10:07:37 +01:00

decimal.h

…

errmsg.h

WL#1054: Pluggable authentication support

2010-08-09 11:32:50 +03:00

ft_global.h

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

hash.h

Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled

2010-07-08 18:20:08 -03:00

heap.h

Remove configuration preprocessor symbols 'THREAD'

2011-01-11 10:07:37 +01:00

keycache.h

WL#5030: Split and remove mysql_priv.h

2010-03-31 16:05:33 +02:00

lf.h

WL#5498: Remove dead and unused source code

2010-07-23 17:13:36 -03:00

m_ctype.h

Merging patch for BUG#58246 into mysql-5.5-bugteam.

2010-12-01 23:15:14 +01:00

m_string.h

WL#5665: Removal of the autotools-based build system

2010-11-20 20:56:09 -02:00

my_aes.h

WL#5016: Fix header file include guards

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

my_alarm.h

Manual merge from 5.1.

2010-07-01 12:06:41 +04:00

my_alloc.h

Post-merge fix: header is used by the client API. Obvious in retrospect.

2010-06-05 16:39:03 -03:00

my_atomic.h

WL#5498: Remove dead and unused source code

2010-07-23 17:18:36 -03:00

my_attribute.h

WL#5498: Remove dead and unused source code

2010-07-23 17:16:29 -03:00

my_base.h

Remove configuration preprocessor symbols 'THREAD'

2011-01-11 10:07:37 +01:00

my_bit.h

Merge from mysql-5.1 to mysql-5.5

2011-02-16 16:33:02 +01:00

my_bitmap.h

Merge from mysql-5.1 to mysql-5.5

2011-02-16 16:33:02 +01:00

my_compiler.h

Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure

2010-11-10 19:14:47 -02:00

my_dbug.h

Automerge 5.1-bugteam => 5.5-bugteam

2010-12-13 17:13:31 +01:00

my_dir.h

WL#5030: Splitting mysql_priv.h

2010-04-06 14:11:07 +02:00

my_getopt.h

Bug#54569 Some options are not allowed to take argument when passed with loose- prefix

2010-10-25 14:30:07 +02:00

my_global.h

Remove configuration preprocessor symbols 'THREAD'

2011-01-11 10:07:37 +01:00

my_handler.h

Merge

2010-12-29 01:26:31 +01:00

my_libwrap.h

WL#5016: Fix header file include guards

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

my_list.h

Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled

2010-07-08 18:20:08 -03:00

my_md5.h

WL#5016: Fix header file include guards

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

my_net.h

WL#5498: Remove dead and unused source code

2010-07-23 17:14:35 -03:00

my_nosys.h

WL#5498: Remove dead and unused source code

2010-07-23 17:15:07 -03:00

my_pthread.h

weave merge from mysql-5.1 to mysql-5.5

2011-02-08 17:47:33 +02:00

my_rdtsc.h

WL#2373 Use cycle counter for timing

2009-11-24 16:36:31 -07:00

my_stacktrace.h

Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.

2010-11-30 17:06:53 -02:00

my_sys.h

Bug #36022 please log more information about "Sort aborted" queries

2011-02-02 12:54:49 +01:00

my_time.h

merge

2011-02-02 20:13:28 +02:00

my_tree.h

WL#5030: Split and remove mysql_priv.h

2010-03-31 16:05:33 +02:00

my_uctype.h

WL#5016: Fix header file include guards

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

my_user.h

…

my_xml.h

…

myisam.h

Remove configuration preprocessor symbols 'THREAD'

2011-01-11 10:07:37 +01:00

myisammrg.h

WL#2360 Performance schema

2009-12-04 18:26:15 -07:00

myisampack.h

WL#5016: Fix header file include guards

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

mysql_com.h

Merge

2010-12-29 01:26:31 +01:00

mysql_embed.h

Bug#57210: remove pstack

2010-11-09 12:45:13 -02:00

mysql_time.h

…

mysql_version.h.in

…

mysql.h

WL#5665: Removal of the autotools-based build system

2010-11-20 20:56:09 -02:00

mysql.h.pp

merge

2010-10-04 15:42:16 +03:00

mysys_err.h

Manual merge with mysql-5.1-bugteam.

2010-12-09 13:49:11 +03:00

password.h

WL#5030: Split and remove mysql_priv.h

2010-03-31 16:05:33 +02:00

probes_mysql_nodtrace.h

Re-adding 'include/probes_mysql_nodtrace.h' removed by accident

2010-02-17 14:37:55 +03:00

probes_mysql.d.base

Fixing some issues in the build when using DTrace probes

2009-03-18 10:04:15 +00:00

probes_mysql.h

Backport of DTrace patches from 6.0

2008-12-20 11:01:41 +01:00

queues.h

WL#5030: Split and remove mysql_priv.h

2010-03-31 16:05:33 +02:00

rijndael.h

WL#5016: Fix header file include guards

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

service_versions.h

WL#5363: Thread Pool Service Interface

2010-06-07 16:01:39 +02:00

sha1.h

merge

2010-10-05 17:27:18 +03:00

sha2.h

Post-fix for Bug#13174.

2010-04-13 20:10:51 +04:00

sql_common.h

WL#1054: Pluggable authentication support

2010-08-09 11:32:50 +03:00

sslopt-case.h

Backport of:

2010-04-13 19:04:45 +04:00

sslopt-longopts.h

Merge of mysql-5.1-bugteam into mysql-trunk-merge.

2010-06-10 22:30:49 -03:00

sslopt-vars.h

Backport of:

2010-04-13 19:04:45 +04:00

t_ctype.h

…

thr_alarm.h

Remove configuration preprocessor symbols 'THREAD'

2011-01-11 10:07:37 +01:00

thr_lock.h

Merging with mysql-5.5-stage.

2010-08-16 14:50:27 +02:00

typelib.h

Backport changeset from mysql-next-mr-bugfixing:

2010-07-05 18:20:46 +02:00

violite.h

WL#5363: Thread Pool Service Interface

2010-06-07 16:01:39 +02:00

welcome_copyright_notice.h

Fix for Bug#57094 (Copyright notice incorrect?).

2010-10-06 19:06:13 +04:00