summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Collapse)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-0/+2
|\
| * Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-0/+1
| |\
| | * update .bzrignore to ignore libmysqld/rpl_handler.cc linkTor Didriksen2009-10-281-0/+1
| | |
| * | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-0/+1
| |\ \ | | |/
| * | A backporting patch for the following revision from 6.0:Alexander Nozdrin2009-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revno: 2630.22.41 committer: Alexander Nozdrin <alik@mysql.com> branch nick: 6.0-rt-bug39255 timestamp: Thu 2008-10-16 16:39:30 +0400 message: A patch for Bug#39255: Stored procedures: crash if function references nonexistent table. The problem is not reproduced in 6.0. Adding a test case.
* | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-0/+2
| |/ |/| | | | | | | | | | | function/ syntax glob(7) wildcards unit tests
* | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-0/+1
|\ \ | |/ |/|
| * WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport from 6.0 to 5.1. Only those sync points are included, which are used in debug_sync.test. The Debug Sync Facility allows to place synchronization points in the code: open_tables(...) DEBUG_SYNC(thd, "after_open_tables"); lock_tables(...) When activated, a sync point can - Send a signal and/or - Wait for a signal Nomenclature: - signal: A value of a global variable that persists until overwritten by a new signal. The global variable can also be seen as a "signal post" or "flag mast". Then the signal is what is attached to the "signal post" or "flag mast". - send a signal: Assign the value (the signal) to the global variable ("set a flag") and broadcast a global condition to wake those waiting for a signal. - wait for a signal: Loop over waiting for the global condition until the global value matches the wait-for signal. Please find more information in the top comment in debug_sync.cc or in the worklog entry. .bzrignore: WL#4259 - Debug Sync Facility Added the symbolic link libmysqld/debug_sync.cc. CMakeLists.txt: WL#4259 - Debug Sync Facility Added definition for ENABLED_DEBUG_SYNC. configure.in: WL#4259 - Debug Sync Facility Added definition for ENABLED_DEBUG_SYNC. include/my_sys.h: WL#4259 - Debug Sync Facility Added definition for the DEBUG_SYNC_C macro. libmysqld/CMakeLists.txt: WL#4259 - Debug Sync Facility Added sql/debug_sync.cc. libmysqld/Makefile.am: WL#4259 - Debug Sync Facility Added sql/debug_sync.cc. mysql-test/include/have_debug_sync.inc: WL#4259 - Debug Sync Facility New include file. mysql-test/mysql-test-run.pl: WL#4259 - Debug Sync Facility Added option --debug_sync_timeout. mysql-test/r/debug_sync.result: WL#4259 - Debug Sync Facility New test result. mysql-test/r/have_debug_sync.require: WL#4259 - Debug Sync Facility New require file. mysql-test/t/debug_sync.test: WL#4259 - Debug Sync Facility New test file. mysys/my_static.c: WL#4259 - Debug Sync Facility Added definition for debug_sync_C_callback_ptr. mysys/thr_lock.c: WL#4259 - Debug Sync Facility Added sync point "wait_for_lock". sql/CMakeLists.txt: WL#4259 - Debug Sync Facility Added debug_sync.cc and debug_sync.h. sql/Makefile.am: WL#4259 - Debug Sync Facility Added debug_sync.cc and debug_sync.h. sql/debug_sync.cc: WL#4259 - Debug Sync Facility New source file. sql/debug_sync.h: WL#4259 - Debug Sync Facility New header file. sql/mysqld.cc: WL#4259 - Debug Sync Facility Added opt_debug_sync_timeout. Added calls to debug_sync_init() and debug_sync_end(). Fixed a purecov comment (unrelated). sql/set_var.cc: WL#4259 - Debug Sync Facility Added server variable "debug_sync". sql/set_var.h: WL#4259 - Debug Sync Facility Added declaration for server variable "debug_sync". sql/share/errmsg.txt: WL#4259 - Debug Sync Facility Added error messages ER_DEBUG_SYNC_TIMEOUT and ER_DEBUG_SYNC_HIT_LIMIT. sql/sql_base.cc: WL#4259 - Debug Sync Facility Added sync points "after_flush_unlock" and "before_lock_tables_takes_lock". sql/sql_class.cc: WL#4259 - Debug Sync Facility Added initialization for debug_sync_control to THD::THD. Added calls to debug_sync_init_thread() and debug_sync_end_thread(). sql/sql_class.h: WL#4259 - Debug Sync Facility Added element debug_sync_control to THD. storage/myisam/myisamchk.c: Fixed a typo in an error message string (unrelated).
* | Ignore a new symbolic link.Alexander Nozdrin2009-09-231-0/+1
|/
* Ignore auto-generated file: libmysqld/examples/mysqltest.ccAlexander Nozdrin2009-08-121-0/+1
|
* Bug#40446 - mysql-test-run --gcov is brokenIngo Struewing2009-02-271-0/+2
| | | | | | | | | | | | | | | | | | Some variable values were missing and perl constructs failed. Initialized the variables and refactored the gcov functions. .bzrignore: Bug#40446 - mysql-test-run --gcov is broken Added gcov log files. mysql-test/lib/mtr_gcov.pl: Bug#40446 - mysql-test-run --gcov is broken Refactored the gcov functions. mysql-test/mysql-test-run.pl: Bug#40446 - mysql-test-run --gcov is broken Initialized gcov variables. Added usage information.
* merge 5.1 --> 5.1-rplAlfranio Correia2008-12-131-0/+25
|\
| * mergeIngo Struewing2008-11-281-0/+25
| | | | | | | | | | .bzrignore: Added autom4te.cache and language directories in sql/share to ignorefile.
* | Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-061-0/+3
|\ \ | |/
| * Bug#31455 mysqlbinlog don't print user readable info about RBR events Alexander Barkov2008-08-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementing -v command line parameter to mysqlbinlog to decode and print row events. mysql-test/include/mysqlbinlog_row_engine.inc mysql-test/r/mysqlbinlog_row.result mysql-test/r/mysqlbinlog_row_big.result mysql-test/r/mysqlbinlog_row_innodb.result mysql-test/r/mysqlbinlog_row_myisam.result mysql-test/r/mysqlbinlog_row_trans.result mysql-test/t/mysqlbinlog_row.test mysql-test/t/mysqlbinlog_row_big.test mysql-test/t/mysqlbinlog_row_innodb.test mysql-test/t/mysqlbinlog_row_myisam.test mysql-test/t/mysqlbinlog_row_trans.test Adding tests client/Makefile.am Adding new files to symlink client/mysqlbinlog.cc Adding -v option sql/log_event.cc Impelentations of the new methods sql/log_event.h Declaration of the new methods and member sql/mysql_priv.h Adding new function prototype sql/rpl_tblmap.cc Adding pre-processor conditions sql/rpl_tblmap.h Adding pre-processor conditions sql/rpl_utility.h Adding pre-processor conditions sql/sql_base.cc Adding reset_table_id_sequence() function. sql/sql_repl.cc Resetting table_id on "RESET MASTER" .bzrignore Ignoring new symlinked files
* | Add doxygen files to .bzrignoreSven Sandberg2008-07-241-0/+3
| | | | | | | | | | .bzrignore: Ignore doxygen files.
* | Merge 5.1->5.1-rplMagnus Svensson2008-05-301-0/+9
|\ \ | |/ | | | | Fix paths and name of a few files to make it work with new mtr.pl
| * Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteamunknown2008-05-161-0/+3031
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam sql/sql_select.cc: Auto merged mysql-test/r/subselect.result: merge of bug 36011 to 5.1-bugteam mysql-test/t/subselect.test: merge of bug 36011 to 5.1-bugteam
| * | Bug#35744 - Test 'partition_alter1_innodb' times out on multiple platforms.unknown2008-05-131-3030/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the test into 3 smaller parts, reducing single test run time. NDB variant still disabled. The runtime for a single test is greater than the runtime for the Innodb variant that was timing out. The test works, but disabled for Build systems. BitKeeper/deleted/.del-partition_alter1_innodb.test: ***MISSING TEXT*** BitKeeper/deleted/.del-partition_alter1_myisam.test: ***MISSING TEXT*** BitKeeper/deleted/.del-partition_alter1_ndb.test: ***MISSING TEXT*** BitKeeper/deleted/.del-partition_alter1_myisam.result: ***MISSING TEXT*** BitKeeper/deleted/.del-partition_alter1_innodb.result: ***MISSING TEXT*** BitKeeper/deleted/.del-partition_alter1.inc: ***MISSING TEXT*** mysql-test/suite/parts/t/disabled.def: ***MISSING TEXT*** mysql-test/suite/parts/inc/partition_alter1_1.inc: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_innodb.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_myisam.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_1_ndb.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_2_innodb.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_2_myisam.test: ***MISSING WEAVE*** mysql-test/suite/parts/t/partition_alter1_2_ndb.test: ***MISSING WEAVE*** BitKeeper/etc/ignore: ***MISSING TEXT*** mysql-test/suite/parts/inc/partition_alter1_1_2.inc: ***MISSING WEAVE*** mysql-test/suite/parts/inc/partition_alter1_2.inc: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_2_ndb.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_innodb.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_myisam.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_1_ndb.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_2_innodb.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_2_myisam.result: ***MISSING WEAVE*** mysql-test/suite/parts/r/partition_alter1_2_ndb.result: ***MISSING WEAVE***
| * | Fixes for bug#36522.unknown2008-05-081-0/+4
| | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added mysql-test/bug36522-64.tar mysql-test/bug36522.tar mysql-test/t.log mysql-test/tps.log to the ignore list
| * | Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-cleanunknown2008-04-231-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hh-nb.hungers:/work/merge/mysql-5.1-build BitKeeper/etc/ignore: auto-union mysql-test/t/disabled.def: Auto merged BitKeeper/deleted/.del-group_concat_max_len_func.result: Delete: mysql-test/r/group_concat_max_len_func.result BitKeeper/deleted/.del-group_concat_max_len_func.test: Delete: mysql-test/t/group_concat_max_len_func.test BitKeeper/deleted/.del-max_allowed_packet_func.test: Delete: mysql-test/t/max_allowed_packet_func.test
| | * | Eightth set of fixes for bug 35988.unknown2008-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added mysql-test/r/max_allowed_packet_func.result to the ignore list
| * | | Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-cleanunknown2008-04-101-0/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into hh-nb.hungers:/work/merge/mysql-5.1-build BitKeeper/etc/ignore: auto-union
| | * | System variable tests delivered by Folio3 (see WL4288).unknown2008-04-101-0/+3
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added mysql-test/linux_sys_vars.inc mysql-test/load_sysvars.inc mysql-test/windows_sys_vars.inc to the ignore list
| * | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-271-8/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hynda.mysql.fi:/home/my/mysql-5.1-marvel BitKeeper/etc/ignore: auto-union client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_plugin.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisampack.c: Auto merged sql/mysqld.cc: Manual merge with main 5.1 tree.
| | * | Fixed a previous patch.unknown2008-02-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: added libmysqld/sql_profile.cc client/mysqltest.c: Use my_micro_time() instead of my_getsystime() for faster execution. include/config-win.h: Moved a definition into a header file. mysys/my_getsystime.c: Use GetSystemTimeAsFileTime() instead of QueryPerformanceCounter() for faster execution.
* | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-02-281-8/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-rpl_row_charset.test: Auto merged BitKeeper/deleted/.del-rpl_row_charset_innodb.test: Auto merged CMakeLists.txt: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged mysql-test/extra/binlog_tests/blackhole.test: Auto merged mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/r/ctype_big5.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/system_mysql_db.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/suite/federated/federated.result: Auto merged mysql-test/suite/federated/federated.test: Auto merged mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result: Auto merged mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result: Auto merged mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test: Auto merged mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: Auto merged mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Auto merged mysql-test/suite/rpl/r/rpl_timezone.result: Auto merged mysql-test/suite/rpl/t/rpl_load_from_master.test: Auto merged mysql-test/suite/rpl/t/rpl_rotate_logs.test: Auto merged mysql-test/suite/rpl/t/rpl_trigger.test: Auto merged mysql-test/t/csv.test: Auto merged mysql-test/t/ctype_big5.test: Auto merged mysql-test/t/gis.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/partition.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/system_mysql_db_fix50117.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/trigger_notembedded.test: Auto merged mysql-test/t/type_blob.test: Auto merged mysql-test/t/view.test: Auto merged mysql-test/t/warnings.test: Auto merged sql/ha_ndbcluster.cc: Auto merged mysql-test/Makefile.am: SCCS merged mysql-test/mysql-test-run.pl: Use local version of mtr.pl mysql-test/lib/mtr_cases.pm: Use local mtr_cases.pm mysql-test/suite/rpl/t/disabled.def: Use remote disabled file mysql-test/t/disabled.def: Use remote disabled file sql/ha_ndbcluster_binlog.cc: Use remote mysql-test/extra/rpl_tests/rpl_charset.test: Manual merge mysql-test/lib/mtr_report.pm: Manual merge mysql-test/suite/binlog/r/binlog_killed_simulate.result: Manual merge mysql-test/suite/binlog/r/binlog_multi_engine.result: Manual merge mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Manual merge mysql-test/suite/binlog/r/binlog_stm_blackhole.result: Manual merge mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Manual merge mysql-test/suite/binlog/t/binlog_killed.test: Manual merge mysql-test/suite/binlog/t/binlog_killed_simulate.test: Manual merge mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test: Manual merge mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test: Manual merge mysql-test/suite/ndb/r/ndb_binlog_format.result: Manual merge mysql-test/suite/ndb/r/ndb_restore.result: Manual merge mysql-test/suite/ndb/t/ndb_restore.test: Manual merge mysql-test/suite/rpl/include/rpl_mixed_dml.inc: Manual merge mysql-test/suite/rpl/r/rpl_stm_log.result: Manual merge mysql-test/suite/rpl/t/rpl_row_sp005.test: Manual merge mysql-test/t/log_state.test: Manual merge mysql-test/t/mysqlbinlog.test: Manual merge mysql-test/t/mysqlbinlog2.test: Manual merge mysql-test/t/upgrade.test: Manual merge
| * | | Add C version of safe_process unknown2008-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added mysql-test/lib/My/SafeProcess/my_safe_process to the ignore list configure.in: Add Makefile to build safe_process mysql-test/Makefile.am: Build lib/My/SafeProcess mysql-test/lib/My/SafeProcess.pm: Use C version of safe_process mysql-test/lib/t/SafeProcessStress.pl: Decrease number of loops mysql-test/lib/My/SafeProcess/Makefile.am: New BitKeeper file ``mysql-test/lib/My/SafeProcess/Makefile.am'' mysql-test/lib/My/SafeProcess/safe_process.cc: New BitKeeper file ``mysql-test/lib/My/SafeProcess/safe_process.cc''
* | | | Patch for bug#32664: event.test has timeout randomly. File is split into ↵unknown2008-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event_1.test and event_2.test. BitKeeper/deleted/.del-events.test: Delete: mysql-test/t/events.test BitKeeper/deleted/.del-events.result: Delete: mysql-test/r/events.result BitKeeper/etc/ignore: Added mysql-test/reg.log to the ignore list
* | | | Fixed differences in STATE in result file for bug#34190.unknown2008-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added mysql-test/suite/funcs_1.tar.zip to the ignore list
* | | | fixes for bug#34190.unknown2008-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added libmysqld/sql_profile.cc to the ignore list
* | | | New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns ↵unknown2008-01-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which CSV does not support Added new tests and corrected existing tests mysql-test/suite/stress/include/ddl3.inc: New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support Had to change CREATE TABLE statements to include NOT NULL due to CSV engine constraints mysql-test/suite/stress/r/ddl_archive.result: New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support Reproduced .result files due to changes in ddl3.inc mysql-test/suite/stress/r/ddl_csv.result: New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support Reproduced .result files due to changes in ddl3.inc mysql-test/suite/stress/r/ddl_innodb.result: New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support Reproduced .result files due to changes in ddl3.inc mysql-test/suite/stress/r/ddl_memory.result: New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support Reproduced .result files due to changes in ddl3.inc mysql-test/suite/stress/r/ddl_myisam.result: New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support Reproduced .result files due to changes in ddl3.inc mysql-test/suite/stress/r/ddl_ndb.result: New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support Reproduced .result files due to changes in ddl3.inc BitKeeper/etc/ignore: Added mysql-test/.DS_Store .DS_Store to the ignore list mysql-test/t/disabled.def: Disabled new test - csv_alter_table.test file due to Bug#33696. Cannot generate a .result file due to the Bug. These tests can be enabled to test the bug fix without needing new tests unless the developer feels the need to add more. mysql-test/r/csv_not_null.result: New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support mysql-test/t/csv_alter_table.test: New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support Designed to test fixes for Bug#33696 - CSV Engine allows nullable columns via ALTER TABLE statements mysql-test/t/csv_not_null.test: New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns which CSV does not support
* | | | Disabled storedproc_06 for all engines due to bug 33464.unknown2008-01-091-0/+2
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added mysql-test/funcs_1.tar mysql-test/suite/funcs_1.tar.gz to the ignore list
* | | | WL#4084: Code changes due to enabled the disabled tests (including other ↵unknown2008-01-081-0/+1
| |/ / |/| | | | | | | | | | | | | | | | | improvements). BitKeeper/etc/ignore: Added mysql-test/funcs_1.log to the ignore list
* | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-12-131-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.1-opt BitKeeper/etc/ignore: auto-union client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/mysql_com.h: Auto merged libmysql/CMakeLists.txt: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/archive.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/delayed.result: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/func_misc.test: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/merge.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/queues.c: Auto merged sql/events.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_partition.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/protocol.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_open.c: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/lib/mtr_report.pl: manual merge mysql-test/r/myisam.result: manual merge mysql-test/r/partition.result: manual merge mysql-test/r/user_var.result: manual merge mysql-test/t/myisam.test: manual merge mysql-test/t/partition.test: manual merge mysql-test/t/user_var.test: manual merge sql/item.h: manual merge sql/item_func.cc: manual merge storage/myisammrg/ha_myisammrg.cc: manual merge
| * | | BUG#32694 post-merge adjustment of EXPLAIN results for 5.1.unknown2007-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added ylwrap to the ignore list
| * | | Merge bk@192.168.21.1:mysql-5.1-optunknown2007-11-201-0/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/31868/my51-31868 BitKeeper/etc/ignore: auto-union libmysqld/lib_sql.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_table.cc: Auto merged
| | * | Bug #31868 mysql_server_init crash when language path is not correctly set.unknown2007-11-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When mysql_server_init() interrupts on some error (wrong errmsg file for example) in the middle of it's execution, it doesn't call execute_ddl_log_recovery() so LOCK_gdl mutex isn't init-ed. In this case we shouldn't execute release_ddl_log during cleanup as it uses that mutex inside. BitKeeper/etc/ignore: Added libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc libmysql_r/client_settings.h to the ignore list libmysqld/lib_sql.cc: Bug #31868 mysql_server_init crash when language path is not correctly set. line moved to clean_up() sql/mysqld.cc: Bug #31868 mysql_server_init crash when language path is not correctly set. release_ddl_log() now can be called from common 'clean_up()' sql/sql_table.cc: Bug #31868 mysql_server_init crash when language path is not correctly set. do_release flag added to the global_ddl_log and the construcntor to set it's initial value. Also now release_ddl_log() checks for that flag.
| * | | Merge mysql.com:/home/hf/work/31305/my50-31305unknown2007-11-121-0/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/31305/my51-31305 BitKeeper/etc/ignore: auto-union storage/myisam/mi_dynrec.c: Auto merged
* | | | Merge hh-nb.hhunger:/work/merge/mysql-5.0-32496unknown2007-11-261-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hh-nb.hhunger:/work/merge/mysql-5.1-32496 BitKeeper/etc/ignore: auto-union mysql-test/suite/funcs_1/r/innodb_views.result: Auto merged mysql-test/suite/funcs_1/r/memory_views.result: Auto merged mysql-test/suite/funcs_1/views/views_master.inc: Auto merged mysql-test/suite/funcs_1/r/myisam_views.result: used ul
| * | | patch for bug#32496 (2nd) with ansi conformant and Mysql test case.unknown2007-11-261-0/+2
| | |/ | |/| | | | | | | | | | BitKeeper/etc/ignore: Added scripts/make_win_src_distribution_old server-tools/instance-manager/net_serv.cc to the ignore list
| * | Merge mysql.com:/home/hf/work/31305/my41-31305unknown2007-11-121-10/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/31305/my50-31305 BitKeeper/etc/ignore: auto-union myisam/mi_dynrec.c: Auto merged
| | * | Bug #31305 myisam tables crash when they are near capacity.unknown2007-11-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we insert a record into MYISAM table which is almost 'full', we first write record data in the free space inside a file, and then check if we have enough space after the end of the file. So if we don't have the space, table will left corrupted. Similar error also happens when we updata MYISAM tables. Fixed by modifying write_dynamic_record and update_dynamic_record functions to check for free space before writing parts of a record BitKeeper/etc/ignore: Added libmysql_r/client_settings.h libmysqld/ha_blackhole.cc to the ignore list myisam/mi_dynrec.c: Bug #31305 myisam tables crash when they are near capacity. now we check space left in table in write_dynamic_record and update_dynamic_record functions. If we don't have enough room for the new (updated) record, return with the error. mysql-test/r/almost_full.result: New BitKeeper file ``mysql-test/r/almost_full.result'' mysql-test/t/almost_full.test: New BitKeeper file ``mysql-test/t/almost_full.test''
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-11-051-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-5.1 BitKeeper/etc/ignore: auto-union sql/handler.cc: Auto merged
| * | | | tests/mysql_client_test.c: typo fixedunknown2007-10-161-0/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | tests/mysql_client_test.c: typo fixed BitKeeper/etc/ignore: Added libmysql_r/client_settings.h libmysql_r/link_sources libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc sql/link_sources to the ignore list
* | | | disable testsunknown2007-11-011-0/+1
|/ / / | | | | | | | | | | | | BitKeeper/etc/ignore: Added libmysql_r/client_settings.h to the ignore list
* | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-09-061-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gleb.loc:/home/uchum/work/bk/5.1-opt BitKeeper/etc/ignore: auto-union mysql-test/r/distinct.result: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/include/mix1.inc: Merge with 5.0-opt. mysql-test/r/group_by.result: Merge with 5.0-opt. mysql-test/r/innodb_mysql.result: Merge with 5.0-opt. mysql-test/r/sp.result: Merge with 5.0-opt. mysql-test/t/group_by.test: Merge with 5.0-opt. mysql-test/t/sp.test: Merge with 5.0-opt. sql/sql_parse.cc: Merge with 5.0-opt. sql/sql_select.cc: Merge with 5.0-opt. sql/sql_view.cc: Merge with 5.0-opt.
| * | Bug #30596 GROUP BY optimization gives wrong result orderunknown2007-08-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The optimization that uses a unique index to remove GROUP BY, did not ensure that the index was actually used, thus violating the ORDER BY that is impled by GROUP BY. Fixed by replacing GROUP BY with ORDER BY if the GROUP BY clause contains a unique index. In case GROUP BY ... ORDER BY null is used, GROUP BY is simply removed. BitKeeper/etc/ignore: Added support-files/mysqld_multi.server tests/bug25714 cscope.in.out cscope.out cscope.po.out to the ignore list mysql-test/r/distinct.result: Bug#30596: Changed test case. Prior to Bug#16458, These queries use temp table and filesort. The bug was that they used a temp table. However, that patch removed filesort also, in which case we can no longer gurantee correct ordering. mysql-test/r/group_by.result: Bug#30596: Correct result mysql-test/r/innodb_mysql.result: Bug#30596: Test case for innodb. Here, as opposed to for MyISAM, row lookup is done using index whenever the index covers the group list. mysql-test/t/group_by.test: Bug#30596: Test case mysql-test/t/innodb_mysql.test: Bug#30596: Test case sql/sql_select.cc: Bug#30596: The fix, replacing GROUP BY with ORDER BY unless ORDER BY [NULL|<constant>]
* | | Merge amd64.(none):/src/mysql-5.1-maintunknown2007-08-031-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into amd64.(none):/src/mysql-5.1-build_29903 BitKeeper/etc/ignore: auto-union client/client_priv.h: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4: Auto merged client/mysql.cc: Auto merged libmysqld/CMakeLists.txt: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/examples/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b: Manual merge.
| * | | Bug#29903 The CMake build method does not produce the embedded library.unknown2007-08-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changes to correct and test Windows embedded build. BitKeeper/etc/ignore: Bug#29903 The CMake build method does not produce the embedded library. - Ignore auto-generated Windows embedded resources. CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Hardcode CSV for all configurations. - Add client directory for gen_lex_hash dependency. client/CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Build the mysqlclient library and echo for the embedded solution. client/client_priv.h: Bug#29903 The CMake build method does not produce the embedded library. - Defined new option. client/mysql.cc: Bug#29903 The CMake build method does not produce the embedded library. - Add server-arg command line parameter libmysqld/CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Added auto generated resources; sql_yacc.cc, sql_yacc.h, message.rc message.h and lex_hash.h. - Link csv library to libmsyqld. libmysqld/Makefile.am: Bug#29903 The CMake build method does not produce the embedded library. - Include CMakeLists.txt in dist. libmysqld/examples/CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Follow existing naming convention. libmysqld/examples/Makefile.am: Bug#29903 The CMake build method does not produce the embedded library. - Include CMakeLists.txt in dist. mysql-test/mysql-test-run.pl: Bug#29903 The CMake build method does not produce the embedded library. - Move embedded option block earlier in the script. - Added the path to the libmysqld.dll to Windows path. win/README: Bug#29903 The CMake build method does not produce the embedded library. - Add instructions for building/testing the embedded library.
View Lorry Controller Status