mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-28 01:34:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45133 commits 2785 branches 343 tags 1.7 GiB
Commit graph

45133 commits

This branch
This branch
All branches
Author SHA1 Message Date
cbell/Chuck@mysql_cab_desk.
73ded84c0a WL#3629 - Replication of Invocation and Invoked Features 
This patch removes the SLAVESIDE_DISABLED token from the event status clause
and adds the ability to mark an event as status = SLAVESIDE_DISABLED by using
the syntax DISABLE ON SLAVE instead.

The patch also adds tests to rpl_events to check the new syntax.
 2007-03-30 11:08:19 -04:00
lzhou/zhl@dev3-63.(none)
2b2ad6d605 BUG#24793 Add SO_KEEPALIVE socket option to avoid cluster nodes keeping dead connections forever. 2007-03-30 15:01:03 +00:00
msvensson@shellback.(none)
724573f7ff Cset exclude: msvensson@shellback.(none)|ChangeSet|20070330134336|02280 2007-03-30 16:43:15 +02:00
lzhou/zhl@dev3-63.(none)
d8b5edb0bd Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354
 2007-03-30 14:40:49 +00:00
evgen@sunlight.local
7c42232d1d Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
NO_AUTO_VALUE_ON_ZERO mode.

In the NO_AUTO_VALUE_ON_ZERO mode the table->auto_increment_field_not_null
variable is used to indicate that a non-NULL value was specified by the user
for an auto_increment column. When an INSERT .. ON DUPLICATE updates the
auto_increment field this variable is set to true and stays unchanged for the
next insert operation. This makes the next inserted row sometimes wrongly have
0 as the value of the auto_increment field.

Now the fill_record() function resets the table->auto_increment_field_not_null
variable before filling the record.
The table->auto_increment_field_not_null variable is also reset by the
open_table() function for a case if we missed some auto_increment_field_not_null
handling bug.
Now the table->auto_increment_field_not_null is reset at the end of the
mysql_load() function.

Reset the table->auto_increment_field_not_null variable after each
write_row() call in the copy_data_between_tables() function.
 2007-03-30 18:13:33 +04:00
mleich@four.local.lan
12ca4150df Merge four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddl 
into  four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx
 2007-03-30 15:48:52 +02:00
msvensson@shellback.(none)
060fb5ed39 Bug#25657 mysql-test-run.pl kill itself under ActiveState perl 
- Read the pid from pidfile in order to be able to kill the real process
instead of the pseudo process. Most platforms will have the same real_pid
as pid
- Kill using the real pid
 2007-03-30 15:43:36 +02:00
mats@romeo.(none)
0e29f46b71 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
 2007-03-30 15:34:55 +02:00
lzhou/zhl@dev3-63.(none)
439202bd9b Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354
 2007-03-30 13:30:58 +00:00
mats@romeo.(none)
4710d3df33 WL#3464 (Add replication event to denote gap in replication): 
Fixing automerge problem and updating comments referring to exec_event().
 2007-03-30 15:29:30 +02:00
cbell/Chuck@mysql_cab_desk.
bb0509566d Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
 2007-03-30 08:38:04 -04:00
cbell/Chuck@mysql_cab_desk.
4eb93db543 Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_test
 2007-03-30 08:24:17 -04:00
mats@romeo.(none)
121f29a541 Patching tests to make them pass on all platforms. 2007-03-30 14:05:34 +02:00
lzhou/zhl@dev3-63.(none)
984f807f5c Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354
 2007-03-30 11:02:36 +00:00
istruewing@chilla.local
b8e0d3490e Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-30 12:35:09 +02:00
istruewing@chilla.local
8ad2472e24 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-30 12:33:44 +02:00
tomas@whalegate.ndb.mysql.com
1296080941 5.1.17 not compatible with 5.1.18 because of change in var page reference size 2007-03-30 11:37:21 +02:00
istruewing@chilla.local
dd13c3839f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-03-30 11:02:19 +02:00
mats@romeo.(none)
083deb4382 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
 2007-03-30 10:35:37 +02:00
mats@romeo.(none)
82c71a60f7 - Fixing binary log positions 
- Eliminating some compiler warnings
 2007-03-30 10:27:08 +02:00
istruewing@chilla.local
facba6ba3a Post merge fix 2007-03-30 09:14:11 +02:00
bar@bar.myoffice.izhnet.ru
0a3a898c9d Merge mysql.com:/home/bar/mysql-5.0.b22638 
into  mysql.com:/home/bar/mysql-5.1.test
 2007-03-30 12:11:21 +05:00
