delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-14	2	-1/+59
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into lmy004.:/work/mysql-5.1-bug17289 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
\| *	Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-14	2	-1/+59
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into lmy004.:/work/mysql-5.1-bug17289
\| \| *	fix for bug #17289 Events: missing privilege check for drop database	unknown	2006-02-10	2	-1/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Events were executed with all privileges possible on planet Earth :( WL#1034 mysql-test/r/events.result: update test results mysql-test/t/events.test: test for bug#17289 Events: missing privilege check for drop database sql/event.h: -add two new methods to event_timed to change and restore the security context sql/event_executor.cc: - move code regarding privilieges checking to event_timed::execute() - add a new function evex_print_warnings() which prints the notes/warnings/errors to the console (easily capturable with logs-into-tables) so one can see what has happened if there was an error of some sort! sql/event_timed.cc: - fix documentation - add a new error code -99, EVENT was revoked from the user on the DB - set_sec_ctx, execute, restore_sex_ctx sql/sql_error.cc: - make warning_level_names public to be used in event_executor.cc - change from 2 arrays to a LEX_STRING array
* \| \|	Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-14	1	-0/+7
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into lmy004.:/work/mysql-5.1-bug16548
\| * \|	disabled a bunch of tests with reference to bugreporsts to cleanup push-build	unknown	2006-02-14	1	-0/+7
\| \| \|
* \| \|	manual merge	unknown	2006-02-14	2	-21/+318
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	- final fixes for bug#16431 (Events: An event which alters itself disappears)	unknown	2006-02-14	2	-21/+318
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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.
* \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-14	5	-2/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl sql/sql_yacc.yy: Auto merged
\| * \ \	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-14	1	-0/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
\| \| * \| \|	disabled non deterministic test	unknown	2006-02-14	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge mysql.com:/usr/home/bar/mysql-5.0.cs_fs	unknown	2006-02-14	2	-0/+32
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/home/bar/mysql-5.1-new.fscs mysql-test/r/variables.result: SCCS merged mysql-test/t/variables.test: SCCS merged
\| \| * \| \|	Many files:	unknown	2006-02-14	2	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \|	Removed version information from test	unknown	2006-02-14	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	MATCH(a,b) AGAINST (... IN NATURAL LANGUAGE MODE)	unknown	2006-02-14	2	-0/+15
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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)
* \| \| \|	Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-14	3	-116/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/alexi/innodb/mysql-5.1-ss115x
\| * \| \| \|	Deleted innodb_unsafe_binlog.test erroneously merged from	unknown	2006-02-14	3	-116/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the innodb-5.0-ss115 snapshot. BitKeeper/deleted/.del-innodb_unsafe_binlog.test~8c3e0832ef20aa2: Delete: mysql-test/t/innodb_unsafe_binlog.test BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b: Delete: mysql-test/t/innodb_unsafe_binlog-master.opt BitKeeper/deleted/.del-innodb_unsafe_binlog.result~7617b075b81d112d: Delete: mysql-test/r/innodb_unsafe_binlog.result
* \| \| \| \|	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-13	2	-3/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
\| * \ \ \ \	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-13	2	-3/+5
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
\| \| * \| \| \| \|	Bug #17179 schema creation fails	unknown	2006-02-13	2	-3/+5
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-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
* \| \| \| \| \|	BUG#17339: Missed line in previous patch	unknown	2006-02-13	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/rpl_loaddata_s.result: Missed line
* \| \| \| \| \|	Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new	unknown	2006-02-13	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339
\| * \ \ \ \ \	Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-13	1	-1/+0
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
\| \| * \| \| \| \|	Fix for bad merge.	unknown	2006-02-13	1	-1/+0
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/t/disabled.def: Removed reference to failed test. sql/ha_archive.cc: This fixes the optimize problem introduced in a bad merge.
* \| \| \| \| \|	BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure ↵	unknown	2006-02-13	28	-60/+104
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that cleanup is done on slave 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
* \| \| \| \|	Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-13	5	-0/+104
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
\| * \| \| \|	Disabling a test, I will look at it tomorrow. Something is wrong with the ↵	unknown	2006-02-13	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge from 5.0. Its probably a flush that is missing somewhere but I am too tired to figure it out at the moment. mysql-test/t/disabled.def: Disabling test. sql/ha_archive.cc: Corrected compile problem
\| * \| \| \|	Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-13	2	-0/+56
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zim.tangent.org:/home/brian/mysql/cleanup-5.1
\| \| * \ \ \	Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-13	2	-0/+56
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zim.tangent.org:/home/brian/mysql/cleanup-5.1
\| \| \| * \| \| \|	Adding thread support for mysqlimport. You can now specify a number of ↵	unknown	2006-02-13	2	-0/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	threads to use and it will thread the loading of the database. Anyone who has had to go through the pain of loading the database will immediatly get the reason for this. 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.
\| * \| \| \| \| \|	Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-13	2	-0/+47
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \|	renamedb.test, renamedb.result:	unknown	2006-02-13	2	-0/+47
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	new file Many files: WL#757 RENAME DATABASE sql/mysql_priv.h: WL#757 RENAME DATABASE sql/mysqld.cc: WL#757 RENAME DATABASE sql/sql_db.cc: WL#757 RENAME DATABASE sql/sql_lex.h: WL#757 RENAME DATABASE sql/sql_parse.cc: WL#757 RENAME DATABASE sql/sql_rename.cc: WL#757 RENAME DATABASE sql/sql_table.cc: WL#757 RENAME DATABASE sql/sql_yacc.yy: WL#757 RENAME DATABASE
* \| \| \| \| \|	Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-13	99	-639/+1043
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
\| * \| \| \| \|	Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-12	12	-281/+42
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zim.tangent.org:/home/brian/mysql/dep-5.1
\| \| * \| \| \| \|	This patch removes the remaining TYPE= code from MySQL. It cleans up a ↵	unknown	2006-02-12	12	-281/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 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
\| * \| \| \| \| \|	Merge	unknown	2006-02-12	3	-6/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \|	MySQL Bugs: #17283: Issues with killing "bankTransactionMaker" (and others) ↵	unknown	2006-02-10	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in 86 tests
\| \| * \| \| \| \| \|	Merge mysqldev@production.mysql.com:my/mysql-5.1-release	unknown	2006-02-06	2	-3/+3
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug mysql-test/mysql-test-run.pl: Auto merged sql/log.cc: Auto merged sql/log.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
\| \| \| * \ \ \ \ \	Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-01-27	2	-3/+3
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
\| \| \| \| * \| \| \| \| \|	Use one option --log-output[=option[,option...]]	unknown	2006-01-27	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instead of current --old-log-format and --both-log-formats options mysql-test/mysql-test-run.pl: use new option instead of the old one for testing mysql-test/r/im_utils.result: correct result file sql/log.cc: use log event handler flags instead of enum_printer sql/log.h: Add log event handler flags to simplify log option processing
\| * \| \| \| \| \| \| \| \|	Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new	unknown	2006-02-12	1	-3/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new mysql-test/lib/mtr_process.pl: Auto merged
\| \| * \| \| \| \| \| \| \| \|	fix race condition in the log_tables test	unknown	2006-02-12	1	-3/+2
\| \| \| \|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/t/log_tables.test: fix race condidtion
\| \| * \| \| \| \| \| \| \|	Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace	unknown	2006-02-11	1	-1/+9
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/local/mysql/mysql-5.1-new mysql-test/lib/mtr_process.pl: Auto merged
\| * \| \| \| \| \| \| \| \| \|	disabled.def:	unknown	2006-02-12	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reenabled tests 'innodb_concurrent', 'innodb_unsafe_binlog', 'rpl_ndb_log' as bugs 3300 15650 17081 are solved mysql-test/t/disabled.def: Reenabled tests 'innodb_concurrent', 'innodb_unsafe_binlog', 'rpl_ndb_log' as bugs 3300 15650 17081 are solved
\| * \| \| \| \| \| \| \| \| \|	Merge	unknown	2006-02-12	1	-24/+24
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VC++Files/libmysqld/libmysqld.vcproj: Auto merged
\| \| * \| \| \| \| \| \| \| \| \|	disabled.def:	unknown	2006-02-12	1	-0/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disabled 'rpl_until' until 15886 is solved libmysqld.vcproj: Added "my_user.c" VC++Files/libmysqld/libmysqld.vcproj: Added "my_user.c" mysql-test/t/disabled.def: Disabled 'rpl_until' until 15886 is solved
\| * \| \| \| \| \| \| \| \| \|	Merge	unknown	2006-02-12	4	-34/+64
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/lib/mtr_cases.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged
\| \| * \| \| \| \| \| \| \| \|	Merge	unknown	2006-02-12	3	-32/+54
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/spatial.cc: Auto merged
\| \| \| * \| \| \| \| \| \| \| \|	spatial.cc:	unknown	2006-02-12	4	-59/+151
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added { ... } around float8get() macro, avoids VC7 error message "illegal else without matching if" mtr_report.pl: Parse error logs to create "warnings" file mtr_cases.pl: Added optoion --ignore-disabled-def Windows build now let TZ pass, removed work around mysql-test-run.pl, mtr_process.pl: Back port of changes from 5.0 mysql-test/lib/mtr_process.pl: Back port of changes from 5.0 mysql-test/mysql-test-run.pl: Back port of changes from 5.0 mysql-test/lib/mtr_cases.pl: Added optoion --ignore-disabled-def Windows build now let TZ pass, removed work around mysql-test/lib/mtr_report.pl: Parse error logs to create "warnings" file sql/spatial.cc: Added { ... } around float8get() macro, avoids VC7 error message "illegal else without matching if"
\| \| * \| \| \| \| \| \| \| \| \|	Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace	unknown	2006-02-12	1	-1/+9
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/local/mysql/mysql-5.0 mysql-test/lib/mtr_process.pl: Auto merged
\| \| \| * \| \| \| \| \| \| \| \|	Fix a race on some platforms in mysql-test-run.pl, where it would sometimes	unknown	2006-02-11	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	errorneously abort reporting failure to kill child processes, where in reality the problem was merely that the child had become a zombie because of missing waitpid() call. mysql-test/lib/mtr_process.pl: Fix race (on some platforms) when killing processes.