matthias@three.local.lan
9c7d94d408
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-11 17:57:35 +01:00
ingo@mysql.com
601a4fdfa2
Merge
2005-02-11 11:59:35 +01:00
igor@rurik.mysql.com
a697e5da15
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 23:48:35 -08:00
igor@rurik.mysql.com
4ef431ad55
select.result:
...
Adjusted results of the test case for bug #7520 for 4.1.
2005-02-10 23:47:57 -08:00
igor@rurik.mysql.com
06ff30f6c0
Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 22:17:18 -08:00
igor@rurik.mysql.com
8b3d59ad42
select.result, select.test:
...
Added a test case for bug #7520 .
table.cc:
Fixed bug #7520 .
The bug was caused by a wrong calculation of the field max_key_length for
a TABLE structure when there was an index on a blob field.
2005-02-10 22:15:38 -08:00
joreland@mysql.com
ec5ac47eb8
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 06:46:05 +01:00
jimw@mysql.com
c4187750ff
Fix all of the enum and set columns in privilege tables to be
...
case-insensitive. (Bug #7989 )
2005-02-10 20:25:14 -08:00
jimw@mysql.com
eecb813c6b
Re-enable ctype_latin1_de test for embedded server (already passes, so it
...
appears to have been accidently disabled) and enable ctype_ucs after moving
a subtest that requires binlog to its own test file.
2005-02-10 18:08:30 -08:00
bell@sanja.is.com.ua
ea8caabb10
Better emulation correct SELECT tree for fields expressions of merging view during name resolving (BUG#6394)
2005-02-10 23:01:59 +02:00
matthias@three.local.lan
54684534fd
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-10 20:28:47 +01:00
mats@mysql.com
6611d3d2f8
Merge mysql.com:/home/bkroot/mysql-5.0
...
into mysql.com:/home/bk/b7853-mysql-5.0
2005-02-10 19:15:53 +01:00
bell@sanja.is.com.ua
5040e7cdb4
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0
2005-02-10 20:08:11 +02:00
joreland@mysql.com
1bda3aaa24
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 17:12:53 +01:00
bell@sanja.is.com.ua
9b1bf2da5a
merge
2005-02-10 18:01:06 +02:00
joreland@mysql.com
87349f0d81
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 16:19:44 +01:00
konstantin@mysql.com
7d735c7207
manual merge
2005-02-10 16:58:02 +03:00
msvensson@neptunus.homeip.net
a172575854
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-10 14:41:52 +01:00
monty@mysql.com
ccb2f3381b
Things missing in last changset
...
After merge fixes
Don't give duplicate warnings for some ::store() functions
2005-02-10 15:41:51 +02:00
msvensson@neptunus.homeip.net
8fb1f824ea
Change script to avoiud multiple --debug flags when starting master servers
2005-02-10 14:13:23 +01:00
bell@sanja.is.com.ua
cfedc23bce
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2005-02-10 13:05:17 +02:00
jimw@mysql.com
3c5602faec
Re-enable alter_table test for embedded server by moving grant-related test
...
to grant.test and using replace_column to neuter the Privileges column in
SHOW FULL COLUMNS.
2005-02-09 18:17:40 -08:00
jimw@mysql.com
845139731b
Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-09 16:36:24 -08:00
monty@mysql.com
a1a39fab84
Merge with 4.1
2005-02-10 02:27:37 +02:00
matthias@three.local.lan
74ba5b0808
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 21:47:54 +01:00
bell@sanja.is.com.ua
70797f571f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-02-09 21:14:06 +02:00
bell@sanja.is.com.ua
90c0024217
reverted patch for BUG#7351 (because of performance ussie)
2005-02-09 21:08:08 +02:00
serg@serg.mylan
db13afd89d
auto-ROLLBACK if binlog was not closed properly
...
auto-commit on Xid_log_event
2005-02-09 20:04:28 +01:00
tomas@poseidon.ndb.mysql.com
264bac2f1d
ndb_port_base is obsolete with WL#2278
2005-02-09 19:29:37 +01:00
monty@mysql.com
ab5aed6047
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-09 19:22:35 +02:00
lenz@mysql.com
afa2a462a1
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-merge
2005-02-09 17:58:29 +01:00
lenz@mysql.com
420d29159f
Merge mysql.com:/space/my/mysql-4.1-merge
...
into mysql.com:/space/my/mysql-5.0
2005-02-09 17:52:31 +01:00
lenz@mysql.com
a0089319d2
- make sure to include the embedded test results in the source distribution
2005-02-09 17:49:43 +01:00
msvensson@neptunus.homeip.net
b8490b5524
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-09 16:26:06 +01:00
msvensson@neptunus.homeip.net
0ed971878d
Fix so that master and master1 does not write to same .trace file
2005-02-09 16:23:22 +01:00
matthias@three.local.lan
83b1d82add
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 15:33:01 +01:00
wax@kishkin.ru
a0507f98b9
merge
2005-02-09 19:13:20 +05:00
bell@sanja.is.com.ua
6cda5f53da
postreview changes
...
(used t3, moved after last bug, renamed)
2005-02-09 16:02:37 +02:00
mleich@mysql.com
48bc6d477d
Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
...
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 11:00:15 +01:00
bell@sanja.is.com.ua
b0a1ee8751
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2005-02-09 11:41:55 +02:00
jimw@mysql.com
5ebbc834fe
Fix removal of tables from cache when the database they are contained
...
within is dropped and lower_case_table_names is set. (Bug #8355 )
2005-02-08 15:14:14 -08:00
hf@deer.(none)
96558f6ad3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 02:54:08 +04:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
bell@sanja.is.com.ua
eb4fb7253d
Merge
2005-02-09 00:31:56 +02:00
sergefp@mysql.com
dcc65b77a6
Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table
2005-02-08 23:44:51 +03:00
pem@mysql.comhem.se
2c26ebe359
WL#2130: Table locking for stored FUNCTIONs
...
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
2005-02-08 20:52:50 +01:00
kent@mysql.com
e27f92103e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-08 18:14:26 +01:00
wax@mysql.com
7d1af16c2a
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-02-08 18:51:42 +05:00
kent@mysql.com
f2b3a33551
Merge
2005-02-08 13:59:29 +01:00
mleich@mysql.com
c1c4822bf3
Insertion of additional sub test cases checking DATA/TIME/TIMESTAMP
...
functionality into the test case "strict".
The additional sub test cases are part of the SoW6 test draft
(sow6-dates.test) written by Trudy/PeterG.
sow6-dates will be no longer needed, because "strict" contains with
this extension all sub test cases of sow6-dates.
2005-02-08 13:46:04 +01:00