Commit graph

4214 commits

Author SHA1 Message Date
serg@serg.mylan
7fbc7d3022 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-04 12:07:49 +02:00
serg@serg.mylan
4aac5d9938 enabling HA_READ_PREFIX_LAST_OR_PREV 2003-07-04 12:07:06 +02:00
ram@mysql.r18.ru
2927f2a293 fix and test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows 2003-07-04 14:41:01 +05:00
hf@deer.(none)
9d4bae335c Resolving conflicts 2003-07-04 13:21:14 +05:00
hf@deer.(none)
c224b55835 SCRUM
Including client code into embedded library

Code trimming (fixes of comments etc)
2003-07-04 11:40:10 +05:00
monty@narttu.mysql.fi
110b497cc3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-07-04 01:57:56 +03:00
monty@narttu.mysql.fi
42e5754a4b Fixed problem with stacksize on Unixware 2003-07-04 01:21:42 +03:00
bar@bar.mysql.r18.ru
4d856e01f3 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-03 19:25:19 +05:00
bar@bar.mysql.r18.ru
d1607a11fe FIELD() now takes in account arguments collations 2003-07-03 19:24:38 +05:00
bell@sanja.is.com.ua
309480f5b3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-07-03 15:25:20 +03:00
bell@sanja.is.com.ua
0f0a0f95ad fixed typo in previous fix 2003-07-03 15:25:00 +03:00
bar@bar.mysql.r18.ru
07f94cb7cd Row comparison now does compare field collations, e.g.
ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0
When a number is compared to a string, character sets and 
collations are not aggregated. e.g. this returned error in 4.1.0:

SELECT 1=_latin2'1';
because character sets was aggregated, and 1 was considered as
a string of latin1 charset during this aggregation.
2003-07-03 17:00:01 +05:00
bell@sanja.is.com.ua
7f29814769 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-07-03 14:13:47 +03:00
bell@sanja.is.com.ua
9ef453c74b after review fix 2003-07-03 14:11:08 +03:00
bell@sanja.is.com.ua
17f13a4a79 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
2003-07-03 14:02:23 +03:00
bar@bar.mysql.r18.ru
74b74ad5e7 There is no Item->binary() anymore. It was remain from 4.0. 2003-07-02 18:34:43 +05:00
bell@sanja.is.com.ua
5cd54c6945 fixed typos 2003-07-02 15:03:49 +03:00
bell@sanja.is.com.ua
feb425a9f2 fixed bug, which lead to crash mysqld by running 'mysql some_db_with_tables' 2003-07-02 14:45:35 +03:00
bell@sanja.is.com.ua
b6f39d22e5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
2003-07-01 19:48:31 +03:00
bell@sanja.is.com.ua
5b3594a80c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-err-4.1
2003-07-01 19:05:31 +03:00
bell@sanja.is.com.ua
2a33b0514e fixed uninitialized pointer 2003-07-01 19:05:08 +03:00
monty@mashka.mysql.fi
baf9baba2a merge 2003-07-01 15:57:45 +03:00
bell@sanja.is.com.ua
791ae8d34d merge 2003-07-01 13:57:46 +03:00
bell@sanja.is.com.ua
f1353c1dda merged 2003-07-01 10:03:20 +03:00
monty@mashka.mysql.fi
6bc7b3a6be LAST_INSERT_ID() should not be set if we couldn't generate an auto_increment id. 2003-06-30 13:28:36 +03:00
monty@mashka.mysql.fi
dbebed97e4 Remove FORCE_INIT_OF_VARS when compiling for valgrind/purify to spot wrong LINT_INIT() options
Fixed bug in ALTER TABLE ... MODIFY integer-column
Added ref_or_null optimization (needed for subqueries)
2003-06-30 13:23:54 +03:00
bell@sanja.is.com.ua
7c799b17b6 merged 2003-06-29 15:35:48 +03:00
bell@sanja.is.com.ua
379e8edff1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-06-29 14:15:38 +03:00
serg@serg.mylan
730f7e3f37 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-29 00:34:47 +02:00
serg@serg.mylan
55115e0f9d timestamp MYD-4.0 format compatibility fix 2003-06-28 23:01:33 +02:00
bell@sanja.is.com.ua
ebc2976f94 fixed bug #745
(resolving fields of reduced subselect)
2003-06-28 17:04:26 +03:00
bell@sanja.is.com.ua
08f8ab5917 Merge 2003-06-28 14:32:06 +03:00
bell@sanja.is.com.ua
a101fc9e79 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-cset-4.1
2003-06-28 13:43:18 +03:00
bell@sanja.is.com.ua
00f952849d merging 2003-06-27 23:14:20 +03: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
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
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
bell@sanja.is.com.ua
2d120d32fa cond_count moved to SELECT_LEX_NODE
fixed BUG #726
2003-06-26 11:09:11 +03: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