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
base64.c
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
CMakeLists.txt	Fix BUILD/compile-pentium64-xxx scripts, when ccache is present.	2010-02-22 20:55:27 +01:00
default.c	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
default_modify.c
errors.c
hash.c	Merge next-mr -> next-4284.	2010-02-02 16:58:15 +03:00
lf_alloc-pin.c
lf_dynarray.c
lf_hash.c
list.c
make-ccc
make-conf.c
Makefile.am
md5.c
mf_arr_appstr.c
mf_brkhant.c
mf_cache.c
mf_dirname.c
mf_fn_ext.c
mf_format.c
mf_getdate.c
mf_iocache.c
mf_iocache2.c
mf_keycache.c
mf_keycaches.c
mf_loadpath.c
mf_pack.c
mf_path.c
mf_qsort.c
mf_qsort2.c
mf_radix.c
mf_same.c
mf_sort.c
mf_soundex.c
mf_tempdir.c
mf_tempfile.c
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
my_append.c
my_atomic.c
my_bit.c
my_bitmap.c
my_chsize.c
my_clock.c
my_compress.c
my_conio.c
my_copy.c
my_crc32.c
my_create.c
my_delete.c
my_div.c
my_dup.c
my_error.c
my_file.c
my_fopen.c
my_fstream.c
my_gethostbyname.c
my_gethwaddr.c
my_getncpus.c
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
my_getsystime.c
my_getwd.c
my_handler.c
my_handler_errors.h
my_init.c	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
my_largepage.c
my_lib.c
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
my_port.c
my_pread.c
my_pthread.c
my_quick.c
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
my_realloc.c
my_redel.c
my_rename.c
my_seek.c
my_sleep.c
my_static.c
my_static.h
my_symlink.c
my_symlink2.c
my_sync.c
my_thr_init.c
my_timer_cycles.il
my_vle.c
my_wincond.c
my_windac.c
my_winerr.c
my_winfile.c
my_winthread.c
my_write.c
mysys_priv.h
ptr_cmp.c
queues.c
rijndael.c
safemalloc.c
sha1.c
stacktrace.c
string.c
test_charset.c
test_dir.c
test_fn.c
test_xml.c
testhash.c
thr_alarm.c
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
thr_rwlock.c	Fix for bug #51105 "MDL deadlock in rqg_mdl_stability test	2010-02-28 07:35:09 +03:00
tree.c
trie.c
typelib.c