mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/include
History
unknown 1f89605e4b Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
  Use original file (my_user.c was already added in 5.1)
mysql-test/mysql-test-run.pl:
  Manual merge
sql/handler.h:
  Manual merge
sql/share/errmsg.txt:
  Align error messages with 5.0
sql/sql_table.cc:
  Manual merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
  No changes
2006-05-04 15:58:30 +03:00
..
mysql WL#3201 additional post-review fixes 2006-05-02 04:11:00 -07:00
.cvsignore
base64.h WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
config-netware.h Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
config-win.h Merge mysql.com:/home/jimw/my/mysql-5.0-clean 2006-05-01 11:38:15 -07:00
decimal.h
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 mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 23:53:45 +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 UNIXWARE removal 2006-04-17 15:56:59 -07:00
Makefile.am Drop a number of OS2 specific files. 2006-04-10 17:48:19 -07: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_base.h Added support for key_block_size for key and table level (WL#602) 2006-05-03 15:59:17 +03:00
my_bitmap.h Added missing prototypes to mysys/my_bitmap.h 2006-04-11 20:31:02 +02:00
my_dbug.h Define USE_TLS when compiling libmysql.dll, to avoid crashing when 2006-03-22 09:55:26 +01:00
my_dir.h
my_getopt.h
my_global.h Merge mysql.com:/home/jimw/my/mysql-5.0-clean 2006-04-30 13:27:38 -07:00
my_handler.h Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +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 Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
my_no_pthread.h UNIXWARE removal 2006-04-17 15:56:59 -07:00
my_nosys.h
my_pthread.h UNIXWARE removal 2006-04-17 15:56:59 -07:00
my_semaphore.h
my_sys.h After merge fixes 2006-05-04 06:28:24 +03:00
my_time.h - fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON) 2006-01-18 20:41:22 +01:00
my_tree.h BUG#18160 - Memory-/HEAP Table endless growing indexes 2006-04-19 15:13:50 +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 Added support for key_block_size for key and table level (WL#602) 2006-05-03 15:59:17 +03:00
myisammrg.h
myisampack.h
mysql.h Backport fix for mysql client not using SSl library directly 2006-04-22 00:48:13 +02:00
mysql_com.h Merge BUG#15110 from 5.0 into 5.1. 2006-01-13 19:09:27 +03: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
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
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 Added support for key_block_size for key and table level (WL#602) 2006-05-03 15:59:17 +03:00