mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31697 commits 2779 branches 343 tags 1.6 GiB
Commit graph

8611 commits

Author SHA1 Message Date
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
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
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)
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.
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
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
knielsen@mysql.com
97229ca7fc Fix mysqldump.test to work with non-standard --vardir. 2006-02-24 10:15:39 +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
konstantin@mysql.com
af62c4a959 Merge mysql.com:/opt/local/work/mysql-4.1-13134 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-24 00:00:15 +03:00
konstantin@mysql.com
7178f247f5 Remove 'delayed' to make the test deterministic (already 
fixed in 5.0).
A post-review fix (Bug#13134)
 2006-02-23 23:41:15 +03:00
msvensson@neptunus.(none)
3fbf02d869 After merge fix 2006-02-23 10:57:33 +01:00
msvensson@neptunus.(none)
3ece1f3eda Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:54:56 +01:00
msvensson@neptunus.(none)
71ef9102c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-23 10:45:39 +01:00
msvensson@neptunus.(none)
8d78cd3e3c Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:41:37 +01:00
msvensson@neptunus.(none)
f80555880a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-23 10:30:31 +01:00
msvensson@neptunus.(none)
ec91a79c9f Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched. 2006-02-23 10:11:57 +01:00
knielsen@mysql.com
776dd75fac Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
 2006-02-23 09:07:30 +01:00
pekka@mysql.com
c9353db37d ndb - enable rpl_ndb_blob* again, disabled by accident 2006-02-23 00:35:32 +01:00
pekka@mysql.com
a2edc49ecd Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-22 23:18:45 +01:00
jmiller@mysql.com
28cbeb7374 rpl_row_mysqlbinlog.result, rpl_row_mysqlbinlog.test: 
Updated with echos for the results file requested by lars
 2006-02-22 23:11:42 +01:00
pekka@mysql.com
e4fd28a74f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-22 22:59:29 +01:00
pekka@mysql.com
5eed3319e9 ndb - ndb_restore.test: fix backup id in result 2006-02-22 22:04:46 +01:00
jmiller@mysql.com
5bed48392b New test for wl2321 2006-02-22 22:03:55 +01:00
konstantin@mysql.com
5d07195888 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 20:15:24 +03:00
jmiller@mysql.com
ef1b1e406f Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-22 15:50:26 +01:00
konstantin@mysql.com
a27e32b565 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 14:04:24 +03:00
anozdrin@mysql.com
a77cc69e62 Fix for BUG#7787: Stored procedures: improper warning for "grant execute" statement. 
The problem was that error flag was not reset.
 2006-02-22 13:44:04 +03:00