mats@mysql.com
c33a64a0e3
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/home/bk/mysql-5.1-release-bug13418-lars
2006-02-24 20:27:51 +01:00
reggie@linux.site
52fbc7a1cd
BUG# 17430 Partitoins: crash on SELECT * FROM t1 WHERE f_int1 IS NULL
...
BUG# 17432: Partitions: wrong result, SELECT ... WHERE <column> is null
2006-02-24 10:10:41 -06:00
msvensson@neptunus.(none)
7d29ace754
Bug #17443 mysqldump test failure
2006-02-24 17:10:40 +01:00
lars@mysql.com
b4953f12a2
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-release-bug13418
2006-02-24 16:22:06 +01:00
lars@mysql.com
32a8a469a7
BUG#13418 (V2): Bit columns should replicate correctly when using RBR
2006-02-24 15:38:20 +01:00
elliot@mysql.com
5753dfe73d
BUG#17521 alter database crashes slave
...
Problem was a null pointer
Fixed by passing correct database name to slave filtering mechanism
Added test.
2006-02-23 23:20:29 -05:00
kent@mysql.com
5d0187f0ae
Makefile.am:
...
Change for 'make distcheck'
libmysqld.vcproj:
Typo
2006-02-22 20:34:25 +01:00
andrey@lmy004.
85236db1f1
disable tests. failures happen from time to time and stop people from
...
pushing. the code needs to be more stable.
2006-02-21 13:07:25 +01:00
pekka@mysql.com
73d75104af
ndb - enable ndb_dd_backuprestore
2006-02-21 09:27:20 +01:00
pekka@mysql.com
dfa0a58014
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-21 09:27:19 +01:00
tomas@poseidon.ndb.mysql.com
37826388e0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-21 09:27:18 +01:00
tomas@poseidon.ndb.mysql.com
0bca0d435c
fixed test result on ndb_dd_restore whwas not done before
2006-02-21 09:25:50 +01:00
pekka@mysql.com
11a7a3ea63
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-21 05:08:18 +01:00
andrey@lmy004.
2453cd4e81
fixed result
2006-02-21 03:17:53 +01:00
andrey@lmy004.
0ba2425caf
fix for bug#16407 (EVENTS: sql_mode)
...
post-review fixes
2006-02-21 02:40:23 +01:00
pekka@mysql.com
54074472e5
ndb - fix event created by ndb_restore bug#17045 (not really)
2006-02-21 02:27:23 +01:00
andrey@lmy004.
a1fdeb1386
manual merge
2006-02-21 00:01:39 +01:00
andrey@lmy004.
22ba4ca3a3
fix for bug#16407 (Events: Changes in sql_mode won't be taken into account)
...
WL#1032
sql_mode setting was disregarded during create/alter event and wasn't set during
event execution.
(post-review small fixes)
2006-02-20 23:52:22 +01:00
andrey@lmy004.
7ef557ed49
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-20 23:29:55 +01:00
konstantin@mysql.com
07db5ac8b1
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-vanilla
2006-02-20 23:00:50 +03:00
andrey@lmy004.
e5e7066e26
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-20 20:57:44 +01:00
konstantin@mysql.com
b58345d8c4
A new error message for deprecated statements.
...
Fixes failing sp.test
2006-02-20 22:51:32 +03:00
pekka@mysql.com
93db514db6
ndb - enable rpl_ndb_blob2 bug#17505
2006-02-20 17:20:54 +01:00
pekka@mysql.com
6287081587
disabled.def: merge
2006-02-20 12:37:28 +01:00
tomas@poseidon.ndb.mysql.com
bb0b5cdbb1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-20 12:37:26 +01:00
tomas@poseidon.ndb.mysql.com
82be07c41b
Bug #17559 ndb_gis test failure
...
- test tables use blobs without PK, and was not handled correctly
2006-02-20 12:36:10 +01:00
andrey@lmy004.
51f87cc655
fix the output. now only 1 space in PK definition
2006-02-20 11:20:31 +01:00
knielsen@mysql.com
ddc2da9c09
post-merge fixes.
2006-02-20 10:30:32 +01:00
knielsen@mysql.com
4fc82049c8
Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-02-20 09:52:22 +01:00
knielsen@mysql.com
c15158e108
Remove hard-coded ../var/.. path in test mix_innodb_myisam_binlog,
...
fails with --vardir option.
2006-02-20 09:34:02 +01:00
igor@rurik.mysql.com
1e437a1fda
Merge rurik.mysql.com:/home/igor/mysql-5.1
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-02-19 19:26:25 -08:00
kent@mysql.com
2f3811b50c
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-20 00:36:40 +01:00
kent@mysql.com
0120bac7f6
mysql-test-run.pl:
...
Added --restart-cleanup option
drop-on-restart.inc:
DROP commands to cleanup on restart
new file
mysqltest.c:
Added option --include=<sql-file>
2006-02-20 00:32:07 +01:00
kent@mysql.com
544e07ba78
Merge
2006-02-19 23:57:49 +01:00
kent@mysql.com
4c81413932
Merge
2006-02-19 23:47:00 +01:00
brian@zim.tangent.org
70b70e43d9
We had a number of tests where there were no bugs related to disabling of tests, bugs were fixed, or no clear discription or plan.
2006-02-19 10:52:12 -08:00
brian@zim.tangent.org
86763e6198
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/dep-5.1
2006-02-19 09:48:17 -08:00
brian@zim.tangent.org
faa1b42989
Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well).
2006-02-19 09:41:59 -08:00
guilhem@mysql.com
af149459ed
Fix after merge of 5.0, fix of a result file which somebody hadn't updated.
...
"mysqldump" test fails (mysqlimport related, Brian aware), ndb_cache2 ndb_cache_multi2
partition_mgm_err fail (unrelated to my changes), rpl_row_view01 (known crash BUG#17265)
2006-02-18 23:37:56 +01:00
guilhem@mysql.com
ac2b5966ca
Merge mysql.com:/home/mysql_src/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.1-new
2006-02-18 21:10:44 +01:00
guilhem@mysql.com
32a5692733
In previous push, a DROP TABLE at the end of test was missing.
2006-02-18 21:08:41 +01:00
guilhem@mysql.com
473cfdfcb2
Merge mysql.com:/home/mysql_src/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.1-new; will fix manually sp_head.cc and mysqld.cc later soon.
2006-02-18 19:07:32 +01:00
guilhem@mysql.com
37c1744a03
Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a number > 31" (the original bug's title isn't the simplest
...
symptom). sys_var::check_set() was wrong. mysqlbinlog makes use of such SET SQL_MODE=N
(where N is interpreted like if SQL_MODE was a field of type SET), so
this bug affected recovery from binlogs if the server was running with certain SQL_MODE values,
for example the default values on Windows (STRICT_TRANS_TABLES); to work around this bug people
had to edit mysqlbinlog's output.
2006-02-18 17:32:15 +01:00
guilhem@mysql.com
56bed24c92
Fix for BUG#14769 "Function fails to replicate if fails half-way (slave stops)":
...
if the function, invoked in a non-binlogged caller (e.g. SELECT, DO), failed half-way on the master,
slave would stop and complain that error code between him and master mismatch.
To solve this, when a stored function is invoked in a non-binlogged caller (e.g. SELECT, DO), we binlog the function
call as SELECT instead of as DO (see revision comment of sp_head.cc for more).
And: minor wording change in the help text.
This cset will cause conflicts in 5.1, I'll merge.
2006-02-18 17:26:30 +01:00
guilhem@mysql.com
4c5d18b150
Fix for BUG#16559 "Replication Problems with Non transactional tables inside an interrupted trans.":
...
problem was: when a connection disconnects having an open transaction affecting MyISAM and InnoDB, the ROLLBACK event stored in the binary log
contained a non-zero error code (1053 because of the disconnection), so when slave applied the transaction, slave complained that its ROLLBACK succeeded
(error_code=0) while master's had 1053, so slave stopped. But internally generated binlog events such as this ROLLBACK
should always have 0 as error code, as is true in 4.1 and was accidentally broken in 5.0,
so that there is no false alarm.
2006-02-18 17:19:16 +01:00
petr@mysql.com
d6a36615d6
Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
...
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug
2006-02-18 18:00:22 +03:00
petr@mysql.com
db7b6ef56f
Merge mysql.com:/home/cps/mysql/trees/5.0/mysql-5.0-virgin-debug
...
into mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
2006-02-18 02:50:50 +03:00
jimw@mysql.com
5659853f3c
Fix results due to change in SHOW CREATE TABLE output
2006-02-17 14:41:57 -08:00
kent@mysql.com
c56a4b1eb6
mysql-test-run.sh:
...
Set the ndbcluster slave port (bug#16780)
disabled.def:
Disabled 'mysqldump' until bug 17443 is closed
2006-02-17 21:55:27 +01:00
jimw@mysql.com
4d483fa2d1
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-17 12:42:08 -08:00