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
acurtis@xiphis.org
13a776778c
Finalize storage engine plugins
...
Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code
2005-12-21 10:18:40 -08:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
bell@sanja.is.com.ua
7f162c7899
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-21 21:15:48 +02:00
bell@sanja.is.com.ua
806f9e24ff
Inefficient usage of String::append() fixed.
...
Bad examples of usage of a string with its length fixed.
The incorrect length in the trigger file configuration descriptor
fixed (BUG#14090).
A hook for unknown keys added to the parser to support old .TRG files.
2005-11-20 20:47:07 +02:00
guilhem@mysql.com
2f95fc2701
Merge mysql.com:/home/mysql_src/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
SergeyV@selena.
00990f9774
Fixes bug #13377 . my_open() & my_create() functions changed to use
...
my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to
allow deleting opened files. my_sopen() implementation is added to
support this functionality.
2005-11-14 16:01:10 +03:00
brian@zim.(none)
510d0f24c8
Added handlerton flag to make storage engines invisable via flag.
2005-11-10 08:24:21 -08:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
monty@mysql.com
303f6b4a7a
Reorder struct elements to be more optimal for 64 bit computers
...
(Main reason for reordering was to get rid of compiler warnings for order of element initialization)
2005-11-04 15:12:22 +02:00
monty@mysql.com
f2f4bf5240
wait_for_update must unlock mutex.
...
(Fixed failure in rpl0000008.test)
2005-11-02 19:28:49 +02:00
monty@mysql.com
1b3ed12017
Fixes during review of pushed code
...
Added back missing return in mysql_delete()
2005-10-27 15:15:01 +03:00
SergeyV@selena.
b357caab3d
Bug #13377 . Small update, code formatting.
2005-10-17 19:36:20 +04:00
SergeyV@selena.
3dec6a3b14
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#13377-mysql-5.0
2005-10-17 19:09:12 +04:00
SergeyV@selena.
221a501120
Small update for #13377 patch
2005-10-17 19:03:54 +04:00
guilhem@mysql.com
4252b546b3
Merge mysql.com:/home/mysql_src/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset
2005-10-12 21:58:02 +02:00
guilhem@mysql.com
4c1c9db823
Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc;
...
in short we now record whenever the slave I/O thread ignores a master's event because of its server id,
and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we
do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored*
executed one, which may not be the last of the master's binlog (and so the slave *looks* behind
the master though it's data-wise it's not).
2005-10-12 13:29:55 +02:00
tomas@poseidon.ndb.mysql.com
e72fdf5619
Merge
2005-10-07 01:12:46 +02:00
serg@serg.mylan
b05a6d8fda
don't "init" binlog if opt_bin_log is not set
...
(bug#13791 - mysqld crashes at startup in TC_LOG_MMAP::open)
2005-10-06 19:05:34 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
jani@ua141d10.elisa.omakaista.fi
a1b609f010
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-04 19:53:07 +03:00
jani@ua141d10.elisa.omakaista.fi
17e87da298
Some fixes including implicit declaration of a function,
...
using wrong type in assignment etc.
2005-10-04 18:20:57 +03:00
SergeyV@selena.
7d0d7826bb
Fixes bug #13377 . Added code to close active log files in case
...
of log reset condition.
2005-10-03 20:34:42 +04:00
brian@zim.(none)
54a958993c
Next big patch for loadable storage engines!
...
Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail.
2005-10-02 19:44:28 -07:00
konstantin@mysql.com
2d4c54ba1b
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
bell@sanja.is.com.ua
c1b185f5ff
WL#2787 (Add view definer/owner to the view definition (.frm) to check privileges on used tables and stored routines when using a VIEW.)
...
Part 2 postreview fixes.
2005-09-20 21:20:38 +03:00
kent@mysql.com
19bae53ddc
log.cc:
...
Cast my_munmap() argument to be able to compile on Solaris
2005-09-16 12:02:19 +02:00
bell@sanja.is.com.ua
aec371f910
WL#2787 (part 2, ver 3 (merged)) changed securety context switching
2005-09-15 22:29:07 +03:00
ndbdev@dl145b.mysql.com
46cc62e216
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-09 15:26:47 +02:00
sergefp@mysql.com
e5b4252481
Fix for BUG#12637: Make SPs+user variables replication work:
...
* Allocate thd->user_var_events elements on appropriate mem_root
* If several SP statements are binlogged as a single statement, collect all user var
accesses they make (grep for StoredRoutinesBinlogging for details)
2005-09-07 19:39:47 +04:00
brian@zim.(none)
57403ddc9d
Merge zim.(none):/home/brian/mysql/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.1
Resolved to minor issues.
2005-08-30 14:40:02 -07:00
sergefp@mysql.com
ad9bfc251c
Slightly amended Monty's SP replication code cleanup patch
2005-08-27 02:33:06 +04:00
sergefp@mysql.com
95c3afc5d9
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
...
"Interleaved SPs execution is now binlogged properly, "SELECT spfunc()" is binlogged too.
The known remaining issue is binlogging/replication of "a routine is deleted while it is executed" scenario.
2005-08-25 17:34:34 +04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
monty@mishka.local
8437e9c1be
Fixes during review of new pushed code
...
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
2005-07-31 12:49:55 +03:00
monty@mysql.com
b3cbd0048f
Cleanups during review of new code
...
Ensure mysql_close() is called if mysql_set_character_set() fails
2005-07-28 16:10:14 +03:00
tulin@dl145b.mysql.com
a6c21a0791
merge
2005-07-19 21:56:10 +02:00
monty@mishka.local
2278e0319c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc
Cleanups during review
...
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
tomas@poseidon.ndb.mysql.com
1affa6182a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-13 13:11:51 +02:00
lars@mysql.com
6db2602ad0
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/mysql-5.0
2005-07-13 02:13:04 +02:00
lars@mysql.com
dc55af92ff
BUG#6987: Added note when stat is failing on relay log, added mutex for log rotatation.
2005-07-12 06:01:26 +02:00
ndbdev@dl145b.mysql.com
723173c0f3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 12:50:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0d4c57f262
Moved tc_log_page_waits outside HAVE_MMAP,
...
because it's used also outside.
2005-06-07 11:45:28 +03:00
tomas@poseidon.ndb.mysql.com
5088b28d09
Merge
2005-05-31 14:37:47 +02:00
msvensson@neptunus.(none)
90f971ae2c
Include fix to function open_binlog from 4.1
...
- Add O_SHARE when opening file.
2005-05-26 21:01:54 +02:00
lars@mysql.com
e76c641190
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
2005-05-09 11:45:59 +02:00
monty@mishka.local
a9f6aab4c9
Fixes while reviewing new code
...
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03:00
tomas@poseidon.ndb.mysql.com
033988f014
Merge
2005-04-25 22:21:25 +02:00
gbichot@quadita2.mysql.com
b75789e3d8
Fixes for BUG#10039 "MEMORY engine is reported as HEAP",
...
BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"
2005-04-23 00:05:05 +02:00
lars@mysql.com
1bd55e471e
Merging 5.0->5.1
2005-04-19 11:09:54 +02:00
serg@serg.mylan
810b2c3d40
remove the rest of isam/merge references
...
fix a race condition in TC_LOG_BINLOG::unlog
2005-04-05 13:17:49 +02:00
patg@patrick.local
8e0eb65f9a
5.0 to 5.1 merge
2005-04-01 12:32:17 -08:00
gbichot@production.mysql.com
56495a3691
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-22 00:28:33 +01:00
gbichot@production.mysql.com
c766efdc5d
Last part of WL#1062: better replication of timezones: no more use
...
of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.
2005-03-22 00:26:12 +01:00
lars@mysql.com
efb077502d
Merge
2005-03-21 23:05:55 +01:00
lars@mysql.com
c6d85289ab
WL#2472:
...
Renamed Table_filter to Rpl_filter
Eliminated very annoying memory leak
2005-03-21 22:09:42 +01:00
jimw@mysql.com
ee2b4ec959
Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
...
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826 )
2005-03-18 16:12:25 -08:00
serg@serg.mylan
3613f8c262
sql/log.cc
...
don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
sql/sql_repl.cc
clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave
2005-03-14 17:53:24 +01:00
serg@serg.mylan
a6b3b8fa98
print more information
2005-03-14 09:27:34 +01:00
serg@serg.mylan
8986ffebde
print xa recovery progress
...
add names to handlertons
trans_need_2pc() macro
2005-03-13 21:58:09 +01:00
lars@mysql.com
7ed7fc7f58
WL#2472: Addendum: Fixes after Mats review
2005-03-10 14:36:48 +01:00
serg@serg.mylan
c49928447d
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-09 13:02:51 +01:00
serg@serg.mylan
1e09c15a8b
don't close binlog in the destructor - use explictit MYSQL_LOG::cleanup for this
2005-03-09 12:29:51 +01:00
lars@mysql.com
26787260b7
WL#2472: Refactoring of replication and binlog filtering.
...
Needed to be able to have multiple masters connected
to same slave server with different filters.
2005-03-08 21:12:35 +01:00
gluh@gluh.mysql.r18.ru
66bd0447e4
Fix for bug#8740: Server crash at start on Solaris 9 (64 bit)
2005-03-03 17:38:58 +03:00
serg@serg.mylan
02d88c398f
bug#8151 - truncate leaves a transaction open
...
deadlock in MYSQL_LOG::new_file()
style fixes
2005-03-02 10:38:25 +01:00
monty@mysql.com
7e5f74f8f2
Merge with global tree
2005-02-25 17:12:06 +02:00
monty@mysql.com
0a6b7aedb2
Remove compiler warnings and remove not used variables
...
(Found during build process)
2005-02-25 16:53:22 +02:00
mats@mysql.com
bfce3aee8d
Bug#8412: merged from 4.1
2005-02-23 23:01:51 +01:00
mats@mysql.com
30ade5b57e
Bug#8412: Setting error code to 0 on statements that cannot fail.
2005-02-23 20:59:00 +01:00
mats@mysql.com
6ad51ffb3c
Bug#8412: Merge from 4.0
2005-02-23 19:58:54 +01:00
serg@serg.mylan
9c9d1fd406
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-23 19:20:17 +01:00
serg@serg.mylan
383c6e312a
don't log BEGIN in auto-commit mode
...
correct end_log_pos for Xid_log_event
2005-02-23 18:26:49 +01:00
serg@serg.mylan
da13ab086d
write "COMMIT" into binlog if there's no Xid at the end of transaction
...
new tests
2005-02-23 14:55:16 +01:00
jani@ua141d10.elisa.omakaista.fi
ebce51950a
Fixed Bug#Server crash due to 'flush status' in various tests.
2005-02-23 14:19:48 +02:00
serg@serg.mylan
a4dbb3b061
compatibility fixes, crashing tests
2005-02-22 15:22:37 +01:00
serg@serg.mylan
82571d6b84
MYSQL_LOG::recover was trying to allocate 0 bytes - bug#8661
2005-02-22 00:43:37 +01:00
serg@serg.mylan
178be07aa3
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 00:17:56 +01:00
serg@serg.mylan
b43029f4eb
bug#8646 - deadlock if long transaction causes binlog rotate
2005-02-22 00:15:31 +01:00
monty@mysql.com
3b1f0964c1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-21 14:48:44 +02:00
monty@mysql.com
cab35adf7e
Review of new pushed code (XA & other)
...
Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command()
2005-02-21 14:47:57 +02:00
serg@serg.mylan
b75d8ac0f3
xa assert fixes
2005-02-21 11:51:50 +01:00
serg@serg.mylan
1bc6ae8913
portability fixes
2005-02-20 20:08:33 +01:00
serg@serg.mylan
e29191e5c5
windows compilation fixes
2005-02-19 12:15:30 +01:00
serg@serg.mylan
5ddb6354a5
after merge fixes
2005-02-16 17:34:02 +01:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
mats@mysql.com
30bf28202c
Bug#8412: For replication to work correctly, the prologue and
...
epilogue to an SQL statement should not have an error code even
when the SQL statement itself has an error code.
2005-02-14 18:39:33 +01:00
ingo@mysql.com
601a4fdfa2
Merge
2005-02-11 11:59:35 +01:00
lars@mysql.com
bef05eda10
BUG#6749: If there is no current database, then nothing should be binlogged if
...
binlog-do-db or binlog-ignore-db are in effect. (In the future 5.1? 5.0? I think
each statement should be verified against the filtering criteria based on the database
it *uses* and not the *current* one. But, right now the *current* database is what
counts according to the semantics of the manual.)
2005-02-10 21:23:48 +01:00
serg@serg.mylan
db13afd89d
auto-ROLLBACK if binlog was not closed properly
...
auto-commit on Xid_log_event
2005-02-09 20:04:28 +01:00
guilhem@mysql.com
ed1696f6b9
WL#1062 "log charset info into all Query_log_event":
...
we store 7 bytes (1 + 2*3) in every Query_log_event.
In the future if users want binlog optimized for small size and less safe,
we could add --binlog-no-charset (and binlog-no-sql-mode etc): charset info
is something by design optional (even if for now we don't offer possibility to disable it):
it's not a binlog format change.
We try to reduce the number of get_charset() calls in the slave SQL thread to a minimum
by caching the charset read from the previous event (which will often be equal to the one of the current event).
We don't use SET ONE_SHOT for charset-aware repl (we still do for timezones, will be fixed later).
No more errors if one changes the global value of charset vars on master or slave
(as we log charset info in all Query_log_event).
Not fixing Load_log_event as it will be rewritten soon by Dmitri.
Testing how mysqlbinlog behaves in rpl_charset.test.
mysqlbinlog needs to know where charset file is (to be able to convert a charset number found
in binlog (e.g. in User_var_log_event) to a charset name); mysql-test-run needs to pass
the correct value for this option to mysqlbinlog.
Many result udpates (adding charset info into every event shifts log_pos in SHOW BINLOG EVENTS).
Roughly the same job is to be done for timezones :)
2005-02-03 16:22:16 +01:00
serg@serg.mylan
fb78bfebe4
open binlog index file *before* tc_log->open() and binlog itself *after*
2005-02-01 15:36:48 +01:00
serg@serg.mylan
3c5060981f
query_id and my_xid -> ulonglong
...
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
serg@serg.mylan
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
serg@serg.mylan
83ef8c58a7
make the code to look safe, not only be safe
2005-01-17 22:35:53 +01:00
serg@serg.mylan
1034677f94
XA (not completely polished out yet)
2005-01-16 13:16:23 +01:00
serg@sergbook.mysql.com
a609bc45f2
merge
2005-01-07 15:02:25 +02:00
guilhem@mysql.com
60f5a69160
2 small fixes for binlog (sorry for grouping them - I won't do it again):
...
WL#2335 (wait if binlog or binlog index file hits disk full or quota exceeded),
fix for BUG#7236 ("--expire_logs_days does not apply if all statements
happen in transactions"), and a behaviour change: abort if mysqld can't start
binlog at startup (if running with --log-bin of course).
2005-01-06 23:53:58 +01:00