mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/ndb/include/kernel
History
unknown e963a7cd34 Merge bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-ndb-bj 
into  bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb


client/mysqltest.c:
  Auto merged
include/config-netware.h:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
storage/csv/ha_tina.cc:
  manual merge.
storage/innobase/btr/btr0btr.c:
  SCCS merged
storage/innobase/buf/buf0buf.c:
  SCCS merged
storage/innobase/dict/dict0dict.c:
  SCCS merged
storage/innobase/fil/fil0fil.c:
  SCCS merged
storage/innobase/fsp/fsp0fsp.c:
  SCCS merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged
storage/innobase/include/btr0cur.ic:
  use local
storage/innobase/include/buf0buf.ic:
  SCCS merged
storage/innobase/log/log0log.c:
  SCCS merged
storage/innobase/log/log0recv.c:
  SCCS merged
storage/innobase/os/os0file.c:
  SCCS merged
storage/innobase/row/row0mysql.c:
  SCCS merged
storage/innobase/row/row0sel.c:
  SCCS merged
storage/innobase/srv/srv0start.c:
  SCCS merged
storage/innobase/ut/ut0dbg.c:
  SCCS merged
2006-10-04 11:33:28 +02:00
..
signaldata Merge bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-ndb-bj 2006-10-04 11:33:28 +02:00
AttributeDescriptor.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
AttributeHeader.hpp Fix for Bug #18413 Data usage for varsize columns are not correctly reported to mysqld 2006-07-03 17:09:32 +02:00
AttributeList.hpp ndb - bug with index build of unique index with 32 attributes 2005-11-05 22:50:15 +01:00
BlockNumbers.h Import ndb varsize 2005-11-07 12:19:28 +01:00
GlobalSignalNumbers.h Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main 2006-06-27 11:22:42 +02:00
GrepEvent.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Interpreter.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
kernel_config_parameters.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
kernel_types.h Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree. 2005-11-08 17:30:41 +01:00
LogLevel.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_limits.h Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 2006-03-01 10:20:40 +01:00
NodeBitmask.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NodeInfo.hpp ndb-wl2325.patch 2005-09-15 11:33:50 +02:00
NodeState.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
RefConvert.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
trigger_definitions.h configure.in: 2005-11-08 07:41:46 +01:00