summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-171-9/+2
|\ | | | | | | | | | | | | | | into zim.tangent.org:/home/brian/mysql/dep-5.1 sql/sql_plugin.cc: SCCS merged
| * Removing support for storage engines being loadable, will push featureto 5.2.unknown2006-02-171-9/+2
| | | | | | | | | | sql/sql_plugin.cc: Removed support for Storage gneines.
* | Merge mysql.com:/home/jimw/my/mysql-5.1-13883unknown2006-02-171-5/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean mysql-test/r/create.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/partition.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/r/system_mysql_db.result: Auto merged mysql-test/r/type_blob.result: Auto merged sql/sql_show.cc: Auto merged mysql-test/r/rpl_mixed_ddl_dml.result: Auto merged
| * | Remove extra space in SHOW CREATE TABLE output. (Bug #13883)unknown2006-02-021-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/alter_table.result: Update test results mysql-test/r/archive_bitfield.result: Update test results mysql-test/r/create.result: Update test results mysql-test/r/ctype_tis620.result: Update test results mysql-test/r/gis-rtree.result: Update test results mysql-test/r/index_merge_innodb.result: Update test results mysql-test/r/information_schema.result: Update test results mysql-test/r/innodb.result: Update test results mysql-test/r/key.result: Update test results mysql-test/r/merge.result: Update test results mysql-test/r/partition.result: Update test results mysql-test/r/partition_range.result: Update test results mysql-test/r/rpl000002.result: Update test results mysql-test/r/rpl_multi_engine.result: Update test results mysql-test/r/show_check.result: Update test results mysql-test/r/sql_mode.result: Update test results mysql-test/r/strict.result: Update test results mysql-test/r/symlink.result: Update test results mysql-test/r/system_mysql_db.result: Update test results mysql-test/r/type_blob.result: Update test results sql/sql_show.cc: Avoid adding extra space between 'PRIMARY KEY' and key fields in SHOW CREATE TABLE output.
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-7955unknown2006-02-174-7/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/bdb.result: Resolve conflict mysql-test/t/bdb.test: Resolve conflict sql/share/errmsg.txt: Resolve conflict
| * | | Fix handling of "SET TRANSACTION ISOLATION LEVEL ...". (Bug #7955)unknown2005-11-024-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/bdb.result: Add results mysql-test/t/bdb.test: Add new test sql/set_var.cc: Refuse attempts to change tx_isolation while a transaction is in progress. sql/set_var.h: Support check function for sys_var_thd_enum sql/share/errmsg.txt: Add new error message sql/sql_yacc.yy: Make sure that lex->option_type always gets set in 'SET TRANSACTION ...'
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanunknown2006-02-174-210/+307
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean BitKeeper/etc/ignore: auto-union mysql-test/r/func_str.result: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_strfunc.cc: Auto merged mysql-test/t/disabled.def: Resolve conflict
| * \ \ \ Merge mysql.com:/home/jimw/my/mysql-5.0-14676unknown2006-02-171-16/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean sql/item_strfunc.cc: Auto merged
| | * | | | Fix possible corruption of results from SUBSTRING_INDEX(). (Bug #14676)unknown2005-11-231-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_str.result: Add new results mysql-test/t/func_str.test: Add new test sql/item_strfunc.cc: Mark tmp_value in Item_func_substr_index as const so that we don't overwrite the contents of another String when getting the delimiter. Fix typo in variable names (delimeter -> delimiter).
| * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-02-173-194/+285
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/15706-bug-5.0-mysql
| | * \ \ \ \ Mergeunknown2006-02-163-194/+285
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item.cc: Auto merged sql/item.h: Auto merged mysql-test/t/disabled.def: SCCS merged
| | | * | | | | Fix bug #15706 find_field_in_tables() returns field from outer selectunknown2006-02-153-194/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If item->cached_table is set, find_field_in_tables() returns found field even if it doesn't belong to current select. Because Item_field::fix_fields doesn't expect such behaviour, reported bug occurs. Item_field::fix_fields() was modifed to detect when find_field_in_tables() can return field from outer select and process such fields accordingly. In order to ease this code which was searching and processing outed fields was moved into separate function called Item_field::fix_outer_field(). sql/item_subselect.h: Fixed bug #15706: find_field_in_tables() returns field from outer select Item_field::fix_outer_field() was marked as friend to Item_subselect class. sql/item.h: Fixed bug #15706: find_field_in_tables() returns field from outer select fix_outer_field() function is added to the Item_field class. sql/item.cc: Fixed bug #15706: find_field_in_tables() returns field from outer select Item_ref::fix_fields() and Item_field::fix_fields() were modifed to detect when find_field_in_tables() can return field from outer select and process such fields accordingly. In order to ease this, code Item_field::fix_fields() which was searching and processing outer fields was moved into separate function called Item_field::fix_outer_field(). To the Item_field::fix_field() added a loop for finding context for found field. mysql-test/t/disabled.def: Fixed bug #15706: find_field_in_tables() returns field from outer select Enable subselect test
* | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.1-17169unknown2006-02-171-14/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean sql/sql_table.cc: Auto merged
| * | | | | | | | Bug #17169: Partitions: out of memory if add partition and unique.unknown2006-02-161-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new partition, a bogus memory allocation problem was reported. mysql-test/r/partition.result: Add new results mysql-test/t/partition.test: Add new regression test sql/sql_table.cc: Fix inverted tests that caused mysql_copy_key_list() to not work at all, remove a forward declaration for a function that does not exist, and fix a debug message.
* | | | | | | | | Bug #17210 Create temp table call to ha_ndbcluster::create_handler_files ↵unknown2006-02-174-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caused core - do not try to create ndb temp tables even if default storage is ndb mysql-test/r/ndb_temporary.result: New BitKeeper file ``mysql-test/r/ndb_temporary.result'' mysql-test/t/ndb_temporary.test: New BitKeeper file ``mysql-test/t/ndb_temporary.test''
* | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-171-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.16234
| * \ \ \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-171-1/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.16234
| | * | | | | | | | | Bug#16234 XML: Crash if ExtractValue()unknown2006-02-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes 16314: XML: extractvalue() crash if vertical bar xml.result, xml.test: Adding test case item_xmlfunc.cc: Using root element as a context node, instead of NULL, with relative paths. sql/item_xmlfunc.cc: Bug#16234 XML: Crash if ExtractValue() Also fixes 16314: XML: extractvalue() crash if vertical bar Use root element as a context node, instead of NULL, with relative paths. mysql-test/t/xml.test: Adding test case mysql-test/r/xml.result: Adding test case
* | | | | | | | | | | WL#2645 (CHECK FOR UPGRADE)unknown2006-02-172-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.1-related fixes BitKeeper/etc/ignore: Added scripts/mysql_upgrade to the ignore list sql/ha_partition.cc: ha_check and ha_repair now to be called sql/handler.cc: code modified to be 5.1 compliant
* | | | | | | | | | | Merging 5.0->5.1unknown2006-02-177-5/+211
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/myisam.h: Auto merged sql/handler.h: Auto merged sql/lex.h: Auto merged sql/slave.cc: Auto merged sql/sql_table.cc: Auto merged include/my_base.h: merging scripts/Makefile.am: merging sql/handler.cc: merging sql/share/errmsg.txt: merging sql/sql_yacc.yy: merging
| * | | | | | | | | Merge bk@192.168.21.1:mysql-5.0unknown2006-02-177-5/+212
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.w2645 sql/sql_table.cc: Auto merged
| | * | | | | | | | | WL#2645 (CHECK TABLE FOR UPGRADE)unknown2006-02-177-5/+212
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary implementation in the server mysql_upgrade script added client/mysqlcheck.c: --check-upgrade option added include/my_base.h: errcode added include/myisam.h: option added scripts/Makefile.am: mysql_upgrade script added sql/handler.cc: checks for old types/bugs added sql/handler.h: declarations regarding checks for upgrade sql/lex.h: sym added sql/share/errmsg.txt: error message added sql/slave.cc: now ha_repair is for public use sql/sql_table.cc: upgrade in ha_repair implemented sql/sql_yacc.yy: CHECK ... FOR UPGRADE added to syntax
| * | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0unknown2006-02-161-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug8841 mysql-test/r/innodb.result: Auto merged mysql-test/r/myisam.result: Auto merged
* | | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-161-3/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51
| * \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-161-3/+6
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
| | * | | | | | | | | | Bug #17459 Cluster row based replication not setup if backup is ongoingunknown2006-02-161-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - also accept setting up binlog for tables in stateBackup
* | | | | | | | | | | | ndb - wl#3023 : pass tables per GCI to injector at epoch startunknown2006-02-161-0/+31
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_ndbcluster_binlog.cc: use_table at beginning of epoch storage/ndb/include/ndbapi/Ndb.hpp: getGCIEventOperations: return distinct event ops at epoch start storage/ndb/src/ndbapi/Ndb.cpp: getGCIEventOperations: return distinct event ops at epoch start storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: getGCIEventOperations: return distinct event ops at epoch start storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: getGCIEventOperations: return distinct event ops at epoch start
* | | | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-163-10/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy004.:/work/mysql-5.1-bug16406 sql/sql_show.cc: Auto merged
| * | | | | | | | | | fix bug in show events which showsunknown2006-02-163-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INTERVAL_VALUE | INTERVAL_FIELD | | 20 | 20 MINUTE | the second one should be without the value mysql-test/r/events.result: update test result to be as they should be sql/event_timed.cc: manually append the name of the interval because it's no more appended by reconstruct_value
* | | | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-162-0/+130
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/dev/mysql-5.1-wl3148 sql/sql_show.cc: Auto merged sql/table.h: Auto merged
| * | | | | | | | | | | The patch adds PROCESSLIST information schemaunknown2006-02-162-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/information_schema.result: Fixing results after PROCESSLIST information schema is added. mysql-test/r/information_schema_db.result: Fixing results after PROCESSLIST information schema is added. mysql-test/t/information_schema.test: Test case to check PROCESSLIST information schema. (Note that selecting other fields from PROCESSLIST can make the test unstable). sql/sql_show.cc: Code for PROCESSLIST information schema sql/table.h: Added for PROCESSLIST informarion schema
* | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.1unknown2006-02-1611-258/+889
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.1-bug8841
| * | | | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-162-84/+100
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy004.:/work/mysql-5.1-bug16406
| | * \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-162-84/+100
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged
| | | * | | | | | | | | | Bug #17415 special character tables are not handled correctly in ndb ↵unknown2006-02-162-45/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binlog/schema dist
| | | * | | | | | | | | | Bug #17414 ndb schema distribution functionality does not work on mysql ↵unknown2006-02-162-39/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | servers without binlog
| * | | | | | | | | | | | small post-merge fixes for bug#16406unknown2006-02-163-17/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (pre-push) mysql-test/r/events.result: update result mysql-test/t/events.test: few more tests sql/event.cc: fix compilation failure after big merge sql/event.h: initialize s_ctx to be the context to be used. don't use sphead->m_security_ctx but we will copy the initted ctx to there sql/event_timed.cc: -initialize s_ctx to be the context to be used. don't use sphead->m_security_ctx but we will copy the initted ctx to there - first init the context - then compile the event - and then copy the context - don't use mysql_change_db() for now change_security_context() gets the right context info
| * | | | | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-166-127/+578
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy004.:/work/mysql-5.1-bug16406
| | * | | | | | | | | | | mergeunknown2006-02-166-127/+578
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/events.result: Auto merged mysql-test/t/events.test: Auto merged sql/event_priv.h: Auto merged sql/sql_db.cc: Auto merged sql/event.cc: manual merge sql/event.h: manual merge sql/event_executor.cc: manual merge sql/event_timed.cc: manual merge
| | | * | | | | | | | | | | fix for bug#16406 (Events: DROP DATABASE doesn't automatically drop events)unknown2006-02-166-133/+583
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#1034 - This changeset also changes the executor so its quite more stable now. Stressing test case added that executes ~800 events per second and dropping hundreds of events at once using DROP DATABASE. (with fixes after review of JimW) (with fixes after review of Serg) mysql-test/r/events.result: update results after TRIGGER_ACL was added mysql-test/t/events.test: -redundant line sql/event.cc: Implemented evex_db_drop_events() which drops all events from a specific database. Needed for SQLCOM_DROP_DATABASE sql/event.h: - protect the event better (see the changes to event_executor.cc and event.cc). An event object could be used in a spawned thread before it's executed but till now the object is marked as being executed when the anonymous sp_head is executed. However, there are timeframes before and after that during which the event is not marked as executed and other thread may delete the object -> so we end with a nirvana pointer. sql/event_executor.cc: - extract some of the code executed in the main thread to a function. Too long functions are bad for the overview. - prepend all information/error messages to the console with "SCHEDULER:" for better overview, and easied searching in the log tables. sql/event_priv.h: - change the name, of evex_db_find_event_by_name() and don't used C++ features like function overloading - define consts for result returned from event_timed::spawn_now() sql/event_timed.cc: - add few methods related to event execution. now the event spawns the worker thread and passes itself as parameter. This way it locks itself for exectution first and then spawning -> no race condition. When the worker thread has finished working with the reference it calls back event_timed::spawn_thread_finish() to unlock itself. sql/sql_db.cc: - call evex_drop_db_events() on DROP DATABASE
| * | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-02-151-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| | * | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-02-151-5/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-5.1-16782unknown2006-02-151-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean sql/ha_partition.cc: Auto merged mysql-test/r/partition.result: Resolve conflicts mysql-test/t/partition.test: Resolve conflicts
| | | | * | | | | | | | | | | | Bug #16782: Partitions: crash, REPLACE .. on table with PK, DUPLICATEunknown2006-02-151-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KEY event. Partitioning wrongly claimed to be able to handle HA_DUPP_POS when it was supported by the underlying storage engine, which resulted in a crash when handling REPLACE statements. mysql-test/r/partition.result: Add new results mysql-test/t/partition.test: Add regression test sql/ha_partition.cc: Fix list of table flags that are not passed through for partitioned tables, and add HA_DUPP_POS to that list. Also, handle HA_EXTRA_FLUSH_CACHE in ha_partition::extra().
| | | * | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.1-16775unknown2006-02-151-2/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean sql/ha_partition.cc: Auto merged mysql-test/r/partition.result: Resolve conflicts mysql-test/t/partition.test: Resolve conflicts
| | | | * | | | | | | | | | | | | Bug #16775: DROP TABLE of subpartitioned table can fail if default engineunknown2006-02-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used. The problem is that the actual engine was not stored in the .par file, causing confusion when the default engine was changed. Now the actual storage engine is stored for subpartitions, as was intended. mysql-test/r/partition.result: Add new results mysql-test/t/partition.test: Add new regression test, marker for end of 5.1 tests sql/ha_partition.cc: Record correct engine type for subpartition parts, and fix use of constant for .par extension instead of ha_par_ext variable.
| * | | | | | | | | | | | | | | | build fixesunknown2006-02-153-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/event.cc: - make this not unsigned. gcc complains sql/event_timed.cc: acl_getroot_no_password() is not there in libmysqld, disable it's usage in this case. sql/set_var.cc: fix for the broken build of Serg. gcc seems to be pretty happy without the return and returns the value of the last statement
| * | | | | | | | | | | | | | | | more cosmetic before push of fix for bug#17289unknown2006-02-151-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/event_timed.cc: - fix comment - use mysql_change_db() this will check for us
| * | | | | | | | | | | | | | | | merging before test + pushunknown2006-02-156-260/+272
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/events.result: Auto merged mysql-test/t/events.test: Auto merged sql/event.h: Auto merged sql/event_timed.cc: manual merge
| * | | | | | | | | | | | | | | | cosmetic post-review changesunknown2006-02-151-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/events.result: result fixed sql/event_executor.cc: cosmetic changes to show the definer of the event