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
tomas@poseidon.ndb.mysql.com
352a6a3854
ps_7ndb.result:
...
fixed ps_7ndb test
2004-12-01 17:35:18 +00: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
f36b81cb35
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-01 12:53:09 +01:00
joreland@mysql.com
4ed3b34c2f
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-01 12:50:13 +01:00
joreland@mysql.com
5832078015
wl#2126 - ndb - Fix handling of null values wrt read multi range
2004-12-01 12:43:30 +01: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
mysqldev@mysql.com
051a5820e6
strict.result:
...
Add warning line to result so that test passes
2004-12-01 00:30:42 +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
bell@sanja.is.com.ua
f20e7a82b7
now we create temporary join for all queries with subqueries to make correct cleunup of tables and avoid too early unlock (BUG#6841)
2004-11-30 21:41:12 +02:00
brian@avenger.(none)
b85f4677d5
Merge for Matt for Innodb bug.
2004-11-30 10:10:40 -08: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
brian@avenger.(none)
0285686fd8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into avenger.(none):/export/brian/mysql/archive-delayed
2004-11-30 03:01:39 -08:00
brian@avenger.(none)
e6f038eacf
Changes to support optimized bulk inserts. This will solve the problem of selects occurring during a bulk insert, and causing the compression factor to drop.
2004-11-30 02:52:14 -08: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
joreland@mysql.com
f13723acbd
Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
...
into mysql.com:/home/jonas/src/wl2126
2004-11-30 08:47:53 +01:00
joreland@mysql.com
a1a4ddad74
ndb - Fixed INCORRECT result file for unique index test
2004-11-30 08:42:42 +01: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
634a1362e8
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-30 07:46:52 +01:00
joreland@mysql.com
85f8ad7bd1
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-30 07:45:49 +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
serg@serg.mylan
4e2a9c6905
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-29 22:49:00 +01:00
serg@serg.mylan
ceb0d1cf87
compatibility fixes
2004-11-29 22:47:50 +01:00
tomas@poseidon.ndb.mysql.com
ee70c9a501
ndb_grant.later:
...
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
2004-11-29 17:46:32 +00:00
joreland@mysql.com
d22ab3f7b3
wl2126 ndb read_multi_range - bugfixes + more tests
2004-11-29 13:50:13 +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
joreland@mysql.com
5d420d9133
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/wl2126
2004-11-29 09:42:29 +01:00
tomas@poseidon.ndb.mysql.com
5e799e4a3b
ndb_grant.later:
...
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
2004-11-29 08:06:53 +00: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
b460059988
merged
2004-11-28 20:42:04 +01:00
serg@serg.mylan
cb538e45f5
post-merge fix
2004-11-28 19:48:41 +01:00