bar@bar.myoffice.izhnet.ru
d5011e8561
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b32510
...
into mysql.com:/home/bar/mysql-work/mysql-5.0.b32510v2
2008-02-20 14:38:52 +04:00
kostja@dipika.(none)
d8e6308c42
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-2pc-opt-merge-push
2008-02-19 14:53:22 +03:00
kostja@dipika.(none)
acf9b1f346
A fix and a test case for Bug#12713 "Error in a stored function called from
...
a SELECT doesn't cause ROLLBACK of statem".
The idea of the fix is to ensure that we always commit the current
statement at the end of dispatch_command(). In order to not issue
redundant disc syncs, an optimization of the two-phase commit
protocol is implemented to bypass the two phase commit if
the transaction is read-only.
2008-02-19 14:43:01 +03:00
kaa@kaamos.(none)
5647dee192
Merge kaamos.(none):/data/src/mysql-5.1
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-17 14:57:01 +03:00
anozdrin/alik@quad.
b25de63309
Add a test case for Bug#21704: Renaming column does not update
...
FK definition.
2008-02-15 14:14:09 +03:00
kaa@kaamos.(none)
9f194149b8
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-13 12:12:00 +03:00
bar@mysql.com/bar.myoffice.izhnet.ru
efa7ee3573
Bug#27877 incorrect german order in utf8_general_ci
...
Problem: incorrect sort order for "U+00DF SHARP S".
Fix: changing sort order for U+00DF to be equal to 's',
like the manual says.
2008-02-11 16:28:33 +04: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
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
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
mkindahl@dl145h.mysql.com
2d9c3b715d
Fixes to make tests pass on pushbuild.
2008-01-31 15:53:47 +01:00
mkindahl@dl145h.mysql.com
6aacc6415a
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-31 12:32:48 +01:00
mkindahl@dl145h.mysql.com
10b194d272
Changes to fix tests in pushbuild.
2008-01-31 12:17:40 +01:00
mkindahl@dl145h.mysql.com
018cb16b3a
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-30 12:53:33 +01:00
mkindahl@dl145h.mysql.com
3bcab5899d
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-01-30 12:14:14 +01:00
mkindahl@dl145h.mysql.com
716c63ebaa
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-01-30 11:25:54 +01:00
mkindahl@dl145h.mysql.com
9294edeb43
Test changes to fix failures in pushbuild.
2008-01-29 14:43:41 +01:00
tsmith@ramayana.hindu.god
3906cc27d7
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-25 10:37:29 -07:00
hezx@mail.hezx.com
41bb6f988c
Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/mysql-5.1-new-rpl
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/merge-51
2008-01-14 15:41:28 +08:00
hezx@mail.hezx.com
2720b76c4a
Fix for versional test
...
Mask binlog positions, error, warning and other information that are not significant for the test
2008-01-14 15:38:02 +08:00
igor@olga.mysql.com
947715c228
Merge olga.mysql.com:/home/igor/mysql-5.1-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug33697
2008-01-11 10:12:29 -08:00
igor@olga.mysql.com
b85ffdb5d5
Fixed bug #33697 .
...
When the function test_if_skip_sort_order prefers index backward scan
to ref access the corresponding access functions must be set accordingly.
2008-01-11 10:05:34 -08:00
gshchepa/uchum@host.loc
17c5117872
Merge host.loc:/home/uchum/work/5.1-opt-33699
...
into host.loc:/home/uchum/work/5.1-opt
2008-01-11 21:39:45 +04:00
mkindahl@dl145h.mysql.com
940ecc23c6
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-11 14:20:06 +01:00
gshchepa/uchum@host.loc
32d13ab23d
Bug#33699: The UPDATE statement allows NULL as new value on a NOT NULL
...
columns (default datatype value is assigned).
The mysql_update function has been modified to generate
an error when trying to set a NOT NULL field to NULL rather than a warning
in the set_field_to_null_with_conversions function.
2008-01-11 05:06:08 +04:00
msvensson@pilot.mysql.com
da6073b4bc
Revert removal of ER_GET_ERRMSG
2008-01-10 10:25:45 +01:00
msvensson@pilot.mysql.com
1fa7072bfa
Bug#33763 Mysqld leaves readonly mode for cluster tables too early - part2
...
- Open tables readonly while not properly initialized
- Close cached tables when coming out of readonly mode
- Apply basically same patch as for 32275
2008-01-09 12:59:20 +01:00
hezx@mail.hezx.com
287b981c87
Add missing include test file for rpl_server_id test
2008-01-06 15:17:47 +08:00
skozlov/ksm@mysql.com/virtop.localdomain
5c55bb7283
WL#4077 added support old versions of mysqld binaries
2007-12-31 17:30:17 +03:00
serg@janus.mylan
d9ca7b670e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-20 22:11:37 +01:00
skozlov/ksm@mysql.com/virtop.localdomain
c9225c9e62
WL#4077 fix for innodb test that were skipped
2007-12-20 23:57:06 +03:00
msvensson@pilot.mysql.com
d930e9bb22
Update path to the load_file
2007-12-20 18:38:23 +01:00
mkindahl@dl145h.mysql.com
bdea24f483
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-12-19 18:51:46 +01:00
msvensson@pilot.mysql.com
d9bdcddc57
Update name of binlog file for ndb_binlog* tests
2007-12-19 17:16:22 +01:00
msvensson@pilot.mysql.com
7feb6c1abe
Improve --check-testcase
2007-12-19 10:25:21 +01:00
skozlov/ksm@mysql.com/virtop.localdomain
b1f2a84bba
WL#4077. Added new value 'ENABLED' for 'support' column of information_schema.engines
2007-12-18 16:10:58 +03:00
cmiller@zippy.cornsilk.net
edbacd3a99
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-12-14 13:42:09 -05:00
tomas@whalegate.ndb.mysql.com
0bd2a86e90
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-14 06:55:44 +01:00
msvensson@shellback.(none)
83ea6d49c5
Fix faulty select to check for existence of blackhole support
2007-12-13 16:07:49 +01:00
tomas@whalegate.ndb.mysql.com
4b5e9edd69
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-13 14:26:57 +01:00
gluh@eagle.(none)
d504588e79
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 16:10:57 +04:00
gluh@eagle.(none)
4f5868114a
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 15:56:04 +04:00
gluh@eagle.(none)
e039595029
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-12-13 14:52:49 +04:00
msvensson@pilot.mysql.com
d918988baa
WL#4189
...
- dynamic configuration support
- safe process
- cleanups
- create new suite for fedarated
2007-12-12 18:19:24 +01:00
istruewing@stella.local
03d99c5956
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-12-11 21:37:33 +01:00
tomas@whalegate.ndb.mysql.com
9eb0ef8914
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-10 10:26:01 +01:00
tsmith@ramayana.hindu.god
3d01ffd78d
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-12-07 03:56:03 -07:00
tsmith@ramayana.hindu.god
8fc0bfb6b6
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
2007-12-05 12:33:36 -07:00
ramil/ram@ramil.myoffice.izhnet.ru
e02d039abe
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b32726/b32726.5.0
2007-11-29 15:12:09 +04:00