mysql-test/r/events.result:
Auto merged
mysql-test/t/events.test:
Auto merged
sql/event.h:
Auto merged
sql/event_executor.cc:
Auto merged
sql/event_timed.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
- fix for bug#16423 (Events: SHOW CREATE EVENT doesn't work)
- this Changeset commits makes CREATE/UPDATE/DELETE EVENT real DDL statements
by committing the currently open transaction before they are executed.
- this Changeset also fixes a trailing space problem since the very early days
of the internal cron
- adds sophisticated checking of whether mysql.event was tampered accidentally
or with purpose by an user.
- adds a lot of inline function documentation - documents everything left
uncodumented
- INTERVAL_XXXX to XXX in I_S.EVENTS.INTERVAL_FIELD
WL#1034 (Internal CRON)
mysql-test/r/events.result:
update result
mysql-test/t/events.test:
add test cases for SHOW CREATE EVENT
add test cases where the structure of mysql.event is changed and error reporting in this case
sql/event.cc:
- do a lot more checking on mysql.event whether it's valid
introduced generic function table_check_intact() which can be used also
for checking whether a system table (mysql.*) has been tampered by user
and report an error in this case. The checking is quite strict, thus
maybe some mechanism can be added later that loosens this like some
session variable, for instance, i_am_aware_that_i_can_damage_my_data
so the table will be opened nevertheless we think that it's not valid.
- add evex_show_create_event(THD *thd, sp_name *spn, LEX_STRING definer)
- document a loooot. not a single function left undocumented.
sql/event.h:
- add evex_show_create_event(THD *thd, sp_name *spn, LEX_STRING definer)
- change get_show_create_event() to get_create_event()
- add TABLE_FIELD_W_TYPE used by table_check_intact()
- add event_timed::sql_mode so it can be used by show create event. currently
always 0, will be fixed by a patch for another bug. At least makes the code
of show create event complete.
sql/event_executor.cc:
- add evex_check_system_tables() that checks on boot and event
main thread startup that mysql.db and mysql.user tables are correct.
- document everything!
sql/event_priv.h:
remove a line
sql/event_timed.cc:
- implement SHOW CREATE EVENT
- document undocumented functions!
sql/share/errmsg.txt:
- fix an error message and add two new
sql/sql_acl.cc:
- add mysql.db table definition to use by table_check_intact()
- exchange some of the positions by numbers from mysql.db to enum names (see sql_acl.h)
sql/sql_acl.h:
- define the structure of mysql.db table
sql/sql_parse.cc:
- handle SQLCOM_SHOW_CREATE_EVENT
- end the current transaction becase CREATE/UPDATE/DELETE EVENT is a DDL
statement
sql/sql_show.cc:
- remove interval_type_to_name
- use common function event_reconstruct_interval_expression()
that reconstructs the expression given at create/alter, to some
extent - interval of 2:62 MINUTE_SECOND will be reconstructed as
interval of 3:02 MINUTE_SECOND!
sql/sql_yacc.yy:
init the definer of event_timed also when doing SHOW CREATE EVENT
because it's needed for checking into mysql.event
sql/table.cc:
- remove stale code. only mysql.event should be a 'system_table'
- add table_check_intact() to check the consistency of a table.
mostly usable with mysql.xxx tables.
sql/table.h:
- export TABLE_FIELD_W_TYPE and table_check_intact() which are used for
checking the structure of a table. mostly usable for mysql.xxx tables.
remove explicit $<ulong_num>$ from sql_yacc.yy
mysql-test/r/fulltext.result:
MATCH(a,b) AGAINST (... IN NATURAL LANGUAGE MODE)
mysql-test/t/fulltext.test:
MATCH(a,b) AGAINST (... IN NATURAL LANGUAGE MODE)
Backporting character_set_filesystem from 5.0 to 5.1.
sql/mysqld.cc:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/set_var.cc:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/set_var.h:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_class.cc:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_class.h:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_yacc.yy:
Backporting character_set_filesystem from 5.0 to 5.1.
mysql-test/t/variables.test:
Backporting character_set_filesystem from 5.0 to 5.1.
mysql-test/r/variables.result:
Backporting character_set_filesystem from 5.0 to 5.1.
-flag was set on field intable share instead of table
mysql-test/r/ndb_basic.result:
Bug #17179 schema creation fails
mysql-test/t/ndb_basic.test:
Bug #17179 schema creation fails
For this particular bug report it was rpl_loadfile.test that did not make proper cleanup, but the patch
includes fixes for other tests aswell.
mysql-test/r/rpl_loaddata2.result:
Cleanup
mysql-test/r/rpl_redirect.result:
Cleanup
mysql-test/r/rpl_slave_status.result:
Cleanup
mysql-test/t/rpl_LD_INFILE.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_drop_temp.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ignore_table.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata2.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_m.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_s.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loadfile.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_multi_update4.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ndb_basic.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_redirect.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func001.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func002.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp001.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp005.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp008.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp009.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp010.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp011.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp012.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig001.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig002.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_skip_error.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_slave_status.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp004.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
client/Makefile.am:
Adding client_thread_libs for mysqlimport (aka it gets pthreads)
client/client_priv.h:
New option
client/mysqlimport.c:
Reworked logic to allow someone to use threads.
mysql-test/r/mysqldump.result:
New results
mysql-test/t/mysqldump.test:
Added tests for threads.
into mysql.com:/usr/home/bar/mysql-5.1-new.fscs
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
BitKeeper/deleted/.del-raid.test~501e9e00b3c27a55:
Delete: mysql-test/t/raid.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Test change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
New results
mysql-test/r/ctype_ujis.result:
New results
mysql-test/r/innodb_concurrent.result:
New results.
mysql-test/r/rpl_heap.result:
New results
mysql-test/r/warnings.result:
New results
mysql-test/t/ctype_ujis.test:
Fixed ENGINE=, test should now actually function
mysql-test/t/innodb_concurrent.test:
Fixed test for engine
mysql-test/t/rpl_heap.test:
Fixed test for engine
mysql-test/t/system_mysql_db_fix.test:
Fixed setup.
mysql-test/t/warnings.test:
Removed deprecated tests
scripts/fill_func_tables.sh:
Fixed script
scripts/mysql_convert_table_format.sh:
Fixed script
sql/ha_innodb.cc:
Fixed comment
sql/sql_yacc.yy:
Removed deprecated syntax
tests/fork_big.pl:
Fixed scipt
tests/fork_big2.pl:
Fixed script
tests/mail_to_db.pl:
Fixed script
tests/mysql_client_test.c:
Fixed test
include/config-netware.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
netware/BUILD/compile-AUTOTOOLS:
Auto merged
netware/Makefile.am:
Auto merged
netware/my_manage.h:
Auto merged
netware/mysql_test_run.c:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
netware/BUILD/mwenv:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/innobase/include/univ.i:
Auto merged
storage/innobase/os/os0thread.c:
Auto merged
storage/myisam/mi_locking.c:
Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
into mysql.com:/home/mydev/mysql-5.1-wl1563-msg
mysql-test/r/create_select_tmp.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/ndb_index_unique.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/sp_trans.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/type_varchar.result:
Auto merged
sql/handler.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/heap.result:
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
Manual merge
mysql-test/r/rpl_err_ignoredtable.result:
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
Manual merge
mysql-test/r/rpl_insert_id.result:
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
Manual merge
into mysql.com:/home/cps/mysql/devel/5.1-merge
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
server-tools/instance-manager/commands.cc:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
sql/ha_ndbcluster.h:
SCCS merged
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key
change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
mysql-test/r/ndb_basic.result:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key
mysql-test/t/ndb_basic.test:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key
sql/ha_ndbcluster.cc:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key
change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
sql/ha_ndbcluster.h:
Bug #17249 delete statement with join where clause fails when table do not have pk
Bug #17257 update fails for inner joins if tables do not have Primary Key
change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
SHOW INSTANCE STATUS output
mysql-test/r/im_life_cycle.result:
update result
mysql-test/t/im_life_cycle.imtest:
fix test to take into account the new column
server-tools/instance-manager/commands.cc:
add a version_no column to the SHOW INSTANCE STATUS output
server-tools/instance-manager/instance_options.cc:
cleanup
mysql-test/r/im_life_cycle.result:
correct result
mysql-test/t/im_life_cycle.imtest:
check that wrong command is processed correctly
server-tools/instance-manager/Makefile.am:
always look for passwords in /etc/ on unixes
server-tools/instance-manager/commands.cc:
fix warning
server-tools/instance-manager/instance.cc:
fix monitoring capabilities, when no port was specified
for an instance
server-tools/instance-manager/instance_map.cc:
allow relative paths in --defaults-file option
server-tools/instance-manager/mysqlmanager.cc:
fix windows warning
server-tools/instance-manager/options.cc:
add vars to allow relative paths in --defaults-file option
server-tools/instance-manager/options.h:
add an option
server-tools/instance-manager/parse.cc:
check for get_text_id return value
server-tools/instance-manager/portability.h:
add _snprintf define, move platfrom-independent
ifdefs to priv.h
server-tools/instance-manager/priv.cc:
increase net timeout. it should be equal to mysqld's
server-tools/instance-manager/priv.h:
move platform-independent ifdefs here
corrected multiple --log-bin options in mysql-test-run
mysql-test/mysql-test-run.sh:
corrected multiple --log-bin options in mysql-test-run
mysql-test/r/rpl_ndb_sync.result:
changed to use temporary heap table on a ndb test
mysql-test/t/rpl_ndb_sync.test:
changed to use temporary heap table on a ndb test
into mysql.com:/home/alexi/innodb/mysql-5.1-merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
