mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/extra
History
unknown 600336ef45 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1


client/mysql.cc:
  Auto merged
cmd-line-utils/readline/bind.c:
  Auto merged
cmd-line-utils/readline/histfile.c:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/my_global.h:
  Auto merged
include/my_tree.h:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/portability.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_cache.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/heap/hp_clear.c:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
client/mysqldump.c:
  Manual merge
client/mysqltest.c:
  Manual merge
extra/replace.c:
  Manual merge
libmysql/libmysql.c:
  Manual merge
mysys/base64.c:
  Manual merge
sql/ha_ndbcluster.cc:
  Manual merge
sql/handler.cc:
  Manual merge
sql/item_strfunc.cc:
  Manual merge
sql/item_timefunc.cc:
  Manual merge
sql/log.cc:
  Manual merge
sql/opt_range.cc:
  Manual merge
sql/password.c:
  Manual merge
sql/sp.cc:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_cache.cc:
  Manual merge
sql/sql_db.cc:
  Manual merge
sql/sql_rename.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge
sql/sql_show.cc:
  Manual merge
sql/sql_trigger.cc:
  Manual merge
sql/sql_update.cc:
  Manual merge
sql/tztime.cc:
  Manual merge
storage/archive/ha_archive.cc:
  Manual merge
storage/federated/ha_federated.cc:
  Manual merge
storage/myisam/mi_create.c:
  Manual merge
storage/myisam/myisampack.c:
  Manual merge
storage/myisammrg/myrg_rkey.c:
  Manual merge
storage/ndb/src/mgmapi/mgmapi.cpp:
  Manual merge
storage/ndb/src/ndbapi/Ndb.cpp:
  Manual merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Manual merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Manual merge
storage/ndb/src/ndbapi/Ndblist.cpp:
  Manual merge
2006-11-30 22:38:12 +02: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 Bug#19738 "make install" tries to build files that "make" should already have built 2006-09-20 09:28:12 +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 Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04: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 UNIXWARE removal 2006-04-17 15:56:59 -07:00