database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity
31,185 Commits 3,279 Branches 1,097 Tags
2e401e202d64c99d5c49d75b1544df014a2eeab8
Commit Graph

10442 Commits

Author SHA1 Message Date
msvensson@neptunus.(none)
2e401e202d Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279/ 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-28 10:55:05 +01:00
msvensson@devsrv-b.mysql.com
ef8b5b47e8 Merge devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279 
into  devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279
 2006-02-28 10:44:48 +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
msvensson@neptunus.(none)
0d2e58c27c Trace mysqlslap to mysqlslap.trace 2006-02-26 23:39:14 +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
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
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
andrey@lmy004.
c4602da973 merge 2006-02-24 12:03:32 +01:00
andrey@lmy004.
a594cd080c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16412
 2006-02-24 11:56:16 +01:00
andrey@lmy004.
c04b3f4a91 Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information) 
WL#1034 (Internal CRON)
 2006-02-24 11:52:03 +01:00
knielsen@mysql.com
97229ca7fc Fix mysqldump.test to work with non-standard --vardir. 2006-02-24 10:15:39 +01:00
msvensson@neptunus.(none)
33140311f1 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 16:10:36 +01: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
knielsen@mysql.com
630a8202be Fix bad merge 2006-02-23 10:51:33 +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
3f61af3f28 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 23:12:32 +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
kent@mysql.com
379ca816be Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-02-22 21:27:46 +01:00
reggie@linux.site
3de74e6237 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1
 2006-02-22 14:18:45 -06:00
reggie@linux.site
6cea16a825 BUG# 17393: Partitions: Wrong error message when assigning too many subpartitions 
We changed the error message to more clearly reflect the fact
that we are counting parts and subparts
 2006-02-22 14:17:11 -06:00
kent@mysql.com
5d0187f0ae Makefile.am: 
Change for 'make distcheck'
libmysqld.vcproj:
  Typo
 2006-02-22 20:34:25 +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
knielsen@mysql.com
da6e7e172f Merge mysqldev@win2003-x86:my/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
 2006-02-22 10:19:45 +01:00
knielsen@mysql.com
49fda2c931 Merge mysql.com:/usr/local/mysql/mysql-5.1-varfix2 
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
 2006-02-22 10:17:59 +01:00
knielsen@mysql.com
da296394e3 Fix test cases to work with non-standard --vardir. 
Rename mix_innodb_myisam_binlog-master.opt; when the test was moved to
separate stm/row test cases, the .opt were not moved along with it,
causing a 60-second test duration because of default lock timeout :-(
 2006-02-22 10:07:54 +01:00
mskold@mysql.com
f56016ee66 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-02-22 09:10:55 +01:00