dlenev@mysql.com
6cb5c38c14
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:03 +03:00
SergeyV@selena.
763475754a
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#15943-mysql-5.0
2006-02-27 20:00:03 +03:00
sergefp@mysql.com
db54dc36f5
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug17314-push
2006-02-27 20:00:02 +03:00
tomas@poseidon.ndb.mysql.com
d3371b996f
BUG#17499, forgot to commit result file
2006-02-27 17:24:06 +01:00
tomas@poseidon.ndb.mysql.com
bfc43d5745
Bug #17499 Alter table of ndb partitioned tables causes mysqld to core
2006-02-27 17:04:49 +01:00
msvensson@devsrv-b.mysql.com
706070fbf8
Bug#17279 user with no global privs and with create priv in db can create databases
...
- Use binary charset in acl_cache, to make searches case sensitive
- Add testcase
2006-02-27 16:41:58 +01:00
jmiller@mysql.com
c800a13762
New test case fro replication between ndb and other storage engines.
2006-02-27 15:09:03 +01:00
SergeyV@selena.
78b33e1835
Fixes bug #17595 . UDFs are not initialized when running mysqld with
...
--skip-grant-tables. However when deleting functions UDFs list was checked
regardless of whther UDFs are initialized or not. Additional check is added
into free_udf() and find_udf() functions to prevent possible runtime errors.
2006-02-27 16:27:34 +03:00
msvensson@neptunus.(none)
4bbf5eb01c
Bug#16795 ndb_cache_multi2
...
- Change && to ||
- Check for return value != 0 in "ndb->init()"
2006-02-27 10:29:55 +01:00
sergefp@mysql.com
0048ea9bb3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug17314
2006-02-27 11:36:41 +03:00
bar@mysql.com
1f30b1525a
xml.test:
...
xml.result:
Adding test for Bug #16312 XML: extractvalue() crash if angle brackets,
A fix for #16234 fixed this bug automatically.
2006-02-27 11:21:20 +04:00
kent@mysql.com
eda13fe08b
example.vcproj:
...
Bug#17721, hang in exampledb, solved by msvensson
drop-on-restart.inc:
Added drop of tables t00,t03,t04
2006-02-27 02:56:34 +01:00
msvensson@neptunus.(none)
0d2e58c27c
Trace mysqlslap to mysqlslap.trace
2006-02-26 23:39:14 +01:00
msvensson@neptunus.(none)
1b115976b6
Trace mysqlcheck to file mysqlcheck.trcae
2006-02-26 23:36:53 +01:00
monty@mysql.com
a95cabcb6b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/my/mysql-5.1
2006-02-26 23:31:03 +02:00
guilhem@mysql.com
e5d450eeca
var/tmp does not work (same fix as knielsen did for rpl_row_UUID a few days ago)
2006-02-26 21:30:39 +01:00
msvensson@neptunus.(none)
45c5c105fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-26 20:25:33 +01:00
msvensson@neptunus.(none)
90e5ca96be
Look for and "convert" paths that start with $MYSQL_TMP_DIR
2006-02-26 19:54:09 +01:00
dlenev@mysql.com
4ca3409390
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-26 21:20:13 +03:00
dlenev@mysql.com
480dcb7f39
Fixed test for bug #13525 "Rename table does not keep info of triggers"
...
after merging fix for it with main tree.
2006-02-26 20:25:24 +03:00
monty@mysql.com
386276d89d
Cleanups
...
Don't run upgrade.test with embedded server as it requires mysqlcheck
2006-02-26 16:03:43 +02:00
dlenev@mysql.com
0b422c635d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-26 16:38:48 +03:00
monty@mysql.com
e6a98314a7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/my/mysql-5.1
2006-02-26 15:12:56 +02:00
monty@mysql.com
e3796c924f
After merge fixes
2006-02-26 15:11:56 +02:00
guilhem@mysql.com
eb4688330d
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/mysql_src/mysql-5.1-new
2006-02-25 22:22:12 +01:00
guilhem@mysql.com
0071749595
WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement),
...
and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
TEMPORARY TABLE was not binlogged so temp table is not known on slave), or if NDB is enabled (because
NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
including in prepared statements and in stored procedures and functions.
Caveats:
a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
b) for the same reason, changing the thread's binlog format inside a stored function is
refused with an error message.
c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
Dmitri).
Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
(not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
phantom protection).
Plus fixes for compiler warnings.
2006-02-25 22:21:03 +01:00
monty@mysql.com
1e2e9e2856
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-02-25 21:54:34 +02:00
kent@mysql.com
7018ab293d
drop-on-restart.inc:
...
Drop 'mysqlslap'
Added database name 'ndbsynctest'
sql_table.cc, create.test, create.result:
Patch for bug#17530 done by evgen, extracted from 5.0
2006-02-25 20:17:07 +01:00
monty@mysql.com
6fd52639c0
Merge monty@192.168.0.9:/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-02-25 13:26:05 +02:00
monty@mysql.com
dd1d40f8f8
Fixed new introduced bug in binlog.test with --ps-protocol
2006-02-25 13:24:18 +02:00
brian@zim.(none)
f40705eb9b
Merge zim.(none):/home/brian/mysql/mysql-5.0
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-02-24 23:31:57 -08:00
brian@zim.(none)
066c7148fb
Someone modified the output to explain but did not run all tests before pushing, otherwise they would have realized that they broke this test.
2006-02-24 15:51:01 -08:00
brian@zim.(none)
ec15323dc1
Fix error messages. Someone pushed a change to an error message but did not update the tests.
...
AKA someone pushed without testing.
2006-02-24 14:16:06 -08:00
brian@zim.(none)
a6041bdba8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-02-24 13:41:38 -08:00
brian@zim.(none)
cb07d52a7e
This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.
2006-02-24 13:20:51 -08:00
dlenev@mysql.com
0c15039e74
Fix for bug #13525 "Rename table does not keep info of triggers".
...
Let us transfer triggers associated with table when we rename it (but only if
we are not changing database to which table belongs, in the latter case we will
emit error).
2006-02-24 23:50:36 +03:00
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
monty@mysql.com
aa4128f811
Merge monty@192.168.0.9:/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-02-24 18:36:09 +02:00
monty@mysql.com
82b77cdd90
Fixes to embedded server to be able to run tests with it
...
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02: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
andrey@lmy004.
79c9ba9ee5
last second additions for bug#16411
2006-02-24 15:28:20 +01:00
andrey@lmy004.
b6f338e9e5
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16411
2006-02-24 14:14:51 +01:00
andrey@lmy004.
b8941aec8f
add this file to revision control. there was not new line at the end of the file
...
fix for bug#16411
2006-02-24 14:10:24 +01:00
evgen@moonbone.local
776b05ea43
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/17530-bug-5.0-mysql
2006-02-24 15:57:36 +03:00
knielsen@mysql.com
436587e997
Fix mysqldump.test to work with non-standard --vardir.
...
(Backported from mysql-5.1-new)
2006-02-24 13:51:04 +01:00
andrey@lmy004.
fe426cae48
fix test result
...
fix for bug #16412 (post-merge fix)
2006-02-24 13:34:28 +01:00
evgen@moonbone.local
bcff10f1fb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/17530-bug-5.0-mysql
2006-02-24 14:29:41 +03:00