mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/include
History
unknown dea988a048 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/parser.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/parser.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
mysql-test/r/udf.result:
  Manual merge
mysql-test/t/events_bugs.test:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge
2006-12-04 19:11:55 +01:00
..
atomic support for xadd emulation, workaround for Darwin 2006-06-29 15:39:53 +02:00
mysql This patch fixes the example engine, the example parser, and the example daemon to compile. AKA You can now test that the interface is actually working :) 2006-11-10 17:21:59 -08:00
.cvsignore
abi_check Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory> 2006-11-07 11:07:27 +01:00
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 Merge mysql.com:/home/my/mysql-5.0 2006-11-27 01:51:50 +02: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 Merge mysql.com:/home/my/mysql-5.0 2006-11-29 23:07:15 +02:00
help_end.h
help_start.h
keycache.h
m_ctype.h fix build failure introduced by 5.1-marvel merge 2006-12-01 14:25:32 +01: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 neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01: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 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016 2006-10-17 12:00:36 -04:00
my_dir.h
my_getopt.h
my_global.h Fixed portability issue in my_thr_init.c (was added in my last push) 2006-11-30 18:25:05 +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 bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
my_semaphore.h
my_sys.h Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 2006-12-04 19:11:55 +01:00
my_time.h Merge bk@192.168.21.1:mysql-5.1-opt 2006-11-17 19:01:35 +04:00
my_tree.h Merge mysql.com:/home/my/mysql-5.0 2006-11-30 22:38:12 +02: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 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 2006-10-24 21:05:35 +02:00
mysql_com.h Fixed compiler warnings (Mostly VC++): 2006-11-30 03:40:42 +02:00
mysql_embed.h
mysql_h.ic Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-11-03 14:40:52 +01:00
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