tomas@whalegate.ndb.mysql.com
77d37e5810 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-03-30 08:37:47 +02:00
bar@mysql.com
f685ae0758 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b22638
 2007-03-30 11:36:09 +05:00
istruewing@chilla.local
caf65f2b3b Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-30 07:50:11 +02:00
istruewing@chilla.local
a4ad591dd8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-30 07:46:52 +02:00
msvensson@pilot.blaudden
266cd861e7 Add missing \ causing CMakelists.txt etc not to be included in dist 2007-03-30 06:57:58 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
a9464595ea Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25446-5.1-new-ndb-bj
 2007-03-30 11:03:44 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
bb1df27c89 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25446-5.1-new-ndb-bj
 2007-03-30 10:59:10 +08:00
mats@romeo.(none)
1694f98859 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  romeo.(none):/home/bkroot/mysql-5.1-rpl
 2007-03-30 04:49:06 +02:00
mats@romeo.(none)
55dd7f8bd8 Post merge fixes of result files. 2007-03-30 04:44:49 +02:00
cbell/Chuck@mysql_cab_desk.
10dd347612 WL#3629 - Replication of Invocation and Invoked Features 
This patch adds code to the binlog calls for replication of the
CREATE, DROP, and UPDATE event commands. An extra gate was added 
to ensure a query with length 0 is not binlogged. This corrects 
the problem of events_scheduling and rpl_events failing on some
build machines.
 2007-03-29 19:55:47 -04:00
istruewing@chilla.local
9c0a23b5e9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-29 22:57:26 +02:00
cbell/Chuck@mysql_cab_desk.
b41603e6b9 Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_test
 2007-03-29 16:54:16 -04:00
cbell/Chuck@mysql_cab_desk.
c7c1b341f7 WL#3629 - Replication of Invocation and Invoked Features 
This patch changes test to remove Windows-specific limitations and potential
rounding errors in the calculation of a UDF.

Also corrects a minor merge conflict.
 2007-03-29 16:43:00 -04:00
mats@romeo.(none)
b463c78218 Post-merge patch. 2007-03-29 22:32:28 +02:00
msvensson@pilot.blaudden
97d3d2e7ea Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-29 22:00:04 +02:00
msvensson@pilot.blaudden
ce4d399473 Update result for bug#19991 2007-03-29 21:59:06 +02:00
mats@romeo.(none)
e12cc44ac3 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
 2007-03-29 21:38:03 +02:00
istruewing@chilla.local
90b09d2866 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-03-29 21:32:34 +02:00
tomas@whalegate.ndb.mysql.com
5610fb9f42 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-03-29 20:50:19 +02:00
mats@romeo.(none)
7c187c2c9b WL#3464: Add replication event to denote gap in replication 
Adding an event that can be used to denote that an incident occured
on the master. The event can be used to denote a gap in the replication
stream, but can also be used to denote other incidents.

In addition, the injector interface is extended with functions to
generate an incident event. The function will also rotate the binary
log after generating an incident event to get a fresh binary log.
 2007-03-29 20:31:09 +02:00
cbell/Chuck@mysql_cab_desk.
9fb3199c26 WL#3629 - Replication of Invocation and Invoked Features 
This patch corrects an error in the header file concerning a method declaration
in the header file. Compiles ok on Windows, but not on Linux.
 2007-03-29 13:21:59 -04:00
iggy@recycle.(none)
0f4a1b38ae Post Merge Cleanup. 2007-03-29 13:04:27 -04:00
svoj@april.(none)
310f12591b Merge mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.1-engines
 2007-03-29 22:01:51 +05:00
tomas@whalegate.ndb.mysql.com
239ab421d8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-29 18:52:33 +02:00
svoj@mysql.com/april.(none)
75f0416532 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines
 2007-03-29 21:50:54 +05:00
tomas@whalegate.ndb.mysql.com
af78c954cb Bug #27529: Slave crashes on lots of updates 
- do not try to perge binlog when purge comes from slave, it never purges binlog anyways
 2007-03-29 18:42:00 +02:00
gkodinov/kgeorge@magare.gmz
fca2a0c4ac Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt
 2007-03-29 19:20:33 +03:00
iggy@recycle.(none)
6a9811b594 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug23491/my50-bug23491
 2007-03-29 12:20:13 -04:00