dlenev@mysql.com
88a583da1d
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:38:45 +03:00
dlenev@mysql.com
db1ecaa1a2
Fix for trigger.test failures on pushbuild hosts introduced by fix for
...
bug #13525 "Rename table does not keep info of triggers".
Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.
2006-02-27 20:32:32 +03:00
dlenev@mysql.com
c09d27c94d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:11:54 +03:00
dlenev@mysql.com
8dbdf5237e
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:00:07 +03:00
dlenev@mysql.com
3d6839d133
Fixed test results after bad auto-merge.
2006-02-27 20:00:06 +03:00
dlenev@mysql.com
6137476427
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:05 +03:00
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
mats@mysql.com
f0f8795beb
Post-merge fixes.
2006-02-27 17:23:20 +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
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.
78f014f0d7
Postfix for #15943 . Explicit call of thd->clear_error() is added.
2006-02-27 16:52:14 +03:00
msvensson@neptunus.(none)
44a2855382
Bug#17716 Slave crash in net_clear on qnx
...
- Set FD_SETSIZE before including "sys/select.h"
2006-02-27 10:08:35 +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
mats@mysql.com
a865af0d4b
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/fix-mysql-5.1-release
2006-02-27 09:09:02 +01: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)
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
brian@zim.(none)
9de15fa967
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-02-25 18:05:12 -08:00
brian@zim.(none)
7234f79c4a
This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break).
2006-02-25 18:03:11 -08:00
kent@mysql.com
1bc614f204
log_event.cc:
...
Visual C++ dont relate 'byte' and 'char*' that close, added casts
mysql.sln:
Only build mysqlserver.lib if embedded target
2006-02-26 01:16:11 +01:00
guilhem@mysql.com
3f3473cfb5
Fix for a segfault in my previous cset (about WL#2712 and WL#2977).
2006-02-26 00:03:52 +01: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
kent@mysql.com
9571e81f04
config-win.h:
...
Enable row based replication for Windows build
replication.m4:
Made help text more clear, default is with row based replication enabled
2006-02-25 21:27:49 +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
pekka@mysql.com
23f544d62f
ndb - sockaddr alignment fix, found on sunfire100a, can affect any non-x86
2006-02-25 17:25:22 +01:00
monty@mysql.com
ab78d065ec
Merge monty@192.168.0.9:/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-02-25 17:48:09 +02:00
monty@mysql.com
54274976e7
Fixed compiler warnings from gcc 4.0.2:
...
- Added empty constructors and virtual destructors to many classes and structs
- Removed some usage of the offsetof() macro to instead use C++ class pointers
2006-02-25 17:46:30 +02:00
monty@mysql.com
a7df038d16
Add back free that I accidently removed in last patch
2006-02-25 13:58:00 +02:00
monty@mysql.com
eff69e73a3
Fixed typo
2006-02-25 13:49:43 +02: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