Alfranio Correia 5dcb0e447f merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge ... Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test Text conflict in mysql-test/r/mysqlbinlog2.result Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result Text conflict in mysql-test/suite/rpl/r/rpl_udf.result Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test Text conflict in sql/field.h 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/mysql_priv.h Text conflict in sql/share/errmsg.txt Text conflict in sql/sp.cc Text conflict in sql/sql_acl.cc Text conflict in sql/sql_base.cc Text conflict in sql/sql_class.h Text conflict in sql/sql_db.cc Text conflict in sql/sql_delete.cc Text conflict in sql/sql_insert.cc Text conflict in sql/sql_lex.cc Text conflict in sql/sql_lex.h Text conflict in sql/sql_load.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_update.cc Text conflict in sql/sql_view.cc Conflict adding files to storage/innobase. Created directory. Conflict because storage/innobase is not versioned, but has versioned children. Versioned directory. Conflict adding file storage/innobase. Moved existing file to storage/innobase.moved. Conflict adding files to storage/innobase/handler. Created directory. Conflict because storage/innobase/handler is not versioned, but has versioned children. Versioned directory. Contents conflict in storage/innobase/handler/ha_innodb.cc		2010-01-07 15:39:11 +00:00
..
atomic	Force use of c-register in CAS instruction on x86-32 bit architecture, b-register used for push and pop, so don't want to give compile the chance to choose the wrong register	2009-12-21 14:08:11 +01:00
mysql	WL#2360 Performance schema	2009-11-30 17:49:15 -07:00
base64.h	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-23 20:20:40 +01:00
config-netware.h	Backport of:	2009-11-23 19:57:31 +03:00
config-win.h	Backport of WL#798 (MySQL IPv6 support) from 6.0.	2009-11-25 13:53:23 +03:00
decimal.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
errmsg.h	Merge from mysql-next-mr.	2009-10-28 10:55:44 +03:00
ft_global.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
hash.h	WL#5137, Remove hash calculation from LOCK_open in open_table	2009-11-20 19:27:54 +01:00
heap.h	WL#2360 Performance schema	2009-12-04 18:26:15 -07:00
help_end.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
help_start.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
keycache.h	WL#2360 Performance schema	2009-12-09 20:19:51 -07:00
lf.h	WL#3230 concurrent hash	2009-11-17 19:31:40 -07:00
m_ctype.h	WL#751 Error message construction, backport	2009-10-15 17:23:43 +05:00
m_string.h	Manual merge of mysql-next-mr-runtime upstream.	2009-11-19 21:48:08 -02:00
Makefile.am	WL#2360 Performance schema	2009-11-30 17:49:15 -07:00
my_aes.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
my_alarm.h	Backport of:	2009-11-24 16:54:59 +03:00
my_alloc.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
my_atomic.h	Yet one more fix for Solaris atomics in builds	2009-12-19 18:24:52 +01:00
my_attribute.h	Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h	2007-04-12 00:43:25 +02:00
my_base.h	Backporting revision from 6.0:	2009-10-16 19:21:54 +04:00
my_bit.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
my_bitmap.h	WL#2360 Performance schema	2009-12-09 20:19:51 -07:00
my_dbug.h	merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640	2009-11-06 18:35:04 +02:00
my_dir.h	This is the downport of	2009-09-11 22:26:35 +02:00
my_getopt.h	Bug#39289 libmysqld.a calls exit() upon error	2008-10-27 13:57:59 +04:00
my_global.h	Manual merge from mysql-trunk-merge.	2009-12-17 22:16:54 +03:00
my_handler.h	Backporting WL#4164 Two-byte collation IDs	2009-10-15 15:17:32 +05:00
my_libwrap.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
my_list.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
my_md5.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
my_net.h	Backport of WL#798 (MySQL IPv6 support) from 6.0.	2009-11-25 13:53:23 +03:00
my_no_pthread.h	Manual merge from mysql-trunk-merge.	2009-12-16 21:02:21 +03:00
my_nosys.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
my_pthread.h	Manual merge from mysql-next-mr.	2009-12-17 23:02:52 +03:00
my_rdtsc.h	WL#2373 Use cycle counter for timing	2009-11-24 16:36:31 -07:00
my_stacktrace.h	Merge from 5.0	2009-12-06 19:01:11 +01:00
my_sys.h	Manual merge from mysql-next-mr.	2009-12-17 23:02:52 +03:00
my_time.h	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294	2008-04-03 13:14:57 -04:00
my_tree.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
my_trie.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
my_uctype.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
my_user.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
my_vle.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
my_xml.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
myisam.h	Fix inconsistently defined THR_LOCK_myisam_mmap	2009-12-20 21:20:11 +00: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.h	Manual merge from mysql-trunk.	2009-12-11 12:39:38 +03:00
mysql.h.pp	Manual merge from mysql-trunk.	2009-12-11 12:39:38 +03:00
mysql_com.h	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2010-01-07 15:39:11 +00:00
mysql_embed.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
mysql_time.h	my_strtoll10-x86.s:	2006-12-31 01:02:27 +01:00
mysql_version.h.in	Bug #15327: configure: --with-tcp-port option being partially ignored	2007-09-13 16:19:46 +02:00
mysys_err.h	WL#2936	2007-03-02 08:43:45 -08: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
probes_mysql_nodtrace.h	Fixed DTrace-related build failures.	2008-12-23 12:05:30 +03:00
queues.h	Bug #31890 Partitions: ORDER BY DESC in InnoDB not working.	2007-11-14 22:20:31 +04:00
rijndael.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
service_versions.h	WL#4903 Plugin Service API part I	2009-11-02 21:05:42 +01:00
sha1.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
sql_common.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
sslopt-case.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
sslopt-longopts.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
sslopt-vars.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
t_ctype.h	Many files:	2006-12-23 20:17:15 +01:00
thr_alarm.h	fixes for build failures due to my yesterday's changeset forbidding	2008-02-19 18:45:11 +01:00
thr_lock.h	WL#2360 Performance schema	2009-12-09 20:19:51 -07:00
typelib.h	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines	2007-04-27 19:09:39 +02:00
violite.h	Manual merge from mysql-trunk-merge.	2009-12-12 23:38:59 +03:00