mariadb/ndb/test/ndbapi
unknown bb2d3eaa30 Merge with 4.1
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_base.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/password.c:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.h:
  Auto merged
sql/udf_example.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
Makefile.am:
  Simple merge
client/mysqldump.c:
  Simple merge
configure.in:
  Simple merge
libmysqld/lib_sql.cc:
  Automatic merge
mysql-test/r/func_str.result:
  Automatic merge
mysql-test/r/grant.result:
  simple merge
mysql-test/r/multi_update.result:
  automatc merge
mysql-test/r/ps.result:
  automatic merge
mysql-test/r/ps_2myisam.result:
  Automatic merge
mysql-test/r/ps_3innodb.result:
  Automatic merge
mysql-test/r/ps_4heap.result:
  Automatic merge
mysql-test/r/ps_5merge.result:
  Automatic merge
mysql-test/r/ps_6bdb.result:
  Automatic merge
mysql-test/r/ps_7ndb.result:
  Automatic merge
mysql-test/r/show_check.result:
  Automatic merge
mysql-test/r/subselect.result:
  Automatic merge
mysql-test/t/grant.test:
  Automatic merge
mysql-test/t/multi_update.test:
  Automatic merge
mysql-test/t/ps.test:
  Automatic merge
mysql-test/t/show_check.test:
  Automatic merge
ndb/docs/wl2077.txt:
  merge
ndb/src/mgmsrv/main.cpp:
  merge
scripts/mysql_fix_privilege_tables.sh:
  merge
sql/item.cc:
  Merge (difficult)
sql/item.h:
  simple merge
sql/item_cmpfunc.h:
  Automatic merge
sql/item_subselect.cc:
  Simple merge
sql/item_subselect.h:
  Automatic merge
sql/mysql_priv.h:
  Simple merge
sql/slave.h:
  Automatic merge
sql/sql_base.cc:
  Removed code that was backported to 4.1
sql/sql_class.h:
  Merge (some code moved to sql_insert.cc)
sql/sql_db.cc:
  simple merge
sql/sql_insert.cc:
  Merge (difficult as logic had changed both in 4.1 and 5.0)
  Some coded moved here from sql_class.h
sql/sql_parse.cc:
  Merge (difficult)
sql/sql_prepare.cc:
  Simple merge
sql/sql_select.cc:
  Automatic merge
sql/sql_table.cc:
  Simple merge
sql/sql_update.cc:
  Difficult merge because of different logic for multi-updates
sql/sql_yacc.yy:
  Simple merge
tests/client_test.c:
  Simple merge
2004-12-22 13:54:39 +02:00
..
bank wl1744 - ndb on windows 2004-11-10 00:03:01 +01:00
old_dirs Makefile.am: 2004-11-08 10:35:23 +00:00
acid.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
acid2.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
adoInsertRecs.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
asyncGenerator.cpp changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
benchronja.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
bulk_copy.cpp changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
cdrserver.cpp changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
celloDb.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
create_all_tabs.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
create_tab.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
drop_all_tabs.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
flex_bench_mysql.cpp Changing the default of libmysqlclient : it's now NO reconnection. 2004-12-09 14:44:10 +01:00
flexAsynch.cpp changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
flexBench.cpp changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
flexHammer.cpp changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
flexScan.cpp changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
flexTimedAsynch.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
flexTT.cpp changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
index.cpp ndb: set column type sets column defaults 2004-09-15 14:52:39 +02:00
index2.cpp ndb: set column type sets column defaults 2004-09-15 14:52:39 +02:00
initronja.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
InsertRecs.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
interpreterInTup.cpp changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
mainAsyncGenerator.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
Makefile.am Merge with 4.1 2004-12-22 13:54:39 +02:00
msa.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
ndb_async1.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
ndb_async2.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
ndb_user_populate.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
ndb_user_transaction.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
ndb_user_transaction2.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
ndb_user_transaction3.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
ndb_user_transaction4.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
ndb_user_transaction5.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
ndb_user_transaction6.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
restarter.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
restarter2.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
restarts.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
ScanFilter.hpp neww ndb automake 2004-05-26 15:36:55 +00:00
ScanFunctions.hpp compile fix for ndbapi test program on irix (variable scope) 2004-11-08 13:59:04 +01:00
ScanInterpretTest.hpp Merge 2004-05-27 11:36:10 +02:00
size.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
slow_select.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
test_event.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
testBackup.cpp Fix so that testBackup wait until start has finished before 2004-09-22 09:27:34 +02:00
testBasic.cpp testBasic -n NoCommit626 2004-10-13 11:28:24 +02:00
testBasicAsynch.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
testBlobs.cpp ndb: fix blob performance in long transactions 2004-11-22 18:54:06 +01:00
testDataBuffers.cpp compile fix for ndbapi test program on irix (variable scope) 2004-11-08 13:59:04 +01:00
testDeadlock.cpp compile fix for ndbapi test program on irix (variable scope) 2004-11-08 13:59:04 +01:00
testDict.cpp Removed getTableForAlteration 2004-12-07 10:27:22 +01:00
testGrep.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
testGrepVerify.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
testIndex.cpp compile fix for ndbapi test program on irix (variable scope) 2004-11-08 13:59:04 +01:00
testInterpreter.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
testLcp.cpp add ndb_init 2004-11-17 14:27:28 +01:00
testMgm.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
testNdbApi.cpp added config parameter Group on connection 2004-12-20 12:36:14 +01:00
testNodeRestart.cpp wl1801 - more node failure handling in simple/dirty read 2004-10-11 11:02:39 +02:00
testOIBasic.cpp compile fix for ndbapi test program on irix (variable scope) 2004-11-08 13:59:04 +01:00
testOperations.cpp wl1744 - win compile fixes 2004-11-10 00:39:12 +01:00
testOrderedIndex.cpp ndb_init() to all ndb programs 2004-09-15 11:49:18 +02:00
testPartitioning.cpp wl2240 - ndb partitioning 2004-11-15 21:40:35 +01:00
testReadPerf.cpp Merge mysql.com:/home/jonas/src/mysql-4.1 2004-11-22 07:52:42 +01:00
testRestartGci.cpp compile fix for ndbapi test program on irix (variable scope) 2004-11-08 13:59:04 +01:00
testScan.cpp ndb - scan bug fix + more test cases 2004-11-29 09:00:39 +01:00
testScanInterpreter.cpp changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
testScanPerf.cpp merge 2004-11-26 10:13:32 +01:00
testSystemRestart.cpp compile fix for ndbapi test program on irix (variable scope) 2004-11-08 13:59:04 +01:00
testTimeout.cpp Fix changed interface to HugoOperations 2004-10-13 11:43:54 +02:00
testTransactions.cpp Test prg update 2004-10-08 16:42:51 +02:00
TraceNdbApi.cpp neww ndb automake 2004-05-26 15:36:55 +00:00
userInterface.cpp more snprintf... 2004-10-21 19:23:18 +00:00
VerifyNdbApi.cpp neww ndb automake 2004-05-26 15:36:55 +00:00