mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-25 09:45:31 +02:00
Code Issues Projects Releases Packages Wiki Activity
mariadb/extra
History
unknown 2e5a6f9eaa Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
Docs/Makefile.am:
  Auto merged
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/Makefile.am:
  Auto merged
myisam/myisampack.c:
  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/view_grant.result:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.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-common/my_time.c:
  Auto merged
sql/sql_handler.cc:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Manual merge with import of upstream yaSSL
2006-12-04 19:28:38 +01:00
..
yassl Fixed compiler warnings 2006-11-30 21:56:03 +02:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
charset2html.c dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features 2004-11-04 22:29:00 +01:00
CMakeLists.txt Additional files for cmake support 2006-08-31 19:52:42 +02:00
comp_err.c Fixes for crashes and test failures 2006-09-01 14:34:37 +02:00
innochecksum.c Fix QNX and IRIX compilation 2005-12-08 15:13:25 +01:00
Makefile.am Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738 2006-09-19 08:18:40 +02:00
my_print_defaults.c Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 2005-08-26 15:56:52 +03:00
mysql_waitpid.c Added global my_getopt_error_reporter function pointer which is 2004-08-31 21:27:58 +05:00
perror.c Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror 2006-07-26 14:09:20 +02:00
replace.c Fixed compiler warnings 2006-11-30 21:56:03 +02:00
resolve_stack_dump.c Several fixes for Netware. 2005-08-24 22:03:34 +03:00
resolveip.c Merge with 4.0 2004-09-01 04:12:09 +03:00