Commit graph

54223 commits

Author SHA1 Message Date
cmiller@zippy.cornsilk.net
3c6591ad8f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-04-09 20:34:38 -04:00
cmiller@zippy.cornsilk.net
59fc28cfc4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore
2008-04-09 18:24:50 -04:00
cmiller@zippy.cornsilk.net
cc2f6266c3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
2008-04-09 18:09:42 -04:00
cmiller@zippy.cornsilk.net
02e6c83950 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore
2008-04-09 17:14:10 -04:00
cmiller@zippy.cornsilk.net
b506166a0c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-04-09 12:27:51 -04:00
cmiller@zippy.cornsilk.net
3e2457b71a Follow-up to B-g#15776, test failures on 64-bit linux.
Make maximum blob size to be 2**32-1, regardless of word size.

Fix failure of timestamp with size of 2**31-1.  The method of
rounding up to the nearest even number would overflow.
2008-04-09 12:27:30 -04:00
mleich@five.local.lan
756725ab93 Merge five.local.lan:/work/merge/mysql-5.1-funcs_1
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
2008-04-09 16:05:58 +02:00
mleich@five.local.lan
963bb655c6 Additional tests inspired by Bug
#12713 Error in a stored function called from a
          SELECT doesn't cause ROLLBACK of statem
2008-04-09 15:56:25 +02:00
kostja@dipika.(none)
9533db5f5b Fix pushbuild errors and warnings. 2008-04-08 21:49:31 +04:00
kostja@dipika.(none)
e4d011c603 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-04-08 20:32:29 +04:00
kostja@dipika.(none)
84de43cda6 Remove dead code. 2008-04-08 20:31:40 +04:00
kostja@dipika.(none)
d1f9376229 Tentative implementation of
WL#4165 Prepared statements: validation 
WL#4166 Prepared statements: automatic re-prepare
Fixes
Bug#27430 Crash in subquery code when in PS and table DDL changed after PREPARE
Bug#27690 Re-execution of prepared statement after table was replaced with a view crashes
Bug#27420 A combination of PS and view operations cause error + assertion on shutdown

The basic idea of the patch is to keep track of table metadata between
prepared statement prepare and execute. If some table used in the statement
has changed, the prepared statement is re-prepared before execution.

See WL#4165 and WL#4166 contents and comments in the code for details
of the implementation.
2008-04-08 20:01:20 +04:00
thek@adventure.(none)
38effd5603 Merge error between two patches caused error out-of-bounds assignment. 2008-04-08 15:57:44 +02:00
aelkin/andrei@mysql1000.(none)
7a8b1baecd Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1-release
2008-04-08 12:52:11 +03:00
kent/mysqldev@mysql.com/production.mysql.com
9b6ac078f6 Makefile.am:
Add ChangeLog if it exists
  - Removed separate 'normal+rowrepl' test run, not needed any longer
  - Removed separate 'rpl' test run, included in main test run already
  - Renamed some test "comments", to use similar naming style
  - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites
  - Reordered test runs, to be aligned with Windows test runs
mysql.spec.sh:
  - No longer including the "Example" storage engine
  - Added to configure "--without-ENGINE" if not to compile engine as plugin
2008-04-08 11:44:18 +02:00
aelkin/andrei@mysql1000.(none)
725d07d559 Bug #35762 Failing CREATE-SELECT steels Table map of the following query
Among two claimed artifacts the critical one is in that the Table map of 
a query following the failing with a duplicate key error CREATE-SELECT is skipped from
instantionating (and thus binlogging). That leads to sending a "chopped" group of the data
row-events without the table map head to the slave. 
The slave can not apply the only data row events.
It's not easy to force the slave to react with an error in such a case (the second complaint
on the bug report), because the lack of a table Rows_log_event::do_apply_event the data row event
handler is a common situation which  normally designates the event has to be filtered out
basing on the repliation do/ingore rules decision.

Fixed: table map creating and binlogging is restored via deploying the standard cleanup call in
select_create::abort().
No error is reported if by chance the table map was not been binlogged.
Leaving this out to resolve with considering how to combine the do/ingore rules with the situation
when erronoulsy the Table_map is not written to binlog.
2008-04-08 10:43:00 +03:00
thek@adventure.(none)
4f15839f66 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2008-04-08 09:20:53 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5397f8c90d Fix for bug #35732: read-only blocks SELECT statements in InnoDB
Problem: SELECTs prohibited for a transactional SE in autocommit mode
if read_only is set.

