mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/libmysqld
History
unknown d6df18dd33 Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.
sql-common/client.c:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
2008-03-12 11:19:46 +03:00
..
examples Bug#32044 some of the tests (backup, drop, query_cache, etc) will timeout on Windows 2007-11-02 09:27:38 +01:00
CMakeLists.txt CMakeLists.txt: 2008-02-18 14:46:47 +01:00
copyright Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
emb_qcache.cc Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
emb_qcache.h Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
embedded_priv.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
lib_sql.cc Merge kaamos.(none):/data/src/mysql-5.1 2008-03-12 11:19:46 +03:00
libmysqld.c Bug#34655 Compile error 2008-02-28 14:55:46 -03:00
libmysqld.def Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0 2007-11-26 16:10:26 -02:00
libmysqld.rc query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00
Makefile.am Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification 2007-10-17 14:05:43 -04:00
resource.h query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00