change status variable from have_partition_engine to have_partitioning.
mysql-test/include/have_partition.inc:
updated to use new status variable
mysql-test/r/have_partition.require:
updated to use new status variable
sql/set_var.cc:
change status variable from have_partition_engine to have_partitioning.
The log content is obviously different in two modes,
as Queries are translated into Prepare and Execute
commands. Thus we should use test only in one mode
to get the match with result.
mysql-test/t/log_tables.test:
disable ps-protocol in log_tables test
sql/event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
scripts/mysql_create_system_tables.sh:
SCCS merged
added option for verbose ndb startup
mysql-test/mysql-test-run.pl:
added option for relative pat in ndb config
mysql-test/ndb/ndbcluster.sh:
added option for relative pat in ndb config
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysqld/lib_sql.cc:
logger initialization added
mysql-test/mysql-test-run.pl:
ndbcluster and ssl disabled in embedded server
mysql-test/mysql-test-run.sh:
ndbcluster disabled in embedded server
mysql-test/r/mysqltest.result:
result fixed
mysql-test/r/sp_notembedded.result:
result fixed
mysql-test/t/log_tables.test:
test disabled in embedded server
mysql-test/t/sp_notembedded.test:
test fixed
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
hide blob event ops under main op
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
hide blob event ops under main op
storage/ndb/src/ndbapi/NdbBlob.cpp:
tinyblob of course has no blob table and no blob op
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
tinyblob of course has no blob table and no blob op
storage/ndb/test/ndbapi/test_event_merge.cpp:
tinyblob of course has no blob table and no blob op
had to add order by
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
had to add order by
mysql-test/r/rpl_foreign_key_innodb.result:
had to add order by
BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38:
Delete: mysql-test/include/not_ndb_table.inc
BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a:
Delete: mysql-test/r/not_ndb_table.require
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
Cleanup test for NDB
mysql-test/t/rpl_foreign_key_innodb.test:
Cleanup test for NDB
mysql-test/r/rpl_foreign_key_innodb.result:
Cleanup test for NDB
mysql-test/t/rpl_optimize.test:
setting back to orginal values
WL#1034 (Internal CRON)
mysql-test/r/events.result:
add a test for to test bug #16431
mysql-test/t/events.test:
results of new tests
sql/event.cc:
- more debug info
- pass info to evex_remove_from_cache() whether the operation
was drop or alter. this fixes possible bug that may lead to dropping
of an event when it's altered. also fix for bug#16431
sql/event_executor.cc:
be more verbose and throw more errors
sql/event_timed.cc:
- add ` around the names of the db and the event_name and not
their concatenation. remove ; from the end - unneeded. this fixes bug #16431,
which was failing because after some recursion the query was ending on ;;
which is normally an error in the parser because that's the delimiter
- more debug info
- don't execute lex_end() two times when there's a parse error or thd->is_fatal_error
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
WL #1034 (Internal CRON)
mysql-test/r/events.result:
fix the results
mysql-test/t/disabled.def:
make it enabled
mysql-test/t/events.test:
- comment out some tests (having problems now)
- add test for fix for bug#16548
sql/sql_yacc.yy:
- fix for bug#16548 (Events: can't alter clause for preserve)
- prefix optional non-terminals with opt_
calculate ndbcluster slave port
mysql-test/mysql-test-run.pl:
calculate ndbcluster slave port
mysql-test/mysql-test-run.sh:
option to run mysql-test-run without binlog
sql/mysqld.cc:
option to run mysql-test-run without binlog
