bell@laptop.sanja.is.com.ua
3d2a3804a1
reset() split in 2 function clear() & add()
...
aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860)
2003-08-28 03:10:14 +03:00
Sinisa@sinisa.nasamreza.org
566ebb63ce
merge fixes
2003-08-27 14:36:38 +03:00
bell@laptop.sanja.is.com.ua
8b8b984da0
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
2003-08-26 23:32:20 +03:00
monty@narttu.mysql.fi
1d0b539263
Fix for bug in ROLLUP when all tables where 'const' tables (Bug #714 )
2003-08-26 20:23:48 +03:00
monty@narttu.mysql.fi
7b99412988
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-08-26 17:53:42 +03:00
monty@narttu.mysql.fi
753cb8509c
Cleanups
...
BTREE, HASH and RTREE are not reserved symbols anymore
2003-08-26 17:52:54 +03:00
bell@laptop.sanja.is.com.ua
31657edc5f
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
2003-08-26 16:24:51 +03:00
Sinisa@sinisa.nasamreza.org
58c659a3bd
symlink.result:
...
Fix for a small error in the merge from 4.0
2003-08-25 17:07:14 +03:00
bell@laptop.sanja.is.com.ua
5b28d4a9a4
removed --rpl option of ./mysql-test-run
...
(./mysql-test-run t/rpl*.test do same work)
2003-08-25 16:40:14 +03:00
Sinisa@sinisa.nasamreza.org
4ba1506244
union.result:
...
same as above
sql_lex.h:
same as above
sql_union.cc:
same as aobve
sql_select.cc:
Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
Plus updating some fields in THD in the proper places
plus fixing a wrong result
2003-08-23 21:21:02 +03:00
bar@bar.mysql.r18.ru
8c55440ba4
CAST(expr AS CHAR(10)) is now working
2003-08-21 14:15:25 +05:00
bell@laptop.sanja.is.com.ua
63fc15ceeb
merge
2003-08-21 00:41:08 +03:00
bell@laptop.sanja.is.com.ua
87bb62007b
merge
2003-08-20 23:39:17 +03:00
bell@laptop.sanja.is.com.ua
11af1f3c9c
Merge
2003-08-20 17:45:04 +03:00
bell@laptop.sanja.is.com.ua
dd9cbce47b
merge
2003-08-19 20:14:35 +03:00
Sinisa@sinisa.nasamreza.org
be67e7176a
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-08-19 16:40:31 +03:00
Sinisa@sinisa.nasamreza.org
faabb1c42c
A fix for a bug with long definition of SET or ENUM.
...
Barkov approved it already
2003-08-19 16:35:17 +03:00
monty@mashka.mysql.fi
eb6458cb18
After merge fixes + bugs from last merge
2003-08-19 16:00:12 +03:00
monty@mashka.mysql.fi
10c4acfb4f
merge
2003-08-19 00:10:21 +03:00
monty@mashka.mysql.fi
4f7512160b
After merge fixes
...
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
bell@sanja.is.com.ua
758129279f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-08-13 10:12:41 +03:00
bell@sanja.is.com.ua
341d5aa036
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
2003-08-12 19:21:03 +03:00
bell@sanja.is.com.ua
f1b1f0d742
after merge fix
2003-08-12 18:51:49 +03:00
bell@sanja.is.com.ua
62849952df
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-having_resolve-4.1
2003-08-12 18:44:48 +03:00
bell@sanja.is.com.ua
011d905391
merge
2003-08-12 17:48:58 +03:00
bell@sanja.is.com.ua
b6a8d68ae4
fixed problem with reference on derived table fields (BUG#1031)
2003-08-12 15:04:49 +03:00
bar@bar.mysql.r18.ru
e5e81f45a0
LIKE didn't work with non-default charset
2003-08-12 16:42:52 +05:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
dlenev@mysql.com
c767f0b2a0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-345
2003-08-11 23:43:54 +04:00
dlenev@dlenev.mshome
921ac8af8b
Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345)
2003-08-11 23:43:01 +04:00
bell@sanja.is.com.ua
b518e93b4a
fixed collation of Item_cache family (BUG#951)
2003-08-11 20:48:51 +03:00
bar@bar.mysql.r18.ru
786af34146
Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
...
The above query created a field of koi8r charset, not cp1251
Change:
CREATE TABLE a (a CHAR(1) CHARACTER SET utf8)
Length now means character length, not byte length.
The above creates a field that guarantees can store a multibyte value
1 character long. For utf8 the above creates a field that can store
3 bytes.
2003-08-11 18:18:34 +05:00
bell@sanja.is.com.ua
71b39c3020
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-08-11 11:57:37 +03:00
bell@sanja.is.com.ua
a0fda66f00
merge
2003-08-11 11:51:33 +03:00
bell@sanja.is.com.ua
da8ab7dd52
test for BUG#969
2003-08-09 17:10:58 +03:00
bell@sanja.is.com.ua
c66cc864e8
merge
2003-08-09 16:53:23 +03:00
bell@sanja.is.com.ua
87c60ca3d6
fixed union unlocking problem (BUG#906)
2003-08-09 14:39:54 +03:00
monty@mashka.mysql.fi
6e7a509d06
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-07 20:18:51 +03:00
monty@mashka.mysql.fi
8f08c511ee
Review of changesets since last pull.
...
(Mostly code cleanups)
2003-08-07 20:16:37 +03:00
bell@sanja.is.com.ua
de705e53f2
fixed bug in used_tables() report of left expression of IN subquery
...
fixed number of rows of external field reported to optimizer
added check of choosen key (checked left expression tag)
(SCRUM fix for simple IN optimisation)
2003-08-07 11:16:02 +03:00
Sinisa@sinisa.nasamreza.org
1d2a7cadae
merge
2003-08-06 18:59:26 +03:00
Sinisa@sinisa.nasamreza.org
3c99eb433c
sql_union.cc, sql_select.cc:
...
Code clean-up
sql_union.cc, union.test, union.result:
A fix for a bug #978 .
This enables that NULL's can be entered into UNION's result set,
although first SELECT columns are NOT NULL.
This is also a start of fixing UNION's properly regarding type
acceptance.
sql_select.cc:
A commit for my second July SPRINT task
2003-08-06 18:48:34 +03:00
serg@serg.mylan
73bb79dbea
Bug #792 combination of date-interval and between with mixed constant and non-constant
2003-08-06 15:37:22 +02:00
kostja@oak.local
a4483aaa1d
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1-count-distinct
2003-08-06 17:25:01 +04:00
kostja@oak.local
2205e3c4c4
fix for bug #958 and tests for it
...
aligned with Sergey notes.
2003-08-06 16:58:03 +04:00
serg@serg.mylan
3396c1a89d
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-05 16:30:22 +02:00
serg@serg.mylan
c0317ce66c
make it clear for optimizer that XOR's are not optimizable at the moment (BUG#992)
2003-08-05 16:29:09 +02:00
bell@sanja.is.com.ua
1119ec0e6f
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-08-05 09:58:00 +03:00
bell@sanja.is.com.ua
659650b4ea
merge
2003-08-05 09:56:21 +03:00
bar@bar.mysql.r18.ru
708ddc3a3b
Fix:
...
CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german2_ci);
INSERT INTO t1 VALUES ('Ü');
SELECT FIELD('ue',s1) FROM t1;
The above returned 0 in error.
Now 1 is returned.
2003-08-05 11:26:31 +05:00