Commit graph

20668 commits

Author SHA1 Message Date
igor@olga.mysql.com
5534f099f1 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.1-opt
2007-04-01 14:00:56 -07:00
svoj@april.(none)
51710387ab Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.1-engines
2007-03-31 17:29:40 +05:00
lars/lthalmann@dl145h.mysql.com
2f0ecd6a14 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-03-31 12:38:20 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
cec17aa0ba Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-31 12:36:50 +02:00
ibabaev@bk-internal.mysql.com
466586472b Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
2007-03-31 09:52:18 +02:00
svoj@mysql.com/june.mysql.com
f297b5d873 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.0-engines
2007-03-31 12:24:28 +05:00
igor@olga.mysql.com
0c5ba6246b Fixed bug : memory corruption when using row equalities in where
conditions.
When allocating memory for KEY_FIELD/SARGABLE_PARAM structures the
function update_ref_and_keys did not take into account the fact that
a single row equality could be replaced by several simple equalities.
Fixed by adjusting the counter cond_count accordingly for each subquery
when performing substitution of a row equality for simple equalities.
2007-03-31 00:23:03 -07:00
ibabaev@bk-internal.mysql.com
9a21d1d50a Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-03-31 05:31:35 +02:00
sergefp@pylon.mylan
0a68b63735 Merge mysql.com:/home/psergey/bk-trees/mysql-5.0-opt
into  mysql.com:/home/psergey/mysql-5.1-merge2
2007-03-31 03:12:33 +04:00
evgen@moonbone.local
bd95e76bac item.cc, insert_update.result:
After merge fix.
2007-03-31 02:57:26 +04:00
evgen@moonbone.local
f470ac2000 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
2007-03-31 02:42:40 +04:00
lars/lthalmann@dl145j.mysql.com
f6f848b9e7 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-03-31 00:17:12 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
9c6dc8c853 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-31 00:15:20 +02:00
sergefp@mysql.com
dd7e39f441 BUG#26624, pushbuild fixes: Merge to 5.0 2007-03-31 00:48:31 +04:00
sergefp@mysql.com
dcb2551347 BUG#26624: high mem usage (crash) in range optimizer
Pushbuild fixes: 
 - Make MAX_SEL_ARGS smaller (even 16K records_in_range() calls is 
   more than it makes sense to do in typical cases)
 - Don't call sel_arg->test_use_count() if we've already allocated 
   more than MAX_SEL_ARGs elements. The test will succeed but will take
   too much time for the test suite (and not provide much value).
2007-03-31 00:29:18 +04:00
kent@mysql.com/kent-amd64.(none)
2d0da97164 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-30 22:26:06 +02:00
ibabaev@bk-internal.mysql.com
8c3525ff31 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-03-30 20:00:12 +02:00
cbell/Chuck@mysql_cab_desk.
c86d40617e Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_kostja
2007-03-30 11:39:45 -04:00
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
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
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
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.
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
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
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
svoj@mysql.com/june.mysql.com
556de62f8d BUG#26138 - REPAIR TABLE with option USE_FRM erases all records in
ARCHIVE table
ARCHIVE table was truncated by REPAIR TABLE ... USE_FRM statement.
The table handler returned its file name extensions in a wrong order.
REPAIR TABLE believed it has to use the meta file to create a new table
from it.

With the fixed order, REPAIR TABLE does now use the data file to create
a new table. So REPAIR TABLE ... USE_FRM works well with ARCHIVE engine
now.

This issue affects 5.0 only, since in 5.1 ARCHIVE engine stores meta
information and data in the same file.
2007-03-30 13:00:21 +05: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
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
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
mats@romeo.(none)
b463c78218 Post-merge patch. 2007-03-29 22:32:28 +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
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
jani@ua141d10.elisa.omakaista.fi
901896fd1c Manual merge from 5.0 2007-03-29 21:11:17 +03:00
monty@mysql.com/narttu.mysql.fi
44c32c0e26 Initialize thd->no_trans_update
(Fixes valgrind warnings)
2007-03-29 21:06:32 +03: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
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
tomas@whalegate.ndb.mysql.com
af78c954cb Bug : 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
jani@ua141d10.elisa.omakaista.fi
b8d6c2e970 Merged from 5.0 2007-03-29 19:31:42 +03: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
iggy@recycle.(none)
c90400c538 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into  recycle.(none):/src/bug23491/my51-bug23491
2007-03-29 12:13:42 -04:00
iggy@recycle.(none)
d41cffc09a Bug MySQLDump prefix function call in a view by database name
- 5.0 merged to 5.1 differences.
2007-03-29 11:12:12 -04:00
cbell/Chuck@mysql_cab_desk.
0322284f92 WL#3629 - Replication of Invocation and Invoked Features
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command
for a series of tests.

The only code change is to correct references to the classname in
enums.
2007-03-29 11:11:28 -04:00
istruewing@chilla.local
6f12d1fdb8 Fix compiler warnings 2007-03-29 16:47:38 +02:00