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
0d01cc56bd
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-19 16:17:54 +03:00
monty@mashka.mysql.fi
ff63a5c3d9
Fix test case
2003-08-19 16:03:18 +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@laptop.sanja.is.com.ua
39a65cd777
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-08-18 01:56:31 +03:00
monty@mashka.mysql.fi
a9146ace70
Cleanups to recent patches
...
Fix packet error when using wrong GRANT command
2003-08-15 09:54:19 +03:00
bell@laptop.sanja.is.com.ua
e9e5faacfe
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-08-15 00:17:43 +03:00
monty@mashka.mysql.fi
fb47e64256
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-13 13:26:52 +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
6250e76381
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-08-12 23:45:53 +03:00
bell@sanja.is.com.ua
57bb575d49
fixed query cache intercommunication with innodb engine
2003-08-12 23:45:04 +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
serg@serg.mylan
bc9f6cde50
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-12 15:30:47 +02: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
bell@sanja.is.com.ua
6ac8e9b93c
optimisation of independent ALL/ANY with aggregate function (WL#1115) (SCRUM)
2003-08-12 12:38:03 +03:00
monty@mashka.mysql.fi
7782286faf
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-12 01:33:55 +03: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
cbb3a78d8d
merge
2003-08-11 12:00:33 +03: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
monty@mashka.mysql.fi
2fb441fdf7
Remove wrong bug fix when calling create_sort_index.
...
Fix possible replication bug with LOAD DATA ... IGNORE LINES #
2003-08-10 05:14:16 +03:00
igor@rurik.mysql.com
994a1ea337
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-09 12:57:39 -07: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
bell@sanja.is.com.ua
b41599de1c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merged_qc-4.0
2003-08-09 14:16:13 +03:00
serg@serg.mylan
083acc29bb
BETWEEN bug fix: non-const expressions on both ends
2003-08-09 01:20:02 +02:00
bell@sanja.is.com.ua
ddd3ee8b27
rewritten test using loop (BUG#930)
...
removed unused field (now it is in variables)
2003-08-08 23:27:22 +03:00
serg@serg.mylan
df8b7799cb
between range optimization bug (between with const on one end only)
2003-08-08 19:13:27 +02:00
serg@serg.mylan
f96d57d302
between tests added
...
bugfixes will follow
2003-08-08 18:49:22 +02:00
dlenev@build.mysql.com
38a5d1b70e
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/dlenev/mysql-4.0-certs
2003-08-08 15:03:42 +02:00
kostja@oak.local
765053c838
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-08-07 22:19:42 +04: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
dlenev@build.mysql.com
3f5faaaff9
openssl_1.result, openssl_1.test:
...
Aligned test with regenerated SSL certs
Many files:
Regenerated expired certificates
2003-08-07 15:20:15 +02:00
kostja@oak.local
c23975aace
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-08-07 13:29:25 +04: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
