Remove DBUG_ENTER in my_end
client/mysqltest.c:
Call 'mysql_server_end' as last function in 'free_used_memory'
Don't use DBUG_VOID_RETURN after mysql_server_end in free_used_memory
Only call mysql_server_end if mysql_server_init has been called
The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()
mysql-test/r/gis.result:
test result
mysql-test/t/gis.test:
testcase
sql/field.cc:
reset() now returns error sign
sql/field.h:
Field_*::reset() now returns error sign if the field can't be reset
sql/sql_load.cc:
check if field can't be reset and return error if it's so
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Add new config paramemter
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
add support for periodic mem-reporting
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
add support for periodic mem-reporting
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
add support for periodic mem-reporting
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
add support for periodic mem-reporting
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
add support for periodic mem-reporting
uninitialized list of guarded instances.
server-tools/instance-manager/guardian.cc:
Initialize guarded_instance to NULL in constuctor. Avoid looping over
uninitialized list of guarded instances
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ndb_update.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/common/util/socket_io.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Manual merge
storage/ndb/src/common/util/InputStream.cpp:
Manual merge
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/parser.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/sp_gis.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/parser.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item_create.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
1) run lcp snapshot for both MM and DD tables (so I dont have to change restore to use WRITE)
2) fix >= and > bug in lcp skip/keep handling
3) very cool test prog for this :-)
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
Add new error insert
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Add new error insert
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Add new error insert
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
1) get >= and > correct for lcp keep/skip
2) always run lcp snapshot impl. (previously only for dd tables)
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
1) get >= and > correct for lcp keep/skip
2) always run lcp snapshot impl. (previously only for dd tables)
storage/ndb/test/ndbapi/testSystemRestart.cpp:
add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
add testcase
Plugin interface version was not raised properly after incompatible
changes to plugin structure were introduced.
Fixed plugin interface version according to worklog 2761.
include/mysql/plugin.h:
Fixed plugin interface version according to worklog 2761.
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/sp.result:
offset error number according to changed error messages file
mysql-test/r/sp_gis.result:
offset error number according to changed error messages file
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/r/type_varchar.result:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
sql/item_func.cc:
Auto merged
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/r/ndb_update.result:
Auto merged
mysql-test/r/type_varchar.result:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
storage/ndb/src/common/util/socket_io.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Merge
storage/ndb/src/common/util/InputStream.cpp:
Merge
