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

..

array.c

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

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

base64.c

fixed compilation warnings. addendum to the fix for bug 29125

2009-03-20 16:27:53 +02:00

ChangeLog

…

charset-def.c

Backporting WL#1213

2010-02-24 13:15:34 +04:00

charset.c

Bug #59884: setting charset to 2048 crashes

2011-02-10 09:34:22 +02:00

checksum.c

WL#5498: Remove dead and unused source code

2010-07-23 17:09:27 -03:00

CMakeLists.txt

Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).

2010-08-12 19:19:57 +04:00

default.c

Bug #58455

2011-02-08 11:21:14 +01:00

errors.c

Manual merge with mysql-5.1-bugteam.

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

hash.c

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

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

lf_alloc-pin.c

WL#5498: Remove dead and unused source code

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

lf_dynarray.c

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

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

lf_hash.c

WL#5498: Remove dead and unused source code

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

list.c

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

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

md5.c

Bug #42434: license of mysys MD5 implementation is not GPL-compatible

2009-03-09 20:57:03 +02:00

mf_arr_appstr.c

Bug #20748: Configuration files should not be read more than once

2007-11-07 15:23:50 -07:00

mf_cache.c

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

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

mf_dirname.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:26:38 -03:00

mf_fn_ext.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:26:38 -03:00

mf_format.c

Bug #58455

2011-02-08 11:21:14 +01:00

mf_getdate.c

Merge from 5.0-bugteam

2009-05-13 08:48:00 -07:00

mf_iocache2.c

Remove configuration preprocessor symbols 'THREAD'

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

mf_iocache.c

Remove configuration preprocessor symbols 'THREAD'

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

mf_keycache.c

Remove configuration preprocessor symbols 'THREAD'

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

mf_keycaches.c

Remove configuration preprocessor symbols 'THREAD'

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

mf_loadpath.c

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

2010-07-02 16:38:04 -03:00

mf_pack.c

Merge

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

mf_path.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:13:30 -03:00

mf_qsort2.c

…

mf_qsort.c

Fix for bug #31207: Test "join_nested" shows different strategy on IA64

2007-10-17 20:08:58 +04:00

mf_radix.c

…

mf_same.c

…

mf_sort.c

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

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

mf_soundex.c

…

mf_tempdir.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:13:30 -03:00

mf_tempfile.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:17:56 -03:00

mf_unixpath.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:16:06 -03:00

mf_wcomp.c

…

mulalloc.c

…

my_access.c

…

my_aes.c

…

my_alarm.c

…

my_alloc.c

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

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

my_atomic.c

WL#5498: Remove dead and unused source code

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

my_bit.c

WL#5498: Remove dead and unused source code

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

my_bitmap.c

Merge from mysql-5.1 to mysql-5.5

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

my_chsize.c

This is the downport of

2009-09-11 22:26:35 +02:00

my_compress.c

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

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

my_conio.c

Bug#29125 Windows Server X64: so many compiler warnings

2009-02-13 11:41:47 -05:00

my_copy.c

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

2010-07-20 16:30:10 -03:00

my_crc32.c

…

my_create.c

WL#5161 : Cross-platform build with CMake

2009-11-09 12:32:48 +01:00

my_delete.c

Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111

2010-06-25 19:32:59 +04:00

my_div.c

…

my_error.c

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

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

my_file.c

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

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

my_fopen.c

weave merge from mysql-5.1 to mysql-5.5

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

my_fstream.c

Remove configuration preprocessor symbols 'THREAD'

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

my_gethostbyname.c

Remove configuration preprocessor symbols 'THREAD'

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

my_gethwaddr.c

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

2010-10-20 12:48:19 -02:00

my_getncpus.c

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

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

my_getopt.c

BUG#57953 my_load_defaults return junk argument ----args-separator---- to caller

2011-01-17 15:44:37 +08:00

my_getpagesize.c

…

my_getsystime.c

weave merge from mysql-5.1 to mysql-5.5

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

