mariadb/ndb/include/kernel
unknown 9ada34b316 Merge for Matt for Innodb bug.
client/mysqldump.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_grant.later:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/my_print_defaults.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
client/mysqladmin.cc:
  Merge for Netware changes. Indention fixes.
sql/field.cc:
  Merge fixes, warnings added from 4.1 to 5.0
sql/mysqld.cc:
  Merge fixes, just indention fixes.
2004-11-30 10:10:40 -08:00
..
signaldata Merge for Matt for Innodb bug. 2004-11-30 10:10:40 -08:00
AttributeDescriptor.hpp Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
AttributeHeader.hpp Added 3 psuedo columns 2004-08-27 22:31:16 +02:00
AttributeList.hpp Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
BlockNumbers.h fix c++ style comments in .h and .c files 2004-10-22 11:59:57 +00:00
GlobalSignalNumbers.h fix c++ style comments in .h and .c files 2004-10-22 11:59:57 +00:00
GrepEvent.hpp Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
Interpreter.hpp compilation fix for AIX 2004-10-26 09:48:01 +00:00
kernel_config_parameters.h Remove unused config parameters 2004-08-05 18:23:01 +02:00
kernel_types.h Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
LogLevel.hpp compilation fix for AIX 2004-10-26 09:48:01 +00:00
ndb_limits.h added test for max limit of 128 attributes in table 2004-10-28 11:19:51 +00:00
NodeBitmask.hpp Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
NodeInfo.hpp wl 1748 2004-06-23 23:53:48 +00:00
NodeState.hpp compilation fix for AIX 2004-10-26 09:48:01 +00:00
RefConvert.hpp Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
trigger_definitions.h fix c++ style comments in .h and .c files 2004-10-22 11:59:57 +00:00