summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 1. Item now uses my_charset_bin by default,unknown2005-01-1813-56/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not default_charset_into. It fixes the problem that in some cases numbers where treated as CHAR(N), not as BINARY(N), e.g. wrong 'charsetnr' when sent to the client side. 2. IFNULL didn't aggregate argument charsets and collations, so IFNULL(1,'a') produced a CHAR(N). Now produces a BINARY(N). 3. SELECT PROCEDURE ANALIZE now returns BINARY columns, which is much better than it worked previously: CHAR with the default character set. But in the future it's worth to fix the fields 'Field_name' and 'Optimal_fieldtype' to use UTF8, and 'Min_value' and 'Max_value' to inherit their charsets from the original items. But it is not important, and BINARY(N) is OK for now. 4. Tests were fixed accordingly. No new tests were made, as the old onces cover everything. mysql-test/r/analyse.result: SELECT PROCEDURE ANALIZE now returns BINARY columns, which is much better than it worked previously: CHAR with the default character set. But in the future it's worth to fix the fields 'Field_name' and 'Optimal_fieldtype' to use UTF8, and 'Min_value' and 'Max_value' to inherit their charsets from the original items. But it is not important, and BINARY(N) is OK for now. mysql-test/r/case.result: Test fix according to the changes mysql-test/r/metadata.result: Test fix according to the changes mysql-test/r/ps_1general.result: Test fix according to the changes mysql-test/r/ps_2myisam.result: Test fix according to the changes mysql-test/r/ps_3innodb.result: Test fix according to the changes mysql-test/r/ps_4heap.result: Test fix according to the changes mysql-test/r/ps_5merge.result: Test fix according to the changes mysql-test/r/ps_6bdb.result: Test fix according to the changes mysql-test/r/ps_7ndb.result: Test fix according to the changes mysql-test/r/union.result: Test fix according to the changes sql/item.cc: Item is now BINARY by default sql/item_cmpfunc.cc: IFNULL now collects arguments collations/charsets like other functions do.
* Fix 'make distclean' goal.unknown2005-01-181-1/+1
|
* Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-181-0/+5
|\ | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean
| * Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-187-6/+41
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean
| * | Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'":unknown2005-01-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Working around hang of master < 3.23.50 on SELECT @@unknown_var (to enable 3.23.49->4.1.10 replication) sql/slave.cc: Working around hang of master < 3.23.50 on SELECT @@unknown_var (to enable 3.23.49->4.1.10 replication)
* | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1810-7/+52
|\ \ \ | | |/ | |/| | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| * | #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literalsunknown2005-01-183-1/+26
| | | | | | | | | | | | | | | | | | | | | We should not overwrite res if it is returned from a const item.
| * | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2005-01-181-0/+3
| |\ \ | | | | | | | | | | | | | | | | sql/filesort.cc: Auto merged
| | * | Anoter fix for moved IO_CACHE objectunknown2005-01-181-0/+3
| | | |
| * | | Fixed new bug that caused symlink test to failunknown2005-01-182-4/+7
| | | | | | | | | | | | | | | | | | | | mysys/my_symlink.c: More debugging
| * | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-01-181-1/+5
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
| | * | backported from 5.0 patch initialization of main select for commands where ↵unknown2005-01-171-1/+5
| | | | | | | | | | | | | | | | subqueries are possible
| * | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-173-1/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bob.(none):/home/reggie/bk/mysql-4.1 BitKeeper/etc/logging_ok: auto-union client/mysql.cc: Auto merged
| | * | | Bug #7966 query cache doesn't work properly with batch statementsunknown2005-01-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql_lex.cc: Set query to not cacheable if we are using multistatements and there are multiple statements in this query sql/sql_lex.cc: Set query to not cacheable if we are using multistatements and there are multiple statements in this query
| | * | | Bug #7922 prompt \p fails on Windows for shared-memory connectionsunknown2005-01-152-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt. mysql.cc: Added code to display mysql.host as prompt when using shared memory client/mysql.cc: Added code to display mysql.host as prompt when using shared memory BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| * | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * \ \ \ Merge mysql.com:/space/my/mysql-4.0unknown2005-01-171-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build Build-tools/Do-pkg: Auto merged
| | | * | | | - Enabled the handling of architecture extensions e.g. "-64bit" when buildingunknown2005-01-171-1/+1
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac OS X PKGs with Do-pkg Build-tools/Do-pkg: - enable handling of architecture extensions e.g. "-64bit"
* | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-172-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
| * | | | | Fixed memory leak in handle_local_infile()unknown2005-01-172-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-177-21/+112
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
| * | | | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2005-01-171-14/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/4.1-bug-7331
| | * \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-14/+19
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | * | | Bug#7937unknown2005-01-171-14/+19
| | | | | |
| * | | | | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2005-01-173-4/+89
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/4.1-bug-7331 sql/sql_select.cc: Auto merged
| | * | | | Fix for BUG#7331.unknown2005-01-063-4/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when a QUICK_SELECT access method is chosen, test_if_skip_sort_order() discovered that the index being used by the quick select will not deliver tuples in sorted order. In this case test_if_skip_sort_order() tried to change the index used by the quick select, but it didn't properly set the other members of the quick select, and especially the range flags of the ranges in QUICK_SELECT::ranges. The fix re-invokes the function SQL_SELECT::test_quick_select to correctly create a valid QUICK_SELECT object. mysql-test/r/order_by.result: Added test results. mysql-test/t/order_by.test: Added test for BUG#7331. sql/sql_select.cc: Fix for BUG#7331.
| * | | | | user_var.result, func_str.result, item_strfunc.cc:unknown2005-01-173-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#7839 ncorrect collation for char(ascii('a')) sql/item_strfunc.cc: bug#7839 ncorrect collation for char(ascii('a')) mysql-test/r/func_str.result: bug#7839 ncorrect collation for char(ascii('a')) mysql-test/r/user_var.result: bug#7839 ncorrect collation for char(ascii('a'))
* | | | | | mysqldump.c:unknown2005-01-171-3/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move out-of-order option. client/mysqldump.c: Move out-of-order option.
* | | | | libmysql.c:unknown2005-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#7891: mysql_character_set_name() returns collation libmysql/libmysql.c: bug#7891: mysql_character_set_name() returns collation
* | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-164-9/+9
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean
| * | | | Makefile.am:unknown2005-01-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#7721 ndb/docs/Makefile.am: Bug#7721
| * | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-166-16/+53
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | initialize mysql->charset in mysql_initunknown2005-01-161-0/+1
| | | | |
| * | | | don't ignore errors in readlinkunknown2005-01-151-3/+2
| | | | |
| * | | | protect against malicious server trying to crash command-line client :)unknown2005-01-141-4/+4
| | | | |
* | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-163-14/+38
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-153-2/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * \ \ \ \ Mergeunknown2005-01-153-14/+38
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | include/my_sys.h: Auto merged sql/filesort.cc: Auto merged mysys/mf_iocache.c: SCCS merged
| | * | | Fixed possible access to unintialized memory in filesort when using many buffersunknown2005-01-153-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_sys.h: Added function to call if IO_CACHE is moved mysys/mf_iocache.c: Added function to call if IO_CACHE is moved sql/filesort.cc: Tell that io_cache is moved
* | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1512-20/+54
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean
| * | | | func_gconcat.result, func_gconcat.test:unknown2005-01-153-2/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #7769. item_sum.h: Fixed bug #7769: a crash for queries with group_concat and having when the query table was empty. The bug was due an unsafe dereferencing. sql/item_sum.h: Fixed bug #7769: a crash for queries with group_concat and having when the query table was empty. The bug was due an unsafe dereferencing. mysql-test/t/func_gconcat.test: Added a test case for bug #7769. mysql-test/r/func_gconcat.result: Added a test case for bug #7769.
| * | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-144-13/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | limit HEAP table size with max_heap_table_size, better estimation for ↵unknown2005-01-144-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mem_per_row heap/hp_create.c: limit HEAP table size with max_heap_table_size heap/hp_write.c: limit HEAP table size with max_heap_table_size include/heap.h: limit HEAP table size with max_heap_table_size sql/ha_heap.cc: limit HEAP table size with max_heap_table_size better estimation for mem_per_row
| * | | | Merge mysql.com:/home/jimw/my/mysql-4.0-cleanunknown2005-01-140-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | | Merge mysql.com:/home/jimw/my/mysql-4.0-7347unknown2005-01-141-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.0-clean
| * | \ \ \ Mergeunknown2005-01-141-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | scripts/mysql_install_db.sh: Merge changes
| | * | | | Fix mysql_install_db to look for libexecdir relative to basedir whenunknown2005-01-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it has been specified. (Bug #7347) scripts/mysql_install_db.sh: When basedir is specified, look for libexecdir relative to that
| * | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-142-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * | | | | bumped up ndb versionunknown2005-01-142-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible with 4.1.9 configure.in: bumped up ndb version
View Lorry Controller Status