Fix: allow them.
2008-04-08 10:20:58 +05:00
kostja@dipika.(none)
a9fff11f49 Fix a compilation warning (unused variable). 2008-04-07 23:57:47 +04:00
kostja@dipika.(none)
63944ed537 A fix for Bug#32724 "innodb_mysql.test fails randomly".
Enable back the disabled test case.
2008-04-07 15:42:32 +04:00
dlenev@mockturtle.local
44fe33f011 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  mockturtle.local:/home/dlenev/src/mysql-5.1-symlink
2008-04-07 13:46:56 +04:00
kostja@dipika.(none)
968b1a0810 Review and update WL#4165 and WL#4166 test coverage. 2008-04-07 13:35:42 +04:00
thek@adventure.(none)
27b6c17d94 Bug#34183 Missing DBUG_RETURN in alloc_root
DBUG_RETURN was missing form an exit path in 5.1 branch of alloc_root
2008-04-07 11:29:45 +02:00
dlenev@mockturtle.local
15fd42b7dd Fix for bug #35733 "main.symlink.test fails".
The problem was that symlink.test failed due to debug assertions or
due to errors emitted for wrong statements (in non-debug builds)
if 6.0 version of server was run with --thread-handling=pool-of-threads
option.

The above problems were caused by that on the one hand code mi_create()
which handles case when error is returned relies on my_errno being set
to appropriate non-0 value, but on the other it has not done this
in case when error was emitted due to discovery that share for table
which we are going to create is already present in the list of open
shares. Running server with pool-of-threads option just exposed this
bug since in this scheduler mode my_errno is reset to 0 when connection
(THD) is reattached to the "real" thread.

This fix ensures that code in mi_create() properly sets my_errno in
the case described above.

Since original reason that caused this bug to be exposed in 6.0 tree
might also under very special conditions lead to incorrect behavior
of earlier versions of server (i.e. to errors emitted for wrong
statements) this patch is also being pushed into 5.1 tree.

No test case is present as this code is already covered by a test
case + pushbuild options combination in 6.0.
2008-04-07 12:59:57 +04:00
joerg@trift2.
0e6f1a731f Merge trift2.:/MySQL/M51/push-5.1
into  trift2.:/MySQL/M51/work-5.1
2008-04-05 13:37:05 +02:00
joerg@trift2.
fa63d5d165 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2008-04-05 12:51:38 +02:00
joerg@trift2.
cca2a8ec42 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/tmp-5.1
2008-04-04 20:03:24 +02:00
joerg@trift2.
0d0b67d270 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/tmp-5.1

Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
2008-04-04 19:52:48 +02:00
joerg@trift2.
a5a1fef394 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-04-04 19:30:52 +02:00
joerg@trift2.
2092e0c004 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/tmp-5.1
2008-04-04 19:25:39 +02:00
davi@mysql.com/endora.local
5d725bfdf8 Bug#35824: mysql_upgrade does not fix scheduler tables when upgrading from 5.1.23 to 5.1.24
The problem is that when upgrading the event table, the sql_mode
column was always being added instead of being updated to list new
sql_mode values, causing upgrades of the event which already have
a sql_mode column to not be updated to the new sql_mode values.

The solution is to always add first a stub sql_mode column and
subsequently update the column to the new sql_mode values.
2008-04-04 13:46:05 -03:00
mleich@five.local.lan
5b6e85157b Merge five.local.lan:/work/merge/mysql-5.1-funcs_1
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
2008-04-04 18:31:02 +02:00
mleich@five.local.lan
c780a0879a Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into  five.local.lan:/work/merge/mysql-5.1-funcs_1
2008-04-04 18:27:37 +02:00
mleich@five.local.lan
71dd9bda70 Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-04 18:02:55 +02:00
mleich@five.local.lan
7498f9e6b8 Backport of fix made in 5.1 to 5.0
mysql-test/Makefile.am   :    Fix a copy-paste error ...
2008-04-04 17:41:14 +02:00
mleich@five.local.lan
c7efce7e3b Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean
into  five.local.lan:/work/merge/mysql-5.0-build
2008-04-04 14:51:43 +02:00
mleich@five.local.lan
40092a7932 Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean
into  five.local.lan:/work/merge/mysql-5.1-build
2008-04-04 14:50:46 +02:00
joerg@trift2.
a1173ad61b mysql-test/Makefile.am : Fix a copy-paste error ... 2008-04-04 13:21:40 +02:00
joerg@trift2.
27e226c69f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2008-04-04 12:12:03 +02:00
joerg@trift2.
e0b54b4817 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2008-04-04 10:26:41 +02:00
joerg@trift-lap.fambruehe
b7360593f1 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2008-04-03 20:58:22 +02:00
joerg@trift-lap.fambruehe
be2080f917 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2008-04-03 20:23:07 +02:00
cmiller@zippy.cornsilk.net
7b77e36909 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-04-03 13:21:02 -04:00
cmiller@zippy.cornsilk.net
61a528c0b2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-04-03 13:19:55 -04:00
cmiller@zippy.cornsilk.net
7e78633f81 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
2008-04-03 13:14:57 -04:00
joerg@trift-lap.fambruehe
e9a27950ce Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2008-04-03 18:51:00 +02:00
cmiller@zippy.cornsilk.net
9ff7a0cedc Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3
When linking with some external programs, "multiple definition 
of `init_time'"

Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).
2008-04-03 11:32:00 -04:00
cmiller@zippy.cornsilk.net
bb7d01f73d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-04-03 11:30:38 -04:00
cmiller@zippy.cornsilk.net
a296df9581 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-04-03 11:28:10 -04:00
joerg@trift-lap.fambruehe
ff698f109a Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2008-04-03 17:23:59 +02:00