Commit graph

16882 commits

Author SHA1 Message Date
unknown
59ef5bede9 fixing wrong value for "examined rows" when UNION's are used.
mysql-test/r/union.result:
  result for a test case for the wrong examined rows with UNION's
mysql-test/t/union.test:
  test case for the wrong examined rows with UNION's
sql/sql_union.cc:
  a patch for the wrong examined rows with UNION's
2005-01-18 23:13:29 +02:00
unknown
e46d235a08 Cleanups in Makefile.ams
client/Makefile.am:
  Remove  explicit _DEPENDENCIES, they are not needed with automatic
   dependency tracking wich we started using several months ago.
  Don't use relative paths in makefiles.
regex/Makefile.am:
  Remove  explicit _DEPENDENCIES, they are not needed with automatic
   dependency tracking wich we started using several months ago.
  Don't use relative paths.
strings/Makefile.am:
  Remove dead rule.
2005-01-18 17:26:04 +03:00
unknown
cd89ed9ab6 1. Item now uses my_charset_bin by default,
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.
2005-01-18 17:41:06 +04:00
unknown
1457163c97 Fix 'make distclean' goal. 2005-01-18 16:23:10 +03:00
unknown
381659fff5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-18 14:07:47 +01:00
unknown
2c6b02ca32 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-18 11:41:51 +01:00
unknown
813e748d4f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-18 10:24:25 +01:00
unknown
ec0daa744f #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals
We should not overwrite res if it is returned from a const item.
2005-01-18 10:42:29 +04:00
unknown
985805ce6a Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
sql/filesort.cc:
  Auto merged
2005-01-18 03:52:15 +02:00
unknown
96f64b4440 Fixed new bug that caused symlink test to fail
mysys/my_symlink.c:
  More debugging
2005-01-18 03:49:39 +02:00
unknown
896cdbe5df Anoter fix for moved IO_CACHE object 2005-01-18 02:04:41 +02:00
unknown
8f04aaae87 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
2005-01-18 01:11:02 +02:00
unknown
608729f711 Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'":
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)
2005-01-17 21:26:14 +01:00
unknown
5847d10712 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
2005-01-17 14:08:36 -06:00
unknown
f6f90e7dc1 Bug #7966 query cache doesn't work properly with batch statements
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
2005-01-17 13:40:36 -06:00
unknown
3392ee95f5 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-17 20:33:33 +01:00
unknown
0b076d2c1f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2005-01-17 12:38:17 -06:00
unknown
e24e848be3 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-17 19:09:33 +01:00
unknown
5854c32283 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.1-build


Build-tools/Do-pkg:
  Auto merged
2005-01-17 18:53:10 +01:00
unknown
f9bcb9ab5c backported from 5.0 patch initialization of main select for commands where subqueries are possible 2005-01-17 19:52:07 +02:00
unknown
94249ec86d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2005-01-17 10:47:43 -06:00
unknown
57f7c497cf - Enabled the handling of architecture extensions e.g. "-64bit" when building
Mac OS X PKGs with Do-pkg


Build-tools/Do-pkg:
  - enable handling of architecture extensions e.g. "-64bit"
2005-01-17 17:22:17 +01:00
unknown
4fc1801d08 Fixed memory leak in handle_local_infile()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-17 19:21:01 +03:00
unknown
e0cbfe7658 Merge mysql.com:/home/timka/mysql/src/4.1-virgin
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
2005-01-17 15:46:44 +02:00
unknown
404fc5aca0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-17 12:53:50 +01:00
unknown
a05bacb06e Bug#7937 2005-01-17 12:29:43 +01:00
unknown
f1328f1337 Merge mysql.com:/home/timka/mysql/src/4.1-virgin
into mysql.com:/home/timka/mysql/src/4.1-bug-7331


sql/sql_select.cc:
  Auto merged
2005-01-17 12:41:59 +02:00
unknown
b25fcad4a7 user_var.result, func_str.result, item_strfunc.cc:
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'))
2005-01-17 10:38:35 +04:00
unknown
7f69f44f0a mysqldump.c:
Move out-of-order option.


client/mysqldump.c:
  Move out-of-order option.
2005-01-17 00:09:47 -06:00
unknown
c72207e143 libmysql.c:
bug#7891: mysql_character_set_name() returns collation


libmysql/libmysql.c:
  bug#7891: mysql_character_set_name() returns collation
2005-01-17 09:27:24 +04:00
unknown
30cddcc187 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-16 21:39:20 +01:00
unknown
0de6a42684 Makefile.am:
Bug#7721


ndb/docs/Makefile.am:
  Bug#7721
2005-01-16 21:39:19 +01:00
unknown
3c45559db8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-16 16:41:38 +01:00
unknown
e4f887ad20 initialize mysql->charset in mysql_init 2005-01-16 16:38:38 +01:00
unknown
11dacd12f4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-16 15:14:06 +01:00
unknown
31457a6258 Bug #7922 prompt \p fails on Windows for shared-memory connections
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
2005-01-15 23:19:34 -06:00
unknown
0d98da70ad don't ignore errors in readlink 2005-01-15 20:08:53 +01:00
unknown
193eae3bec Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-15 12:00:56 +02:00
unknown
e4b2a04e46 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-15 10:21:50 +01:00
unknown
16f3170e73 func_gconcat.result, func_gconcat.test:
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.
2005-01-15 01:05:00 -08:00
unknown
403541d7e8 Merge
include/my_sys.h:
  Auto merged
sql/filesort.cc:
  Auto merged
mysys/mf_iocache.c:
  SCCS merged
2005-01-15 03:49:07 +02:00
unknown
deac81af88 Fixed possible access to unintialized memory in filesort when using many buffers
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
2005-01-15 03:47:06 +02:00
unknown
60c1541524 protect against malicious server trying to crash command-line client :) 2005-01-14 22:46:04 +01:00
unknown
6f70a1d909 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-14 19:51:29 +01:00
unknown
b7efd8174a limit HEAP table size with max_heap_table_size, better estimation for 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
2005-01-14 19:49:45 +01:00
unknown
7b43fb6ca4 Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-14 10:45:17 -08:00
unknown
d3ad1a919e Merge mysql.com:/home/jimw/my/mysql-4.0-7347
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-01-14 10:44:29 -08:00
unknown
58d9ba8d84 Merge
scripts/mysql_install_db.sh:
  Merge changes
2005-01-14 10:40:05 -08:00
unknown
4b03a0a7cb Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-14 19:15:55 +01:00
unknown
baf0a4418a - replaced obsoleted "BuildPrereq" with "BuildRequires" in the RPM spec file
support-files/mysql.spec.sh:
  - replaced obsoleted "BuildPrereq" with "BuildRequires" instead
2005-01-14 18:20:03 +01:00