mariadb/ndb/include/ndbapi
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
..
Ndb.hpp AIX compile fixes 2004-10-22 15:13:06 +00:00
ndb_cluster_connection.hpp fixed error in test result 2004-11-30 17:47:47 +00:00
NdbApi.hpp merge blob code 2004-06-17 14:03:21 +02:00
ndbapi_limits.h Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 2004-10-29 10:24:56 +00:00
NdbBlob.hpp Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-10-31 15:44:35 +01:00
NdbConnection.hpp Merge mysql.com:/home/jonas/src/mysql-5.0 2004-11-24 12:40:04 +01:00
NdbCursorOperation.hpp wl1671 - Sorted scan 2004-05-26 13:24:14 +02:00
NdbDictionary.hpp merge 2004-11-15 11:21:21 +01:00
ndberror.h aligned backup errorcodes with rest of ndb error codes giving it range from 1300 2004-11-29 15:14:43 +00:00
NdbError.hpp Fix ndberror after jonas comments 2004-05-05 12:42:00 +02:00
NdbEventOperation.hpp introduced ndb_global.h/my_global.h to replace sytem lib includes e.g. stdio, stdlib 2004-05-07 08:39:42 +02:00
NdbIndexOperation.hpp merge 2004-11-11 10:45:45 +01:00
NdbIndexScanOperation.hpp merge 2004-11-25 14:33:33 +01:00
NdbOperation.hpp merge 2004-11-11 10:45:45 +01:00
NdbPool.hpp Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
NdbRecAttr.hpp merge 2004-06-11 12:16:03 +02:00
NdbReceiver.hpp AIX compile fixes 2004-10-22 15:13:06 +00:00
NdbResultSet.hpp added force send interface to scan 2004-11-22 13:41:46 +00:00
NdbScanFilter.hpp Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
NdbScanOperation.hpp Merge mysql.com:/home/jonas/src/mysql-4.1-fix 2004-11-29 09:28:23 +01:00