mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/include
History
unknown 90d14d50a9 Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into  mysql.com:/home/hf/work/mysql-5.1.clean


include/my_time.h:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/my_decimal.cc:
  Auto merged
sql/my_decimal.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/type_newdecimal.result:
  SCCS merged
mysql-test/t/type_newdecimal.test:
  merging
sql/item.cc:
  merging
sql/item_subselect.cc:
  SCCS merged
sql/item_timefunc.h:
  merging
sql/sql_lex.cc:
  SCCS merged
sql/sql_select.h:
  merging
2006-11-08 19:09:39 +04: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 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 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 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 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 Fix incorrect spellings of "dropped" in source and tests. (Bug #12828) 2005-08-30 12:24:37 -07:00
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 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2006-10-11 10:01:43 +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 Rename rest() macro in my_list.h to list_rest(). (Bug #12327) 2005-08-09 18:02:36 -07:00
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 Merge mysql.com:/home/hf/work/mysql-5.0.clean 2006-11-08 19:09:39 +04: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 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 Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmt 2006-10-24 17:50:46 +05: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 WL#1034 update 2005-12-12 21:19:19 +01:00
rijndael.h
sha1.h A fix for Bug#13944 "libmysqlclient exporting sha1_result function": 2006-01-11 17:31:52 +03:00
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 WL #2604: Partition Management 2006-01-17 08:40:00 +01:00
typelib.h
violite.h Re-apply missing changeset, orignally pushed by elliot 2006-06-06 14:21:07 +03:00