mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/ndb
History
unknown 3c52ab722e Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.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_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
storage/ndb/tools/ndb_size.tmpl:
  Auto merged
sql/sql_table.cc:
  SCCS merged
2006-11-02 03:30:16 +03:00
..
bin Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
config Many files: 2006-08-21 15:34:29 +02:00
demos Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
docs Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2005-11-23 14:57:00 +02:00
include Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp 2006-10-25 10:44:22 +02:00
lib Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndbapi-examples Fixed ndbapi-examples, and added tests for mysql-test-run.pl 2006-09-01 15:14:50 +02:00
src Merge trift2.:/MySQL/M51/clone-5.1 2006-11-01 13:26:03 +01:00
test Merge perch.ndb.mysql.com:/home/jonas/src/51-work 2006-10-19 11:23:34 +02:00
tools Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 2006-11-02 03:30:16 +03:00
Makefile.am Bug#22417 2006-09-18 19:31:08 -07:00
plug.in Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed. 2006-08-18 21:19:19 -07:00