mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/include
History
unknown 380690316f Merge mysql.com:/home/mysql_src/mysql-5.0-van 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).


configure.in:
  Auto merged
mysql-test/r/ndb_charset.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/base64.c:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  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
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
storage/ndb/tools/ndb_size.tmpl:
  Auto merged
mysql-test/t/disabled.def:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  used "ul", Pekka said he'll fix
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  used "ul", Pekka said he'll fix
2005-11-19 10:43:28 +01:00
..
.cvsignore
base64.h WL#2835: Base64 mysys functions 2005-10-14 01:14:23 +02:00
config-netware.h 4.1->5.0 merge 2005-10-29 02:36:57 +04:00
config-os2.h
config-win.h config-win.h: 2005-11-14 04:07:24 +02:00
decimal.h A lot of fixes to Precision math 2005-05-05 20:06:49 +05:00
errmsg.h A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work" 2005-05-16 18:27:21 +04:00
ft_global.h WL#2575 - Fulltext: Parser plugin for FTS 2005-11-06 13:13:06 +01:00
hash.h Followup: rename the declaration (hash_reset -> my_hash_reset) 2005-01-11 13:57:07 +03:00
heap.h WL #528: Faster free_tmp_table 2005-11-06 08:29:03 +01: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 of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree) 2005-11-05 13:20:35 +02:00
m_string.h Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp 2005-10-13 18:23:53 +03:00
Makefile.am Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree) 2005-11-05 13:20:35 +02: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 Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree) 2005-11-05 13:20:35 +02:00
my_bitmap.h Reapplied portability changes, from changesets by kent, joerg and msvensson 2005-11-06 02:19:51 +01:00
my_dbug.h Fixed bug from last push 2005-05-18 21:12:59 +03:00
my_dir.h
my_getopt.h Merge with 4.0 2004-09-01 04:12:09 +03:00
my_global.h Merge mysql.com:/home/mysql_src/mysql-5.0 2005-11-18 16:38:01 +01: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 BUG#7384 IM fails to compile on Solaris. 2004-12-18 03:21:20 +03:00
my_no_pthread.h
my_nosys.h
my_pthread.h Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash 2005-11-15 21:57:02 +01:00
my_semaphore.h
my_sys.h Fixes bug #13377. my_open() & my_create() functions changed to use 2005-11-14 16:01:10 +03:00
my_time.h Fixes during review of new pushed code 2005-07-31 12:49:55 +03:00
my_tree.h after merge fixes 2004-03-18 00:09:13 +02:00
my_trie.h WL#2466 - Fulltext: "always-index" words 2005-06-07 21:17:09 +05:00
my_xml.h
myisam.h WL#2575 - Fulltext: Parser plugin for FTS 2005-11-06 13:13:06 +01:00
myisammrg.h key_cmp -> key_cmp_if_same 2004-05-16 14:48:32 +03:00
myisampack.h Casted all macro arguments, 2004-07-28 21:46:22 +02:00
mysql.h Merge mysql.com:/home/jimw/my/mysql-5.0-11787 2005-09-03 09:34:34 -07:00
mysql_com.h Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +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 Show all generated warnings in SHOW ERROR 2005-02-24 23:33:42 +02:00
plugin.h Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree) 2005-11-05 13:20:35 +02:00
queues.h Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
raid.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
rijndael.h
sha1.h
sql_common.h Remove stale declaration, fix a typo in comment. 2004-10-15 22:03:11 +04:00
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
thr_alarm.h Added patches from Novell 2004-05-25 22:00:14 +03:00
thr_lock.h Merge mysql.com:/home/my/mysql-4.1 2005-07-28 17:09:54 +03:00
typelib.h Bug#6202: ENUMs are not case sensitive even if declared BINARY 2004-10-25 17:51:26 +05:00
violite.h Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-09-12 17:00:50 -07:00