summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-10-155-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * WL#1106: Switch = --maxdb rather than --sapdbunknown2003-10-155-5/+5
| |
* | Add in bit_xor function (approved by Sergei)unknown2003-10-154-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_sum.cc: Add in bit_xor class functions. sql/item_sum.h: Add bit_xor class. sql/lex.h: Add in bit_xor symbol. sql/sql_yacc.yy: Add in bit_xor function BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | row0purge.c, row0mysql.c, os0file.c, os0file.h, fil0fil.h, fil0fil.c:unknown2003-10-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMPORT TABLESPACE must reset lsns if they are too high ha_innodb.cc: DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table sql/ha_innodb.cc: DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table innobase/fil/fil0fil.c: IMPORT TABLESPACE must reset lsns if they are too high innobase/include/fil0fil.h: IMPORT TABLESPACE must reset lsns if they are too high innobase/include/os0file.h: IMPORT TABLESPACE must reset lsns if they are too high innobase/os/os0file.c: IMPORT TABLESPACE must reset lsns if they are too high innobase/row/row0mysql.c: IMPORT TABLESPACE must reset lsns if they are too high innobase/row/row0purge.c: IMPORT TABLESPACE must reset lsns if they are too high
* | sql_yacc.yy:unknown2003-10-142-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Add DISCARD etc. in the keyword: rule of sql_yacc.yy sql_table.cc: Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE sql/sql_table.cc: Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE sql/sql_yacc.yy: Add DISCARD etc. in the keyword: rule of sql_yacc.yy
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-10-1311-12/+140
|\ \ | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
| * | Many files:unknown2003-10-1311-12/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALTER TABLE ... DISCARD/IMPORT TABLESPACE Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x sql/ha_innodb.cc: ALTER TABLE ... DISCARD/IMPORT TABLESPACE sql/sql_class.cc: ALTER TABLE ... DISCARD/IMPORT TABLESPACE sql/sql_parse.cc: ALTER TABLE ... DISCARD/IMPORT TABLESPACE sql/sql_table.cc: ALTER TABLE ... DISCARD/IMPORT TABLESPACE sql/ha_innodb.h: ALTER TABLE ... DISCARD/IMPORT TABLESPACE sql/handler.h: ALTER TABLE ... DISCARD/IMPORT TABLESPACE sql/lex.h: ALTER TABLE ... DISCARD/IMPORT TABLESPACE sql/mysql_priv.h: ALTER TABLE ... DISCARD/IMPORT TABLESPACE sql/sql_class.h: ALTER TABLE ... DISCARD/IMPORT TABLESPACE sql/sql_lex.h: ALTER TABLE ... DISCARD/IMPORT TABLESPACE sql/sql_yacc.yy: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/ha/ha0ha.c: Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x innobase/ha/hash0hash.c: Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x innobase/buf/buf0buf.c: Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x innobase/buf/buf0flu.c: Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x innobase/buf/buf0lru.c: Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x innobase/buf/buf0rea.c: Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x innobase/btr/btr0btr.c: Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x innobase/btr/btr0sea.c: Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x innobase/fil/fil0fil.c: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/include/buf0buf.h: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/include/ha0ha.h: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/include/hash0hash.h: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/include/row0mysql.h: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/include/buf0buf.ic: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/include/ha0ha.ic: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/include/ibuf0ibuf.ic: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/page/page0page.c: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/row/row0mysql.c: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/row/row0purge.c: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/row/row0uins.c: ALTER TABLE ... DISCARD/IMPORT TABLESPACE innobase/row/row0umod.c: ALTER TABLE ... DISCARD/IMPORT TABLESPACE
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-10-131-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
| * | fixed fix_fields() parameters for GROUP_CONCAT() ORDER BY clauseunknown2003-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (BUG#1537) mysql-test/r/func_gconcat.result: test of BUG#1537 mysql-test/t/func_gconcat.test: test of BUG#1537 sql/item_sum.cc: passing correct address of pointer to item to fix_dields(), using that addres to get access to item after fix_fields
* | | wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed.unknown2003-10-1224-48/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typo in error message text corrected. new tests added mysql-test/r/func_compress.result: new tests added mysql-test/t/func_compress.test: new tests added sql/item_strfunc.cc: max size of uncompressed data is max_allowed_packet not 8K sql/share/czech/errmsg.txt: typo fixed sql/share/danish/errmsg.txt: typo fixed sql/share/dutch/errmsg.txt: typo fixed sql/share/english/errmsg.txt: typo fixed sql/share/estonian/errmsg.txt: typo fixed sql/share/french/errmsg.txt: typo fixed sql/share/german/errmsg.txt: typo fixed sql/share/greek/errmsg.txt: typo fixed sql/share/hungarian/errmsg.txt: typo fixed sql/share/italian/errmsg.txt: typo fixed sql/share/japanese/errmsg.txt: typo fixed sql/share/korean/errmsg.txt: typo fixed sql/share/norwegian-ny/errmsg.txt: typo fixed sql/share/norwegian/errmsg.txt: typo fixed sql/share/polish/errmsg.txt: typo fixed sql/share/portuguese/errmsg.txt: typo fixed sql/share/romanian/errmsg.txt: typo fixed sql/share/russian/errmsg.txt: typo fixed sql/share/serbian/errmsg.txt: typo fixed sql/share/slovak/errmsg.txt: typo fixed sql/share/spanish/errmsg.txt: typo fixed sql/share/swedish/errmsg.txt: typo fixed sql/share/ukrainian/errmsg.txt: typo fixed
* | | mysqld.cc:unknown2003-10-111-1/+1
|/ / | | | | | | | | | | | | | | Fix error in --show-slave-auth-info help string. sql/mysqld.cc: Fix error in --show-slave-auth-info help string.
* | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2003-10-091-2/+6
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1
| * | Tiny cleanup after the push of WL#1098 "Seconds_behind_master in SHOW SLAVE ↵unknown2003-10-091-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STATUS": a better comment, and replacing an assignment by an equivalent simpler one. sql/log_event.cc: a better comment, and replacing an assignment by an equivalent simpler one.
* | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-10-081-237/+240
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
| * | errmsg.txt:unknown2003-10-081-158/+158
| | | | | | | | | | | | | | | | | | | | | | | | Add Stefan's new translations. sql/share/german/errmsg.txt: Add Stefan's new translations.
| * | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-10-081-247/+250
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1 BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1: Auto merged
| | * \ Mergeunknown2003-10-081-247/+250
| | |\ \ | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-mysql.ico: Delete: VC++Files/mysqlshutdown/mysql.ico
| | | * | Incorporate Stefan's new translations of German error messages.unknown2003-10-081-247/+250
| | | |/
* | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2003-10-091-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1
| * | | Portability fixunknown2003-10-081-1/+6
| |/ /
* | | Final push for WL#1098:unknown2003-10-094-18/+86
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Add a column "Timestamp_of_last_master_event_executed" in SHOW SLAVE STATUS". Finally this is adding - Slave_IO_State (a copy of the State column of SHOW PROCESSLIST for the I/O thread, so that the users, most of the time, has enough info with only SHOW SLAVE STATUS). - Seconds_behind_master. When the slave connects to the master it does SELECT UNIX_TIMESTAMP() on the master, computes the absolute difference between the master's and the slave's clock. It records the timestamp of the last event executed by the SQL thread, and does a small computation to find the number of seconds by which the slave is late. mysql-test/r/rpl000015.result: result update mysql-test/r/rpl_empty_master_crash.result: result update mysql-test/r/rpl_error_ignored_table.result: result update mysql-test/r/rpl_flush_log_loop.result: result update mysql-test/r/rpl_loaddata.result: result update mysql-test/r/rpl_log.result: result update mysql-test/r/rpl_log_pos.result: result update mysql-test/r/rpl_max_relay_size.result: result update mysql-test/r/rpl_redirect.result: result update mysql-test/r/rpl_replicate_do.result: result update mysql-test/r/rpl_reset_slave.result: result update mysql-test/r/rpl_rotate_logs.result: result update mysql-test/r/rpl_trunc_binlog.result: result update mysql-test/r/rpl_until.result: result update mysql-test/t/rpl000015.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_empty_master_crash.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_error_ignored_table.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_flush_log_loop.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_loaddata.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_log.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_log_pos.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_max_relay_size.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_openssl.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_redirect.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_replicate_do.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_reset_slave.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_rotate_logs.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_trunc_binlog.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS mysql-test/t/rpl_until.test: update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS sql/log_event.cc: when the SQL thread executes an event, we record its timestamp sql/slave.cc: in check_master_version() we know read the master's clock, to know the clock difference with the slave. In show_master_info() we send the state of the I/O thread, and compute the number of seconds by which the slave is late. sql/slave.h: timestamp of the last master's event executed by the SQL thread, and difference between the clocks of the master and slave. sql/sql_repl.cc: clear the Seconds_behind_master column of SHOW SLAVE STATUS when RESET SLAVE or CHANGE MASTER.
* | Indentation cleanupsunknown2003-10-086-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove wait_if_global_read_lock on commit as this can cause deadlocks BUILD/FINISH.sh: Cleanup BUILD/SETUP.sh: Cleanup BUILD/compile-pentium-valgrind-max: Don't write message twice mysql-test/r/innodb.result: Removed failure as this can cause deadlocks mysql-test/r/rpl_max_relay_size.result: Make test repeatable mysql-test/t/innodb.test: Removed failure as this can cause deadlocks mysql-test/t/rpl_max_relay_size.test: Removed failure as this can cause deadlocks sql/handler.cc: Remove wait_if_global_read_lock as this can cause deadlocks sql/opt_range.cc: Indentation cleanup sql/sql_db.cc: Comment cleanup sql/sql_parse.cc: Comment cleanup sql/sql_repl.cc: Indentation cleanup sql/sql_select.cc: Indentation cleanup
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-10-0819-262/+416
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1 libmysqld/examples/Makefile.am: Auto merged sql/item_subselect.cc: Auto merged sql/sql_select.cc: Auto merged
| * Fixed bug in error handling of CREATE ... SELECTunknown2003-10-086-19/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More tests cases After merge fixes BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838: Delete: mysql-test/t/ansi-master.opt mysql-test/r/ansi.result: Cleaned up test to be able to remove ansi-master.opt mysql-test/r/create.result: Updated results mysql-test/r/insert_select.result: Updated results mysql-test/r/rpl000009.result: Updated results mysql-test/t/ansi.test: Cleaned up test to be able to remove ansi-master.opt mysql-test/t/create.test: More tests mysql-test/t/insert_select.test: More tests mysql-test/t/mysqlbinlog.test: Fixed test after merge sql/mysql_priv.h: Added character-sets-dir to 'show variables' sql/set_var.cc: Added character-sets-dir to 'show variables' sql/sql_class.cc: Fixed that send_error() is called properly when a SELECT fails sql/sql_class.h: Fixed that send_error() is called properly when a SELECT fails sql/sql_insert.cc: Fixed bug in error handling of CREATE ... SELECT sql/sql_select.cc: Fixed bug in error handling of CREATE ... SELECT
| * Fixes after mergeunknown2003-10-084-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/std_data/trunc_binlog.000001: Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001 client/mysqltest.c: Fixed merge problem mysql-test/mysql-test-run.sh: Fixed merge problem mysql-test/r/distinct.result: Fix after merge mysql-test/r/drop_temp_table.result: Fix after merge mysql-test/r/join_outer.result: Fix after merge mysql-test/r/mysqldump.result: Fix after merge mysql-test/r/null_key.result: Fix after merge mysql-test/r/order_by.result: Fix after merge mysql-test/r/rpl_alter.result: Fix after merge mysql-test/r/rpl_loaddata.result: Fix after merge mysql-test/r/rpl_loaddata_rule_m.result: Fix after merge mysql-test/r/rpl_trunc_binlog.result: Fix after merge mysql-test/r/select_safe.result: Fix after merge mysql-test/t/insert.test: Fix after merge mysql-test/t/mysqlbinlog.test: Fix after merge mysql-test/t/rpl000009.test: Fix after merge mysql-test/t/rpl_alter.test: Fix after merge mysql-test/t/rpl_loaddata_rule_m.test: Fix after merge mysql-test/t/rpl_trunc_binlog.test: Fix after merge sql-common/client.c: Fix after merge sql/item_subselect.cc: Fix after merge sql/repl_failsafe.cc: Fix after merge sql/slave.cc: Fix after merge sql/sql_insert.cc: Fix after merge
| * mergeunknown2003-10-0717-223/+336
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysqld.cc: Auto merged sql/sql_select.cc: Auto merged innobase/row/row0mysql.c: merge (no changes) innobase/row/row0sel.c: merge (no changes) sql/item_subselect.cc: Use sanjas patch instead
| | * Merge with 4.0 to get fix for mysqlbinlogunknown2003-10-071-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: Auto merged mysql-test/r/create.result: Auto merged scripts/Makefile.am: Auto merged sql/sql_select.cc: Auto merged mysql-test/mysql-test-run.sh: Cleaned up argument handling for external programs
| | | * Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-10-071-0/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
| | | | * Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-10-031-0/+2
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
| | | | | * Fixed bug #1323 (varchar fields becoming char fields adter create ... select)unknown2003-10-031-0/+2
| | | | | |
| | * | | | Merge with 4.0.16unknown2003-10-0716-223/+333
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-mysqldump.result: Delete: mysql-test/r/mysqldump.result BitKeeper/deleted/.del-mysqldump.test: Delete: mysql-test/t/mysqldump.test BitKeeper/deleted/.del-compile-netware-max: Delete: netware/BUILD/compile-netware-max BitKeeper/deleted/.del-compile-netware-max-debug: Delete: netware/BUILD/compile-netware-max-debug BitKeeper/deleted/.del-compile-netware-src: Delete: netware/BUILD/compile-netware-src BitKeeper/deleted/.del-knetware.imp: Delete: netware/BUILD/knetware.imp BUILD/compile-pentium-valgrind-max: Auto merged BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql: Auto merged BitKeeper/deleted/.del-openssl.imp: Delete: netware/BUILD/openssl.imp acinclude.m4: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/server-cert.pem: Auto merged client/mysqlbinlog.cc: Auto merged extra/resolveip.c: Auto merged heap/hp_test2.c: Auto merged include/my_global.h: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged libmysql/libmysql.def: Auto merged libmysqld/examples/Makefile.am: Auto merged myisam/mi_check.c: Auto merged myisam/mi_test2.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/r/fulltext_multi.result: Auto merged mysql-test/r/fulltext_order_by.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/std_data/rpl_loaddata2.dat: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/user_var.test: Auto merged mysys/mf_dirname.c: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/des_key_file.cc: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.h: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql-bench/test-transactions.sh: Auto merged sql/sql_base.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged support-files/mysql.server.sh: Auto merged client/mysqltest.c: Merge with 4.0.16 Changed version number to '2.0' to avoid confusion with version numbering in 3.23 mysql-test/r/distinct.result: Updated results for merge mysql-test/r/insert.result: Updated results for merge mysql-test/r/insert_select.result: Updated results for merge mysql-test/r/join_outer.result: Updated results for merge mysql-test/r/mix_innodb_myisam_binlog.result: Updated results for merge mysql-test/r/order_by.result: Updated results for merge mysql-test/r/rpl000009.result: Updated results for merge mysql-test/r/rpl_loaddata.result: Updated results for merge mysql-test/r/rpl_log.result: Updated results for merge mysql-test/r/select_safe.result: Updated results for merge scripts/mysql_install_db.sh: Change -eq to = BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483: dummy
| | | * | | After merge fixesunknown2003-10-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/resolveip.c: After merge fix mysql-test/mysql-test-run.sh: Fixed comment mysql-test/r/rpl_trunc_binlog.result: Updated results sql/log_event.cc: Better (shorter) error message
| | | * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-031-33/+33
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | | * | When the I/O thread was stopped while copying a long transaction, and restarted,unknown2003-10-031-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it by moving the test for corruption to Start_log_event::exec_event(). Changed Rotate_log_event::exec_event() to not increment positions when the event is seen in the middle of a transaction. I did a separate commit in 4.1 (so this should not be merged to 4.0) because code is a bit different in 4.1. A test to see if the slave detects when the master died while writing a transaction to the binlog (uses a forged truncated binlog I made). sql/log_event.cc: When the I/O thread was stopped while copying a long transaction, and restarted, Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it by moving the test for corruption to Start_log_event::exec_event(). Changed Rotate_log_event::exec_event() to not increment positions when the event is seen in the middle of a transaction.
| | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-035-140/+157
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into mishka.mysql.fi:/home/my/mysql-4.0
| | | | * | Optimized code for setting user variables with := and fixed some bugs in old ↵unknown2003-10-035-140/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code (Bug #1194) Use forced close of socket to make mysqld shutdown faster when used under valgrind mysql-test/mysql-test-run.sh: Added --skip-bdb for valgrind mysql-test/r/user_var.result: Extended test for user variables mysql-test/t/user_var.test: Extended test for user variables sql/item_func.cc: Optimized code for setting user variables with := and fixed some bugs in old code sql/item_func.h: Optimized code for setting user variables sql/log.cc: Fixed comments sql/mysqld.cc: Use forced close of socket to make mysqld shutdown faster when used under valgrind sql/sql_class.h: Optimized code for setting user variables
| | | * | | Reverting changeset 1.1590unknown2003-10-021-23/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | sql/slave.h: Reverting changeset 1.1590.
| | | * | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-011-2/+24
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | | * | Follow-up of an IRC discussion today. Declaring ignore_log_space_limit volatile,unknown2003-10-011-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and a comment to explain why. sql/slave.h: Declaring ignore_log_space_limit volatile, and a comment to explain why.
| | | * | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-10-012-26/+68
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1194/mysql-4.0
| | | | * | turn Item_func_set_user_var unknown2003-10-012-36/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ::native_val, ::native_val_int and native_val_str into inline
| | | | * | rewrite Item_func_set_user_var ::val, ::val_str, ::val_int, ::updateunknown2003-09-302-89/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with less code duplication
| | | | * | fixed bug #1194 unknown2003-09-241-17/+102
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (changes in Item_func_set_user_var::update, ::val, ::val_str, ::val_int) mysql-test/r/user_var.result: added tests for bug #1194 mysql-test/t/user_var.test: added tests for bug #1194
| | | * | - enable changing the number of table bits for JOINs to be increasedunknown2003-09-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from ulong to ulonglong by defining -DBIG_JOINS sql/mysql_priv.h: - enable changing the number of table bits for JOINs to be increased from ulong to ulonglong by defining BIG_JOINS
| | | * | Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog)unknown2003-09-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add quoting for use `database` for mysqlbinlog Removed test ins0000001 Add support for --replace for exec in mysqltest Don't refer to install dir in mysqlbinlog.result BitKeeper/deleted/.del-ins000001.result~f45c599efdf8352b: Delete: mysql-test/r/ins000001.result BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483: Delete: mysql-test/t/ins000001.test client/mysqlbinlog.cc: Removed random chars after filename for LOAD DATA INFILE client/mysqltest.c: Add support for --replace for 'exec' mysql-test/r/drop_temp_table.result: Updated results after quoting change mysql-test/r/fulltext_multi.result: Updated results after quoting change mysql-test/r/fulltext_order_by.result: Updated results after quoting change mysql-test/r/insert.result: New tests mysql-test/r/insert_select.result: Updated results after quoting change mysql-test/r/mix_innodb_myisam_binlog.result: Updated results after quoting change mysql-test/r/mysqlbinlog.result: Updated results after quoting change mysql-test/r/rpl_log.result: Updated results after quoting change mysql-test/t/fulltext_multi.test: Remove 'use' mysql-test/t/fulltext_order_by.test: Remove 'use' mysql-test/t/insert.test: Merge test with ins0000001.test mysql-test/t/mysqlbinlog.test: Don't refer to install dir in result sql/log_event.cc: Add quoting for use `database` for mysqlbinlog support-files/mysql.server.sh: Move pid_file test after arguments have been parsed
| | | * | Fix for BUG#1345 "SQL Syntax Error in binarylog with DROP TABLES":unknown2003-09-281-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's just backquoting the db's and table's names when writing DROP TEMPORARY TABLE to the binlog when a connection ends. A testcase for this. sql/sql_base.cc: backquote db and table name when writing DROP TEMPORARY TABLE to the binlog when a connection ends.
| | | * | Fix for 64-bit machines.unknown2003-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am almost sure this is the cause for BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries? BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris) The reason why I think it's wrong is that the normal client code has uint32 ip_addr. (of course on 32-bit machines it does not matter, but on 64-bit it does).
| | | * | a small comment about why we call end_io_cache in mysql_loadunknown2003-09-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_load.cc: small comment
| | | * | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-09-251-15/+24
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | | * | Fix for BUG#1391:unknown2003-09-251-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files" (the bug is in the master) mysql-test/r/rpl_loaddata.result: result update mysql-test/std_data/rpl_loaddata2.dat: change to introduce a unique key violation mysql-test/t/rpl_loaddata.test: testcase for bug#1391. sql/sql_load.cc: fix for bug#1391: for a small file, we had in the binlog only the Create_file, not the Delete_file (the Create_file was written when the READ_INFO was destroyed).
View Lorry Controller Status