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
serg@serg.mylan
32ea8fea28
fix test when no InnoDB is present
2003-06-27 19:32:59 +02: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
monty@mashka.mysql.fi
dfac0fc90a
Allow one to use MERGE tables with tables from different databases
...
Added command 'replace_column' to mysqltest
2003-06-27 16:29:10 +03:00
lenz@mysql.com
144f7f57c7
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2003-06-27 13:23:43 +02: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
lenz@kallisto.local
382e1ad064
- fixed typo (dbl -> dnl) in acinclude.m4
2003-06-27 10:07:22 +02: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
serg@serg.mylan
e7b28cbc56
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-26 13:23:37 +02:00
serg@serg.mylan
f6b0f559c3
preload.test:
...
Change mode to -rw-rw-r--
2003-06-26 13:23:08 +02: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
bell@sanja.is.com.ua
2d120d32fa
cond_count moved to SELECT_LEX_NODE
...
fixed BUG #726
2003-06-26 11:09:11 +03:00
gluh@gluh.mysql.r18.ru
7455759f11
Bug fixed: mysql-test failure on rpl tests
2003-06-26 09:39:23 +05:00
bk@mysql.r18.ru
3038105e19
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/bk/mysql-4.1
2003-06-26 08:51:36 +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
monty@mashka.mysql.fi
fff60e3a86
Fixed slowdown problem on windows
2003-06-25 19:43:06 +03: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
bk@mysql.r18.ru
dad54b7d29
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/bk/mysql-4.1
2003-06-25 11:47:52 +05:00
bell@sanja.is.com.ua
76315814b7
Fixed error handling to be able do not interrupt update (907) (SCRUM)
...
fixed bug of current select pointer in subselect execution
fixed layuot
2003-06-25 01:19:09 +03:00
serg@serg.mylan
52de7a7bd5
Merge
2003-06-24 21:15:40 +02:00
venu@myvenu.com
5788c90d07
test for SQL_MODE with PIPES_AS_CONCAT, ANSI and IGNORE_SPACE
2003-06-24 10:43:57 -07: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
63235ceeef
mysql_create_system_tables.sh:
...
Type fix
2003-06-24 15:55:39 +05:00
monty@mashka.mysql.fi
ebfded1764
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-06-24 13:43:36 +03:00
bk@mysql.r18.ru
1e731c9a2e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/bk/mysql-4.1
2003-06-24 15:11:53 +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@mashka.mysql.fi
9c6070018a
indentation change
2003-06-24 13:09:48 +03: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
gluh@gluh.mysql.r18.ru
91e3245b67
Merge gluh@gw:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
2003-06-23 13:02:28 +05:00
bk@mysql.r18.ru
365f06b372
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/bk/mysql-4.1
2003-06-23 12:58:18 +05:00
gluh@gluh.mysql.r18.ru
66af4b5c9a
Internal commit
2003-06-23 12:56:44 +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
bk@mysql.r18.ru
cec3fb4a25
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/bk/mysql-4.1
2003-06-21 19:42:36 +05: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
lenz@kallisto.local
7a6059cc88
- make sure that scripts/*.sql files are being added to the source
...
distribution as well
2003-06-20 13:57:51 +02: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