mariadb

Tree: 54ad7d88d0

Author	SHA1	Message	Date
unknown	39bc53e7c7	Merge magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt into magare.gmz:/home/kgeorge/mysql/work/B31440-5.1-opt mysql-test/r/func_regexp.result: Auto merged sql/item_cmpfunc.cc: Auto merged	18 years ago
unknown	9380fdb1c6	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt	18 years ago
unknown	62d4258f73	Merge polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254 into polly.(none):/home/kaa/src/maint/mysql-5.1-maint	18 years ago
unknown	010d312650	Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254 into polly.(none):/home/kaa/src/maint/mysql-5.0-maint	18 years ago
unknown	a463718e59	Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254 into polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254 include/my_global.h: Auto merged	18 years ago
unknown	acf0609c83	Merge mysql.com:/home/hf/work/31155/my50-31155 into mysql.com:/home/hf/work/31155/my51-31155 sql/item.cc: Auto merged sql/item.h: Auto merged	18 years ago
unknown	147eef3eba	Merge bk@192.168.21.1:mysql-5.1-opt into mysql.com:/home/hf/work/31155/my51-31155 sql/item.cc: Auto merged sql/item.h: merging	18 years ago
unknown	1ccf107a5e	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/home/hf/work/31155/my50-31155 sql/item.cc: Auto merged	18 years ago
unknown	9908eceb2a	Merge mysql.com:/home/hf/work/31155/my50-31155 into mysql.com:/home/hf/work/31155/my51-31155 sql/item.h: Auto merged sql/item_geofunc.h: Auto merged sql/item.cc: merging sql/item_geofunc.cc: merging	18 years ago
unknown	65a32e834f	Fix for bug #31254 : "Max_data_length" truncated / reported wrong (compiler issue ?) Problem: Improper compile-time flags on AIX prevented use of files > 2 GB. This resulted in Max_data_length being truncated to 2 GB by MyISAM code. Solution: Reverted large-file changes from the fix for bug10776. We need to define _LARGE_FILES on AIX to have support for files > 2 GB. Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be automatically defined by including standards.h, we also need a workaround to avoid this conflict. config/ac-macros/large_file.m4: Reverted large-file changes from the fix for bug10776. We need to define _LARGE_FILES on AIX to have support for files > 2 GB. include/my_global.h: _LARGE_FILE_API is defined in standards.h that is automatically included by at least some C++ compilers on AIX. Since it is also incompatible with _LARGE_FILES which is required for POSIX IO calls to be largefile-safe, the only workaround is to explicitely #undef _LARGE_FILE_API.	18 years ago
unknown	d1aabe3897	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint into sin.intern.azundris.com:/home/tnurnberg/30951/51-30951	18 years ago
unknown	e0bdce865a	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into sin.intern.azundris.com:/home/tnurnberg/30951/50-30951	18 years ago
unknown	b9be40cc1e	Merge sin.intern.azundris.com:/home/tnurnberg/30951/50-30951 into sin.intern.azundris.com:/home/tnurnberg/30951/51-30951 mysql-test/r/func_sapdb.result: Auto merged mysql-test/t/func_sapdb.test: Auto merged sql-common/my_time.c: Auto merged	18 years ago
unknown	91f6d169a6	Bug#30951: makedate returns different results depending on version of mysql makedate() will fold years below 100 into the 1970-2069 range. CS removes code that also wrongly folded years between 100 and 200 into that range, which should be left unchanged. Backport from 5.1. mysql-test/r/func_sapdb.result: Show that makedate() works correctly for 100 <= year < 200. mysql-test/t/func_sapdb.test: Show that makedate() works correctly for 100 <= year < 200. sql-common/my_time.c: Remove unnecessary date magic. Syncs behaviour with 5.1+ and manual.	18 years ago
unknown	f1720f61e0	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint into sin.intern.azundris.com:/home/tnurnberg/30821/51-30821 sql/mysqld.cc: Auto merged	18 years ago
unknown	0d128c0746	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into sin.intern.azundris.com:/home/tnurnberg/30821/50-30821 sql/mysqld.cc: Auto merged	18 years ago
unknown	adc1cfc1f4	Merge sin.intern.azundris.com:/home/tnurnberg/30821/50-30821 into sin.intern.azundris.com:/home/tnurnberg/30821/51-30821 sql/mysqld.cc: NULL merge	18 years ago
unknown	c83bff9915	Bug#30821: setting --tc_heuristic_recover tries to set myisam_stats_method Options to mysqld were not processed correctly because switch statement was missing some "break"s. CS adds them. No test case; would require .opt file and server restart. Manually tested. sql/mysqld.cc: Add missing "break"s to switch() in mysqld to fix option processing.	18 years ago
unknown	bbbe064bf1	Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint BitKeeper/deleted/.del-changelog: Auto merged BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in: Auto merged BitKeeper/deleted/.del-mysql-client-BASE.files.in: Auto merged BitKeeper/deleted/.del-mysql-server-BASE.files.in: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-mysql-test-BASE.files.in: Auto merged BitKeeper/deleted/.del-rules: Auto merged Makefile.am: Merged in removal of debian dir from 5.0-maint	18 years ago
unknown	c236111f6c	Removed debian dir. It was a mistake to embed it in the tree in the first place. BitKeeper/deleted/.del-Makefile.am~2cb643bedd5f474: Delete: debian/Makefile.am BitKeeper/deleted/.del-README.Maintainer: Delete: debian/README.Maintainer BitKeeper/deleted/.del-changelog: Delete: debian/changelog BitKeeper/deleted/.del-compat: Delete: debian/compat BitKeeper/deleted/.del-control.in: Delete: debian/control.in BitKeeper/deleted/.del-copyright.more: Delete: debian/copyright.more BitKeeper/deleted/.del-copyright: Delete: debian/copyright BitKeeper/deleted/.del-defs.mk.in: Delete: debian/defs.mk.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.README.Maintainer.in: Delete: debian/libmysqlclientSLIB-dev.README.Maintainer.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.dirs.in: Delete: debian/libmysqlclientSLIB-dev.dirs.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.docs.in: Delete: debian/libmysqlclientSLIB-dev.docs.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.examples.in: Delete: debian/libmysqlclientSLIB-dev.examples.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in: Delete: debian/libmysqlclientSLIB-dev.files.in BitKeeper/deleted/.del-libmysqlclientSLIB-dev.links.in: Delete: debian/libmysqlclientSLIB-dev.links.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.README.Debian.in: Delete: debian/libmysqlclientSLIBoff.README.Debian.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.dirs.in: Delete: debian/libmysqlclientSLIBoff.dirs.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.docs.in: Delete: debian/libmysqlclientSLIBoff.docs.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.files.in: Delete: debian/libmysqlclientSLIBoff.files.in BitKeeper/deleted/.del-libmysqlclientSLIBoff.postinst.in: Delete: debian/libmysqlclientSLIBoff.postinst.in BitKeeper/deleted/.del-libndbclientNLIB-dev.dirs.in: Delete: debian/libndbclientNLIB-dev.dirs.in BitKeeper/deleted/.del-libndbclientNLIB-dev.files.in: Delete: debian/libndbclientNLIB-dev.files.in BitKeeper/deleted/.del-libndbclientNLIB-dev.links.in: Delete: debian/libndbclientNLIB-dev.links.in BitKeeper/deleted/.del-libndbclientNLIB.README.Debian.in: Delete: debian/libndbclientNLIB.README.Debian.in BitKeeper/deleted/.del-libndbclientNLIB.dirs.in: Delete: debian/libndbclientNLIB.dirs.in BitKeeper/deleted/.del-libndbclientNLIB.files.in: Delete: debian/libndbclientNLIB.files.in BitKeeper/deleted/.del-libndbclientNLIB.postinst.in: Delete: debian/libndbclientNLIB.postinst.in BitKeeper/deleted/.del-mysql-client-BASE.NEWS.in: Delete: debian/mysql-client-BASE.NEWS.in BitKeeper/deleted/.del-mysql-client-BASE.README.Debian.in: Delete: debian/mysql-client-BASE.README.Debian.in BitKeeper/deleted/.del-mysql-client-BASE.dirs.in: Delete: debian/mysql-client-BASE.dirs.in BitKeeper/deleted/.del-mysql-client-BASE.docs.in: Delete: debian/mysql-client-BASE.docs.in BitKeeper/deleted/.del-mysql-client-BASE.files.in: Delete: debian/mysql-client-BASE.files.in BitKeeper/deleted/.del-mysql-client-BASE.lintian-overrides.in: Delete: debian/mysql-client-BASE.lintian-overrides.in BitKeeper/deleted/.del-mysql-common.README.Debian.in: Delete: debian/mysql-common.README.Debian.in BitKeeper/deleted/.del-mysql-common.dirs.in: Delete: debian/mysql-common.dirs.in BitKeeper/deleted/.del-mysql-common.files.in: Delete: debian/mysql-common.files.in BitKeeper/deleted/.del-mysql-common.postrm.in: Delete: debian/mysql-common.postrm.in BitKeeper/deleted/.del-mysql-common.preinst.in: Delete: debian/mysql-common.preinst.in BitKeeper/deleted/.del-mysql-extra-BASE.dirs.in: Delete: debian/mysql-extra-BASE.dirs.in BitKeeper/deleted/.del-mysql-extra-BASE.files.in: Delete: debian/mysql-extra-BASE.files.in BitKeeper/deleted/.del-mysql-management-BASE.dirs.in: Delete: debian/mysql-management-BASE.dirs.in BitKeeper/deleted/.del-mysql-management-BASE.files.in: Delete: debian/mysql-management-BASE.files.in BitKeeper/deleted/.del-mysql-management-BASE.mysql-management.init.in: Delete: debian/mysql-management-BASE.mysql-management.init.in BitKeeper/deleted/.del-mysql-server-BASE.NEWS.in: Delete: debian/mysql-server-BASE.NEWS.in BitKeeper/deleted/.del-mysql-server-BASE.README.Debian.in: Delete: debian/mysql-server-BASE.README.Debian.in BitKeeper/deleted/.del-mysql-server-BASE.config.in: Delete: debian/mysql-server-BASE.config.in BitKeeper/deleted/.del-mysql-server-BASE.dirs.in: Delete: debian/mysql-server-BASE.dirs.in BitKeeper/deleted/.del-mysql-server-BASE.docs.in: Delete: debian/mysql-server-BASE.docs.in BitKeeper/deleted/.del-mysql-server-BASE.files.in: Delete: debian/mysql-server-BASE.files.in BitKeeper/deleted/.del-mysql-server-BASE.links.in: Delete: debian/mysql-server-BASE.links.in BitKeeper/deleted/.del-mysql-server-BASE.lintian-overrides.in: Delete: debian/mysql-server-BASE.lintian-overrides.in BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.paranoid.in: Delete: debian/mysql-server-BASE.logcheck.ignore.paranoid.in BitKeeper/deleted/.del-my.cnf: Delete: debian/additions/my.cnf BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.server.in: Delete: debian/mysql-server-BASE.logcheck.ignore.server.in BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.workstation.in: Delete: debian/mysql-server-BASE.logcheck.ignore.workstation.in BitKeeper/deleted/.del-mysql-server-BASE.mysql-server.logrotate.in: Delete: debian/mysql-server-BASE.mysql-server.logrotate.in BitKeeper/deleted/.del-mysql-server-BASE.postinst.in: Delete: debian/mysql-server-BASE.postinst.in BitKeeper/deleted/.del-mysql-server-BASE.postrm.in: Delete: debian/mysql-server-BASE.postrm.in BitKeeper/deleted/.del-mysql-server-BASE.preinst.in: Delete: debian/mysql-server-BASE.preinst.in BitKeeper/deleted/.del-mysql-server-BASE.prerm.in: Delete: debian/mysql-server-BASE.prerm.in BitKeeper/deleted/.del-mysql-server-BASE.templates.in: Delete: debian/mysql-server-BASE.templates.in BitKeeper/deleted/.del-mysql-server-PREV.preinst.in: Delete: debian/mysql-server-PREV.preinst.in BitKeeper/deleted/.del-mysql-server.lintian-overrides: Delete: debian/additions/mysql-server.lintian-overrides BitKeeper/deleted/.del-mysql-server.preinst.in: Delete: debian/mysql-server.preinst.in BitKeeper/deleted/.del-mysql-storage-BASE.dirs.in: Delete: debian/mysql-storage-BASE.dirs.in BitKeeper/deleted/.del-mysql-storage-BASE.files.in: Delete: debian/mysql-storage-BASE.files.in BitKeeper/deleted/.del-mysql-storage-BASE.mysql-storage.init.in: Delete: debian/mysql-storage-BASE.mysql-storage.init.in BitKeeper/deleted/.del-mysql-test-BASE.dirs.in: Delete: debian/mysql-test-BASE.dirs.in BitKeeper/deleted/.del-mysql-test-BASE.files.in: Delete: debian/mysql-test-BASE.files.in BitKeeper/deleted/.del-mysql-tools-BASE.dirs.in: Delete: debian/mysql-tools-BASE.dirs.in BitKeeper/deleted/.del-mysql-tools-BASE.files.in: Delete: debian/mysql-tools-BASE.files.in BitKeeper/deleted/.del-rules: Delete: debian/rules BitKeeper/deleted/.del-source.lintian-overrides.in: Delete: debian/source.lintian-overrides.in BitKeeper/deleted/.del-watch: Delete: debian/watch BitKeeper/deleted/.del-POTFILES.in.in: Delete: debian/po/POTFILES.in.in BitKeeper/deleted/.del-ca.po: Delete: debian/po/ca.po BitKeeper/deleted/.del-cs.po: Delete: debian/po/cs.po BitKeeper/deleted/.del-da.po: Delete: debian/po/da.po BitKeeper/deleted/.del-de.po: Delete: debian/po/de.po BitKeeper/deleted/.del-es.po: Delete: debian/po/es.po BitKeeper/deleted/.del-eu.po: Delete: debian/po/eu.po BitKeeper/deleted/.del-fr.po: Delete: debian/po/fr.po BitKeeper/deleted/.del-gl.po: Delete: debian/po/gl.po BitKeeper/deleted/.del-it.po: Delete: debian/po/it.po BitKeeper/deleted/.del-ja.po: Delete: debian/po/ja.po BitKeeper/deleted/.del-nb.po: Delete: debian/po/nb.po BitKeeper/deleted/.del-ndb_mgmd.cnf: Delete: debian/additions/ndb_mgmd.cnf BitKeeper/deleted/.del-nl.po: Delete: debian/po/nl.po BitKeeper/deleted/.del-pt.po: Delete: debian/po/pt.po BitKeeper/deleted/.del-pt_BR.po: Delete: debian/po/pt_BR.po BitKeeper/deleted/.del-ro.po: Delete: debian/po/ro.po BitKeeper/deleted/.del-ru.po: Delete: debian/po/ru.po BitKeeper/deleted/.del-sv.po: Delete: debian/po/sv.po BitKeeper/deleted/.del-templates.pot: Delete: debian/po/templates.pot BitKeeper/deleted/.del-tr.po: Delete: debian/po/tr.po	18 years ago
unknown	f22b95401e	Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime into weblab.(none):/home/marcsql/TREE/mysql-5.1-27858-b mysql-test/r/log_tables.result: Auto merged	18 years ago
unknown	3df1613f27	Bug#27858 (Failing to log to a log table doesn't log anything to error log) Before this patch, failures to write to the log tables (mysql.slow_log and mysql.general_log) were improperly printed (the time was printed twice), or not printed at all. With this patch, failures to write to the log tables is reported in the error log, for all cases of failures. mysql-test/r/log_tables.result: Bug#27858 (Failing to log to a log table doesn't log anything to error log) mysql-test/t/log_tables.test: Bug#27858 (Failing to log to a log table doesn't log anything to error log) sql/log.cc: Bug#27858 (Failing to log to a log table doesn't log anything to error log)	18 years ago
unknown	03e74b8c5e	Bug#29223 declare cursor c for SHOW ..... "DECLARE CURSOR FOR SHOW ..." is a syntax that currently appears to work, but is untested for some SHOW commands and does not work for other SHOW commands. Since this is an un-intended feature that leaked as a result of a coding bug (in the parser grammar), the correct fix is to fix the grammar to not accept this construct. In other words, "DECLARE CURSOR FOR SHOW <other commands that don't work>" is not considered a bug, and we will not implement other features to make all the SHOW commands usable inside a cursor just because someone exploited a bug. mysql-test/r/sp-error.result: Only allow declaring cursors for SELECT statements to avoid possible further confusion/problems. mysql-test/t/information_schema.test: Only SELECT statements are allowed in cursors. mysql-test/t/sp-error.test: Add test case for Bug#29223. Non-SELECT statements in cursors now yields a parser error. sql/sql_yacc.yy: Rework DECLARE CURSOR statement to not allow non-SELECT statements.	18 years ago
unknown	f0fcc8c267	Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31471 into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/create.result: Auto merged mysql-test/r/null.result: Auto merged sql/item_cmpfunc.cc: Auto merged	18 years ago
unknown	1fc06a1f46	Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31471 into gleb.loc:/home/uchum/work/bk/5.0-opt	18 years ago
unknown	3ca34c102a	A patch for BUG#31418: User locks misfunctioning after mysql_change_user(). The problem was that THD::ull was not reset in THD::cleanup(). The fix is to reset it. sql/sql_class.cc: Reset THD::ull after cleanup to prevent memory corruption. tests/mysql_client_test.c: Add test case for BUG#31418.	18 years ago
unknown	24a567e9f6	Fix for bug #31154 : field.h:1649: virtual int Field_bit::cmp(const uchar, const uchar): Assertion Problem: GROUP_CONCAT(DISTINCT BIT_FIELD...) uses a tree to store keys; which are constructed using a temporary table fields, see Item_func_group_concat::setup(). As a) we don't store null bits in the tree where the bit fields store parts of their data and b) there's no method to properly compare two table records we've got problem. Fix: convert BIT fields to INT in the temporary table used. mysql-test/r/func_gconcat.result: Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar, const uchar): Assertion - test result. mysql-test/t/func_gconcat.test: Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar, const uchar): Assertion - test case. sql/item_sum.cc: Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar, const uchar): Assertion - force the create_tmp_table() to convert BIT columns to INT in order to be able to compare records containing BIT fields.	18 years ago
unknown	048cb42dbf	after merge fix	18 years ago
unknown	937504e7a0	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/sql_yacc.yy: manual merge	18 years ago
unknown	f30eacb223	Bug#30981 CHAR(0x41 USING ucs2) doesn't add leading zero Bug#30982 CHAR(..USING..) can return a not-well-formed string Bug#30986 Character set introducer followed by a HEX string can return bad result check_well_formed_result moved to Item from Item_str_func fixed Item_func_char::val_str for proper ucs symbols converting added check for well formed strings for correct conversion of constants with underscore charset mysql-test/r/ctype_ucs.result: test result mysql-test/r/ctype_utf8.result: test result mysql-test/t/ctype_ucs.test: test case mysql-test/t/ctype_utf8.test: test case sql/item.cc: check_well_formed_result() moved from Item_str_func sql/item.h: check_well_formed_result() moved from Item_str_func sql/item_strfunc.cc: check_well_formed_result moved to Item fixed Item_func_char::val_str for proper ucs symbols converting sql/item_strfunc.h: check_well_formed_result moved to Item sql/sql_yacc.yy: added check for well formed string	18 years ago
unknown	1c7b80dff9	Fix for bug #31174 : "Repair" command on MyISAM crashes with small myisam_sort_buffer_size. An incorrect length of the sort buffer was used when calculating the maximum number of keys. When myisam_sort_buffer_size is small enough, this could result in the number of keys < number of BUFFPEK structures which in turn led to use of uninitialized BUFFPEKs. Fixed by correcting the buffer length calculation. myisam/sort.c: Use a correct buffer length when calculating the maximum number of keys. Assert that for each BUFFPEK structure there is at least one corresponding key. Otherwise we would fail earlier and not reach merge_buffers(). mysql-test/r/repair.result: Added a test case for bug #31174. mysql-test/t/repair.test: Added a test case for bug #31174.	18 years ago
unknown	76af571717	Bug #31440 : 'select 1 regex null' asserts debug server The special case with NULL as a regular expression was handled at prepare time. But in this special case the item was not marked as fixed. This caused an assertion at execution time. Fixed my marking the item as fixed even when known to return NULL at prepare time. mysql-test/r/func_regexp.result: Bug #31440: test case mysql-test/t/func_regexp.test: Bug #31440: test case sql/item_cmpfunc.cc: Bug #31440: mark the item as fixed even when known to return NULL.	18 years ago
unknown	b164a8ab7c	Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint into polly.(none):/home/kaa/src/maint/mysql-5.1-maint	18 years ago
unknown	c6398928fd	Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint into polly.(none):/home/kaa/src/maint/mysql-5.1-maint mysql-test/include/mix1.inc: Auto merged mysql-test/r/innodb_mysql.result: Auto merged	18 years ago
unknown	bdd5b62399	Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-maint into polly.(none):/home/kaa/src/maint/mysql-5.0-maint	18 years ago
unknown	27e2f30e05	Post-merge test case for Bug 31409 mysql-test/include/handler.inc: Add test case for Bug 31409 mysql-test/r/handler_innodb.result: Add test case result for InnoDB run of the handler test for Bug 31409 mysql-test/r/handler_myisam.result: Add test case result for MyISAM run of the handler test for Bug 31409	18 years ago
unknown	b24d4a977f	Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime into moksha.com.br:/Users/davi/mysql/bugs/31409-5.1 sql/sql_base.cc: Auto merged sql/sql_handler.cc: Auto merged	18 years ago
unknown	dc1ce0ba41	Mismerge broken 5.1-runtime compilation because do_command was defined static but it's still used by another compilation unit. Remove static qualifier from do_command definition. sql/sql_parse.cc: do_command is also used by sql_connect.c in 5.1	18 years ago
unknown	846ff61547	Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime sql/sql_parse.cc: Post merge fix, the do_command prototype doesn't exist anymore.	18 years ago
unknown	d2b946c59e	Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime sql/sql_parse.cc: Auto merged	18 years ago
unknown	8d57154ae4	Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sql_parse.cc: Auto merged	18 years ago
unknown	4c97d5fde1	Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime	18 years ago
unknown	75a1d92906	Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime	18 years ago
unknown	86cb5ae9bc	Post-merge test case for Bug 21587 mysql-test/include/handler.inc: Add test case for Bug 21587 mysql-test/r/handler_innodb.result: Add test case result for InnoDB run of the handler test for Bug 21587 mysql-test/r/handler_myisam.result: Add test case result for MyISAM run of the handler test for Bug 21587	18 years ago
unknown	954bb0f555	Merge moksha.com.br:/Users/davi/mysql/bugs/21587-5.0 into moksha.com.br:/Users/davi/mysql/bugs/21587-5.1 sql/sql_handler.cc: Auto merged	18 years ago
unknown	42b3bbec13	Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 mysql-test/mysql-test-run.pl: Auto merged scripts/mysql_system_tables_data.sql: Auto merged	18 years ago
unknown	17c19299af	Merge ramayana.hindu.god:/home/tsmith/m/bk/51 into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 configure.in: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/Makefile.am: Auto merged scripts/mysql_system_tables_data.sql: Auto merged scripts/mysqld_safe.sh: Auto merged sql/sql_select.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged	18 years ago
unknown	c7ca2283a9	Merge ramayana.hindu.god:/home/tsmith/m/bk/50 into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 mysql-test/mysql-test-run.pl: Auto merged scripts/mysql_system_tables_data.sql: Auto merged	18 years ago
unknown	5597f40f7f	Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 sql/sql_class.cc: Auto merged	18 years ago
unknown	80ace29416	Bug #31517 : Potential crash due to access of NULL thd in mark_transaction_to_rollback() Introduced in mark_transaction_to_rollback(), part of fix for bug 24989; fix is to check thd for NULL before using it. sql/sql_class.cc: It is possible that mark_transaction_to_rollback() may be called in rare circumstances when thd is NULL (e.g., from some calls to convert_error_code_to_mysql()). Don't use thd if it is NULL.	18 years ago

... 3 4 5 6 7 ...

50580 Commits (54ad7d88d03c940330510e0870e4bce17327a952) All Branches Search

50580 Commits (54ad7d88d03c940330510e0870e4bce17327a952)

All Branches