mkindahl@dl145h.mysql.com
d6fd94f77b
More fixes to remove test failures in pushbuild.
2008-02-04 12:12:03 +01:00
msvensson@pilot.mysql.com
86d065f525
Make mtr_report.pl into it's own package
...
Remove mtr_log_*
2008-02-04 11:16:25 +01:00
msvensson@pilot.mysql.com
c10fb20dd2
Merge bk-internal:/home/bk/mysql-5.1-maint2
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-04 09:16:37 +01:00
msvensson@pilot.mysql.com
abb0bdde9e
Add --verbose-restart
2008-02-04 09:15:44 +01:00
mkindahl@dl145h.mysql.com
ec9d14f844
Yet more changes to fix the merge clone.
2008-02-04 08:43:22 +01:00
bar@mysql.com/bar.myoffice.izhnet.ru
3a438cf57a
Bug#32510 LIKE search fails with indexed 'eucjpms' and 'ujis' char column
...
Problem: some collation handlers called incorrect version
of my_like_range_xxx(), which led to wrong min_str and max_str,
so like range optimizer threw away good records.
Fix: changing the wrong handlers to call proper version of
my_like_range_xxx().
2008-02-04 11:10:40 +04:00
mkindahl@dl145h.mysql.com
ff40ccb8d7
Masking out some more errors and warnings that are benign.
2008-02-04 07:15:14 +01:00
mkindahl@dl145h.mysql.com
e493906588
Minor fix to make rpl_loaddata_map pass without warnings.
2008-02-04 06:49:15 +01:00
jonas@perch.ndb.mysql.com
9fa1b08faa
ndb - bug#33619
...
make sure to alloc logspace and set bits
if doing delete after previous update wo/ touching DD part
2008-02-03 21:24:59 +01:00
mkindahl@dl145h.mysql.com
dc96cb21bf
Removing expected errors from slave from the warnings file.
2008-02-03 18:43:05 +01:00
mkindahl@dl145h.mysql.com
221ef88c6a
Bug #34244 Test ndb_binlog_log_bin fails for 'drop table if
...
exists t1,t2,t3'
Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE'
Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create
'mysql/ndb_apply_status'
Tests cases didn't wait for cluster to come up due to a typo
in have_multi_ndb.inc.
2008-02-03 11:48:45 +01:00
mkindahl@dl145h.mysql.com
c35112de8c
Disabling various tests and reporting bugs for them.
2008-02-02 08:15:36 +01:00
mkindahl@dl145h.mysql.com
04273b3d5f
Fixes to make tests pass in pushbuild.
2008-02-01 20:26:39 +01:00
mkindahl@dl145h.mysql.com
1e5fa89dde
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 17:57:22 +01:00
mkindahl@dl145h.mysql.com
e00096a1a7
Again blanking out some numbers in file names that is dependent
...
on the context.
2008-02-01 17:26:28 +01:00
thek@adventure.(none)
83428ce932
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2008-02-01 17:00:54 +01:00
mkindahl@dl145h.mysql.com
20a5cc259b
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 15:38:14 +01:00
mkindahl@dl145h.mysql.com
4f7ad14be0
Fixes to make tests pass in pushbuild.
2008-02-01 15:34:34 +01:00
anozdrin/alik@quad.
9450412f28
Fix merge.
2008-02-01 17:23:46 +03:00
thek@adventure.(none)
b77bb8ec84
* Manual merge fix.
2008-02-01 14:33:36 +01:00
mkindahl@dl145h.mysql.com
7abc1dda10
Fixes to makes tests pass on Windows and vanilla build.
2008-02-01 14:27:23 +01:00
thek@adventure.(none)
9fc16fbfc0
Merge adventure.(none):/home/thek/Development/cpp/bug33201/my50-bug33201
...
into adventure.(none):/home/thek/Development/cpp/bug33201/my51-bug33201
2008-02-01 14:14:37 +01:00
thek@adventure.(none)
323e9a4c53
Bug#33201 Crash occurs when granting update privilege on one column of a view
...
When issuing a column level grant on a table which require pre-locking the
server crashed.
The reason behind the crash was that data structures used by the lock api
wasn't properly reinitialized in the case of a column level grant.
2008-02-01 14:10:46 +01:00
mkindahl@dl145h.mysql.com
74afc4afa7
Re-creating binlog_start_comment.test to make sure that changes
...
are propagated from earlier versions.
2008-02-01 13:49:28 +01:00
mkindahl@dl145h.mysql.com
22affb3326
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 13:28:11 +01:00
mkindahl@dl145h.mysql.com
294571f083
Various fixes to make tests pass on Windows.
2008-02-01 13:18:27 +01:00
mkindahl@dl145h.mysql.com
cc807b927a
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 12:10:28 +01:00
mkindahl@dl145h.mysql.com
d85f474f75
Committing premature delete (the file will be deleted in a soon-to-come cset).
...
.del-strict_autoinc_4bdb.result:
Delete: mysql-test/r/strict_autoinc_4bdb.result
strict_autoinc_4bdb.result:
Rename: BitKeeper/deleted/.del-strict_autoinc_4bdb.result -> mysql-test/r/strict_autoinc_4bdb.result
2008-02-01 12:07:17 +01:00
mkindahl@dl145h.mysql.com
5ef8a06c1b
Fixing result files to make tests pass in pushbuild.
2008-02-01 12:00:28 +01:00
anozdrin/alik@quad.
1852fb971e
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-02-01 13:55:39 +03:00
mkindahl@bk-internal.mysql.com
8b0091ff53
Deleting Berkeley DB test files since BDB is not distributed with 5.1.
...
.del-bdb_notembedded.test:
Delete: mysql-test/t/bdb_notembedded.test
.del-strict_autoinc_4bdb.result:
Delete: mysql-test/r/strict_autoinc_4bdb.result
.del-bdb_notembedded.result:
Delete: mysql-test/r/bdb_notembedded.result
2008-02-01 11:47:56 +01:00
anozdrin/alik@quad.
dcb0012173
Fix merge.
2008-02-01 13:47:11 +03:00
anozdrin/alik@quad.
9b4306b8eb
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-02-01 13:29:27 +03:00
mkindahl@dl145h.mysql.com
15b74eb7bf
Changes to make tests pass on vanilla build.
2008-02-01 10:46:02 +01:00
kaa@mbp.local
0879b1a69b
Merge mbp.local:/Users/kaa/src/opt/bug25162/my51-bug25162
...
into mbp.local:/Users/kaa/src/opt/mysql-5.1-opt
2008-02-01 13:39:37 +05:00
kaa@mbp.local
e80794b3ee
Merge mbp.local:/Users/kaa/src/opt/bug25162/my50-bug25162
...
into mbp.local:/Users/kaa/src/opt/mysql-5.0-opt
2008-02-01 13:37:22 +05:00
kaa@mbp.local
947529acf3
Merge mbp.local:/Users/kaa/src/opt/bug25162/my50-bug25162
...
into mbp.local:/Users/kaa/src/opt/bug25162/my51-bug25162
2008-02-01 13:26:53 +05:00
kaa@mbp.local
663453d572
Fix for bug #25162 : Backing up DB from 5.1 adds 'USING BTREE' to KEYs
...
on table creates
The problem was in incompatible syntax for key definition in CREATE
TABLE.
5.0 supports only the following syntax for key definition (see "CREATE
TABLE syntax" in the manual):
{INDEX|KEY} [index_name] [index_type] (index_col_name,...)
While 5.1 parser supports the above syntax, the "preferred" syntax was
changed to:
{INDEX|KEY} [index_name] (index_col_name,...) [index_type]
The above syntax is used in 5.1 for the SHOW CREATE TABLE output, which
led to dumps generated by 5.1 being incompatible with 5.0.
Fixed by changing the parser in 5.0 to support both 5.0 and 5.1 syntax
for key definition.
2008-02-01 13:00:40 +05:00
hezx@mail.hezx.com
4371a7888d
Merge zhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug33862_failed_drop_user/5.1
2008-02-01 10:27:03 +08:00
evgen@moonbone.local
f967e24718
Bug#30787: Stored function ignores user defined alias.
...
Simple subselects are pulled into upper selects. This operation substitutes the
pulled subselect for the first item from the select list of the subselect.
If an alias is defined for a subselect it is inherited by the replacement item.
As this is done after fix_fields phase this alias isn't showed if the
replacement item is a stored function. This happens because the Item_func_sp::make_field
function makes send field from its result_field and ignores the defined alias.
Now when an alias is defined the Item_func_sp::make_field function sets it for
the returned field.
2008-01-31 23:46:26 +03:00
holyfoot/hf@hfmain.mysql.com
612b263bbe
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/25426/my51-25426
2008-01-31 21:04:00 +04:00
mkindahl@dl145h.mysql.com
4c95b29614
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-31 17:46:50 +01:00
aelkin/andrei@mysql1000.(none)
de7e6d2565
failure in 5.1 tree for rpl_server_id caused by the wrong offset in
...
the include file.
fixed with correcting the offset.
2008-01-31 18:26:04 +02:00
aelkin/andrei@mysql1000.(none)
8e45696765
bug#32971 manual merge of two tests results
2008-01-31 18:12:58 +02:00
mkindahl@dl145h.mysql.com
7cfdd60045
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-01-31 16:15:46 +01:00
hhunger@hh-nb.hungers
5817cec5ba
fixes for bug#34190.
2008-01-31 16:12:54 +01:00
aelkin/andrei@mysql1000.(none)
e06d0c7983
Merge mysql1000.(none):/mnt/nb/home/elkin/MySQL/TEAM/FIXES/5.1/bug32971-error_propag_slave
...
into mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug32971-rbr_error_prop
2008-01-31 17:02:29 +02:00
mkindahl@dl145h.mysql.com
2d9c3b715d
Fixes to make tests pass on pushbuild.
2008-01-31 15:53:47 +01:00
pekka@sama.ndb.mysql.com
1ccf00f00a
Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107
...
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107
2008-01-31 14:47:50 +01:00
skozlov/ksm@mysql.com/virtop.(none)
7a82a059a9
Test case for bug#12691
2008-01-31 16:23:27 +03:00