Commit graph

4064 commits

Author SHA1 Message Date
serg@serg.mylan
55115e0f9d timestamp MYD-4.0 format compatibility fix 2003-06-28 23:01:33 +02:00
bell@sanja.is.com.ua
95fbec7599 after review patch 2003-06-27 23:00:33 +03:00
bell@sanja.is.com.ua
1c2191e2cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1
2003-06-27 22:19:14 +03:00
paul@teton.kitebird.com
a8b104da9d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-06-27 12:37:31 -05:00
jani@rhols221.adsl.netsonic.fi
41aa9a026d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
2003-06-27 18:52:09 +03:00
jani@rhols221.adsl.netsonic.fi
541b0d5322 Added support for structured options (WL task ID 947). 2003-06-27 18:51:39 +03:00
bar@bar.mysql.r18.ru
28b2fcba27 item.cc:
A better comment
2003-06-27 16:09:53 +05:00
bar@bar.mysql.r18.ru
b528745dce When unifying arguments for comparion, binary strings won character strings,
and comparison was done binary. Now, a binary string wins a character sting 
taking in account their derivation. That means a character field wins a
binary literal and comparison is done according to the character field
collation, not binary.
2003-06-27 16:08:52 +05:00
bar@bar.mysql.r18.ru
d31de69795 str0 IN (str1, str2, ...) now works according to collation rules 2003-06-27 13:52:38 +05:00
bar@bar.mysql.r18.ru
52a7f95678 BETWEEN now works according to collation rules 2003-06-27 12:02:08 +05:00
paul@teton.kitebird.com
33f8d7aedf Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-06-26 11:04:20 -05:00
bar@bar.mysql.r18.ru
65335d37ff New messages for 3-adic and N-adic operations
REPLACE() now processed arguments collations according to standard
2003-06-26 15:45:04 +05:00
wax@kishkin.ru
492813d966 Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g 2003-06-26 05:06:49 +06:00
paul@teton.kitebird.com
36a75d26f2 modify error message 2003-06-25 16:25:03 -05:00
bar@bar.mysql.r18.ru
e009dce0c3 item_func.cc:
My stupid typo fix
2003-06-25 19:50:27 +05:00
bar@bar.mysql.r18.ru
c47c07ca6d Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-06-25 19:03:36 +05:00
bell@sanja.is.com.ua
39fb96c662 fixed mistyping (BUG #699) 2003-06-25 16:51:00 +03:00
bar@bar.mysql.r18.ru
c6c4e8b8e1 LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
now process arguments according to standard SQL collation determation
rules.
2003-06-25 15:07:20 +05:00
bar@bar.mysql.r18.ru
cb4539e8de String comparison functions now use the same DTCollation with
CONCAT() and other string functions. This allows to reuse a lot
if code and to simplify further development.
2003-06-24 17:12:07 +05:00
bar@bar.mysql.r18.ru
e8de3ff6d5 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-06-24 15:11:52 +05:00
bar@bar.mysql.r18.ru
7371150f2d New class DTCollation (SQL:2003 calls it "declared type collation")
It's a combination of collation and its derivation (precedence order)
2003-06-24 15:11:07 +05:00
monty@narttu.mysql.fi
e187e22ab5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-06-24 12:11:01 +03:00
monty@narttu.mysql.fi
1bd306ccd4 Fixed some new memory leaks
Updated VC++ files
2003-06-24 12:10:35 +03:00
bar@bar.mysql.r18.ru
8bd715daa4 Item character set is stored in Item itself now, not in ITem->str_value 2003-06-24 13:37:11 +05:00
ram@mysql.r18.ru
f55db178a2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1.gis
2003-06-23 18:38:45 +05:00
bell@sanja.is.com.ua
7b7892afad Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1
2003-06-23 00:02:20 +03:00
bar@bar.mysql.r18.ru
4c7714b7f9 item_cmpfunc.cc:
Temporarily fix for test failure
  ,.
2003-06-20 19:05:45 +05:00
bar@bar.mysql.r18.ru
f78a77798c item_cmpfunc.cc:
Rewritten in nicer way
  ,
2003-06-20 18:45:28 +05:00
bell@sanja.is.com.ua
e17ad368af Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1
2003-06-20 13:40:21 +03:00
ram@mysql.r18.ru
a89a7eb327 Renamed xxx_as_text() and xxx__from_text(). 2003-06-20 14:53:37 +05:00
ram@mysql.r18.ru
528386fc78 Added AsWKT() alias for AsText().
Renamed as_text().
2003-06-20 14:31:47 +05:00
miguel@hegel.(none)
354af955bc Fix error msg. Bug #681 2003-06-19 12:17:23 -04:00
bell@sanja.is.com.ua
af6de3bfee merging 2003-06-19 16:15:11 +03:00
bell@sanja.is.com.ua
096ae170ae Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1
2003-06-19 15:25:41 +03:00
igor@rurik.mysql.com
acdc9c59a7 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 03:40:48 -07:00
lenz@mysql.com
8f4794822f Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-06-19 12:19:28 +02:00
lenz@kallisto.local
1908cc62b6 - revert wrong include of zlib.h as zlib is not part of the source
distribution - better use -I../zlib where appropriate (usually we use
   the zlib installed in the system)
2003-06-19 12:18:04 +02:00
igor@rurik.mysql.com
63691e27a2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 02:42:49 -07:00
igor@rurik.mysql.com
98eeaa54f3 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-19 02:39:46 -07:00
igor@rurik.mysql.com
3ed12d5a74 preload.result, preload.test:
Removed non-generic info (key used blocks)
preload.result, preload.test, lex.h, sql_yacc.yy:
  Syntax change for preload statement
2003-06-19 02:34:33 -07:00
bar@bar.mysql.r18.ru
069e57bd2f Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-06-19 13:13:40 +05:00
bar@bar.mysql.r18.ru
ebb88ec6ea LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations 2003-06-19 13:12:55 +05:00
igor@rurik.mysql.com
5a6d0da277 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-19 00:01:16 -07:00
bar@bar.mysql.r18.ru
69af692a5c These functions now return a result of proper collation:
BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE
2003-06-19 11:36:44 +05:00
igor@rurik.mysql.com
5425591503 Merge 2003-06-18 07:31:23 -07:00
bar@bar.mysql.r18.ru
319124508a The default collation for cp1251 has been changed to general_ci 2003-06-17 18:10:35 +05:00
serg@serg.mylan
0d02b972db Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-16 00:13:25 +02:00
monty@narttu.mysql.fi
c1f1107b2a Add missing defines 2003-06-16 01:13:24 +03:00
serg@serg.mylan
7a08f3653b bad merge fixed 2003-06-16 00:13:23 +02:00
monty@narttu.mysql.fi
e090f2d0cc Fixes for make_win_src_distributions
Removed compiler warnings
2003-06-15 23:24:37 +03:00