Alexey Kopytov f10885675c Manual merge of mysql-trunk into mysql-trunk-merge. ...

Conflicts:

Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/Makefile.am
Text conflict in mysql-test/collections/default.daily
Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result
Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test
Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test
Text conflict in mysys/charset.c
Text conflict in sql/field.cc
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_func.cc
Text conflict in sql/log.cc
Text conflict in sql/log_event.cc
Text conflict in sql/log_event_old.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/rpl_utility.cc
Text conflict in sql/rpl_utility.h
Text conflict in sql/set_var.cc
Text conflict in sql/share/Makefile.am
Text conflict in sql/sql_delete.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_table.cc
Text conflict in storage/example/ha_example.h
Text conflict in storage/federated/ha_federated.cc
Text conflict in storage/myisammrg/ha_myisammrg.cc
Text conflict in storage/myisammrg/myrg_open.c

2010-03-24 18:03:44 +03:00

..

array.c

Fix for a few assorted compiler warnings.

2009-08-28 12:06:59 -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

Manual merge of mysql-trunk into mysql-trunk-merge.

2010-03-24 18:03:44 +03:00

checksum.c

Bug#29125 Windows Server X64: so many compiler warnings

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

CMakeLists.txt

Fix BUILD/compile-pentium64-xxx scripts, when ccache is present.

2010-02-22 20:55:27 +01:00

default_modify.c

This is the downport of

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

default.c

Manual merge from mysql-trunk-merge.

2010-02-24 16:52:27 +03:00

errors.c

Backport of:

2009-11-24 16:54:59 +03:00

hash.c

Merge next-mr -> next-4284.

2010-02-02 16:58:15 +03:00

lf_alloc-pin.c

WL#3230 concurrent hash

2009-11-17 19:31:40 -07:00

lf_dynarray.c

WL#3230 concurrent hash

2009-11-17 19:31:40 -07:00

lf_hash.c

WL#3230 concurrent hash

2009-11-17 19:31:40 -07:00

list.c

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

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

make-ccc

Remove unused (and incorrect) my_lread() and my_lwrite()

2006-09-14 23:29:44 -06:00

make-conf.c

Many files:

2006-12-23 20:17:15 +01:00

Makefile.am

WL#2373 Use cycle counter for timing

2009-11-24 16:36:31 -07: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_brkhant.c

Many files:

2006-12-23 20:17:15 +01:00

mf_cache.c

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

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

mf_dirname.c

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

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

mf_fn_ext.c

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

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

mf_format.c

BUG#43949 Initialization of slave produces a warning message in Valgrind

2009-04-19 02:21:33 +01:00

mf_getdate.c

Merge from 5.0-bugteam

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

mf_iocache2.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

mf_iocache.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

mf_keycache.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

mf_keycaches.c

Backport of:

2009-10-14 20:37:38 +04:00

mf_loadpath.c

Backport of:

2009-11-24 16:54:59 +03:00

mf_pack.c

Manual merge.

2009-12-18 16:44:24 -02:00

mf_path.c

Backport of:

2009-11-24 16:54:59 +03:00

mf_qsort2.c

Many files:

2006-12-23 20:17:15 +01:00

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

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

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

mf_same.c

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

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

mf_sort.c

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint

2007-10-18 14:32:43 +04:00

mf_soundex.c

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

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

mf_tempdir.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

mf_tempfile.c

Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1

2007-10-11 18:07:40 +03:00

mf_unixpath.c

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

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

mf_util.c

Many files:

2006-12-23 20:17:15 +01:00

mf_wcomp.c

Many files:

2006-12-23 20:17:15 +01:00

mf_wfile.c

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

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

mulalloc.c

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

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

my_access.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_aes.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

my_alarm.c

Many files:

2006-12-23 20:17:15 +01:00

my_alloc.c

Backport of Bug#15192 to mysql-next-mr

2009-11-10 18:31:28 -02:00

my_append.c

Backport of:

2009-11-24 16:54:59 +03:00

my_atomic.c

WL#2595 kernel-independent atomic operations

2009-11-17 17:11:32 -07:00

my_bit.c

Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1

2007-10-11 18:07:40 +03:00

my_bitmap.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_chsize.c

This is the downport of

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

my_clock.c

Backport of:

2009-11-24 16:54:59 +03:00

my_compress.c

Bug#29125 Windows Server X64: so many compiler warnings

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

my_conio.c

Bug#29125 Windows Server X64: so many compiler warnings

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

my_copy.c

Backport of:

2009-11-24 16:54:59 +03:00

my_crc32.c

Many files:

2006-12-23 20:17:15 +01:00

my_create.c

WL#5161 : Cross-platform build with CMake

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

my_delete.c

Manual resolving for the following files

2009-12-01 21:07:18 +02:00

my_div.c

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

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

my_dup.c

This is the downport of

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

my_error.c

