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