bell@sanja.is.com.ua
5c836428eb
merge
2003-07-07 18:49:54 +03:00
bell@sanja.is.com.ua
0aa4563e82
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-07 15:01:47 +03:00
bell@sanja.is.com.ua
7ad5331768
merge
2003-07-07 10:30:52 +03:00
bell@sanja.is.com.ua
9b6083dbe7
fixed memory leak in group_concat function (BUG#796)
...
fixed test func_gconcat to be repeatable independent of presend tables and avoid removing user tables
2003-07-06 18:11:19 +03:00
bell@sanja.is.com.ua
45e001f465
reduced using of slow current_thd/current_lex macro
...
initialization of item_thd moved to constructor (in any case we need thd in constructor)
initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757)
removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items
2003-07-05 03:03:31 +03:00
bell@sanja.is.com.ua
f9936c61f7
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-05 00:10:51 +03:00
bar@bar.mysql.r18.ru
de9ba3848c
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-04 18:12:59 +05:00
bar@bar.mysql.r18.ru
0c2041cfdf
New methods
...
Item_func::agg_arg_collations()
Item_func::arr_arg_collations_for_comparison()
to aggregate argument collations.
It helps to reuse a lot of code.
2003-07-04 18:12:23 +05:00
ram@mysql.r18.ru
2d350a1de0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-07-04 15:39:57 +05: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
bar@bar.mysql.r18.ru
d1607a11fe
FIELD() now takes in account arguments collations
2003-07-03 19:24:38 +05: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
monty@narttu.mysql.fi
6a9a3ec0eb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-07-03 14:49:36 +03:00
monty@narttu.mysql.fi
bc2f77f224
Fixed test case to be more portable
2003-07-03 14:48:47 +03:00
bell@sanja.is.com.ua
73fdf52fa2
merged
2003-07-03 11:59:57 +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
monty@mashka.mysql.fi
cd2de0a5eb
Fixed testcases and bug introduced by last changeset
2003-07-01 17:59:42 +03:00
monty@mashka.mysql.fi
baf9baba2a
merge
2003-07-01 15:57:45 +03:00
monty@mashka.mysql.fi
a6755acb4e
Fix needed to support MERGE tables in different databases
2003-07-01 15:49:32 +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
100a101ab6
Merge
2003-06-30 13:14:18 +03:00
bell@sanja.is.com.ua
7c799b17b6
merged
2003-06-29 15:35:48 +03: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
ad9cb47c0c
merging
...
test moved to other bug
2003-06-28 13:34:07 +03:00
bell@sanja.is.com.ua
00f952849d
merging
2003-06-27 23:14:20 +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
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
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
bell@sanja.is.com.ua
223f305cdd
optimization results (SCRUM) WL#902
2003-06-27 13:36:03 +03: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
bell@sanja.is.com.ua
e8b1e21615
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-cond_count-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-top2-4.1
2003-06-26 11:31:13 +03: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
bell@sanja.is.com.ua
2f54542f59
after merging fix
2003-06-26 00:16:03 +03:00
bell@sanja.is.com.ua
7b77c5a2d3
merged
2003-06-25 23:52:15 +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
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
bell@sanja.is.com.ua
b171910b2b
fixed BUG #679
...
outer resolved fields now do not marked as dependent if they is not really belong to outer SELECT
one-letter variables name fixed
2003-06-20 10:15:58 +03:00
bell@sanja.is.com.ua
af6de3bfee
merging
2003-06-19 16:15:11 +03:00
bell@sanja.is.com.ua
8ac294c9ac
after merge fix
2003-06-19 16:08: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
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