Commit graph

17260 commits

Author SHA1 Message Date
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
9474fed704 Manual merge of fix for bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix" into 4.1 tree.


sql/field.h:
  Manual merge.
2005-01-18 17:23:46 +03:00
unknown
9ed0d85550 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg7884
2005-01-18 17:05:09 +03:00
unknown
b1a0f67a03 Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum()
macros.

It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".


sql/field.h:
  Since FIELDFLAG_INTERVAL, FIELDFLAG_BITFIELD, FIELDFLAG_BLOB and
  FIELDFLAG_GEOM flags occupy the same space as number of decimals for
  FIELDFLAG_NUMBER fields, it is safer to check in "f_is_geom()"-type
  macros that we have non-number field, like we already do in f_is_blob()
  macro.
2005-01-18 17:04:16 +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
a46c9b23c0 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-01-18 13:44:53 +02:00
unknown
7f4bb64a75 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-01-18 12:10:11 +01:00
unknown
3671fe1f72 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-18 11:45:41 +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
f003895df9 myisam/ft_boolean_search.c
-trunc* bug - don't increase yweaks in this case


myisam/ft_boolean_search.c:
  -trunc* bug - don't increase yweaks in this case
mysql-test/r/fulltext.result:
  -trunc* bug - don't increase yweaks in this case
mysql-test/t/fulltext.test:
  -trunc* bug - don't increase yweaks in this case
2005-01-18 11:27:38 +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
dd68385435 Fix over-optimization that could result in an unsigned double field being
set to a negative value. (Bug #7700)


sql/field_conv.cc:
  Don't treat real fields as identical when destination is unsigned and
  the source is not.
mysql-test/t/type_float.test:
  Add test for setting double unsigned to a negative value from a signed double
mysql-test/r/type_float.result:
  Add test results
2005-01-17 16:13:56 -08:00
unknown
896cdbe5df Anoter fix for moved IO_CACHE object 2005-01-18 02:04:41 +02:00
unknown
1aa2d73da5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/sql_lex.cc:
  Auto merged
2005-01-18 01:15:02 +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
77b8a94d7a make the code to look safe, not only be safe 2005-01-17 22:35:53 +01: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
3752c3b33b Print a warning when an old table (with no character set stored) is opened
and the default character set is multi-byte, which will result in character
column size changes. (Bug #6913)


sql/table.cc:
  Print a warning when an old table is opened and the
  default character set is multi-byte that warns about
  character column sizes possibly getting changed
2005-01-17 12:22:23 -08: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
a5faeb1b26 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-17 14:07:16 +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
950f28f011 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-01-17 13:23:39 +02: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
5a37fffdac Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-01-17 09:17:48 +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
3c9170ed17 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/sql_lex.cc:
  Auto merged
2005-01-16 18:36:50 +02:00
unknown
7f586778f3 postreview changes
sql/sql_lex.cc:
  layout fixed
2005-01-16 18:36:13 +02: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