Luis Soares df8543868d merge: 5.1 -> 5.1-rpl ... conflicts: Text conflict in client/mysqltest.cc Text conflict in mysql-test/include/wait_until_connected_again.inc Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/r/events_bugs.result Text conflict in mysql-test/r/log_state.result Text conflict in mysql-test/r/myisam_data_pointer_size_func.result Text conflict in mysql-test/r/mysqlcheck.result Text conflict in mysql-test/r/query_cache.result Text conflict in mysql-test/r/status.result Text conflict in mysql-test/suite/binlog/r/binlog_index.result Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_packet.result Text conflict in mysql-test/suite/rpl/t/rpl_packet.test Text conflict in mysql-test/t/disabled.def Text conflict in mysql-test/t/events_bugs.test Text conflict in mysql-test/t/log_state.test Text conflict in mysql-test/t/myisam_data_pointer_size_func.test Text conflict in mysql-test/t/mysqlcheck.test Text conflict in mysql-test/t/query_cache.test Text conflict in mysql-test/t/rpl_init_slave_func.test Text conflict in mysql-test/t/status.test		2009-01-23 13:22:05 +01:00
..
.cvsignore
array.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
base64.c	BUG#28884 - maybe a problem with malloc into base64.c	2008-01-15 16:23:14 +04:00
ChangeLog
charset-def.c
charset.c	Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>	2008-02-18 23:29:39 +01:00
checksum.c
CMakeLists.txt	Bug#37003 Tests sporadically crashes with embedded server	2008-06-18 13:17:15 -03:00
default.c	Up-merge 5.0.66a-release changes (via 5.0) into 5.1.	2008-07-17 11:45:08 -06:00
default_modify.c
errors.c	Fix for Bug#16902.	2008-06-16 10:05:00 +02:00
hash.c	Added "Sun Microsystems, Inc." to copyright headers on files modified	2008-11-10 21:21:49 +01:00
list.c
make-ccc
make-conf.c
Makefile.am	Bug#37003 Tests sporadically crashes with embedded server	2008-06-18 13:17:15 -03:00
md5.c
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
mf_cache.c
mf_dirname.c
mf_fn_ext.c
mf_format.c
mf_getdate.c
mf_iocache.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_iocache2.c
mf_keycache.c	Bug#37302 (missing DBUG_RETURN macro in function "find_key_block" (5.0 only))	2008-08-11 15:08:12 -06:00
mf_keycaches.c
mf_loadpath.c
mf_pack.c	Merge from 5.0-bugteam local.	2008-08-18 13:11:55 -04:00
mf_path.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_qsort2.c
mf_radix.c
mf_same.c
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
mf_strip.c
mf_tempdir.c	Bug#38293 Libmysqld crash in mysql_library_init if language file missing	2008-11-19 13:57:23 +04: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
mf_util.c
mf_wcomp.c
mf_wfile.c
mulalloc.c
my_access.c
my_aes.c
my_alarm.c
my_alloc.c	Bug#38296 (low memory crash with many conditions in a query)	2008-08-11 10:10:00 -06:00
my_append.c
my_atomic.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_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	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_chsize.c
my_clock.c
my_compress.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_conio.c
my_copy.c
my_crc32.c
my_create.c	Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main	2008-03-13 23:35:52 +02:00
my_delete.c	Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main	2007-12-07 22:27:48 +02:00
my_div.c
my_dup.c
my_error.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_file.c
my_fopen.c
my_fstream.c
my_gethostbyname.c
my_gethwaddr.c
my_getncpus.c
my_getopt.c	Bug#31177: Server variables can't be set to their current values	2009-01-12 06:32:49 +01:00
my_getpagesize.c
my_getsystime.c	Reverted wrong patch, fix for Windows 32bit build.	2008-02-26 18:44:04 +02:00
my_getwd.c
my_handler.c	Fixed problem with non-synchronous error lists	2008-03-28 18:45:03 +02:00
my_handler_errors.h	Fixed problem with non-synchronous error lists	2008-03-28 18:45:03 +02:00
my_init.c	merge: 5.1 -> 5.1-rpl	2009-01-23 13:22:05 +01:00
my_largepage.c
my_lib.c	Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint	2007-10-18 14:32:43 +04:00
my_libwrap.c
my_lock.c
my_lockmem.c
my_malloc.c
my_memmem.c
my_messnc.c
my_mkdir.c
my_mmap.c
my_net.c
my_netware.c
my_new.cc
my_once.c
my_open.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_port.c
my_pread.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_pthread.c
my_quick.c
my_read.c
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
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
my_sleep.c
my_static.c	Bug#35616: memory overrun on 64-bit linux on setting large values for keybuffer-size	2008-08-19 15:56:41 +02:00
my_static.h	Bug#35616: memory overrun on 64-bit linux on setting large values for keybuffer-size	2008-08-19 15:56:41 +02: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_symlink2.c	Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines	2007-11-12 15:26:37 +04:00
my_sync.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_thr_init.c	Bug#38522: 5 seconds delay when closing application using embedded server	2008-12-04 19:41:53 +01:00
my_vle.c
my_wincond.c
my_windac.c
my_winthread.c
my_write.c	Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint	2007-10-25 08:22:14 +04:00
mysys_priv.h
ptr_cmp.c
queues.c	Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>	2008-02-18 23:29:39 +01:00
rijndael.c
safemalloc.c	Bug#35616: memory overrun on 64-bit linux on setting large values for keybuffer-size	2008-08-21 06:48:28 +02:00
sha1.c
stacktrace.c	merge fix from 5.0-bugteam	2008-09-16 15:23:07 +02:00
string.c
test_charset.c
test_dir.c
test_fn.c
test_xml.c
testhash.c
thr_alarm.c	Avoid compilation problem on AIX.	2008-04-28 13:41:12 -04:00
thr_lock.c	Merge Bug#36579 into mysql-5.1-bugteam	2008-08-25 10:57:34 -03:00
thr_mutex.c	Bug#38941: fast mutexes in MySQL 5.1 have mutex contention when calling random()	2008-10-15 19:21:00 -03:00
thr_rwlock.c
tree.c
trie.c
typelib.c