summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Collapse)AuthorAgeFilesLines
* Add client/dtoa.c to .bzrignore.Alexander Nozdrin2010-01-201-0/+1
|
* Manual merge from next-mr.2010-01-121-0/+2
|\
| * WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#16565 mysqld --help --verbose does not order variablesBug#20413 sql_slave_skip_counter is not shown in show variables Bug#20415 Output of mysqld --help --verbose is incomplete Bug#25430 variable not found in SELECT @@global.ft_max_word_len; Bug#32902 plugin variables don't know their names Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting! Bug#34829 No default value for variable and setting default does not raise error Bug#34834 ? Is accepted as a valid sql mode Bug#34878 Few variables have default value according to documentation but error occurs Bug#34883 ft_boolean_syntax cant be assigned from user variable to global var. Bug#37187 `INFORMATION_SCHEMA`.`GLOBAL_VARIABLES`: inconsistent status Bug#40988 log_output_basic.test succeeded though syntactically false. Bug#41010 enum-style command-line options are not honoured (maria.maria-recover fails) Bug#42103 Setting key_buffer_size to a negative value may lead to very large allocations Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled Bug#44797 plugins w/o command-line options have no disabling option in --help Bug#46314 string system variables don't support expressions Bug#46470 sys_vars.max_binlog_cache_size_basic_32 is broken Bug#46586 When using the plugin interface the type "set" for options caused a crash. Bug#47212 Crash in DBUG_PRINT in mysqltest.cc when trying to print octal number Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds Bug#49417 some complaints about mysqld --help --verbose output Bug#49540 DEFAULT value of binlog_format isn't the default value Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix) Bug#49644 init_connect and \0 Bug#49645 init_slave and multi-byte characters Bug#49646 mysql --show-warnings crashes when server dies
* | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-0/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test Text conflict in mysql-test/r/mysqlbinlog2.result Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result Text conflict in mysql-test/suite/rpl/r/rpl_udf.result Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test Text conflict in sql/field.h Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysql_priv.h Text conflict in sql/share/errmsg.txt Text conflict in sql/sp.cc Text conflict in sql/sql_acl.cc Text conflict in sql/sql_base.cc Text conflict in sql/sql_class.h Text conflict in sql/sql_db.cc Text conflict in sql/sql_delete.cc Text conflict in sql/sql_insert.cc Text conflict in sql/sql_lex.cc Text conflict in sql/sql_lex.h Text conflict in sql/sql_load.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_update.cc Text conflict in sql/sql_view.cc Conflict adding files to storage/innobase. Created directory. Conflict because storage/innobase is not versioned, but has versioned children. Versioned directory. Conflict adding file storage/innobase. Moved existing file to storage/innobase.moved. Conflict adding files to storage/innobase/handler. Created directory. Conflict because storage/innobase/handler is not versioned, but has versioned children. Versioned directory. Contents conflict in storage/innobase/handler/ha_innodb.cc
| * WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Row-based replication requires the types of columns on the master and slave to be approximately the same (some safe conversions between strings are allowed), but does not allow safe conversions between fields of similar types such as TINYINT and INT. This patch implement type conversions between similar fields on the master and slave. The conversions are controlled using a new variable SLAVE_TYPE_CONVERSIONS of type SET('ALL_LOSSY','ALL_NON_LOSSY'). Non-lossy conversions are any conversions that do not run the risk of losing any information, while lossy conversions can potentially truncate the value. The column definitions are checked to decide if the conversion is acceptable. If neither conversion is enabled, it is required that the definitions of the columns are identical on master and slave. Conversion is done by creating an internal conversion table, unpacking the master data into it, and then copy the data to the real table on the slave.
* | 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.
* | 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.
* merge 5.1 --> 5.1-rplAlfranio Correia2008-12-131-0/+25
|\
| * mergeIngo Struewing2008-11-281-0/+25
| |
* | 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
| |
* | 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-bugteamgkodinov/kgeorge@magare.gmz2008-05-161-0/+3031
| |\ | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
| * | Bug#35744 - Test 'partition_alter1_innodb' times out on multiple platforms.pcrews@pcrews-mac-local.local2008-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.
| * | Fixes for bug#36522.hhunger@hh-nb.hungers2008-05-081-0/+4
| | |
| * | Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-cleanhhunger@hh-nb.hungers2008-04-231-0/+1
| |\ \ | | | | | | | | | | | | into hh-nb.hungers:/work/merge/mysql-5.1-build
| | * | Eightth set of fixes for bug 35988.hhunger@hh-nb.hungers2008-04-231-0/+1
| | | |
| * | | Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-cleanhhunger@hh-nb.hungers2008-04-101-0/+3
| |\ \ \ | | |/ / | |/| | | | | | into hh-nb.hungers:/work/merge/mysql-5.1-build
| | * | System variable tests delivered by Folio3 (see WL4288).hhunger@hh-nb.hungers2008-04-101-0/+3
| | | |
| * | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2008-02-271-8/+8
| |\ \ \ | | |/ / | |/| | | | | | into hynda.mysql.fi:/home/my/mysql-5.1-marvel
| | * | Fixed a previous patch.jani@hynda.mysql.fi2008-02-181-0/+1
| | | |
* | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplmsvensson@pilot.mysql.com2008-02-281-8/+9
|\ \ \ \ | |/ / / |/| | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
| * | | Add C version of safe_process msvensson@shellback.(none)2008-01-181-0/+1
| | | |
* | | | Patch for bug#32664: event.test has timeout randomly. File is split into ↵hhunger@hh-nb.hungers2008-02-201-0/+1
| | | | | | | | | | | | | | | | event_1.test and event_2.test.
* | | | Fixed differences in STATE in result file for bug#34190.hhunger@hh-nb.hungers2008-02-061-0/+1
| | | |
* | | | fixes for bug#34190.hhunger@hh-nb.hungers2008-01-311-0/+1
| | | |
* | | | New tests added for Bug#33558 - Test "stress.ddl_csv needs nullable columns ↵pcrews@pcrews-mac-local.local2008-01-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | which CSV does not support Added new tests and corrected existing tests
* | | | Disabled storedproc_06 for all engines due to bug 33464.hhunger@hh-nb.hungers2008-01-091-0/+2
| | | |
* | | | WL#4084: Code changes due to enabled the disabled tests (including other ↵hhunger@hh-nb.hungers2008-01-081-0/+1
| |/ / |/| | | | | | | | improvements).
* | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1gluh@eagle.(none)2007-12-131-0/+1
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
| * | | BUG#32694 post-merge adjustment of EXPLAIN results for 5.1.timour/tkatchaounov@lapi.mysql.com2007-12-081-0/+1
| | | |
| * | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@hfmain.(none)2007-11-201-0/+3
| |\ \ \ | | |/ / | |/| | | | | | into mysql.com:/home/hf/work/31868/my51-31868
| | * | Bug #31868 mysql_server_init crash when language path is not correctly set.holyfoot/hf@mysql.com/hfmain.(none)2007-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.
| * | | Merge mysql.com:/home/hf/work/31305/my50-31305holyfoot/hf@hfmain.(none)2007-11-121-0/+1
| |\ \ \ | | |/ / | |/| | | | | | into mysql.com:/home/hf/work/31305/my51-31305
* | | | Merge hh-nb.hhunger:/work/merge/mysql-5.0-32496hhunger@hh-nb.hhunger2007-11-261-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | into hh-nb.hhunger:/work/merge/mysql-5.1-32496
| * | | patch for bug#32496 (2nd) with ansi conformant and Mysql test case.hhunger@hh-nb.hhunger2007-11-261-0/+2
| | |/ | |/|
| * | Merge mysql.com:/home/hf/work/31305/my41-31305holyfoot/hf@hfmain.(none)2007-11-121-10/+11
| |\ \ | | | | | | | | | | | | into mysql.com:/home/hf/work/31305/my50-31305
| | * | Bug #31305 myisam tables crash when they are near capacity.holyfoot/hf@mysql.com/hfmain.(none)2007-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
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-11-051-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-5.1
| * | | | tests/mysql_client_test.c: typo fixedserg@janus.mylan2007-10-161-0/+6
| | |_|/ | |/| |
View Lorry Controller Status