my_getwd.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:26:38 -03:00

my_handler_errors.h

WL#5016: Fix header file include guards

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

my_handler.c

WL#5498: Remove dead and unused source code

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

my_init.c

Bug#42054: SELECT CURDATE() is returning bad value

2011-01-12 18:36:39 -02:00

my_largepage.c

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

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

my_lib.c

Remove configuration preprocessor symbols 'THREAD'

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

my_libwrap.c

…

my_lock.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:26:38 -03:00

my_lockmem.c

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

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

my_malloc.c

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

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

my_memmem.c

…

my_mess.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:13:30 -03:00

my_mkdir.c

…

my_mmap.c

Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111

2010-06-25 19:32:59 +04:00

my_new.cc

Bug#43461: invalid comparison with string literal in default.c

2009-03-19 17:20:15 -03:00

my_once.c

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

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

my_open.c

Remove configuration preprocessor symbols 'THREAD'

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

my_port.c

…

my_pread.c

Remove configuration preprocessor symbols 'THREAD'

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

my_pthread.c

Remove configuration preprocessor symbols 'THREAD'

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

my_quick.c

This is the downport of

2009-09-11 22:26:35 +02:00

my_rdtsc.c

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

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

my_read.c

Remove configuration preprocessor symbols 'THREAD'

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

my_redel.c

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

2010-07-20 16:30:10 -03:00

my_rename.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:13:30 -03:00

my_seek.c

Manual merge with mysql-5.1-bugteam.

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

my_sleep.c

WL#5486: Remove code for unsupported platforms

2010-07-15 08:13:30 -03:00

my_static.c

Remove configuration preprocessor symbols 'THREAD'

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

my_static.h

WL#5498: Remove dead and unused source code

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

my_symlink2.c

Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines

2007-11-12 15:26:37 +04:00

my_symlink.c

Fix for bug#48451: my_seek and my_tell ignore MY_WME flag

2010-12-09 12:59:12 +03:00

my_sync.c

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

2010-10-19 15:05:25 -02:00

my_thr_init.c

Bug#42054: SELECT CURDATE() is returning bad value

2011-01-12 18:36:39 -02:00

my_timer_cycles.il

WL#2373 Use cycle counter for timing

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

my_wincond.c

A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock

2010-10-04 13:03:11 +02:00

my_windac.c

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

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

my_winerr.c

This is the downport of

2009-09-11 22:26:35 +02:00

my_winfile.c

Bug#55629 5.5.x goes into infinite loop and high cpu after

2010-10-05 14:18:16 +02:00

my_winthread.c

A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock

2010-10-04 13:03:11 +02:00

my_write.c

Remove configuration preprocessor symbols 'THREAD'

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

mysys_priv.h

Bug#42054: SELECT CURDATE() is returning bad value

2011-01-12 18:36:39 -02:00

ptr_cmp.c

Bug #58699 cannot build with gcc dbg on solaris

2010-12-21 13:00:26 +01:00

queues.c

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

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

rijndael.c

WL#5498: Remove dead and unused source code

2010-07-23 17:09:27 -03:00

sha1.c

Bug #56427 : Replace copyright notice removed from SHA1 code

2010-10-05 17:03:04 +03:00

stacktrace.c

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

2010-11-30 21:20:32 -02:00

string.c

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

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

test_charset.c

WL#5498: Remove dead and unused source code

2010-07-23 17:09:27 -03:00

test_dir.c

…

test_xml.c

…

testhash.c

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

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

thr_alarm.c

Remove configuration preprocessor symbols 'THREAD'

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

thr_lock.c

Remove configuration preprocessor symbols 'THREAD'

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

thr_mutex.c

Remove configuration preprocessor symbols 'THREAD'

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

thr_rwlock.c

Remove configuration preprocessor symbols 'THREAD'

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

tree.c

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

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

typelib.c

Fix C++ style comments, they cause syntax errors in C file.

2010-03-13 22:17:47 +01:00