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/ndb/include
History
unknown bdddd8c089 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Resolve conflicts
sql/ha_innodb.cc:
  Resolve conflicts
sql/item_strfunc.cc:
  Resolve conflicts
2005-08-31 15:24:06 -07:00
..
debugger ndb - wl-2451: Increase max schema object to > 1600 2005-04-10 22:43:17 +02:00
editline Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
kernel Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-31 15:24:06 -07:00
logger fixed so that last repeats are printed first with correct time if another message comes 2004-12-22 22:47:56 +01:00
mgmapi Merge mysql.com:/home/jonas/src/mysql-4.1 2005-07-25 13:23:34 +02:00
mgmcommon BUG#11516 ndb_mgmd debug core on cluster shutdown with failed data nodes 2005-07-07 15:19:56 +10:00
ndbapi Merge eel.(none):/home/jonas/src/mysql-4.1 2005-08-18 14:25:00 +02:00
newtonapi portability/autoconf fixes and removed warnings 2004-05-12 06:24:12 +02:00
portlib BUG#10950 2005-08-17 08:40:11 +10:00
transporter WL#2347 - Load independent heartbeats 2005-07-22 20:29:25 +10:00
util Merge 2005-07-15 01:41:59 +02:00
Makefile.am Merge 2005-01-28 00:47:41 +01:00
ndb_constants.h ndb - wl-1203 alignment fix 2005-02-26 16:56:39 +01:00
ndb_global.h.in Merge mysql.com:/home/jonas/src/mysql-4.1 2005-01-19 10:07:14 +01:00
ndb_init.h added ndb_init.h to distribution 2004-12-21 10:37:12 +01:00
ndb_net.h lots of HAVE_ and some ndb_global fixes for ndb subtree 2004-05-11 14:39:17 +02:00
ndb_types.h.in changes ndb types include 2005-01-04 13:12:22 +01:00
ndb_version.h.in stilled mem leak in usage on getVersionString 2005-07-14 18:02:33 +02:00