summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug #9507 /etc/init.d/mysql script does not stop mysqld correctlyunknown2005-03-311-3/+14
| | | | | | | | | wait_for_pid function is fixed to wait for pid removal in "stop". recomitted with post-review fix support-files/mysql.server.sh: wait_for_pid function corrected to work properly with start/stop
* A fix for Bug#9443 "mysql_client_test fails on linux and some solaris unknown2005-03-311-2/+8
| | | | | | | | | | | | platforms": yet another issue with floating pointer comparisons. The fix uses the workaround with volatiles. sql/item_cmpfunc.cc: A fix for the failing mysql_client_test on some Intel platforms when compiled with optimization. We don't use -ffloat-store compileation as it may slow all floating point operations.
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-03-302-15/+31
|\ | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-4.1
| * Fix 'Bootstrap' to bypass a problem with "bk changes" by changing the ↵unknown2005-03-301-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | directory before calling the command. Build-tools/Bootstrap: Bypass a BK problem with "bk changes": It stopped delivering changeset comments when 1) it encountered a single, unbroken line with about 1k characters AND 2) it was applied not to the current directory but to a named BK root directory. As 1) cannot be changed post-factum (and might happen again), the "bk changes" command is now preceded by a "cd $REPO". Do some renaming of variables used around the "bk changes" call to improve documentation.
| * Portability fix (avoid bash-ism).unknown2005-03-301-1/+3
| | | | | | | | | | | | support-files/mysql.server.sh: Replace a non-portable "for" loop (bash style, fails on BSD) by an equivalent "while" loop. Note that the "stop" method is still wrong, as it does not wait for file removal.
| * Ensure 'texi2html' is taken from the Docs tree, not to miss any corrections.unknown2005-03-301-1/+3
| |
* | postmerge fixesunknown2005-03-302-20/+26
| | | | | | | | | | | | | | mysql-test/r/metadata.result: postmerge change sql/item.cc: work around about varchar in 4.1
* | mergeunknown2005-03-3012-35/+98
|\ \ | |/ | | | | | | sql/sql_parse.cc: Auto merged
| * Fix for BUG#9213: GROUP BY returns wrong query results:unknown2005-03-304-2/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index different from the index join optimizer has choosen. mysql-test/r/group_by.result: Testcase for BUG#9213 mysql-test/t/group_by.test: Testcase for BUG#9213 sql/table.h: Added comments about TABLE::used_keys
| * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-301-15/+17
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-4.1
| | * A fix (bug #9401: type_timestamp segfaults mysqld)unknown2005-03-301-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_select.cc: A fix (bug #9401: type_timestamp segfaults mysqld). 1. create_tmp_field_from_field() is modified to take 'Item_ref *item' and 'char *name' instead of 'bool modify_item' and 'Item *item'. 2. For Item_sum_min/max we should never modify item, so NULL is passed as item to the create_tmp_field_from_field().
| * | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-303-6/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1
| | * | Remove .opt file for faster test running.unknown2005-03-303-6/+4
| | |/ | | | | | | | | | | | | BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106: Delete: mysql-test/t/ctype_cp1251-master.opt
| * | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-305-13/+12
| |\ \ | | |/ | |/| | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * mergedunknown2005-03-301-6/+5
| | |\
| | | * don't strcmp db if it's a patternunknown2005-03-301-4/+5
| | | |
| | * | Fedora now defines read(2)/write(2) as macros.unknown2005-03-293-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Argh!
| | * | typo fixedunknown2005-03-291-1/+1
| | | |
| | * | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-290-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 mysql-test/r/ps_7ndb.result: Auto merged
| | | * \ Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-291-11/+11
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | | * | update resultsunknown2005-03-291-11/+11
| | | | | |
* | | | | | Mergeunknown2005-03-3020-512/+1921
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/metadata.result: Auto merged sql/item.h: Auto merged sql/item_func.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_union.cc: Auto merged mysql-test/r/union.result: SCCS merged mysql-test/t/union.test: SCCS merged
| * | | | | postreview changesunknown2005-03-303-15/+617
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350) mysql-test/r/subselect.result: added new subquery tests to make code covarage better mysql-test/t/subselect.test: added new subquery tests to make code covarage better sql/item_subselect.cc: fixed typo in comment removed unused code fixed bug with HAVING clause detectiuon (BUG#9350) postreview changes
| * | | | | fixed union types merging and table related metadata (BUG#8824)unknown2005-03-2317-422/+1169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_group.result: new result mysql-test/r/metadata.result: new result test of metadata of variables, unions and derived tables mysql-test/r/union.result: new results test of union of enum mysql-test/t/metadata.test: test of metadata of variables, unions and derived tables mysql-test/t/union.test: test of union of enum sql/field.cc: Field type merging rules added Fixed table name/alias returting for field made from temporary tables sql/field.h: removed unned field type reporting sql/item.cc: fixed bug in NEW_DATE type field creartion replaced mechanism of merging types of UNION sql/item.h: replaced mechanism of merging types of UNION sql/item_func.h: new item type to make correct field type detection possible sql/item_subselect.cc: added table name parameter to prepare() to show right table alias for derived tables sql/sql_derived.cc: added table name parameter to prepare() to show right table alias for derived tables sql/sql_lex.h: added table name parameter to prepare() to show right table alias for derived tables sql/sql_parse.cc: made function for enum/set pack length calculation sql/sql_prepare.cc: added table name parameter to prepare() to show right table alias for derived tables sql/sql_select.cc: new temporary table field creation by Item_type_holder fixed table alias for temporary table sql/sql_union.cc: added table name parameter to prepare() to show right table alias for derived tables
| * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-03-164-75/+135
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| | * | | | | fixed left expression of IN/ALL/ANY subquery transformation support (BUG#8888)unknown2005-03-104-75/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: result changing fixed last test test of transformation of left expression of subquery mysql-test/t/subselect.test: fixed last test test of transformation of left expression of subquery sql/item_subselect.cc: fixfields made for left part of IN/ALL/ANY subquery before calling cols() to detect type of transformation (scalar or row) similar action of both transformation moved to separate function sql/item_subselect.h: optimised field initialization and new method
* | | | | | | Mergeunknown2005-03-301-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Merge from 4.0
| * | | | | | | Do-compile:unknown2005-03-302-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option --with-big-tables Build-tools/Do-compile: Added option --with-big-tables BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-301-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
| * | | | | | | | Do-compile:unknown2005-03-301-1/+3
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option --with-blackhole Build-tools/Do-compile: Added option --with-blackhole
* | | | | | | | Mergeunknown2005-03-292-0/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged acinclude.m4: SCCS merged
| * | | | | | Post-review fix: Drop the duplicate assignment.unknown2005-03-291-2/+0
| | | | | | |
| * | | | | | Introduce "configure" support for a new '-with-big-tables' option that can ↵unknown2005-03-292-0/+31
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace the current way of passing '-DBIG_TABLES' to the compilers. This is needed even in 4.0, as 'Do-compile-all' must use this new approach for all "max" builds in 4.0, 4.1, and up. acinclude.m4: Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option and set the CPP symbol 'BIG_TABLES' accordingly. configure.in: Call the new 'MYSQL_CHECK_BIG_TABLES' macro.
* | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-292-13/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
| * \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-292-13/+14
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | * | | | | New test resultunknown2005-03-291-11/+11
| | | | | | |
| | * | | | | Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from ↵unknown2005-03-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the place where the second master is started
* | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-296-22/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
| * | | | | | ctype-utf8.c, ctype-sjis.c:unknown2005-03-292-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Safer and mode readable way. strings/ctype-sjis.c: Safer and mode readable way. strings/ctype-utf8.c: Safer and mode readable way.
| * | | | | | ctype-big5.c:unknown2005-03-291-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More readable and safer way. strings/ctype-big5.c: More readable and safer way.
| * | | | | | Better error message.unknown2005-03-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugs#9057: Incorrect errormsg for too-large char field in table definition
| * | | | | | Remove redundant my_security_attr_free() from unknown2005-03-291-2/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_connections_shared_memory (double free spotted by Monty). sql/mysqld.cc: Remove excessive my_security_attr_free()
* | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-293-14/+293
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
| * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-292-0/+172
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1
| | * | | | | Adding Cybozu's patch.unknown2005-03-292-0/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not active by default. One need to pass -DHAVE_CYBOZU_COLLATION to activate it. mysys/charset-def.c: Adding Cybozu's patch. Not active by default. strings/ctype-utf8.c: Adding Cybozu's patch. Not active by default.
| * | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-291-14/+121
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-4.1
| | * | | | | Post-review fixes for "!include" patch originating from Yahoo! (the whole ↵unknown2005-03-251-14/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch is recommitted) mysys/default.c: Post-review fixes for "!include" patch originating from Yahoo!
* | | | | | | mysql-test-run.pl:unknown2005-03-292-2/+286
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected typo mtr_diff.pl: A simplified unified diff in Perl new file mysql-test/lib/mtr_diff.pl: A simplified unified diff in Perl mysql-test/mysql-test-run.pl: Corrected typo
* | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-282-16/+28
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my41
| * | | | | ndb - set up long key page vars in ACC_LOCKREQ (bug#????)unknown2005-03-282-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbacc/Dbacc.hpp: set up long key page vars in ACC_LOCKREQ ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: set up long key page vars in ACC_LOCKREQ
View Lorry Controller Status