reword the misleading message.
mysql-test/r/sp-error.result:
Test results fixed (Bug#15206)
mysql-test/r/sp.result:
Test results fixed (Bug#15206)
mysql-test/r/type_decimal.result:
Disable an unportable test case (Bug#7670)
mysql-test/r/variables.result:
Test results fixed (Bug#15206)
mysql-test/r/view_grant.result:
Test results fixed (Bug#15206)
mysql-test/t/type_decimal.test:
Remove an unportable (QNX) test case (Bug#7670). The test output
depends on system-specific sprintf() implementation.
The original complain was about erroneous conversion to long long,
which was applied prior to conversion to double: but the expected
behaviour can't be achieved until we have an own string -> double
conversion function.
client/mysqltest.c:
If connection suceeded don't close it, just call handle_no_error which will check if an error was expected
mysql-test/r/mysqltest.result:
Update test result
mysql-test/t/mysqltest.test:
Add test for connection not being added to connection pool if "disable_abort_on_error" was used
libmysqlclient versioning when linked with GNU ld.
BitKeeper/etc/ignore:
Added libmysql/libmysql.ver to the ignore list
configure.in:
libmysqlclient versioning when linked with GNU ld.
libmysql/Makefile.shared:
libmysqlclient versioning when linked with GNU ld.
libmysql/libmysql.ver.in:
New BitKeeper file ``libmysql/libmysql.ver.in''
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/sql_table.cc:
Auto merged
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/r/ps.result:
SCCS merged
mysql-test/t/ps.test:
SCCS merged
mysql-test/r/ctype_ucs.result:
Test results changed (Bug#13337)
mysql-test/r/ps.result:
Test results changed (Bug#13337)
mysql-test/t/ctype_ucs.test:
Fix Bug#13337 (move the test that uses UCS character set to
ctype_ucs)
mysql-test/t/ps.test:
Fix Bug#13337 (move the test that uses UCS character set to
ctype_ucs)
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/sql_table.cc:
Auto merged
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/sql_table.cc:
Auto merged
values stored into DOUBLE column" (Can't repeat)
mysql-test/r/type_decimal.result:
Test results fixed (Bug#7670)
mysql-test/t/type_decimal.test:
A test case for Bug#7670
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
client/mysqldump.c:
Auto merged
sql/field.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
scripts/mysqld_multi.sh:
Auto merged
extra/comp_err.c:
Manual merge: From 4.1 to 5.0, the license line was moved to a different place.
WL#2703 restart for ndb_mgmd
Solving two problems with one stone.
Allows the stopping and restarting of mgm nodes other than the one the mgmclient
is connected to.
ndb/include/mgmapi/mgmapi.h:
Add the internal ndb_mgm_end_session command.
This will unreserve the nodeid we have allocated synchronously.
Otherwise we can't do a restart of a node really quickly as the nodeids are cleaned
up after the connection to mgmd is closed.
ndb/include/mgmcommon/ConfigRetriever.hpp:
Allow configuration on if end_session is going to be called on object destruction.
We need to set this to false for ndbd as we fork()
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
When destroying ConfigRetreiver, ndb_mgm_end_session - i.e. deallocate the nodeid
ndb/src/common/util/SocketServer.cpp:
When destroying a SocketServer, close the server socket.
ndb/src/kernel/main.cpp:
don't purge allocated resources when cleaning up in parent process (nodeid)
ndb/src/kernel/vm/Configuration.cpp:
have option end_session to closeConfiguration
ndb/src/kernel/vm/Configuration.hpp:
have option end_session to closeConfiguration
ndb/src/mgmapi/mgmapi.cpp:
Implement ndb_mgm_end_session
ndb/src/mgmclient/CommandInterpreter.cpp:
Correct output of STOP as we can now stop mgmd as well as ndbd
ndb/src/mgmsrv/MgmtSrvr.cpp:
Add code into start for connecting to our own mgmd.
Create sendStopMgmd() which does the same job as sendSTOP_REQ, but for ndb_mgmd
Allow stopping of other ndb_mgmd processes by creating a connection to them
and issuing the stop command
When stopping all nodes, stop other ndb_mgmd processes as well.
Remove set_connect_string. Replace with connect_to_self. This is a much better
way of doing things.
ndb/src/mgmsrv/MgmtSrvr.hpp:
add connect_to_self and remove set_connect_string.
ndb/src/mgmsrv/Services.cpp:
Add endSession.
- delete Allocated_resources for this connection
- create new Allocated_resources for this connection
conceivably you could keep the socket open across node restarts (and even
possibly get a different node id). But I wouldn't try it and expect happiness.
ndb/src/mgmsrv/Services.hpp:
Add endSession
ndb/src/mgmsrv/main.cpp:
allow mgmd to be restarted.
- add g_RestartServer flag
- move connecting to our own mgmd into MgmtSrvr (where it belongs)
- output correct Shutdown/Restart message on shutdown/restart
