into mysql.com:/opt/local/work/mysql-5.1-merge1
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_select.cc:
Auto merged
/var/tmp in my path when testing data diretory. the var directory
exists in a src tree but may not exist in a different testing
build setup.
mysql-test/r/partition_mgm_err.result:
added a row insert just to make sure the data and index files are made
mysql-test/t/partition_mgm_err.test:
removed the /var/tmp path elements since there is not guarantee that
other build setups will include this path
into linux.site:/home/reggie/work/mysql-5.1-bug14354
mysql-test/r/partition_mgm_err.result:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
mysql-test/t/partition_mgm_err.test:
SCCS merged
WL#1034 (Internal CRON)
mysql-test/r/events.result:
fix results file
mysql-test/t/events.test:
change test for the fix of bug#16404
sql/lex.h:
enabled/disabled were only for events, going back to enable/disable
fix for bug#16404
sql/sql_yacc.yy:
ENABLED -> ENABLE
DISABLED -> DISABLE
fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
mysql-test/r/binlog_row_ctype_cp932.result:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Updated to remove ndb_dd_disk2memory
ndb_dd_disk2memory.result:
Updated results to match change to show create table for NDB tables. WL 2604
mysql-test/r/ndb_dd_disk2memory.result:
Updated results to match change to show create table for NDB tables. WL 2604
mysql-test/t/disabled.def:
Updated to remove ndb_dd_disk2memory
mysql-test/r/partition_mgm_err.result:
only the single drop table since we have disabled query logging for the create table
mysql-test/t/partition_mgm_err.test:
test for bug #14354
first make sure /tmp/bug14354 is not there, then make the dir
create a partitioned table with the partition using
/tmp/bug14354 as it's data dir
we are disabling query logging since we are using $MYSQL_TEST_DIR
and we are not certain where the tmp files will be created.
sql/ha_partition.cc:
pass partition filename with pathname into
set_up_table_before_create.
remove the path from the passed in value and then append the filename
to the data_file_name or index_file_name if those values were
specified.
sql/ha_partition.h:
added partition_name_with_path to set_up_table_before_create
sql/mysql_priv.h:
move append_file_to_dir to mysql_priv.h
sql/sql_parse.cc:
moving append_file_to_dir to mysql_priv.h
sql/sql_partition.cc:
add_keyword_string was not writing keyword value with quotes
this was fixed by WL 2604
mysql-test/r/partition_mgm_err.result:
result block for bug#15523
mysql-test/t/partition_mgm_err.test:
test block for bug #15523
This bug was fixed as part of the large WL 2604 push.
mysql-test/r/partition_mgm_err.result:
results block for bug #16534
mysql-test/t/partition_mgm_err.test:
test block for bug# 16534
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
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
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_
mysql-test/t/ndb_dd_ddl.test:
Updated test case with suggestions from omer
mysql-test/r/ndb_dd_ddl.result:
Updated test case with suggestions from omer
mysql-test/ndb/ndbcluster.sh:
Upgraded DataMemory to 20M so that ndb_restore tests fit in memory
mysql-test/r/ndb_config.result:
Upgraded DataMemory to 20M so that ndb_restore tests fit in memory
mysql-test/r/ndb_restore.result:
Added check that no extra objects exist before starting
Added printout from erronous node group map
mysql-test/t/disabled.def:
Activated ndb_restore again
mysql-test/t/ndb_restore.test:
Added new test cases and handling of error case for node group maps
storage/ndb/tools/restore/consumer_restore.cpp:
Removed debug printouts
storage/ndb/tools/restore/restore_main.cpp:
Removed debug printouts
ndbout => info
some ndbout => err
and yet others
ndbout => debug
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view.test:
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
sql/sql_prepare.cc:
Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~7c748e8e7ae6e7fe:
Delete: mysql-test/t/ctype_cp932_notembedded.test
mysql-test/r/innodb.result:
result fixed
mysql-test/r/query_cache.result:
result fixed
mysql-test/r/query_cache_notembedded.result:
result fixed
mysql-test/r/sp-error.result:
result fixed
mysql-test/r/sp.result:
result fixed
mysql-test/r/view.result:
result fixed
mysql-test/r/view_grant.result:
result fixed
mysql-test/t/sp-destruct.test:
test disabled
mysql-test/t/view.test:
lines moved to view_grant.test
mysql-test/t/view_grant.test:
lines moved from view.test
tree to get rid of multiple typos in CS comments and
unify the patch.
configure.in:
CSV is compiled in by default now
include/my_base.h:
add new ha_extra flag for the log tables
mysql-test/include/im_check_os.inc:
we should only run im tests if csv is on for now: im relies
on mysqld options available only in csv build.
mysql-test/include/system_db_struct.inc:
check log tables structure
mysql-test/lib/init_db.sql:
create log tables when running tests.
mysql-test/mysql-test-run.pl:
Add old logs flag to IM tests. As IM could only deal with
old logs (this feature is not needed with log tables)
mysql-test/r/connect.result:
update result
mysql-test/r/csv.result:
update result
mysql-test/r/im_utils.result:
update result
mysql-test/r/information_schema.result:
update result
mysql-test/r/mysqlcheck.result:
update result
mysql-test/r/show_check.result:
update result
mysql-test/r/system_mysql_db.result:
update result
mysql-test/t/connect.test:
disable test if CSV engine is not in: result depends on the
presence of CSV-based log tables
mysql-test/t/csv.test:
add tests for concurrent insert (the functionality is added
to CSV in this patch)
mysql-test/t/information_schema.test:
disable test if CSV engine is not in: result depends on the
presence of CSV-based log tables
mysql-test/t/mysqlcheck.test:
disable test if CSV engine is not in: result depends on the
presence of CSV-based log tables
mysql-test/t/show_check.test:
disable test if CSV engine is not in: result depends on the
presence of CSV-based log tables
mysql-test/t/system_mysql_db.test:
disable test if CSV engine is not in: result depends on the
presence of CSV-based log tables
mysql-test/t/system_mysql_db_fix.test:
disable test if CSV engine is not in: result depends on the
presence of CSV-based log tables
scripts/mysql_create_system_tables.sh:
new system tables: slow_log and general_log
scripts/mysql_fix_privilege_tables.sql:
add new log tables: use an SP to create them for
non-csv build to work fine.
sql/ha_myisam.cc:
move locking-related checks to the hanlder
sql/ha_myisam.h:
new function declared
sql/handler.h:
new virtual function is added: we should check for handler-related
locking issues in the handler
sql/lock.cc:
from now on we check for handler-related locking issues
in the handler itself rather then in lock.cc
sql/log.cc:
Add log tables support, refactoring: there are log event
handlers with common interface. They are used by the LOGGER
class, which is responsible for their initialization, cleanup
and managment. Logging to the tables provided by one of the
log event handler types.
sql/log.h:
declare new log classes
sql/log_event.cc:
convert old logging routines calls to use new API
sql/mysql_priv.h:
define common log routines and objects
sql/mysqld.cc:
Add support for the log tables. Their initalization, cleanup
and specific options.
sql/share/errmsg.txt:
add new error messages for the log tables
sql/slave.cc:
convert old logging routines calls to use new API
sql/sql_base.cc:
TABLE objects used by the logger should be skipped
during refreshes (as log tables are always opened
and locked). fix table_is_used to skip them. This
is needed for FLUSH LOGS to work
sql/sql_db.cc:
convert old logging routines calls to use new API
sql/sql_delete.cc:
fix TRUNCATE to work with log tables
sql/sql_parse.cc:
command_name is now an array of LEX_STRINGs
sql/sql_prepare.cc:
convert old logging routines calls to use new API
sql/sql_show.cc:
convert old logging routines calls to use new API
sql/sql_table.cc:
don't reoped the log tables for admin purposes
sql/table.cc:
mark log tables as such during the open
sql/table.h:
add log-related info
storage/csv/ha_tina.cc:
add support for concurrent insert (see bk commit - 5.1 tree
(petr:1.1910) for standalone patch), add log tables-specific
csv table handling.
storage/csv/ha_tina.h:
enable concurrent insert for CSV, add log table flag
mysql-test/r/log_tables.result:
New BitKeeper file ``mysql-test/r/log_tables.result''
mysql-test/t/log_tables.test:
New BitKeeper file ``mysql-test/t/log_tables.test''
mysql-test/r/partition.result:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
Adding test case.
sql_yacc.yy:
Adding TEXT_STRING_filesystem, which
converts from character_set_client to
character_set_conversion.
Replacing TEXT_STRING_sys to TEXT_STRING_filesystem
in LOAD DATA and SELECT INTO OUTFILE contexts.
sql_class.h, sql_class.cc:
Adding character_set_filesystem variable,
and charset_is_character_set_filesystem
flag (to avoid conversion when it's not necessary).
set_var.h, set_var.cc:
Adding sys_var_character_set_filesystem
mysqld.cc:
Adding --character-set-filesystem startup option.
sql/mysqld.cc:
Adding --character-set-filesystem startup option.
sql/set_var.cc:
Adding sys_var_character_set_filesystem
sql/set_var.h:
Adding sys_var_character_set_filesystem
sql/sql_class.cc:
Adding character_set_filesystem variable,
and charset_is_character_set_filesystem
flag (to avoid conversion when it's not necessary).
sql/sql_class.h:
Adding character_set_filesystem variable,
and charset_is_character_set_filesystem
flag (to avoid conversion when it's not necessary).
sql/sql_yacc.yy:
Adding TEXT_STRING_filesystem, which
converts from character_set_client to
character_set_conversion.
Replacing TEXT_STRING_sys to TEXT_STRING_filesystem
in LOAD DATA and SELECT INTO OUTFILE contexts.
mysql-test/t/loaddata.test:
Adding test case.
mysql-test/r/loaddata.result:
Adding test case.
mysql-test/t/rpl_row_USER.test:
Changed test to allow ndbcluster engine to be use
mysql-test/r/rpl_row_USER.result:
Changed test to allow ndbcluster engine to be use
mysql-test/t/rpl_bit.test:
Changed test to allow ndbcluster engine to be use
mysql-test/r/rpl_bit.result:
Changed test to allow ndbcluster engine to be use
mysql-test/r/rpl_log_pos.result:
Changed test to allow ndbcluster engine to be use
mysql-test/t/rpl_log_pos.test:
Changed test to allow ndbcluster engine to be use
mysql-test/r/not_ndb_table.require:
Needed a way to tell some test case to skip running it default-storage-engine was set to ndb
mysql-test/t/rpl_000015.test:
Updated test case
mysql-test/r/rpl_000015.result:
Updated test case
mysql-test/t/rpl_loaddata2.test:
Updated test case
mysql-test/r/rpl_loaddata2.result:
Updated test case
mysql-test/t/rpl_loadfile.test:
Updated test case
mysql-test/r/rpl_loadfile.result:
Updated test case
mysql-test/include/not_ndb_table.inc:
added comment header.
mysql-test/t/rpl_foreign_key_innodb.test:
Skip test when NDB is forced
mysql-test/t/rpl_optimize.test:
Skip test when NDB is forced
mysql-test/t/rpl000005.test:
updated test case
mysql-test/r/rpl000005.result:
updated test case
mysql-test/t/rpl_user_variables.test:
Test clean up for CRBR testing
mysql-test/r/rpl_user_variables.result:
Test clean up for CRBR testing
mysql-test/r/rpl_timezone.result:
Test clean up for CRBR testing
mysql-test/t/rpl_timezone.test:
Test clean up for CRBR testing
