kostja@bodhi.(none)
8fb0abcd2f
A post-merge fix.
2007-06-01 17:53:38 +04:00
kostja@bodhi.(none)
f1336a5809
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-06-01 17:50:24 +04:00
kostja@bodhi.(none)
d97db648a0
Fix some mysqltest warnings.
2007-06-01 17:49:01 +04:00
kostja@bodhi.(none)
d0ff5df029
Fix a warning.
2007-06-01 14:17:23 +04:00
kostja@bodhi.(none)
679a264357
A post-merge fix.
2007-06-01 13:33:57 +04:00
kostja@bodhi.(none)
16633169e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-06-01 12:12:06 +04:00
jani@a88-113-38-195.elisa-laajakaista.fi
2c8f4f9791
Added casts to avoid compiler warnings and fixed a wrong type.
...
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.
2007-05-31 17:45:22 +03:00
lars/lthalmann@mysql.com/dl145j.mysql.com
685293b985
Disabled due to valgrind failure (talked to Tomas)
2007-05-31 10:34:22 +02:00
lars/lthalmann@dl145j.mysql.com
30179dd8c0
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-05-31 10:27:53 +02:00
lars/lthalmann@dl145j.mysql.com
73ca08a481
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-05-31 10:23:37 +02:00
lars/lthalmann@dl145h.mysql.com
4e90009904
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
2007-05-31 10:20:58 +02:00
malff/marcsql@weblab.(none)
b2d394787e
Build warning cleanup
2007-05-30 17:46:28 -06:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
4835204dcc
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-30 22:33:54 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
95b1be9eb1
bug#22725
...
refining the test because of Bug #28786 'reset master' does not reset binlogging on embeded server
2007-05-30 22:29:15 +03:00
thek@adventure.(none)
c2e2d0bfa0
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-05-30 17:34:27 +02:00
thek@adventure.(none)
d505eac7e9
Merge adventure.(none):/home/thek/Development/cpp/bug24988/my51-bug24988
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-05-30 17:17:46 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
1ec47e4ef8
Changed to vertical output for rpl_row_until.test
2007-05-30 17:00:48 +02:00
lars/lthalmann@dl145k.mysql.com
5816dfe330
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-05-30 15:58:48 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
ac1d6a7f61
Masking out error that is not generated by the test (rpl_ndb_basic.test) itself
2007-05-30 15:56:05 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
1a491f3640
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2007-05-30 16:32:36 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
e87959a23a
bug#22725
...
the test is not supposed for row format. the include-guard is set.
2007-05-30 16:14:55 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
aedc19a392
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2007-05-30 15:59:21 +03:00
bar@mysql.com/bar.myoffice.izhnet.ru
05c75a9c01
CMakeLists.txt:
...
Adding strnlen.c into the list of source files.
2007-05-30 17:29:05 +05:00
anozdrin/alik@ibm.
de9f159c60
1. Fix memory leak.
...
2. Use multibyte-safe constant.
2007-05-30 16:24:21 +04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
67c34a2c3c
bug#17654 --read-from-remote-server causes core
...
fixing FD event issue that showed up on pb.
2007-05-30 14:29:34 +03:00
bar@bar.myoffice.izhnet.ru
457491f58a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into mysql.com:/home/bar/mysql-5.1.b28558
2007-05-30 16:04:52 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
f6e5cfd85c
Define HAVE_STRNLEN correctly.
2007-05-30 16:02:54 +05:00
lars/lthalmann@mysql.com/dl145k.mysql.com
a6cf35bb78
Added extra parenthesis to remove compiler warning
...
Fixed test case rpl_incident.test (synchronize drop table, masked IO thread behaviour)
2007-05-30 11:55:56 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
ad8e43155b
Fixing wrong memory read problem detected by Valgrind in "xml" test.
...
The source of the problem was in my_vsnprintf() implementation.
2007-05-30 14:03:35 +05:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
1f12c44b91
Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug27044_slave_dup2unique
...
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-30 11:22:07 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
03638e3aa3
bug#22725
...
merge 5.0 with 5.1
2007-05-30 11:18:55 +03:00
anozdrin/alik@ibm.
072ff4e3e0
Disable IM tests.
2007-05-30 12:06:07 +04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
54772da05e
Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-30 10:59:54 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
6c3921eb9a
bug#22725
...
test comments correction
2007-05-30 10:56:18 +03:00
anozdrin/alik@ibm.
c0b3242ea5
Disable IM-tests.
2007-05-30 11:53:50 +04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
6620493d19
Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-30 10:27:05 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
508e17fd93
bug#22725
...
combining the final result variable in such way that either option of the test execution
will yield zero.
2007-05-30 00:22:24 +03:00
malff/marcsql@weblab.(none)
8c27ed9e42
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-05-29 14:53:21 -06:00
malff/marcsql@weblab.(none)
e8fec66e9e
Manual merge
2007-05-29 14:52:17 -06:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
2e60009cde
bug#22725
...
tests refining, see binlog_killed.test file for details
2007-05-29 23:16:50 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
dcd8098f94
bug#22725
...
merge with 5.0
2007-05-29 22:17:09 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
1537484087
Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-29 21:21:13 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
515f304827
bug#22725
...
refining the test.
2007-05-29 21:05:08 +03:00
anozdrin/alik@ibm.
e4370e7aa5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-cs-3
2007-05-29 21:24:13 +04:00
anozdrin/alik@ibm.
7d02017cb6
Refactoring patch:
...
1. Refactor sp_show_create_function() and sp_show_create_procedure()
into show_create_routine().
2. Code cleanup: eliminate proxy functions.
2007-05-29 21:22:33 +04:00
malff/marcsql@weblab.(none)
cb4316e35d
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-05-29 10:52:07 -06:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
4bce6498b9
bug#22725
...
result file updated
2007-05-29 18:38:47 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
f7c3285f2e
Bug#27044 replicated with unique field ndb table allows duplkey inserts
...
The bug in that slave version of a table with unique field still was
able to execute INSERT query as replace whereas it's impossible on master.
The reason of this artifact is wrong usage of ndb->extra:s.
Fixed with resetting flags at do_after.
There is open issue with symmetrical resetting
table->file->extra(HA_EXTRA_NO_IGNORE_NO_KEY)
which i had to hand to bug#27077.
The test for the current bug was committed in a cset for bug#27320.
2007-05-29 16:36:05 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
3b93001c25
Bug#22725 Replication outages from ER_SERVER_SHUTDOWN (1053) set in replication events
...
Refining the tests since pb revealed the older version's fragality - the error from SF() due to killed
may be different on different env:s.
DBUG_ASSERT instead of assert.
2007-05-29 16:27:55 +03:00
thek@adventure.(none)
7fc2ddbf22
Undefined unused function causing red in PushBuild.
2007-05-29 15:05:35 +02:00