Alexander Nozdrin 522d9ac30f Auto-merge from mysql-trunk-bugfixing. ... Due to a BZR bug, that merge was done by the following command: bzr merge -r 'revid:tor.didriksen@sun.com-20100527074248-6qtv0p1ugy6o1hjo..' <mysql-trunk-bugfixing path>		2010-06-01 16:38:01 +04:00
..
atomic	Fix compiler warnings in my_atomic.h	2010-02-19 17:20:29 +03:00
mysql	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-04-30 00:33:06 +04:00
base64.h
CMakeLists.txt	merge, add plugin/audit_null/CMakeLists.txt	2010-01-26 05:39:48 +01:00
config-netware.h	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
config-win.h	Backporting WL#1213	2010-02-24 13:15:34 +04:00
decimal.h
errmsg.h	Merge from mysql-next-mr.	2009-10-28 10:55:44 +03:00
ft_global.h	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
hash.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02: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#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
lf.h	WL#3230 concurrent hash	2009-11-17 19:31:40 -07:00
m_ctype.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
m_string.h	Merge a change from mysql-5.1-innodb:	2010-05-20 14:43:06 +03:00
Makefile.am	Another incarnation of the patch for Bug#30708	2010-05-19 17:00:23 +04: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
my_atomic.h	Auto-merge from mysql-next-mr-bugfixing.	2010-02-23 18:49:21 +03:00
my_attribute.h
my_base.h	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03: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	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
my_dir.h	WL#5030: Splitting mysql_priv.h	2010-04-06 14:11:07 +02:00
my_getopt.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
my_global.h	Auto-merge from mysql-trunk.	2010-05-28 09:47:58 +04:00
my_handler.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
my_libwrap.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
my_list.h
my_md5.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
my_net.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
my_no_pthread.h	Manual merge from mysql-trunk-merge.	2009-12-16 21:02:21 +03:00
my_nosys.h
my_pthread.h	Backport: Remove unused and ancient files, functions, and facilities.	2010-05-28 19:13:31 -03:00
my_rdtsc.h	WL#2373 Use cycle counter for timing	2009-11-24 16:36:31 -07:00
my_stacktrace.h	Merging from 5.0-bugteam	2010-01-27 11:42:20 +01:00
my_sys.h	Auto-merge from mysql-trunk-bugfixing.	2010-06-01 16:38:01 +04:00
my_time.h	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
my_tree.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
my_trie.h
my_uctype.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
my_user.h
my_vle.h
my_xml.h
myisam.h	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01: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	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
mysql_com.h	Auto-merge from mysql-trunk.	2010-05-28 09:47:58 +04:00
mysql_embed.h	Backport of:	2010-04-13 19:04:45 +04:00
mysql_time.h
mysql_version.h.in
mysys_err.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
password.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02: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	Re-adding 'include/probes_mysql_nodtrace.h' removed by accident	2010-02-17 14:37:55 +03:00
queues.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02: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
sha2.h	Post-fix for Bug#13174.	2010-04-13 20:10:51 +04:00
sql_common.h	WL#5016: Fix header file include guards	2009-09-23 23:32:31 +02:00
sslopt-case.h	Backport of:	2010-04-13 19:04:45 +04:00
sslopt-longopts.h	Backport of:	2010-04-13 19:04:45 +04:00
sslopt-vars.h	Backport of:	2010-04-13 19:04:45 +04:00
t_ctype.h
thr_alarm.h	WL#5161 : Cross-platform build with CMake	2009-11-09 12:32:48 +01:00
thr_lock.h	Followup to Bug#45225 Locking: hang if drop table with no timeout	2010-02-15 13:11:20 +01:00
typelib.h	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
violite.h	Backport of:	2010-04-13 19:04:45 +04:00