mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32382 commits 2785 branches 343 tags 1.6 GiB
Commit graph

574 commits

Author SHA1 Message Date
brian@zim.(none)
bdfb7180ca Refactored some code to remove ifdef and removed dead code related to un-useable sync code. 2006-03-23 05:51:31 -08:00
mats@mysql.com
4440b71dda Bug#18280 (RBR: Extreneous maps when writing to general_log and slow_log): 
Filter out replication general_log and slow_log entirely from binary
log. Caching result of table share-specific tests.
 2006-03-17 18:11:07 +01:00
mats@mysql.com
90215eb387 WL#3023 (Use locks in statement-like manner): 
Post-merge patches.
 2006-03-09 03:56:14 +01:00
mats@mysql.com
9dace13548 WL#3023 (Use locks in a statement-like manner): 
Changes according to review comments.
 2006-03-08 21:49:49 +01:00
mats@mysql.com
e0f5d35ceb Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/w3023-mysql-5.1-new
 2006-03-03 09:57:42 +01:00
mats@mysql.com
1e66bc0d16 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/w3023-mysql-5.1-new
 2006-02-28 10:06:58 +01:00
holyfoot@deer.(none)
91d09f4635 Fixed crashes in embedded-server tests 2006-02-28 12:21:56 +04: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
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
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
mats@mysql.com
43bc3c4068 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/w3023-mysql-5.1-new
 2006-02-16 08:46:45 +01:00
mats@mysql.com
2884408c75 WL#3023 (Use locks in a statement-like manner): 
Table maps are now written on aquiring locks to tables and released
  at the end of each logical statement.
 2006-02-16 08:30:53 +01:00
bar@mysql.com
cc3623aecf Many files: 
Backporting character_set_filesystem from 5.0 to 5.1.
 2006-02-14 08:24:01 +04:00
konstantin@mysql.com
5ed755d0d8 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-08 23:53:45 +03:00
konstantin@mysql.com
98091b152a Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-02-02 18:17:18 +03:00
jani@ua141d10.elisa.omakaista.fi
2dcc483e6c Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
sergefp@mysql.com
f02b4f54ad Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
 2006-01-24 15:34:02 +03:00
holyfoot@mysql.com
09359dce59 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-23 11:59:31 +04:00
sergefp@mysql.com
2e458b0928 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5
 2006-01-20 19:38:11 +03:00
cps@outpost.site
c08d4aa703 Fix the tree: plugin-related changes, necessary for 
CSV storage engine to be statically compiled.
Derived from antony's patch.
 2006-01-20 00:40:56 +03:00
holyfoot@mysql.com
53a379d041 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-19 18:05:57 +04:00
bell@sanja.is.com.ua
e87d5e9a83 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
 2006-01-18 13:49:37 +02:00
bell@sanja.is.com.ua
4e931d3c45 Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851). 2006-01-18 13:48:57 +02:00
sergefp@mysql.com
55380631cc Manual merge 2006-01-18 14:09:08 +03:00
bar@mysql.com
4e4b37a8ef loaddata.result, loaddata.test: 
Adding test case.
sql_yacc.yy:
  Adding TEXT_STRING_filesystem, which
  converts from character_set_client to
  character_set_conversion.
  Replacing TEXT_STRING_sys to TEXT_STRING_filesystem
  in LOAD DATA and SELECT INTO OUTFILE contexts.
sql_class.h, sql_class.cc:
  Adding character_set_filesystem variable,
  and charset_is_character_set_filesystem
  flag (to avoid conversion when it's not necessary).
set_var.h, set_var.cc:
  Adding sys_var_character_set_filesystem
mysqld.cc:
  Adding --character-set-filesystem startup option.
 2006-01-18 12:55:38 +04:00
aivanov@mysql.com
55d77bdc36 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/dev/mysql-5.1-studio
 2006-01-15 17:41:32 +03:00
aivanov@mysql.com
8e499f0292 Changes to avoid compilation errors in MS Visual Studio 7.1 
(reviewed by Mats)
 2006-01-15 15:47:27 +03:00
anozdrin@mysql.com
b1705ae5c4 Merge BUG#15110 from 5.0 into 5.1. 
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
 2006-01-13 19:09:27 +03:00
jani@ua141d10.elisa.omakaista.fi
df801decef Fixed refresh_status function. 2006-01-10 18:56:23 +02:00
reggie@linux.site
74e8c453b6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups
 2006-01-09 17:35:25 -06:00
mats@mysql.com
94d3a8e050 Changes to support aCC on HP-UX. 2006-01-09 15:59:39 +01:00
lars@mysql.com
9e24aedea5 BUG#16188: Could not compile 2006-01-04 16:24:58 +01:00
mats@mysql.com
3377014a3c Post-merge fixes. 2006-01-04 15:04:36 +01:00
mats@mysql.com
e6bd8be4f3 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b15924-mysql-5.1-new
 2006-01-04 14:00:35 +01:00
holyfoot@mysql.com
42dd692212 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-04 14:28:41 +04:00
holyfoot@deer.(none)
e8697cf428 Big patch to make embedded-server working in 5.x 
Now it supports queries returning several results
(particularly important with the SP)
 2006-01-04 14:20:28 +04:00
reggie@fedora.(none)
ffd8a0e5f9 cleaned up some of the casts as a result of Mats' review 2006-01-03 22:37:24 -06:00
reggie@fedora.(none)
c77ee8c96a some casts and simple fixes to fix compile errors in Visual 2005 2005-12-30 06:32:33 -06:00
sergefp@mysql.com
328f8fa735 WL#2985 "Partition pruning", postreview fixes: Small code fixes and better comments 2005-12-27 15:04:35 +03:00
sergefp@mysql.com
e597607cb8 Merge newbox:mysql-5.1-ppruning-r4 
into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge
 2005-12-26 14:56:15 +03:00
mats@mysql.com
56db7a6b6e Bug#15924 (Core dump in sp_trans): 
Added code for pending event flush just before executing the
  function or trigger.
 2005-12-24 12:07:07 +01:00
sergefp@mysql.com
e1f49888bf WL#2985 "Partition Pruning" 2005-12-22 12:29:00 +03:00
lars@mysql.com
ad126d90e0 WL#1012: All changes as one single changeset. 
This includes both code and test cases.
 2005-12-22 06:39:02 +01:00
kent@mysql.com
63b4ce720a Merge 2005-12-18 15:26:37 +01:00
jonas@perch.ndb.mysql.com
2180197c9b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-15 15:11:42 +01:00
ramil@mysql.com
04cff0d055 Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
 2005-12-14 21:42:08 +04:00
jimw@mysql.com
00d29cd259 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-12 11:57:07 -08:00
igor@rurik.mysql.com
ad53d72033 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-12-10 23:31:03 -08:00
anozdrin@mysql.com
5d105fb7e7 Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 
into  mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge
 2005-12-09 15:14:19 +03:00