mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/libmysqld
History
unknown 3279ee0a12 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification


configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
sql/Makefile.am:
  SCCS merged
2007-05-07 16:59:03 -04:00
..
examples Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 2007-04-11 09:34:02 +02:00
CMakeLists.txt Fixed compiler warnings 2007-02-23 13:13:55 +02: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 manual merge 2007-03-09 16:06:08 +01: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 zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02 2007-05-07 16:59:03 -04:00
resource.h query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00