joerg@mysql.com
8d0378f542
Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M41/merge-4.1
2006-01-24 17:52:53 +01:00
andrey@lmy004.
8519423890
fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
...
WL#1034 (Internal CRON)
2006-01-24 16:04:35 +01:00
msvensson@neptunus.(none)
019953e0f2
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
2006-01-24 15:52:54 +01:00
msvensson@neptunus.(none)
c36e8861e3
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-24 15:52:08 +01:00
msvensson@neptunus.(none)
b4af5d743e
Make mysql-test-run.sh compatible
2006-01-24 15:51:02 +01:00
msvensson@neptunus.(none)
9f2a17816f
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-24 14:53:47 +01:00
msvensson@neptunus.(none)
60296f8f7f
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
2006-01-24 14:10:48 +01:00
joerg@mysql.com
1fa62bdafc
Test "ctype_ucs": Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).
2006-01-24 13:54:34 +01:00
aelkin@mysql.com
cf6becdebe
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-24 14:49:25 +02:00
gluh@eagle.intranet.mysql.r18.ru
b4f7c9bbd5
Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
...
Fill schema tables with data before filesort if it's necessary
2006-01-24 16:48:19 +04:00
sergefp@mysql.com
f02b4f54ad
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
2006-01-24 15:34:02 +03:00
msvensson@neptunus.(none)
bcf118b474
Merge
2006-01-24 13:33:00 +01:00
jmiller@mysql.com
f82892fea7
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-24 13:27:16 +01:00
jmiller@mysql.com
e0fc898399
disabled.def:
...
Updated to remove ndb_dd_disk2memory
ndb_dd_disk2memory.result:
Updated results to match change to show create table for NDB tables. WL 2604
2006-01-24 13:26:21 +01:00
gluh@eagle.intranet.mysql.r18.ru
fa776a6f67
Fix for bug#15851 Unlistable directories yield no info from information_schema
...
to skip directories which are not allowed for read
2006-01-24 15:59:08 +04:00
msvensson@neptunus.(none)
3d5f530caa
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-24 08:43:34 +01:00
msvensson@neptunus.(none)
09ec2919a1
Make it possible to run mysql-test-run.pl with default test suite in different vardir.
2006-01-24 08:30:54 +01:00
reggie@linux.site
daa0587c3d
bug #14354 - data directory and index directory not working for partitions
2006-01-23 23:20:23 -06:00
reggie@linux.site
57c432b94e
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1
2006-01-23 22:20:32 -06:00
reggie@linux.site
631b9af2be
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1-bug16718
2006-01-23 22:13:12 -06:00
jmiller@mysql.com
5ea8f304bf
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-24 01:13:20 +01:00
jmiller@mysql.com
f063d80678
disabled.def:
...
Updated with new bug number
2006-01-24 01:12:23 +01:00
petr@mysql.com
35f0ebac6c
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
2006-01-24 01:28:26 +03:00
guilhem@mysql.com
502f3085f8
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/mysql_src/mysql-5.1-new
2006-01-23 22:18:30 +01:00
guilhem@mysql.com
ea0725602b
Fix for the test failure of binlog_row_ctype_cp932. Note that since we pushed row-based replication,
...
"make test" != "mysql-test-run && mysql-test-run --ps-protocol". "make test" is what should be used;
had it been, the failure would have been noticed earlier. Putting back cxx flags I had by accident removed.
Disclaimer: 5.1-new is in a sorry state: log_tables and some ndb* fail, mysqlslap test crashes randomly in a row-based replication assertion (sql_class.cc:2207).
2006-01-23 22:17:12 +01:00
aelkin@mysql.com
4ba60488f6
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-23 22:32:05 +02:00
evgen@moonbone.local
b1967ad723
Fixed bug #16510 : Updating field named like '*name' caused server crash.
...
When setup_fields() function finds field named '*' it expands it to the list
of all table fields. It does so by checking that the first char of
field_name is '*', but it doesn't checks that the '* is the only char.
Due to this, when updating table with a field named like '*name', such field
is wrongly treated as '*' and expanded. This leads to making list of fields
to update being longer than list of the new values. Later, the fill_record()
function crashes by dereferencing null when there is left fields to update,
but no more values.
Added check in the setup_fields() function which ensures that the field
expanding will be done only when '*' is the only char in the field name.
2006-01-23 21:51:32 +03:00
jmiller@mysql.com
ccc36b0103
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-23 18:25:19 +01:00
jmiller@mysql.com
0f6e44d110
disabled.def:
...
Disabled ndb_dd_disk2memory
2006-01-23 18:24:12 +01:00
reggie@linux.site
e389f947f8
BUG# 15523 - ALTER TABLE ... PARTITION BY does not work
...
this was fixed by WL 2604
2006-01-23 10:39:32 -06:00
svoj@april.(none)
18681229a0
Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0
2006-01-23 20:07:26 +04:00
aelkin@mysql.com
0fc8284de8
BUG#15699, failure to apply ignore rule for unexisting table.
...
Since replication rules execute after `mysql_multi_update_prepare' returns we
delay to `break' in case this functions returns non-zero (some tables are not found)
for to examine if there is an ignore rule for a not-found table. By doing that
it is guaranteed do/ignore replication rules logically preceed opening table routine.
2006-01-23 18:03:09 +02:00
reggie@linux.site
7350f48356
BUG# 16534: just a change to the test suite showing that it's fixed.
...
This bug was fixed as part of the large WL 2604 push.
2006-01-23 09:44:13 -06:00
gvb@phoenix.(none)
5b9d686e87
Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into phoenix.(none):/data/mysql-4.1-BK
2006-01-23 16:34:53 +01:00
reggie@linux.site
c5f2f9180f
Bug# 16718 partitioning support status variable has incorrect name
...
change status variable from have_partition_engine to have_partitioning.
2006-01-23 08:42:32 -06:00
petr@mysql.com
c355ce858b
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
2006-01-23 17:28:37 +03:00
petr@mysql.com
fa0c7e0994
disable ps_protocol in log_tables test.
...
The log content is obviously different in two modes,
as Queries are translated into Prepare and Execute
commands. Thus we should use test only in one mode
to get the match with result.
2006-01-23 17:27:16 +03:00
andrey@lmy004.
869661ff9e
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16548
2006-01-23 15:02:42 +01:00
jmiller@mysql.com
935a2379bd
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-23 14:48:12 +01:00
jmiller@mysql.com
ad4ec4a6ef
disabled.def:
...
updated
2006-01-23 14:46:56 +01:00
svoj@april.(none)
4dc4502ab3
BUG#16489 - utf8 + fulltext leads to corrupt index file.
...
Fixed that UPDATE statement crashes multi-byte charset fulltext index.
2006-01-23 17:15:33 +04:00
jmiller@mysql.com
cddd1294b8
rpl_foreign_key.test:
...
Added comments on 1022 per Lars request
2006-01-23 14:07:58 +01:00
andrey@lmy004.
9b7b1fd6fd
- disable events for now (again)
2006-01-23 13:56:34 +01:00
andrey@lmy004.
877facc5ec
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16548
2006-01-23 12:38:54 +01:00
holyfoot@mysql.com
edc91d6643
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
2006-01-23 15:31:54 +04:00
ingo@mysql.com
b6e28c99d0
WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
...
Change "duplicate key" message to print key name
instead of key number.
2006-01-23 12:17:05 +01:00
gvb@phoenix.(none)
66cb90410c
Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into phoenix.(none):/data/mysql-4.1-BK
2006-01-23 11:18:06 +01:00
andrey@lmy004.
6df1ec2c76
Merge
2006-01-23 11:06:12 +01:00
tomas@poseidon.ndb.mysql.com
771f52b771
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-23 10:44:18 +01:00
tomas@poseidon.ndb.mysql.com
92c93523dd
added option for relative pat in ndb config
...
added option for verbose ndb startup
2006-01-23 10:42:02 +01:00