mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/include
History
unknown f1af1a5d7e Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge


BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Auto merged
BitKeeper/deleted/.del-libmysqld_ia64.dsp~578ab58d5f281d2a:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c:
  Auto merged
BitKeeper/deleted/.del-mysqldemb_ia64.dsp~c7f7d75d542393cd:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax_ia64.dsp~25006b7cc0725ad1:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
include/my_base.h:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
mysql-test/r/federated.result:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
mysql-test/t/federated.test:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
sql/field.cc:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
sql/ha_federated.cc:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
sql/handler.cc:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
tests/mysql_client_test.c:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
2006-08-08 09:01:32 -07:00
..
atomic support for xadd emulation, workaround for Darwin 2006-06-29 15:39:53 +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 Cset exclude: msvensson@shellback.|ChangeSet|20060411181854|53834 2006-06-15 14:55:01 +02: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
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 support for xadd emulation, workaround for Darwin 2006-06-29 15:39:53 +02:00
my_base.h Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 2006-08-08 09:01:32 -07: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
my_getopt.h
my_global.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-13 22:09:36 +04: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 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
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
mysql.h Merge mysql.com:/home/hf/work/mysql-4.1.mrg 2006-07-18 14:52:29 +05: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
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@192.168.21.1:mysql-4.1 2006-07-13 22:32:18 +05: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 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