mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
f1337d3ef1
Merge c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20161
...
into c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-05-31 14:07:43 -04:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
02b3293592
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-05-31 13:51:01 -04:00
aelkin@dl145k.mysql.com
5d8d38ee4c
Bug#14157: utf8 encoding in binlog without set character_set_client
...
adapting to pushbuild's custom to switch from default pathes. The name for
var directory must be set with MYSQLTEST_VARDIR.
2006-05-31 19:49:38 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
fbd7a258e2
BUG#18198: Many strange partition functions were allowed, now only strictly allowed functions are ok
2006-05-31 13:32:14 -04:00
serg@sergbook.mysql.com
2e16f1eccc
after review fixes
2006-05-31 18:07:32 +02:00
mskold@mysql.com
07189b3845
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into mysql.com:/home/marty/MySQL/mysql-5.1-new
2006-05-31 16:16:04 +02:00
tomas@poseidon.ndb.mysql.com
b6f54a737a
Bug #18947 CRBR: order in binlog of create table and insert (on different table) not determ
...
- wait for schema event also if mysqld is a single one in cluster to ensure serialization with data events
+ some current_thd removals
+ enabling kill of sql thread during shema sync wait
2006-05-31 16:16:03 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
9686e7bfc9
BUG#20161: LINEAR keyword on subpartitions not displayed in information schema for partitions
...
and in SHOW CREATE TABLE
2006-05-31 09:33:10 -04:00
mskold@mysql.com
8cd139c27a
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/marty/MySQL/mysql-5.0
2006-05-31 15:32:49 +02:00
serg@sergbook.mysql.com
4accfd2968
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-31 15:07:29 +02:00
mskold@mysql.com
4532eb14e3
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/marty/MySQL/mysql-5.1-new
2006-05-31 14:38:20 +02:00
jani@ua141d10.elisa.omakaista.fi
04441d04b1
Merge from 5.0 to 5.1. Third part with fixes.
2006-05-31 14:55:28 +03:00
jani@ua141d10.elisa.omakaista.fi
a0a7573e02
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new-marvel
2006-05-31 14:18:12 +03:00
aelkin@dl145k.mysql.com
e9570047a4
BUG#14157: utf8 encoding in binlog without set character_set_client
...
missed table to drop after merge from 4.1
2006-05-31 12:51:21 +02:00
aelkin@dl145k.mysql.com
87c935fe48
Merge dl145k.mysql.com:/tmp/andrei/MERGE/mysql-4.1
...
into dl145k.mysql.com:/tmp/andrei/MERGE/5.0
2006-05-31 10:47:16 +02:00
msvensson@shellback.(none)
abf422cd0e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-05-31 10:33:38 +02:00
serg@sergbook.mysql.com
a1b9c3a1ed
proper cleanup after the test
2006-05-31 10:30:48 +02:00
mskold@mysql.com
c11887c49b
Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database
2006-05-31 10:28:42 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9bf4fd5e9b
Merge from 5.0
2006-05-31 11:18:58 +03:00
gbichot@dl145j.mysql.com
5b33d510a4
Merge gbichot@bk-internal:/home/bk/mysql-5.1-new
...
into dl145j.mysql.com:/users/gbichot/mysql-5.1-new
2006-05-31 09:02:02 +02:00
ngrishakin@mysql.com
0774b37d2b
disabled.def with ndb_dd_backuprestore test disabled
2006-05-30 23:21:44 +02:00
serg@sergbook.mysql.com
7135b559ab
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-30 18:24:06 +02:00
gbichot@dl145j.mysql.com
2367ca4675
Merge gbichot@bk-internal:/home/bk/mysql-5.1-new
...
into dl145j.mysql.com:/users/gbichot/mysql-5.1-new
2006-05-30 16:21:51 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c81b4c01bf
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-30 16:07:49 +03:00
elliot@mysql.com
1a7ad4e45d
Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
2006-05-30 07:57:12 -04:00
anozdrin@mysql.com
11fcbaf1e1
Merge mysql.com:/home/alik/MySQL/devel/5.0-rt
...
into mysql.com:/home/alik/MySQL/devel/5.0-tree
2006-05-30 13:22:49 +04:00
igor@rurik.mysql.com
6051e0f959
Fixed bug #17873 : confusing error message when IGNORE/USE/FORCE INDEX
...
refers to a column name.
2006-05-30 00:08:58 -07:00
gluh@eagle.intranet.mysql.r18.ru
ae72df07f2
Bug#17204 "second CALL to procedure crashes Server"
...
Bug#18282 "INFORMATION_SCHEMA.TABLES provides inconsistent info about invalid views"
This bug caused crashes or resulted in wrong data being returned
when one tried to obtain information from I_S tables about views
using stored functions.
It was caused by the fact that we were using LEX representing
statement which were doing select from I_S tables as active LEX
when contents of I_S table were built. So state of this LEX both
affected and was affected by open_tables() calls which happened
during this process. This resulted in wrong behavior and in
violations of some of invariants which caused crashes.
This fix tries to solve this problem by properly saving/resetting
and restoring part of LEX which affects and is affected by the
process of opening tables and views in get_all_tables() routine.
To simplify things we separated this part of LEX in a new class
and made LEX its descendant.
2006-05-30 10:45:23 +05:00
ngrishakin@mysql.com
89afd0225b
Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
2006-05-30 01:37:20 +02:00
ngrishakin@mysql.com
0763f5e7b4
removed partitions from ndb_dd_backuprestore test
2006-05-30 01:36:35 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
7dae459d70
BUG#17310: Archive error for drop database
2006-05-29 14:51:46 -04:00
andrey@lmy004.
35b6416fcf
Merge lmy004.:/work/mysql-5.1-new-vanilla
...
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 20:23:44 +02:00
msvensson@shellback.(none)
b30cbbe131
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint_from_5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 16:33:32 +02:00
msvensson@shellback.(none)
4693d06a49
Add missing drop table
2006-05-29 16:27:45 +02:00
msvensson@neptunus.(none)
10719727ff
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-29 15:43:00 +02:00
andrey@lmy004.
ea20259aac
Merge lmy004.:/work/mysql-5.1-new-vanilla
...
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 15:16:07 +02:00
msvensson@neptunus.(none)
076ddbf840
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-29 15:06:37 +02:00
msvensson@neptunus.(none)
3e2c08cc99
Update after merge to 5.0
2006-05-29 15:05:31 +02:00
andrey@lmy004.
2a6ffba67d
add missing events_grant test
2006-05-29 13:16:29 +02:00
msvensson@neptunus.(none)
20e0714176
Merge neptunus.(none):/home/msvensson/mysql/bug16297/my50-bug16297
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-29 13:16:17 +02:00
kroki@mysql.com
e87bc6e48c
Avoid race between master and slave.
2006-05-29 14:45:20 +04:00
andrey@lmy004.
b4752351f2
Fix for bug #17394 - Events namespace is wrong
2006-05-29 10:39:45 +02:00
msvensson@neptunus.(none)
c58f79cb3e
Update result file after merge
2006-05-29 09:26:31 +02:00
msvensson@neptunus.(none)
91e4fd9ac9
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 09:06:06 +02:00
ramil@mysql.com
6b2ab800c9
manual merge
2006-05-29 11:17:38 +05:00
igor@rurik.mysql.com
cb4c6a0ded
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-05-28 14:23:28 -07:00
aelkin@mysql.com
6119b7136e
BUG#14157: utf8 encoding in binlog without set character_set_client
...
refining the test case to exclude problems with koi8r on some platforms.
2006-05-28 19:47:01 +03:00
serg@sergbook.mysql.com
71657322fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-28 14:54:28 +02:00
serg@sergbook.mysql.com
fe97dbb587
handlerton cleanup:
...
duplicate fields removed, st_mysql_storage_engine added to support
run-time handlerton initialization (no compiler warnings), handler API
is now tied to MySQL version, handlerton->plugin mapping added
(slot-based), dummy default_hton removed, plugin-type-specific
initialization generalized, built-in plugins are now initialized too,
--default-storage-engine no longer needs a list of storage engines
in handle_options().
mysql-test-run.pl bugfixes
2006-05-28 14:51:01 +02:00
igor@rurik.mysql.com
377b3e0306
Fixed bug #17873 : confusing error message when IGNORE/USE/FORCE INDEX
...
refers to a column name.
Added a new error message ER_INDEX_DOES_NOT_EXIST.
2006-05-27 23:57:33 -07:00