monty@mysql.com
55cc515c8f
merged on pull
2004-12-02 14:47:14 +02:00
hf@deer.(none)
c7ef44857f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-02 16:46:30 +04:00
monty@mysql.com
d1a666d59a
Cleanups during review stage
...
Added auto-correct of field length for enum/set tables for ALTER TABLE
This is becasue of a bug in previous MySQL 4.1 versions where the length for enum/set was set incorrectly after ALTER TABLE
2004-12-02 14:43:51 +02:00
hf@deer.(none)
71bfbbdcd0
Fixes to make mysql-test-run --embedded-server working
2004-12-02 16:08:17 +04:00
matthias@three.local.lan
257d1f6db3
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-02 12:54:32 +01:00
ram@gw.mysql.r18.ru
3b111a9b42
A fix (bug #6878 : Crash with engine=memory).
2004-12-02 15:06:15 +04:00
ram@gw.mysql.r18.ru
7ed2753300
A fix (bug #6878 : Crash with engine=memory).
2004-12-02 14:34:53 +04:00
ram@gw.mysql.r18.ru
c78eefbc95
Fixes (bug #6932 : 'revoke all privileges...' doesn't remove all proper columns from columns_priv
...
bug #6933 : error in the tests/grant.pl test).
2004-12-02 13:34:30 +04:00
bar@mysql.com
a09a603d83
Bug #6379 : ENUM values are incorrectly converted
...
- add_field_to_list() now uses <List>String
instead of TYPELIB to be able to distinguish
literals 'aaa' and hex literals 0xaabbcc.
- move some code from add_field_to_list() where
we don't know column charset yet, to
mysql_prepare_table(), where we do.
2004-12-02 12:48:43 +04:00
bar@mysql.com
a38160f370
Move common trailing space checks into an include file.
...
Check UCS2 trailing spaces.
2004-12-01 19:25:05 +04:00
joreland@mysql.com
0718f788d6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-01 10:15:25 +01:00
joreland@mysql.com
64d6563afa
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-01 10:13:55 +01:00
joreland@mysql.com
9acd3ea38d
testcase for bug#6871, ndb, replace with collations
2004-12-01 10:13:18 +01:00
bell@sanja.is.com.ua
4c017d18e2
Merge
2004-12-01 10:25:11 +02:00
mskold@mysql.com
da1f5728fd
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-01 09:22:26 +01:00
mwagner@mysql.com
2e0d1b3f9c
openssl_1.result, have_openssl_1.require, openssl_1.test:
...
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
2004-12-01 02:35:02 +01:00
guilhem@mysql.com
81609d6e1c
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-30 22:22:12 +01:00
guilhem@mysql.com
7219d2be90
two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
...
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.
2004-11-30 22:20:52 +01:00
tomas@poseidon.ndb.mysql.com
aec0b4e4d7
fixed error in test result
...
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
2004-11-30 17:47:47 +00:00
tomas@poseidon.ndb.mysql.com
abb50b38ee
ps_7ndb.result, ps_7ndb.test:
...
ndb now runs ps tests just like the others
2004-11-30 15:08:26 +00:00
mskold@mysql.com
9aca0cdac5
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-30 10:21:12 +01:00
ram@gw.mysql.r18.ru
3f741570e9
An additional test for 'CREATE DATABASE' with non-default character set.
2004-11-30 13:19:35 +04:00
ram@gw.mysql.r18.ru
0ca8fd2ee9
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
2004-11-30 12:27:17 +04:00
mskold@mysql.com
18afa572f6
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-30 07:47:52 +01:00
joreland@mysql.com
e86ce67ea5
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-30 07:43:19 +01:00
joreland@mysql.com
474f23a402
ndb - fixed long overdue problems with unique indexes and null values
2004-11-30 07:41:26 +01:00
matthias@three.local.lan
97f40042d0
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-29 12:11:36 +01:00
sergefp@mysql.com
0bf584d9a5
Fix and testcase for BUG#6699
2004-11-29 06:51:30 +03:00
mskold@mysql.com
0648cc4285
Added better test for Bug #6794 Wrong outcome of update operation of ndb table
2004-11-28 22:33:01 +01:00
mskold@mysql.com
065184dac3
Fix for Bug #6794 Wrong outcome of update operation of ndb table
2004-11-28 22:28:36 +01:00
serg@serg.mylan
cb538e45f5
post-merge fix
2004-11-28 19:48:41 +01:00
serg@serg.mylan
96729c62be
merged
2004-11-28 18:19:01 +01:00
serg@serg.mylan
989721d12f
bad merge fixed
2004-11-28 17:06:40 +01:00
serg@serg.mylan
1a32157950
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-28 16:32:01 +01:00
serg@serg.mylan
7eccc3107f
skip last compress test if we're short of RAM
2004-11-28 16:31:14 +01:00
matthias@three.local.lan
ea28fc6351
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-26 10:49:14 +01:00
monty@mysql.com
eb304bd49f
Fixes while reviewing code
...
(Cleanups and better bug fixes)
2004-11-26 02:31:22 +02:00
bell@sanja.is.com.ua
3c108b2a84
init values to avoid junk returning in case of null value asking without assigning value (BUG#6806)
2004-11-25 22:54:49 +02:00
mats@mysql.com
4ac392fa45
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/bkroot/mysql-4.1
2004-11-25 13:35:53 +01:00
timour@mysql.com
f1e86036ee
Merge mysql.com:/home/timka/mysql/src/4.0-virgin
...
into mysql.com:/home/timka/mysql/src/4.0-master
2004-11-25 13:25:35 +02:00
mats@mysql.com
9ffb3fd39c
Merge
2004-11-25 12:23:41 +01:00
timour@mysql.com
38ab93c6be
Merge for BUG#3759 which was missing from the main tree for some reason.
2004-11-25 11:37:28 +02:00
mats@mysql.com
fe0911e95e
Merge mysql.com:/space/bkroot/mysql-4.0
...
into mysql.com:/space/bk/b6148-mysql-4.0
2004-11-25 09:38:52 +01:00
mats@mysql.com
c06cae0f55
Fix for Bug#6148. Only rewind read position in binary log when the
...
slave SQL thread is started.
2004-11-25 09:26:45 +01:00
serg@serg.mylan
e80bd82e83
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 23:47:14 +01:00
serg@serg.mylan
e8203e437a
bug#6784
...
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
2004-11-24 23:16:16 +01:00
bar@mysql.com
0f79f61480
Bug#6787 LIKE not working properly with _ and utf8 data
2004-11-24 20:09:54 +04:00
serg@serg.mylan
2ca5a0f2b1
merged
2004-11-22 20:15:48 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
076f27147f
Bug#6252 - Duplicate columns in keys should fail
...
Added check for duplicate column in key
Added tests and fixed tests which exploit bug
2004-11-22 18:07:04 +00:00
serg@serg.mylan
af51d26238
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-11-22 18:47:23 +01:00