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


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
mysql-test/r/ps.result:
  SCCS merged
2006-11-02 03:24:11 +03:00
..
atomic support for xadd emulation, workaround for Darwin 2006-06-29 15:39:53 +02:00
mysql Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 2006-10-05 00:41:29 -07:00
.cvsignore
base64.h BUG#19459 (BINLOG RBR command does not lock tables correctly causing 2006-10-02 15:05:05 +02:00
config-netware.h Merge moonbone.local:/work/tmp_merge-5.0-mysql 2006-08-29 18:58:50 +04:00
config-win.h Windows 64bit fixes 2006-09-21 15:19:20 +02:00
decimal.h Bug#16172 DECIMAL data type processed incorrectly 2006-08-08 16:03:42 +05:00
errmsg.h errmsg.txt: 2006-09-07 13:52:30 +10:00
ft_global.h
hash.h Small cleanup in code handling stored routines/table prelocking. 2006-11-01 15:41:48 +03:00
heap.h This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). 2006-09-30 12:49:46 -07:00
help_end.h
help_start.h
keycache.h
m_ctype.h Merge mysql.com:/home/hf/mysql-5.0.mrg 2006-10-12 15:42:05 +05:00
m_string.h Merge rama.(none):/home/jimw/my/mysql-5.0-clean 2006-09-28 20:20:33 -07:00
Makefile.am Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 2006-06-25 09:59:34 -04:00
md5.h
my_aes.h
my_alarm.h
my_alloc.h
my_atomic.h compile-time definition of intptr type 2006-08-01 14:02:19 +02:00
my_base.h Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-10-19 16:43:46 +02: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 Fixes for crashes and test failures 2006-09-01 14:34:37 +02:00
my_dir.h
my_getopt.h
my_global.h thr_alarm.c, thr_lock.c, my_global.h: 2006-10-12 19:43:47 +02:00
my_handler.h After merge fixes 2006-06-30 20:07:33 +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
my_net.h Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2006-09-15 18:19:09 -04: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
my_sys.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-10-19 10:15:08 +02:00
my_time.h Remove direct mapping of enum interval_type to mysql.event.interval_field 2006-10-10 17:59:46 +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
my_uctype.h
my_user.h
my_vle.h
my_xml.h
myisam.h Merge chilla.local:/home/mydev/mysql-5.0-bug8283 2006-10-09 22:24:55 +02: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
mysql.h Bug #23427: incompatible ABI change in 5.0.26? 2006-10-24 19:05:11 +02:00
mysql_com.h Merge siva.hindu.god:/usr/home/tim/m/bk/g51 2006-09-29 17:01:16 -06:00
mysql_embed.h
mysql_time.h
mysql_version.h.in
mysys_err.h After merge fixes 2006-05-04 06:28:24 +03:00
queues.h
rijndael.h
sha1.h
sql_common.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-08-02 14:13:01 +04:00
sslopt-case.h
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
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
typelib.h
violite.h Re-apply missing changeset, orignally pushed by elliot 2006-06-06 14:21:07 +03:00