- Fixed problem, only detect comment if the # is on start of line AND starting line of the current command.
- Wrote tests for most of the mysqltest commands, added stricter checking of correct syntax.
client/mysqltest.c:
Updated mysql test to do stricter checking of syntax. For example when the number
of arguments to a command is known, everything else is "junk" => die.
Better checking of argument types.
Added better debug printouts.
Added improved printouts when wrong syntax is detected.
Fix two bugs where mysqltest could not detect end of comamnd properly, as described in bug#11316
Fix segfault when performing too many source commands.
Fix segfault when doing too many while loop levels.
Add printout of line number in die
Remove lineno and \n in all strings passed to die function.
Decrese BLOCK_STACK_DEPTH from 32 to 16, does any test use more than 1 level?
mysql-test/mysql-test-run.pl:
export MYSQL_TEST environment variable, used from msyqltest.test
mysql-test/mysql-test-run.sh:
export MYSQL_TEST environment variable, used from msyqltest.test
mysql-test/r/mysqltest.result:
Updated test results
mysql-test/r/rpl_flush_log_loop.result:
Updated test result.
Approved by lars
mysql-test/t/innodb-deadlock.test:
Correct wrong syntax
Superfluos ;
mysql-test/t/innodb-lock.test:
Correct wrong syntax
Superfluos ;
mysql-test/t/mysqltest.test:
Add several new tests for mysqltest.
Foxus on detecting wrong syntax in test files.
Use exec with expected error to execute test scripts that will kill mysqltest
Change some negative test that were previously commented out to use the above method.
mysql-test/t/ndb_autodiscover2.test:
Correct wrong syntax
Superfluos ;
mysql-test/t/rpl_change_master.test:
Correct wrong syntax
Superfluos ;
mysql-test/t/rpl_deadlock.test:
Correct wrong syntax
Superfluos ;
mysql-test/t/rpl_drop_temp.test:
Correct wrong syntax
Superfluos ;
mysql-test/t/rpl_flush_log_loop.test:
Fix after detecting wrong syntax, missing ;
Discussed with lars.
mysql-test/t/rpl_insert_id.test:
Missing ;
mysql-test/t/rpl_rotate_logs.test:
Correct wrong syntax
Superfluos ;
mysql-test/t/rpl_until.test:
Missing delimiter
mysql-test/include/mysqltest_while.inc:
New file to test too many while levels
using @@var_name in proc
Made sure we don't lose the tokenizer state when swapping lex in during SET
parsing.
mysql-test/r/sp.result:
New test case for BUG#9538.
mysql-test/t/sp.test:
New test case for BUG#9538.
sql/sp_head.cc:
Keep lex->next_state when swapping lex during SP parsing (for SET mainly),
otherwise the tokenizer gets confused.
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
configure.in:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/include/portlib/NdbTCP.h:
Auto merged
storage/ndb/include/transporter/TransporterRegistry.hpp:
Auto merged
storage/ndb/include/util/SocketServer.hpp:
Auto merged
storage/ndb/include/util/ndb_opts.h:
Auto merged
storage/ndb/include/util/version.h:
Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/common/util/Parser.cpp:
Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
storage/ndb/src/common/util/version.c:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmclient/main.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/transporter/Transporter.hpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
sql/sql_prepare.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
tests/mysql_client_test.c:
Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
SCCS merged
ndb/src/common/transporter/Transporter.cpp:
SCCS merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
mysql-test/t/ctype_utf8.test:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
sql/sql_prepare.cc:
Auto merged
sub-sequent procedure is called" which was fixed by the same patch
as bug #9597 "read lock stays when querying view from stored procedure".
mysql-test/r/sp.result:
Added test case for bug #9565 "Wrong locking in stored procedure if a
sub-sequent procedure is called".
mysql-test/t/sp.test:
Added test case for bug #9565 "Wrong locking in stored procedure if a
sub-sequent procedure is called".
try to find most suitable table, to avouid pickup table with too low locking mode or occupy table with write mode for select when it will be need for update later
(BUG#9597)
mysql-test/r/view.result:
opening table in correct locking mode test
mysql-test/t/view.test:
opening table in correct locking mode test
sql/sql_base.cc:
take into account table lock mode when opening table:
try to find most suitable table, to avouid pickup table with too low locking mode or occupy table with write mode for select when it will be need for update later
syntax in binlog which stops replication":
disallow the use of parameter markers which can lead to generation
of malformed binlog queries.
mysql-test/r/ps.result:
Test results fixed: a test case for Bug#11299
mysql-test/t/ps.test:
A test case for Bug#11299
sql/sql_lex.cc:
Introduce a new parser token for a parameter marker. Make sure
that a parameter marker can not be used in a query which, when
transformed to a binlog query, becomes grammatically incorrect.
sql/sql_yacc.yy:
The check for COM_PREPARE has been moved into the lexer.
mysql-test/var:
New BitKeeper file ``mysql-test/var''
mysql-test/r/fulltext_order_by.result:
A post-merge fix.
mysql-test/t/fulltext_order_by.test:
A post-merge fix (a different plan is chosen for a query in 5.0)
sql/sql_select.cc:
Post-merge fix.
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/field.cc:
manual merge
tests/mysql_client_test.c:
manual merge
mysql-test/r/select.result:
manual merge
mysql-test/t/select.test:
manual merge
sql/sql_select.cc:
Auto merged
sql/item_func.cc:
Auto merged
source table present (this happens for ORDER BY after UNION)
mysql-test/r/fulltext_order_by.result:
Testcase for BUG#11869
mysql-test/t/fulltext_order_by.test:
Testcase for BUG#11869
This is needed because in some cases range optimization is performed twice and added
NOT NULL item must have correct const_table_map() value.
mysql-test/r/select.result:
Testcase for BUG#11700
mysql-test/t/select.test:
Testcase for BUG#11700
mysql-test/r/innodb.result:
test result fixed
mysql-test/r/type_newdecimal.result:
test result fixed
mysql-test/t/innodb.test:
test moved here
mysql-test/t/type_newdecimal.test:
Innobase bug moved to the innodb.test
No separate typecode for MEDIUMTEXT/LONGTEXT is added, as we
have no sound decision yet what typecodes and for what types are
sent by the server (aka what constitutes a distinct type in MySQL).
mysql-test/r/ps_2myisam.result:
Test results fixed: new longtext/longblob length (2^32)
mysql-test/r/ps_3innodb.result:
Test results fixed: new longtext/longblob length (2^32)
mysql-test/r/ps_4heap.result:
Test results fixed: new longtext/longblob length (2^32)
mysql-test/r/ps_5merge.result:
Test results fixed: new longtext/longblob length (2^32)
mysql-test/r/ps_6bdb.result:
Test results fixed: new longtext/longblob length (2^32)
mysql-test/r/ps_7ndb.result:
Test results fixed: new longtext/longblob length (2^32)
sql/field.cc:
A fix for Bug#9735 "mysql_fetch_fields() acts strange on
LONGBLOB/LONGTEXT": fix wrong initialization of field_length
in case of BLOB fields.
tests/mysql_client_test.c:
A test case for Bug#9735 "mysql_fetch_fields() acts strange on
LONGBLOB/LONGTEXT"
into mysql.com:/usr/home/bar/mysql-5.0
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/item.cc:
After merge fix.
into mysql.com:/usr/home/bar/mysql-4.1.num-conv
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_table.cc:
Auto merged
character set is UCS2".
The bug is no longer repeatable.
mysql-test/r/ps.result:
Test results fixed (a test case for Bug#9442)
mysql-test/t/ps.test:
A test case for Bug#9442 "Set parameter make query fail if column
character set is UCS2
all tables suggested by prelocking algorithm.
Added test for bug #11889 "Server crashes when dropping trigger using stored
routine" (which was fixed by previous patch).
mysql-test/r/trigger.result:
Since we are using open_ltable() now to open table for trigger creation, code
for error when we try to create trigger on view has changed to equivalent one.
Added test for bug #11889 "Server crashes when dropping trigger using stored
routine".
mysql-test/t/trigger.test:
Since we are using open_ltable() now to open table for trigger creation, code
for error when we try to create trigger on view has changed to equivalent one.
Added test for bug #11889 "Server crashes when dropping trigger using stored
routine".
sql/sql_trigger.cc:
mysql_create_or_drop_trigger():
It is better to open only table for which we are going to create or drop
trigger with open_ltable() since we don't really need working prelocking
in this case.
binary).
mysql-test/r/ps.result:
Test results fixed (Bug#9379)
mysql-test/t/ps.test:
A test case for Bug#9379 (collation of a parameter marker is binary)
sql/item.cc:
- set Item_param::collation to str_value collation, if Item_param
is assigned a string. Reset it to default in Item_param::reset() (on
the next execution it can be assigned a number).
sql/item_func.cc:
- now that item collation can change between executions
(if this item is Item_param), we need to register the change
of the execution tree in the rollback list.
data": remove the fix for another bug (8807) that
added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
to prevent their evaluation at prepare. As this bit hanged in
Item_subselect::used_tables_cache for ever, a constant subquery with
a placeholder was never evaluated as such, which caused wrong
choice of the execution plan for the statement.
- to fix Bug#8807 backport a better fix from 5.0
- post-review fixes.
mysql-test/r/ps.result:
Bug#11458: test results fixed
mysql-test/t/ps.test:
- add a test case for Bug#11458 "Prepared statement with subselects return
random data"
sql/item.cc:
- remove unnecessary Item_param::fix_fields
- fix Item_param::set_null to set item_type accordingly (safety:
Item_param should behave like a basic constant).
sql/item.h:
Remove Item_param::fix_fields
sql/item_subselect.h:
Remove no more existing friend.
sql/mysql_priv.h:
Add UNCACHEABLE_PREPARE to mark all subqueries as uncacheable if
in statement prepare (backport from 5.0).
sql/sql_lex.h:
Comment fixed.
sql/sql_parse.cc:
If in statement prepare, mark all subqueries as uncacheable (backport
from 5.0)
sql/sql_prepare.cc:
Switch off the uncacheable flag from all subqueries after statement
prepare is done (backport from 5.0)
indirectly using non-cached function".
mysql-test/r/trigger.result:
Fixed test case after fixing bug #11554 "Server crashes on statement
indirectly using non-cached function".
mysql-test/t/trigger.test:
Fixed test case after fixing bug #11554 "Server crashes on statement
indirectly using non-cached function".
end of the test, causing subsequent tests to fail.
mysql-test/r/rpl_deadlock.result:
Result change.
mysql-test/t/rpl_deadlock.test:
Tables used in the test but not dropped.
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
BitKeeper/etc/config:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
