summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/bkroot/mysql-5.1-newunknown2006-02-1619-473/+552
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bk/w3023-mysql-5.1-new mysql-test/extra/binlog_tests/ctype_cp932.test: Auto merged mysql-test/r/binlog_row_blackhole.result: Auto merged mysql-test/r/binlog_stm_ctype_cp932.result: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log.h: Auto merged sql/log_event.h: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/parse_file.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.h: Auto merged sql/log_event.cc: Merge with mysql-5.1-new
| * WL#3023 (Use locks in a statement-like manner):unknown2006-02-1619-437/+496
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Table maps are now written on aquiring locks to tables and released at the end of each logical statement. mysql-test/extra/binlog_tests/ctype_cp932.test: Disabling cleanup code mysql-test/r/binlog_row_blackhole.result: Result change mysql-test/r/binlog_row_mix_innodb_myisam.result: Result change mysql-test/r/binlog_stm_ctype_cp932.result: Result change mysql-test/r/rpl_row_charset.result: Result change mysql-test/r/rpl_row_create_table.result: Result change mysql-test/t/rpl_row_create_table.test: Binlog position change sql/handler.cc: Writing table map after external_lock() sql/handler.h: Adding class for table operation hooks. sql/log.cc: Adding binlog_write_table_map() to THD. Removing write_table_map() from MYSQL_LOG. sql/log.h: Minor interface changes to move table map writing. sql/log_event.cc: Removing pre-allocation of memory for buffers. Allowing ULONG_MAX as table id denoting an event to ignore (only used to transfer flags). Adding code to collect tables while seeing table maps and lock collected tables when seeing a binrow event. Debriding code as a result of the above changes. sql/log_event.h: Minor interface changes. sql/mysql_priv.h: Adding hooks argument to create_table_from_items(). sql/parse_file.cc: Minor fix to avoid crash in debug printout. sql/rpl_rli.h: Adding list of tables to lock to RLI structure. sql/slave.cc: Using list of tables to lock from RLI structure. sql/sql_acl.cc: Removing redundant pending events flush. sql/sql_base.cc: Moving pending event flush. Using flag to guard to clear statement transaction only if this is the original open tables state. sql/sql_class.cc: Adding flag for open tables state. Removing redundant pending events flushes. Write a dummy event to indicate that the tables to lock should be emptied on the slave. sql/sql_class.h: Adding open tables state flags. Adding binlog_write_table_map() function to THD. Changes to select_create() to support new locking scheme. sql/sql_insert.cc: Adding rollback of statement transaction on error. It can now contain events after locking tables. sql/sql_load.cc: Removing redundant pending event flush. sql/sql_table.cc: Adding hooks argument to create_table_from_items(). Calling prelock hook before starting to lock tables. sql/sql_update.cc: Removing a compiler warning. sql/table.h: Minor changes.
| * WL#3023 (RBR: Use locks in a statment-like manner):unknown2006-01-265-24/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interface changes pushed early. Separation of public and implementation interface for external_lock() in preparation for implementation. sql/handler.cc: Separating public virtual external_lock() into public non-virtual ha_external_lock() and private virtual external_lock(). Some minor changes to ha_*_row() function. sql/handler.h: Separating public virtual external_lock() into public non-virtual ha_external_lock() and private virtual external_lock(). sql/lock.cc: Using new public ha_external_lock instead of internal external_lock. sql/opt_range.cc: Using new public ha_external_lock instead of internal external_lock. sql/sql_table.cc: Using new public ha_external_lock instead of internal external_lock.
| * Merge mysql.com:/home/bkroot/mysql-5.1-newunknown2006-01-181-16/+23
| |\ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bk/w3023-mysql-5.1-new sql/handler.h: Merge with mysql-5.1-new
| | * The ha_*_row() function shall not be virtual since they representunknown2006-01-041-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public interface for handler users. Virtual keyword removed for those functions. sql/handler.h: The ha_*_row() function shall not be virtual since they represent public interface for handler users.
* | | 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
| * | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-151-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy004.:/work/mysql-5.1-bug16410
| | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-151-2/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.1
| | | * | | | | | | Item_case_expr::type() cannot be called without fix_fields() :(unknown2006-02-151-2/+2
| | | | | | | | | |
| * | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-153-259/+263
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy004.:/work/mysql-5.1-bug16410
| | * | | | | | | | Fix the coding style in a few new files.unknown2006-02-153-259/+263
| | |/ / / / / / /
| * | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-152-0/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy004.:/work/mysql-5.1-bug16410
| | * | | | | | | fix for bug#16410 (Events: CREATE EVENT is legal in a CREATE TRIGGER statement)unknown2006-02-152-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#1034 (Internal CRON) (post-post-review updates) mysql-test/r/events.result: update results file mysql-test/t/events.test: add test for Bug #16410 Events: CREATE EVENT is legal in a CREATE TRIGGER statement sql/sp_head.cc: CREATE/ALTER/DROP event mean explicit commit, so they are not allowed in a FUNCTION/TRIGGER. Fixes bug#16410 sql/sql_parse.cc: - end active transaction for CREATE/ALTER/DROP EVENT because they are DDL statements.
* | | | | | | | | 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
* | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-1517-78/+144
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy004.:/work/mysql-5.1-bug17289
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-1515-62/+96
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.1
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-1515-62/+96
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.1 sql/ha_ndbcluster.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/log_event.cc: Auto merged sql/sql_select.cc: Auto merged
| | | * | | | | | | post-merge fixes for dbugunknown2006-02-151-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dbug/dbug.c: post-merge fixes (-#T in explain was forgotten) sql/set_var.h: post-merge fixes (DBUG_POP() is the correct way to restore default settings now)
| | | * | | | | | | Automergeunknown2006-02-1514-61/+100
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_select.cc: Auto merged tests/mysql_client_test.c: Auto merged client/mysqlslap.c: SCCS merged configure.in: SCCS merged libmysql/libmysql.c: SCCS merged mysys/my_init.c: SCCS merged
| | | | * | | | | | | dbug changes:unknown2006-02-1414-61/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. dbug state is now local to a thread 2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL, DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF 3. macros are do{}while(0) wrapped 4. incremental modifications to the dbug state (e.g. "+d,info:-t") 5. dbug code cleanup, style fixes 6. _db_on_ and DEBUGGER_ON/OFF removed 7. rest of MySQL code fixed because of 3 (missing ;) and 6 8. dbug manual updated 9. server variable @@debug (global and local) to control dbug from SQL! a. -#T to print timestamps in the log BitKeeper/deleted/.del-readme.prof~2f3bae1550a0038d: Delete: dbug/readme.prof client/mysqlslap.c: typo fixed configure.in: test for sleep() too dbug/dbug.c: thread local dbug settings DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL style changes to be more in line with MySQL code cleanup (many mallocs removed) incremental modification of dbug state (e.g. DBUG_PUSH("+t:-d,info")) DBUG_SET, _db_explain_ -#T dbug/monty.doc: obsolete and duplicate docs removed dbug/user.r: new features documented include/my_dbug.h: correct do{}while wrapping thread local dbug settings DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL DBUG_EVALUATE,DBUG_EVALUATE_IF libmysql/libmysql.c: remove _db_on_ and DEBUGGER_ON/OFF mysys/my_init.c: missed DBUG_RETURN mysys/my_thr_init.c: bugfix - transaction id's are unsigned mysys/testhash.c: remove _db_on_ and DEBUGGER_ON/OFF sql/ha_myisammrg.cc: missed ; sql/ha_ndbcluster.cc: remove _db_on_ and DEBUGGER_ON/OFF missed ; sql/ha_ndbcluster_binlog.cc: remove _db_on_ and DEBUGGER_ON/OFF missed ; sql/item_cmpfunc.cc: missed ; sql/lock.cc: missed DBUG_RETURN sql/log_event.cc: missed ; sql/mysqld.cc: remove _db_on_ and DEBUGGER_ON/OFF missed ; DBUG_SET_INITIAL sql/opt_range.cc: remove _db_on_ and DEBUGGER_ON/OFF sql/set_var.cc: class sys_var_thd_dbug and "debug" server variable sql/set_var.h: class sys_var_thd_dbug and "debug" server variable sql/slave.cc: missed ; sql/sql_cache.cc: missed ; sql/sql_plugin.cc: missed ; sql/sql_select.cc: remove _db_on_ and DEBUGGER_ON/OFF storage/heap/hp_test2.c: remove _db_on_ and DEBUGGER_ON/OFF storage/myisam/ft_eval.c: remove _db_on_ and DEBUGGER_ON/OFF storage/myisam/ft_test1.c: remove _db_on_ and DEBUGGER_ON/OFF storage/myisam/mi_open.c: remove _db_on_ and DEBUGGER_ON/OFF missed ; storage/myisam/mi_test1.c: remove _db_on_ and DEBUGGER_ON/OFF storage/myisam/mi_test2.c: remove _db_on_ and DEBUGGER_ON/OFF storage/myisam/mi_test3.c: remove _db_on_ and DEBUGGER_ON/OFF storage/ndb/src/ndbapi/DictCache.cpp: missed ; storage/ndb/src/ndbapi/NdbTransaction.cpp: missed ; tests/mysql_client_test.c: remove _db_on_ and DEBUGGER_ON/OFF
| | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-141-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.1 sql/sql_plugin.h: Auto merged include/mysql/plugin.h: Auto merged
| | | | * | | | | | | | my_bool is internal type, so should be SHOW_MY_BOOLunknown2006-02-141-1/+1
| | | | |/ / / / / / /
| * | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-153-4/+109
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zim.tangent.org:/home/brian/mysql/archive-5.1
| * | | | | | | | | | This patch adds a new field to the meta file for tracking flushes (this is ↵unknown2006-02-152-16/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being kept to later do stats and determine how often the compression buffer is being foiled). This should keep things all nice an compatible between versions. Also added a flush table test as well. Found one possible bug in OPTIMIZE TABLE which has never been reported, but I think it would be possible on a file system that ran out of disk. mysql-test/r/archive.result: New results mysql-test/t/archive.test: Added test for flush tables, which will also let me confirm DELAYED INSERT. sql/ha_archive.cc: Adding new stat sql/ha_archive.h: Just extending SHARE
* | | | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-156-8/+120
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy004.:/work/mysql-5.1-bug17289
| * | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-151-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work sql/sql_partition.cc: Auto merged
| | * | | | | | | | | Fix for bug#16907 Partitions: crash, SELECT goes into last partition, UNIQUE ↵unknown2006-02-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INDEX In presense of subpartitioning use get_part_partition_id() to calculate part_id
| * | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-153-2/+104
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work sql/sql_partition.cc: Auto merged
| | * | | | | | | | | Post-review fix (WL#2987)unknown2006-02-141-7/+4
| | | | | | | | | | |
| | * | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-143-2/+107
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
| | | * \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-143-2/+107
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged
| | | | * \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-02-133-2/+107
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged
| | | | | * | | | | | | | | Added partition pruning checks (WL#2987)unknown2006-02-103-2/+107
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first ↵unknown2006-02-151-1/+1
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | column of primary key use part_info->no_subparts to calculate partition range in case of subpartitions mysql-test/r/partition.result: Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first column of primary key test case mysql-test/t/partition.test: Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first column of primary key test case
View Lorry Controller Status