- 28 Jan, 2008 1 commit
-
-
unknown authored
into trift2.:/MySQL/M51/push-5.1 configure.in: Auto merged extra/CMakeLists.txt: Auto merged extra/resolveip.c: Auto merged mysql-test/t/disabled.def: Auto merged
-
- 27 Jan, 2008 2 commits
-
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 mysql-test/r/mysqlcheck.result: Use local (manual merge) mysql-test/t/mysqlcheck.test: Use local (manual merge)
-
unknown authored
and so that it works correctly on Windows. mysql-test/r/mysqlcheck.result: Flush tables before monkeying around with underlying MyISAM data files mysql-test/t/mysqlcheck.test: Fix the test case for bug #25347 so that it actually does test the behavior. Also, this makes it work on Windows by ensuring that mysqld doesn't hold the underlying MyISAM files open while we try to corrupt them on disk. Flush tables before monkeying around with underlying MyISAM data files; --use-frm, so that mysqlcheck will succeed.
-
- 25 Jan, 2008 5 commits
-
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 mysql-test/t/mysqlcheck.test: Manual merge
-
unknown authored
mysql-test/t/mysqlcheck.test: Use --remove_file and --write_file instead of --exec rm and --exec touch.
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 sql/sql_select.cc: Auto merged
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 client/mysqldump.c: Auto merged configure.in: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/handler.cc: Manual merge sql/item.cc: Manual merge
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 sql/sql_select.cc: Auto merged
-
- 24 Jan, 2008 9 commits
-
-
unknown authored
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt
-
unknown authored
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt mysql-test/r/innodb_mysql.result: Auto merged mysql-test/t/disabled.def: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged
-
unknown authored
into quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged-5.0
-
ssh://bk-internal.mysql.com//home/bk/mysql-5.1unknown authored
into kaamos.(none):/data/src/opt/mysql-5.1-opt
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/build/51 BitKeeper/triggers/triggers-lib.pl: Auto merged
-
unknown authored
BitKeeper/triggers/triggers-lib.pl: Fix bug in innodb_send_changes_mail() that always displayed details for the most recent changeset (-r+) instead of the $cset function argument.
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/build/51 storage/innobase/handler/ha_innodb.cc: use local (null merge)
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
-
unknown authored
Fixes: Bug #32083: server crashes on show status when InnoDB is not initialized innodb_export_status(): Check that InnoDB has been initialized before invoking srv_export_innodb_status(). (Bug #32083) This bug does not exist in MySQL/InnoDB 5.1. sql/ha_innodb.cc: Applied innodb-5.0-ss2223 snapshot Revision r2223: branches/5.0: innodb_export_status(): Check that InnoDB has been initialized before invoking srv_export_innodb_status(). (Bug #32083) This bug does not exist in MySQL/InnoDB 5.1.
-
- 23 Jan, 2008 23 commits
-
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/build/51 scripts/make_binary_distribution.sh: Auto merged
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
-
unknown authored
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/inno/51-triggers
-
unknown authored
-
unknown authored
that they control. BitKeeper/triggers/post-commit.innodb.pl: Trigger to notify InnoDB developers about changes in InnoDB files. BitKeeper/triggers/post-incoming.innodb.pl: Trigger to notify InnoDB developers about changes in InnoDB files. BitKeeper/triggers/pre-commit.innodb.pl: Trigger to warn MySQL developers that they have changed InnoDB files, and that their changes will be sent to the InnoDB developers if they choose to commit. BitKeeper/triggers/triggers-lib.pl: Utility functions for BK triggers written in Perl.
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
-
unknown authored
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-33618 mysql-test/r/sp-code.result: Auto merged mysql-test/t/sp-code.test: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sp_rcontext.cc: Auto merged
-
unknown authored
-
unknown authored
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618 mysql-test/t/sp.test: Auto merged sql/sp_head.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 sql/item_timefunc.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted) The server used to crash when REPEAT or another control instruction was used in conjunction with labels and a LEAVE instruction. The crash was caused by a missing "pop" of handlers or cursors in the code representing the stored program. When executing the code in a loop, this missing "pop" would result in a stack overflow, corrupting memory. Code generation has been fixed to produce the missing h_pop/c_pop instructions. Also, the logic checking that labels at the beginning and the end of a statement are matched was incorrect, causing Bug 33983. End labels, when used, must match the label used at the beginning of a block. mysql-test/r/sp-code.result: Bug#33618 (Crash in sp_rcontext) mysql-test/r/sp-error.result: Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted) mysql-test/r/sp.result: Bug#33618 (Crash in sp_rcontext) mysql-test/t/sp-code.test: Bug#33618 (Crash in sp_rcontext) mysql-test/t/sp-error.test: Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted) mysql-test/t/sp.test: Bug#33618 (Crash in sp_rcontext) sql/sp_head.cc: Bug#33618 (Crash in sp_rcontext) sql/sp_head.h: Bug#33618 (Crash in sp_rcontext) sql/sp_rcontext.cc: Bug#33618 (Crash in sp_rcontext) sql/sp_rcontext.h: Bug#33618 (Crash in sp_rcontext) sql/sql_yacc.yy: Bug#33618 (Crash in sp_rcontext)
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint configure.in: Auto merged sql/item_timefunc.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 sql/item_timefunc.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint configure.in: Auto merged extra/resolveip.c: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/func_misc.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_strfunc.h: Auto merged sql/item_timefunc.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/sort.c: Auto merged client/mysqlcheck.c: manual merge mysql-test/r/mysqlcheck.result: manual merge mysql-test/t/mysqlcheck.test: manual merge
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build cmd-line-utils/readline/bind.c: Auto merged cmd-line-utils/readline/complete.c: Auto merged cmd-line-utils/readline/display.c: Auto merged cmd-line-utils/readline/histfile.c: Auto merged cmd-line-utils/readline/rltty.c: Auto merged cmd-line-utils/readline/undo.c: Auto merged cmd-line-utils/readline/xmalloc.c: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
-
unknown authored
Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed mysqlcheck tests nullness of the engine type to know whether the "table" is a view or not. That also falsely catches tables that are severly damaged. Instead, use SHOW FULL TABLES to test whether a "table" is a view or not. (Don't add new function. Instead, get original data a smarter way.) Make it safe for use against databases before when views appeared. client/mysqlcheck.c: Use SHOW FULL TABLES to test better whether a name in the table list is one of a view. Checking that the engine is NULL is insufficient. Implemented suggestion from jimw that involved removing most of original patch and getting data a better way mysql-test/r/mysqlcheck.result: Verify that tables that have NULL/unreadable engine types are processed and not interpreted as views. mysql-test/t/mysqlcheck.test: Verify that tables that have NULL/unreadable engine types are processed and not interpreted as views.
-
unknown authored
Patch by Kasper Dupont. No CLA required for this size of patch. "resolveip" program produces incorrect result if given a hostname starting with a digit. Someone seems to have thought that names can not have digits at the beginning. Instead, use the resolver library to work out the rules of hostnames, as it will undoubtedly be better at it than we are. configure.in: See if we need to a library for address lookups. extra/resolveip.c: Don't use silly heuristic to know whether a string is a dotted quad. Instead, pass the whole thing into the resolver and let its smarts do all the work.
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build configure.in: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/src/yassl_imp.cpp: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build configure.in: merge fix
-