mariadb/include
unknown 26f0d13d01 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/federated.result:
  Manual merge.
mysql-test/t/federated.test:
  Manual merge.
sql/sql_insert.cc:
  Manual merge.
2006-07-13 00:18:59 +04:00
..
atomic atomic ops: 2006-06-17 16:20:39 +02:00
mysql Build fixes for Windows, Solaris, HPUX, AIX. 2006-06-24 07:45:23 +02:00
.cvsignore
base64.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
config-netware.h Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
config-win.h Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 2006-06-13 16:06:35 -04:00
decimal.h A lot of fixes to Precision math 2005-05-05 20:06:49 +05:00
errmsg.h Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
ft_global.h WL#2575 - Fulltext: Parser plugin for FTS 2005-11-06 13:13:06 +01:00
hash.h A fix for Bug#7209 "Client error with "Access Denied" on updates 2006-01-04 17:35:30 +03:00
heap.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
help_end.h Several fixes for Netware. 2005-08-24 22:03:34 +03:00
help_start.h Several fixes for Netware. 2005-08-24 22:03:34 +03:00
keycache.h Bug#12920 - key_read_requests counter appears to re-set 2005-09-14 13:18:16 +02:00
m_ctype.h Fix spelling in comments as requested by Osku 2006-05-02 09:13:58 -04:00
m_string.h Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN(). 2006-06-19 15:17:15 +04:00
Makefile.am Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 2006-06-25 09:59:34 -04:00
md5.h Update copyright 2001-12-06 14:10:51 +02:00
my_aes.h Made keyread (key scanning) a key specific attribute. 2002-06-19 00:22:30 +03:00
my_alarm.h Update copyright 2001-12-06 14:10:51 +02:00
my_alloc.h Fix incorrect spellings of "dropped" in source and tests. (Bug #12828) 2005-08-30 12:24:37 -07:00
my_atomic.h atomic ops: 2006-06-17 16:20:39 +02:00
my_base.h Merge mysql.com:/home/dlenev/mysql-5.0-bg18437-3 2006-07-02 02:12:53 +04:00
my_bitmap.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
my_dbug.h Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix 2006-05-16 14:34:35 +02:00
my_dir.h Fix for Bug #1952 2003-12-12 03:39:29 +03:00
my_getopt.h Merge with 4.0 2004-09-01 04:12:09 +03:00
my_global.h Merge april:devel/BitKeeper/mysql-5.0-engines 2006-06-19 19:58:55 +05:00
my_handler.h Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
my_libwrap.h Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper" 2006-06-21 18:35:19 +03:00
my_list.h Rename rest() macro in my_list.h to list_rest(). (Bug #12327) 2005-08-09 18:02:36 -07:00
my_net.h removing MSDOS defines and code 2006-05-08 14:50:13 -05:00
my_no_pthread.h UNIXWARE removal 2006-04-17 15:56:59 -07:00
my_nosys.h removing MSDOS defines and code 2006-05-08 14:50:13 -05:00
my_pthread.h Merge mysql.com:/home/jimw/my/mysql-5.0-clean 2006-05-19 19:07:33 -07:00
my_semaphore.h more #ifdef THREAD added 2003-04-30 12:32:43 +02:00
my_sys.h Correcting signature for my_strndup to be able to build on Windows 2006-07-07 15:59:17 +02:00
my_time.h Reorganize, physically the events code 2006-06-08 23:07:11 +02:00
my_tree.h Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-05-08 15:15:05 -05:00
my_trie.h WL#2466 - Fulltext: "always-index" words 2005-06-07 21:17:09 +05:00
my_uctype.h WL#1386 - CTYPE table for unicode character sets 2006-02-02 10:07:47 +04:00
my_user.h Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause 2006-01-11 02:07:40 +03:00
my_vle.h WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
my_xml.h Adding XPath support: ExtractValue and UpdateXML functions. 2005-12-21 17:13:52 +04:00
myisam.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
myisammrg.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
myisampack.h Casted all macro arguments, 2004-07-28 21:46:22 +02:00
mysql.h Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208 2006-04-26 22:24:25 +02:00
mysql_com.h Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster) 2006-06-14 11:08:36 +02:00
mysql_embed.h remove the rest of isam/merge references 2005-04-05 13:17:49 +02:00
mysql_time.h Fix for bug #6266 "Invalid DATETIME value is not handled properly". 2004-11-15 15:44:29 +03:00
mysql_version.h.in Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
mysys_err.h After merge fixes 2006-05-04 06:28:24 +03:00
queues.h WL#1034 update 2005-12-12 21:19:19 +01:00
rijndael.h Made keyread (key scanning) a key specific attribute. 2002-06-19 00:22:30 +03:00
sha1.h A fix for Bug#13944 "libmysqlclient exporting sha1_result function": 2006-01-11 17:31:52 +03:00
sql_common.h bug #20318 (ctype_ucs2_def test fails with embedded) 2006-06-19 22:11:01 +05:00
sslopt-case.h fixed so that --ssl and --skip-ssl works with the MySQL clients. 2002-09-17 23:46:53 +03:00
sslopt-longopts.h Merge mysql.com:/home/jimw/my/mysql-5.0-1039 2006-05-19 16:17:24 -07:00
sslopt-vars.h Merge mysql.com:/home/jimw/my/mysql-5.0-1039 2006-05-19 16:17:24 -07:00
t_ctype.h Update copyright 2001-12-06 14:10:51 +02:00
thr_alarm.h Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
thr_lock.h WL #2604: Partition Management 2006-01-17 08:40:00 +01:00
typelib.h Bug#6202: ENUMs are not case sensitive even if declared BINARY 2004-10-25 17:51:26 +05:00
violite.h Re-apply missing changeset, orignally pushed by elliot 2006-06-06 14:21:07 +03:00