mariadb/ndb/include
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
..
debugger Fix backup event 2004-09-17 14:18:28 +02:00
editline Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
kernel Merge for Matt for Innodb bug. 2004-11-30 10:10:40 -08:00
logger compilation fix for AIX 2004-10-26 09:48:01 +00:00
mgmapi fixed error in test result 2004-11-30 17:47:47 +00:00
mgmcommon fixed error in test result 2004-11-30 17:47:47 +00:00
ndbapi Merge for Matt for Innodb bug. 2004-11-30 10:10:40 -08:00
newtonapi portability/autoconf fixes and removed warnings 2004-05-12 06:24:12 +02:00
portlib moved ndb_restore together with rest of the ndb tools 2004-11-14 11:02:06 +00:00
transporter Hand merge 2004-09-20 14:20:01 +02:00
util merge 2004-11-25 14:33:33 +01:00
Makefile.am added mgmapi/mgmapi_config_parameters.h, mgmapi/mgmapi_config_parameters_debug.h 2004-11-24 13:59:03 +00:00
ndb_global.h aligned ndb versioning with mysql 2004-11-01 13:55:43 +00: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 Make sure that Int8(16,32,64) is signed 2004-11-02 15:37:26 +01:00
ndb_version.h moved ndb versioning to configure and fixed ndb docs make 2004-06-04 16:08:50 +02:00