WL#4903 Plugin Service API part I

2009-11-02 21:05:42 +01:00

my_file.c

This is the downport of

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

my_fopen.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_fstream.c

Backport of:

2009-11-24 16:54:59 +03:00

my_gethostbyname.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_gethwaddr.c

fix compile error. definition of VOID in trunk still conflicts with windows headers. that was fixed in 6.0

2009-09-13 19:38:06 +02:00

my_getncpus.c

WL#2595 kernel-independent atomic operations

2009-11-17 17:11:32 -07:00

my_getopt.c

A follow-up on WL#5154 and WL#5182: remove forgotten options.

2010-03-03 22:22:02 +03:00

my_getpagesize.c

Many files:

2006-12-23 20:17:15 +01:00

my_getsystime.c

merge

2009-12-19 03:21:49 +01:00

my_getwd.c

Backport of:

2009-11-24 16:54:59 +03:00

my_handler_errors.h

WL#5016: Fix header file include guards

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

my_handler.c

Fix AIX error during compile in my_handler (pointer to data is used, while pointer to function is expected).

2010-01-19 18:22:51 +01:00

my_init.c

Manual merge of mysql-trunk into mysql-trunk-merge.

2010-03-24 18:03:44 +03:00

my_largepage.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_lib.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_libwrap.c

Many files:

2006-12-23 20:17:15 +01:00

my_lock.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_lockmem.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_malloc.c

Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

2007-08-29 19:20:18 +04:00

my_memmem.c

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

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

my_messnc.c

WL#2110 (SIGNAL)

2009-09-10 03:18:29 -06:00

my_mkdir.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_mmap.c

This is the downport of

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

my_net.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_netware.c

Many files:

2006-12-23 20:17:15 +01: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

my_once.c: clarify the comment

2009-12-26 21:55:32 +01:00

my_open.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_port.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

my_pread.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_pthread.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_quick.c

This is the downport of

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

my_rdtsc.c

remove use of undocumented __sparcv8plus - this macro does not seem to be defined anymore with Sun Studio 12

2010-02-14 14:32:27 +01:00

my_read.c

This is the downport of

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

my_realloc.c

Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1

2007-10-11 18:07:40 +03:00

my_redel.c

Backport of:

2009-11-24 16:54:59 +03:00

my_rename.c

Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1

2007-10-11 18:07:40 +03:00

my_seek.c

This is the downport of

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

my_sleep.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

my_static.c

Merge next-mr -> next-4284.

2009-12-15 21:45:22 +03:00

my_static.h

WL#5016: Fix header file include guards

2009-09-23 23:32:31 +02: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

Bug#39102 valgrind build does not compile in realpath, which make DATA/INDEX DIR fail

2008-10-27 19:25:11 +04:00

my_sync.c

Manual merge from mysql-trunk.

2009-12-11 12:39:38 +03:00

my_thr_init.c

Bug #50362 comp_err crashes during compilation on FreeBSD.

2010-01-20 14:04:17 +01:00

my_timer_cycles.il

WL#2373 Use cycle counter for timing

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

my_vle.c

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

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

my_wincond.c

A follow up for the fix for Bug#35164 (remove priorities on Windows).

2009-11-23 20:08:37 +03:00

my_windac.c

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

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

my_winerr.c

This is the downport of

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

my_winfile.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

my_winthread.c

merge

2009-12-19 14:11:48 +01:00

my_write.c

This is the downport of

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

mysys_priv.h

merge

2010-01-11 17:46:16 +01:00

ptr_cmp.c

WL#5105, review fix

2009-11-20 20:01:43 +01:00

queues.c

Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>

2008-02-18 23:29:39 +01:00

rijndael.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

safemalloc.c

WL#4738 streamline/simplify @@variable creation process

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

sha1.c

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

2007-01-22 14:04:40 +02:00

stacktrace.c

Manual merge from mysql-trunk-merge.

2009-12-16 21:02:21 +03:00

string.c

Bug#29125 Windows Server X64: so many compiler warnings

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

test_charset.c

Fix doxygen warnings.

2007-08-15 17:43:08 +04:00

test_dir.c

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

test_fn.c

Many files:

2006-12-23 20:17:15 +01:00

test_xml.c

Many files:

2006-12-23 20:17:15 +01:00

testhash.c

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

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

thr_alarm.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

thr_lock.c

Followup to Bug#45225 Locking: hang if drop table with no timeout

2010-02-15 13:11:20 +01:00

thr_mutex.c

WL#2360 Performance schema

2009-12-09 20:19:51 -07:00

thr_rwlock.c

Fix for bug #51105 "MDL deadlock in rqg_mdl_stability test

2010-02-28 07:35:09 +03:00

tree.c

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

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

trie.c

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

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

typelib.c

Fix various compiler/OS compatibility errors

2010-01-19 16:31:21 +01:00