into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
configure.in:
Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Removed one test that needs manual interaction
Added order by in some places
mysql-test/t/ndb_autodiscover.test:
Removed one test that needs manual interaction
Added order by in some places
sql/ha_ndbcluster.cc:
Using HA_WRONG_ASCII_ORDER to activate filesort on a not "sorted" ordered index.
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/examples/ha_archive.cc:
Added in example information from testing archive with Slashdot's comments.
sql/handler.h:
Fixed broken merge.
sql/set_var.cc:
Adding in "have_archive" to variables shown to make tests work.
configure.in:
Auto merged
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqladmin.c:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
innobase/include/trx0roll.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0roll.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/usr/usr0sess.c:
Auto merged
isam/isamchk.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysys/default.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
netware/Makefile.am:
Auto merged
netware/init_db.sql:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
tools/mysqlmanager.c:
Auto merged
VC++Files/dbug/dbug.dsp:
Auto merged
VC++Files/heap/heap.dsp:
Auto merged
VC++Files/isam/isam.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/myisam/myisam.dsp:
Auto merged
VC++Files/myisammrg/myisammrg.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
merge
client/mysqlbinlog.cc:
merge
extra/perror.c:
merge
include/mysql_com.h:
merge
libmysqld/Makefile.am:
merge
netware/BUILD/mwenv:
merge
sql/mysqld.cc:
merge
configurations added to build the libraries with USE_TLS flag to be
used for libmysqld
VC++Files/dbug/dbug.dsp:
TLS_DEBUG configuration added
VC++Files/heap/heap.dsp:
TLS and TLS_DEBUG configurations added
VC++Files/isam/isam.dsp:
TLS and TLS_DEBUG configurations added
VC++Files/libmysql/libmysql.dsp:
MYSQL_CLIENT define enabled
VC++Files/libmysqld/libmysqld.dsp:
using of _tls libraries added
VC++Files/myisam/myisam.dsp:
TLS and TLS_DEBUG configurations added
VC++Files/myisammrg/myisammrg.dsp:
TLS and TLS_DEBUG configurations added
VC++Files/mysys/mysys.dsp:
TLS and TLS_DEBUG configurations added
include/mysql_com.h:
__declspec(dllimport) seems to be necessary when one uses .dll
on Windows
into mysql.com:/tmp/skr99/mysql-4.0
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysqld.cc:
Auto merged
Build-tools/Do-compile:
Fixed indentation
configure.in:
Added patches from Novell
Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
extra/perror.c:
Fixed error number reporting to not report 'Unknown error'
include/my_global.h:
Defines to make NETWARE patches cleaner
include/thr_alarm.h:
Fixed wrong macro
netware/mysql_install_db.c:
Indentation fix
Updated ndb_ test cases
mysql-test/r/ndb_autodiscover.result:
Updated to new output of error message
mysql-test/r/ndb_basic.result:
Added som order by to sort the result correctly before comparing
mysql-test/r/ndb_index_unique.result:
Added test for USING HASH combined with PRIMARY KEY and UNIQUE index
mysql-test/t/ndb_autodiscover.test:
Correctede error case
mysql-test/t/ndb_basic.test:
Added som order by
mysql-test/t/ndb_index_unique.test:
Added test for USING HASH combined with PRIMARY KEY and UNIQUE index
sql/ha_ndbcluster.cc:
Added the index flag HA_ONLY_WHOLE_INDEX if index is created with USING HASH.
VC++Files/mysqldemb/mysqldemb.dsp:
Removed references to BDB and InnoDB from 'classic'
VC++Files/sql/mysqld.dsp:
Removed references to BDB and InnoDB from 'classic'
A set of changes improving our RTree indexes and fixed few bugs
found during the tests
myisam/rt_index.c:
Algorythm for picking the branch to insert was fixed.
pick_by_perimeter version of the algorythm added (mostly for testing
purposes)
myisam/rt_index.h:
minimal size of the page set to 1/3
It noticeable increases searching performance
myisam/rt_key.c:
counting of the size of the filled part of the page fixed
rtree_choose_key moved to rt_index.c
myisam/rt_key.h:
no need to make rtree_choose_key global
myisam/rt_mbr.c:
operations for counting the perimeter of MBR added
myisam/rt_mbr.h:
interface for rtree_perimeter_increase
myisam/rt_split.c:
my_multi_malloc changed with my_alloca
sql/spatial.cc:
LINESTRING object can consist of single point
ndb/test/ndbapi/flexHammer/flexHammer.cpp:
This test program also uses old way to create tables, thus requires NdbSchemaCon.hpp
ndb/test/ndbapi/flexTT/flexTT.cpp:
This test program also uses old way to create tables, thus requires NdbSchemaCon.hpp
ndb/test/src/NDBT_ResultRow.cpp:
Correct spelling errors in comment's.
Moved NdbSchemaCon and NdbSchemaOp out of the public NdbApi, it can however still be used by old test programs.
Added print oof indexes to desc.
ndb/BinDist.sh:
Removed AttrType.hpp from BinDist.sh
ndb/include/ndbapi/Ndb.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
ndb/include/ndbapi/NdbApi.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
ndb/include/ndbapi/NdbConnection.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
Moved internal types to the class where they are used
ndb/include/ndbapi/NdbIndexOperation.hpp:
Use limit from ndbapi_limit.h
ndb/include/ndbapi/NdbOperation.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
Remove faulty comment about how many attributes a key is allowed to consist of
Removed unused member variables
ndb/include/ndbapi/NdbRecAttr.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
ndb/include/ndbapi/NdbSchemaCon.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
ndb/include/ndbapi/NdbSchemaOp.hpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
Moved all "old" datatypes here, so if a test program is still using old type, include NdbSchemaCon.hpp
ndb/include/ndbapi/ndbapi_limits.h:
Corrected limitations, added some from AttrTyp.hpp
ndb/src/Makefile:
Remove newtonapi from Makefile
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
Removed AttrType
Include NdbSchemaCon since restore uses old types
ndb/src/kernel/blocks/backup/restore/main.cpp:
Include NdbOut
ndb/src/mgmsrv/MgmtSrvr.cpp:
Remov AttrType.hpp
ndb/src/ndbapi/ClusterMgr.cpp:
Remov AttrType.hpp
ndb/src/ndbapi/Ndb.cpp:
Removed NdbSchemaCon and NdbSchemaOp includes from public NdbApi
Removed AttrType.hpp
Moved internal types to the class where they are used
ndb/src/ndbapi/NdbApiSignal.cpp:
Removed AttrType.hpp
ndb/src/ndbapi/NdbApiSignal.hpp:
Removed AttrType.hpp
ndb/src/ndbapi/NdbConnection.cpp:
Moved internal type s to the class where they belong
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
RemovedAttrType.hpp
Use limits from ndbapi_limits.h
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Removed AttrType.hpp
Moved printRecAttr to end since it depends on old types and need to include "NdbSchemaCon", function will be rewritten and moved to NdbRecAttr. It's also useful from other places where an attribute has been read into an NdbRecAttr.
ndb/src/ndbapi/NdbIndexOperation.cpp:
Use limitations from ndbapi_limits.h
Moved internal tyeps to the class where they belongs
ndb/src/ndbapi/NdbOperation.cpp:
Use limits from ndbapi_limits.h
ndb/src/ndbapi/NdbOperationDefine.cpp:
Remove AttrType.hpp
ndb/src/ndbapi/NdbOperationExec.cpp:
Moved internal tyeps to the class where they belongs
ndb/src/ndbapi/NdbOperationInt.cpp:
RemovedAttrType.hpp
Use limits from ndbapi_limits.h
ndb/src/ndbapi/NdbOperationScan.cpp:
RemovedAttrType.hpp
Use limits from ndbapi_limits.h
ndb/src/ndbapi/NdbOperationSearch.cpp:
Removed AttrType.hpp
Use limits from ndbapi_limits.h
ndb/src/ndbapi/NdbResultSet.cpp:
Moved the "internal" types to corresponding class
ndb/src/ndbapi/NdbSchemaCon.cpp:
Updated not to be included in public NdbApi
ndb/src/ndbapi/NdbSchemaOp.cpp:
Updated not to be included in public NdbApi
ndb/src/ndbapi/NdbUtil.hpp:
Removed AttrType.hpp
ndb/src/ndbapi/Ndbif.cpp:
Removed AttrType.hpp
Removed NdbSchemaCon and NdbSchemaOp from public NdbApi
Moved "interal" types to their corresponding class
ndb/src/ndbapi/Ndbinit.cpp:
Removed NdbSchemaCon and NdbSchemaOp from public NdbApi
ndb/src/ndbapi/Ndblist.cpp:
Removed NdbSchemaCon and NdbSchemaOp from public NdbApi
Moved "internal" types to their corresponding class
ndb/src/ndbapi/TransporterFacade.cpp:
Removed AttrType.hpp
ndb/src/ndbapi/TransporterFacade.hpp:
Removed AttrType.hpp
Moved internal definition of how many Ndb objects to create to here
ndb/test/include/NDBT_Table.hpp:
Removed old NdbSchema*
Added function to print information about an index
ndb/test/ndbapi/acid/acid.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/flexAsynch/flexAsynch.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/flexScan/flexScan.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/interpreterInTup/interpreterInTup.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/lmc-bench/src/user/userInterface.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/ronja/initronja/initronja.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/telco/msa.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/testDataBuffers/testDataBuffers.cpp:
This test program uses old NdbScheaCon.hpp
ndb/test/ndbapi/testNdbApi/testNdbApi.cpp:
Remove AttrType.hpp
Define max number of Ndb objects test should "try" to create.
ndb/test/ndbapi/testRestartGci/testRestartGci.cpp:
Moved "internal" datatypes to corresponding class, in this case Ndb class
ndb/test/src/NDBT_ResultRow.cpp:
This test program uses old NdbScheaCon.hpp
But should soon use "printer" from NdbRecAttr
ndb/test/src/NDBT_Table.cpp:
Print table info more SQL like
ndb/test/src/UtilTransactions.cpp:
When AttrType.hpp, this hidden bug was discovered. Using wrong enum types in switch.
ndb/tools/desc/desc.cpp:
Alos print info about indexes for a table
