mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/libmysqld
History
unknown bb48472601 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/CMakeLists.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/rpl_injector.cc:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_locale.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
unittest/mysys/my_atomic-t.c:
  Auto merged
sql/log_event.cc:
  Manual merge main->rpl
sql/mysqld.cc:
  Manual merge main->rpl
2007-01-12 12:31:44 +01:00
..
examples Merge mysql.com:/d2/hf/clean/my51-clean 2006-12-31 12:41:42 +04:00
CMakeLists.txt Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
copyright Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
emb_qcache.cc Many files: 2006-12-23 20:17:15 +01:00
emb_qcache.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
embedded_priv.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
lib_sql.cc Merge mysql.com:/d2/hf/common/my50-common 2007-01-03 02:43:59 +04:00
libmysqld.c Many files: 2006-12-23 20:17:15 +01:00
libmysqld.def Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2 2006-09-06 18:27:26 +02:00
libmysqld.rc query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00
Makefile.am Merge mysql.com:/d2/hf/clean/my51-clean 2006-12-31 12:41:42 +04:00
resource.h query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00