epotemkin@bk-internal.mysql.com
9e2dcb5e91
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-04-13 23:32:23 +02:00
msvensson@pilot.blaudden
2aef31fa51
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-13 15:13:12 +02:00
msvensson@pilot.blaudden
86a364319d
Add option manual-ddd
...
Change syntax for starting manual ddd or gdb to avoid having to
change working dir
2007-04-13 15:06:05 +02:00
mats@romeo.(none)
06ee2fd79e
Merge romeo.(none):/home/bkroot/mysql-5.1-rpl
...
into romeo.(none):/home/bk/b27779-mysql-5.1-rpl
2007-04-13 14:59:49 +02:00
msvensson@pilot.blaudden
7df5e05b4d
Add missing option --manual-ddd
...
Change syntax to start manual gdb/ddd to avoid having to
cd to the mysql-test directory before calling the command
2007-04-13 14:40:52 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
455b325b53
Avoid resetting a variable. Fixed grant.test.
2007-04-13 14:04:57 +03:00
mats@romeo.(none)
6044deb72e
BUG#17095 (Cluster RBR in circle does not terminate):
...
Updating result files with wrong server id for BEGIN and COMMIT
events.
2007-04-13 12:03:01 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
defddfd255
Merged from 5.0
2007-04-13 12:47:44 +03:00
mats@romeo.(none)
75c1242de8
Fixing result file
2007-04-13 10:38:34 +02:00
svoj@mysql.com/june.mysql.com
ed81a81a9e
BUG#27516 - divide by zero crash during optimize table
...
When a table status is requested by statement like SHOW TABLE
STATUS and there is another statement (e.g. DELETE) sets
number of records to 0 concurrently, we may get division by
zero error, which crashes a server.
This is fixed by using thread local variable x->records instead
of shared info->state->records when we check if it is zero and
divide by it.
2007-04-13 12:38:27 +05:00
jani@a88-113-38-195.elisa-laajakaista.fi
52196018ce
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
2007-04-13 10:25:33 +03:00
tomas@whalegate.ndb.mysql.com
2a917850d2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
2007-04-13 08:15:49 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
8ad4614bcd
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
2007-04-13 09:07:46 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
c66f50fa68
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
2007-04-13 09:04:34 +03:00
bar@bar.myoffice.izhnet.ru
37b467a43c
Merge mysql.com:/home/bar/mysql-5.0.b20095
...
into mysql.com:/home/bar/mysql-5.1-new-rpl
2007-04-13 10:08:52 +05:00
bar@mysql.com
52f4b9343f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-5.0.b20095
2007-04-13 10:06:50 +05:00
bar@mysql.com
be8fc46db6
Bug#20095 Changing length of VARCHAR field with UTF8 collation does not truncate values
...
Problem: single byte do_varstring1() function was called, which didn't
check limit on "number of character", and checked only "number of bytes".
Fix: adding a multi-byte aware function do_varstring1_mb(),
to limit on "number of characters"
2007-04-13 10:05:55 +05:00
tomas@whalegate.ndb.mysql.com
592e0f2250
correct merge error
2007-04-13 01:52:45 +02:00
tomas@whalegate.ndb.mysql.com
ac8d2dead6
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-13 01:45:44 +02:00
tomas@whalegate.ndb.mysql.com
5d89ca3a89
Bug#27775 mediumint auto_increment with ndb_restore
...
- autoincrement column of size medium int not handled in ndb_restore
- added testcase also for other types, tiny, small... etc
2007-04-13 01:37:24 +02:00
dkatz@damien-katzs-computer.local
dac9f99327
Bug #27322 failure to allocate transaction_prealloc_size causes crash
...
Fix for when memory pre-allocation fails.
2007-04-12 18:03:26 -04:00
svoj@mysql.com/april.(none)
005d8c5284
BUG#25951 - ignore/use index does not work with fulltext
...
IGNORE/USE/FORCE INDEX hints were honored when choosing FULLTEXT
index.
With this fix these hints are ignored. For regular indexes we may
perform table scan instead of index lookup when IGNORE INDEX was
specified. We cannot do this for FULLTEXT in NLQ mode.
2007-04-13 02:31:34 +05:00
joerg@trift2.
a3c70abb4e
Header file "decimal.h" needs to be delivered with binary packages:
...
Bug#27456 decimal.h is not installed with public include files
2007-04-12 21:50:56 +02:00
gshchepa/uchum@gshchepa.localdomain
4b2aab14ba
Bug#5507: TRUNCATE does not work with views.
...
Support of views wasn't implemented for the TRUNCATE statement.
Now TRUNCATE on views has the same semantics as DELETE FROM view:
mysql_truncate() checks whether the table is a view and falls back
to delete if so.
In order to initialize properly the LEX::updatable for a view
st_lex::can_use_merged() now allows usage of merged views for the
TRUNCATE statement.
2007-04-12 23:21:37 +05:00
tomas@whalegate.ndb.mysql.com
ba60730808
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
2007-04-12 18:29:43 +02:00
tomas@whalegate.ndb.mysql.com
6015317269
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
2007-04-12 18:29:24 +02:00
anozdrin/alik@ibm.
9719af3f2b
Test case for BUG#5274: Stored procedure crash if length
...
of CHAR variable too great.
2007-04-12 19:42:45 +04:00
tomas@whalegate.ndb.mysql.com
6dd82bd3a4
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-04-12 16:14:20 +02:00
tomas@whalegate.ndb.mysql.com
036f4e4059
Bug#17095 circular replication for ndb
...
- test case
- reset server id in injector
2007-04-12 16:13:49 +02:00
mats@romeo.(none)
c2f20fa79e
Merge romeo.(none):/home/bkroot/mysql-5.0-rpl
...
into romeo.(none):/home/bk/b26551-mysql-5.0-rpl
2007-04-12 14:32:37 +02:00
msvensson@pilot.blaudden
9a53086995
Update result file to 5.1 format of SHOW CREATE
2007-04-12 14:29:10 +02:00
mats@romeo.(none)
785bca21e0
BUG#25688 (RBR: circular replication may cause STMT_END_F flags to
...
be skipped):
Fixing test since a replace assumed that we were on slave when we were
on master.
2007-04-12 14:14:50 +02:00
mats@romeo.(none)
fd24cdf91c
BUG#26551 (Aborted query for non-transactional table breaks replication):
...
Added error code ER_QUERY_INTERRUPTED to the list of special errors
that prevent the slave from starting to execute a query.
2007-04-12 14:00:45 +02:00
jani@ua141d10.elisa.omakaista.fi
335153121b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-04-12 12:50:02 +03:00
tomas@whalegate.ndb.mysql.com
98c2e79af4
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-12 11:29:05 +02:00
tomas@whalegate.ndb.mysql.com
2e620e3db6
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-12 11:12:43 +02:00
tomas@whalegate.ndb.mysql.com
f9a900f80e
Bug #27758 Restoring NDB backups makes table usable in SQL nodes
...
- parse indexname using "split" instead of sscanf, as not to break at space
- test case with space in key
- enclose names in printout
2007-04-12 11:07:30 +02:00
mats@romeo.(none)
93860556e6
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b25688-mysql-5.1-rpl
2007-04-12 09:10:45 +02:00
mats@romeo.(none)
11fc24ef24
BUG#25688 (RBR: circular replication may cause STMT_END_F flags to be
...
skipped):
By moving statement end actions from Rows_log_event::do_apply_event() to
Rows_log_event::do_update_pos() they will always be executed, even if
Rows_log_event::do_apply_event() is skipped because the event originated
at the same server. This because Rows_log_event::do_update_pos() is always
executed (unless Rows_log_event::do_apply_event() failed with an error,
in which case the slave stops with an error anyway).
Adding test case.
Fixing logic to detect if inside a group. If a rotate event occured
when an initial prefix of events for a statement, but for which the
table did contain a key, last_event_start_time is set to zero, causing
rotate to end the group but without unlocking any tables. This left a
lock hanging around, which subsequently triggered an assertion when a
second attempt was made to lock the same sequence of tables.
In order to solve the above problem, a new flag was added to the relay
log info structure that is used to indicate that the replication thread
is currently executing a statement. Using this flag, the replication
thread is in a group if it is either in a statement or inside a trans-
action.
The patch also eliminates some gratuitous header file inclusions that
were not needed (and caused compile errors) and replaced them with
forward definitions.
2007-04-12 08:58:04 +02:00
jonas@perch.ndb.mysql.com
890b19c895
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-12 07:40:15 +02:00
jonas@perch.ndb.mysql.com
3ddd25f2f3
ndb - mysql-test-run testcase for bug#27757
2007-04-12 07:19:10 +02:00
igor@olga.mysql.com
e04289704d
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-04-11 15:12:49 -07:00
msvensson@pilot.blaudden
3a8b0edcb5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 23:43:58 +02:00
msvensson@pilot.blaudden
cd2f78fdd8
Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to connect
...
- Add testcase for SSL connection from mysqldump to mysqld
2007-04-11 23:42:53 +02:00
igor@olga.mysql.com
4bf11f99eb
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-11 13:48:02 -07:00
msvensson@pilot.blaudden
4774c40089
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 22:08:00 +02:00
igor@olga.mysql.com
e1efba0225
Post-merge fix.
2007-04-11 12:45:27 -07:00
msvensson@pilot.blaudden
900e0d685d
Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-11 21:03:29 +02:00
msvensson@pilot.blaudden
e81cb86952
Add test for connect using different ssl ciphers
2007-04-11 21:01:10 +02:00
igor@olga.mysql.com
3b990d2cf4
Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27484
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-11 11:57:40 -07:00