jani@a88-113-38-195.elisa-laajakaista.fi
68d795b0da
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-4.1-main
2007-04-13 09:02:14 +03: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
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
gshchepa/uchum@gshchepa.localdomain
342a6c5866
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into gshchepa.localdomain:/home/uchum/work/bk-trees/5507-ci
2007-04-13 00:38:45 +05:00
tomas@whalegate.ndb.mysql.com
7fd59a08af
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 21:38:44 +02:00
tomas@whalegate.ndb.mysql.com
3ff7444ac7
remove inline NdbRecAttr functions for medium int as not to depend in my_global
2007-04-12 21:34:25 +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
mtaylor@qualinost.(none)
99c5f418af
BUG#27367 mysql.server should be LSB init script compliant
...
Moved cd $basedir to live in the start section, as it only applies to the start
functionality and breaks the restart task
2007-04-12 11:16:07 -07:00
mtaylor@qualinost.(none)
7caf1843ee
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus
...
into qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
2007-04-12 11:01:32 -07:00
mtaylor@qualinost.(none)
0af87ed83a
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus
...
into qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
2007-04-12 11:00:54 -07:00
tomas@whalegate.ndb.mysql.com
0ddf40b025
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
2007-04-12 19:49:46 +02:00
tomas@whalegate.ndb.mysql.com
8a98276ba7
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
2007-04-12 19:49:21 +02:00
joerg@trift2.
3050edc0b9
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2007-04-12 18:41:55 +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
msvensson@pilot.blaudden
74dfba96e7
Bug#27783 mysql_install_db should be able to install again, preserving existing files.
...
- Allow mysql_install_db to be run a second time in the same
datadir to create and fill any missing system tables
2007-04-12 17:48:28 +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
msvensson@pilot.blaudden
3a7821014a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-12 14:56:52 +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
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
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
bar@mysql.com
e0cc5fd02c
mysqld.cc:
...
Removing wrong MYF(0) argument.
2007-04-12 11:29:43 +05:00
mtaylor@qualinost.(none)
6547960e28
Adding files to support building for debian.
...
---
Removed reference to debian svn location of debian dir.
Changed verbage of comment to appease Timothy.
---
Removed added manpages that aren't appropriate for our build.
---
Added debian dir to list of dist targets.
Added list of files needed to be distributed in debian dir.
---
Added semi-colons to fix syntax error.
---
BUG#27769 MySQL should include debian packaing dir
Added debian/Makefile to configure.in to support make dist.
2007-04-11 16:13:09 -07: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
05c0e928a9
Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-11 22:08:19 +02:00
msvensson@pilot.blaudden
941c411dd0
Bug#21765 Illegal Instruction crash on pre-pentium when using YASSL
...
- Import patch with different method of detecting if machine has
cpuid instruction
2007-04-11 22:07:24 +02:00
igor@olga.mysql.com
e1efba0225
Post-merge fix.
2007-04-11 12:45:27 -07:00
msvensson@pilot.blaudden
d631f11972
Print warning to log when SSL setup fails
2007-04-11 21:38:43 +02: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
igor@olga.mysql.com
520b144007
Fixed bug #27484 : a crash when incompatible row expressions with nested rows
...
are used as arguments of the IN predicate.
Added a function to check compatibility of row expressions. Made sure that this
function to be called for Item_func_in objects by fix_length_and_dec().
2007-04-11 11:41:12 -07:00
tomas@whalegate.ndb.mysql.com
b86f256d24
remove warning
2007-04-11 20:22:31 +02:00
tomas@whalegate.ndb.mysql.com
3c0e6e3983
missing return
2007-04-11 19:29:32 +02:00
tomas@whalegate.ndb.mysql.com
06acade5c2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-11 18:11:14 +02:00
tomas@whalegate.ndb.mysql.com
dd4351e96f
Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
...
- try to catch as many malloc failures as possible and give error messages
2007-04-11 15:21:11 +02:00
df@pippilotta.erinye.com
42499a4713
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-11 13:57:52 +02:00
df@pippilotta.erinye.com
f98d1614c3
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-11 13:32:40 +02:00
df@pippilotta.erinye.com
b51c346781
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-11 13:31:28 +02:00
df@pippilotta.erinye.com
d5f6363ba1
make configure handle service pack version strings
2007-04-11 13:01:11 +02:00
gkodinov/kgeorge@magare.gmz
4202454baa
Bug #27530 :
...
The function CRC32() returns unsigned integer.
But the metadata (the unsigned flag) for the
function was set incorrectly.
As a result type arithmetics based on the
function's metadata (like finding the concise
type of an temporary table column to hold the result)
returned incorrect results.
Fixed by returning correct type information.
This fix is based on code contributed by Martin Friebe
(martin@hybyte.com ) on 2007-03-30.
2007-04-11 13:58:16 +03:00
msvensson@pilot.blaudden
4e17e06a5b
Add replace_result for things that are not tested
2007-04-11 09:06:27 +02:00
gkodinov/kgeorge@magare.gmz
4aeb1c896e
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B19372-5.0-opt
2007-04-11 09:37:01 +03:00
jonas@perch.ndb.mysql.com
e0a4d1b4c7
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-04-11 08:28:09 +02:00
jonas@perch.ndb.mysql.com
d76e039ae7
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-04-11 08:26:52 +02:00
jonas@perch.ndb.mysql.com
bb1adff862
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-04-11 08:26:23 +02:00
jonas@perch.ndb.mysql.com
4954962388
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2007-04-11 08:24:11 +02:00