unknown e79249f81b Manual merge ... configure.in: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/partition.result: Auto merged mysql-test/r/partition_symlink.result: Auto merged mysql-test/t/func_misc.test: Auto merged mysql-test/t/partition.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/partition_info.cc: Auto merged sql/partition_info.h: Auto merged sql/rpl_rli.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_parse.cc: Manual merge. Needs later fix. New code in create table was not accepted. Needs to be added to mysql_create_table_no_lock().		2008-03-14 12:02:11 +01:00
..
atomic	Bug#33728 Atomic builtins	2008-01-11 20:34:36 -02:00
mysql	Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines	2008-03-07 13:46:29 -08:00
.cvsignore
base64.h
config-netware.h	Many files:	2007-07-23 23:54:55 +02:00
config-win.h	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge	2007-10-29 12:42:06 -04:00
decimal.h
errmsg.h
ft_global.h
hash.h
heap.h	Added support for 'internal temporary tables' in HEAP tables.	2007-07-25 01:58:12 +03:00
help_end.h
help_start.h
keycache.h	Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0. This is for bug #5731.	2007-08-29 20:45:04 +04:00
m_ctype.h	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	2007-08-14 00:22:34 +03:00
m_string.h	Merge mysql.com:/misc/mysql/31177/50-31177	2007-12-01 15:53:56 +01:00
Makefile.am	Post merge fix for BUG 33728	2008-01-11 21:34:23 -02:00
my_aes.h
my_alarm.h
my_alloc.h
my_atomic.h
my_attribute.h
my_base.h	Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl	2008-02-05 14:52:20 +01:00
my_bitmap.h	Bug#31552 Replication breaks when deleting rows from out-of-sync table	2007-12-12 12:14:59 +02:00
my_dbug.h
my_dir.h
my_getopt.h	Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>	2008-02-18 23:29:39 +01:00
my_global.h	Merge kaamos.(none):/data/src/mysql-5.1	2008-03-12 11:19:46 +03:00
my_handler.h
my_libwrap.h
my_list.h
my_md5.h
my_net.h
my_no_pthread.h
my_nosys.h
my_pthread.h	Merge moksha.local:/Users/davi/mysql/push/mysql-5.0-runtime	2007-10-09 09:48:49 -03:00
my_sys.h	Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>	2008-02-18 23:29:39 +01:00
my_time.h	Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>	2008-02-18 23:29:39 +01:00
my_tree.h
my_trie.h
my_uctype.h
my_user.h
my_vle.h
my_xml.h
myisam.h	Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris	2007-08-13 16:11:25 +03:00
myisammrg.h	Bug#30273 - merge tables: Can't lock file (errno: 155)	2007-12-11 15:32:10 +01:00
myisampack.h
mysql.h	Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0	2007-11-26 16:10:26 -02:00
mysql_com.h	Bug#34655 Compile error	2008-02-28 14:55:46 -03:00
mysql_embed.h	Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server	2007-11-18 00:32:06 +04:00
mysql_h.ic	Bug#34655 Compile error	2008-02-28 14:55:46 -03:00
mysql_time.h
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
queues.h	Bug #31890 Partitions: ORDER BY DESC in InnoDB not working.	2007-11-14 22:20:31 +04:00
rijndael.h
sha1.h
sql_common.h	Merge mysql.com:/home/hf/work/25097/my50-25097	2008-02-27 13:00:59 +04:00
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
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	Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>	2008-02-18 23:29:39 +01:00
typelib.h
violite.h