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 8c7852ba3c Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new


include/my_base.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
libmysqld/Makefile.am:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/mysqld.cc:
  Manual merge.
2005-11-28 20:14:12 +01:00
..
examples Merge mysql.com:/usr/local/bk/mysql-5.0 2005-11-28 20:14:12 +01:00
copyright Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
emb_qcache.cc Fix crash in embedded server due to incorrect storage of results 2005-03-31 19:17:45 -08:00
emb_qcache.h Fix crash in embedded server due to incorrect storage of results 2005-03-31 19:17:45 -08:00
embedded_priv.h Proposed fix for #3744 (embedded server, wrong error message if database is 2004-05-17 12:05:57 +05:00
lib_sql.cc Fix for bug #13546 "Build errors with --with-embedded-server 2005-09-28 18:43:46 +04:00
libmysqld.c Fix for bug #9632 (strict.test fails in -embedded-server mode) 2005-05-09 16:26:06 +05:00
libmysqld.def Fixes to previous changeset 2005-07-18 20:05:30 +03:00
libmysqld.rc query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00
Makefile.am Bug #15168 yassl failure on amd64 2005-11-24 17:17:36 +01:00
resource.h query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00