Commit graph

58911 commits

Author SHA1 Message Date
Alexander Nozdrin
1df46c4e5b Ignore a new symbolic link. 2009-09-23 18:02:39 +04:00
Alexander Nozdrin
2ff2b14477 Merge mysql-trunk-signal (into mysql-next-mr-alik, which is mysql-next-mr). 2009-09-23 17:57:39 +04:00
Staale Smedseng
8b9843408d Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2

Cleaning up warnings not present in 5.0.
2009-09-23 15:21:29 +02:00
Alexander Nozdrin
613297ff1e A patch for Bug#47474 (mysqld hits Dbug_violation_helper assert
when compiled with Sun Studio compiler).

The thing is that Sun Studio compiler calls destructor of stack
objects when pthread_exit() is called. That triggered an assertion
in DBUG_ENTER()/DBUG_RETURN() validation logic (if DBUG_ENTER() is
used in the beginning of function, all returns should be replaced
by DBUG_RETURN/DBUG_VOID_RETURN macros).

A fix is to explicitly use DBUG_LEAVE macro.
2009-09-23 17:10:23 +04:00
Satya B
0c9b77803c merge to mysql-5.1-bugteam 2009-09-23 17:45:56 +05:30
Satya B
29b6cc60cd Additional Fix for BUG#44030 - Error: (1500) Couldn't read the MAX(ID) autoinc
value from the index (PRIMARY)


With the fix for BUG#46760, we correctly flag the presence of row_type 
only when it's actually changed and enables the FAST ALTER TABLE which was
disabled with the BUG#39200.

So the changes made by BUG#46760 makes MySQL data dictionaries to be out of 
sync but they are handled already by InnoDB with this BUG#44030.

The test was originally written to handle this but we requested Innodb to
update the test as the data dictionaries were in sync after the fix for 
BUG#39200.

Adjusting the innodb-autoinc testcase as mentioned in the comments.
2009-09-23 17:42:12 +05:30
Bjorn Munch
7e6392a463 null merge from trunk-mtr 2009-09-23 13:52:21 +02:00
Bjorn Munch
597850888b null merge from 5.1-mtr 2009-09-23 13:39:36 +02:00
Bjorn Munch
3e14f87e70 merge from -trunk 2009-09-23 13:34:24 +02:00
Mats Kindahl
8f35f7c907 Bug #37221: SET AUTOCOMMIT=1 does not commit binary log
When setting AUTOCOMMIT=1 after starting a transaction, the binary log
did not commit the outstanding transaction. The reason was that the binary
log commit function saw the values of the new settings, deciding that there
were nothing to commit.

Fixed the problem by moving the implicit commit to before the thread option
flags were changed, so that the binary log sees the old values of the flags
instead of the values they will take after the statement.
2009-09-23 13:20:48 +02:00
Georgi Kodinov
1014e5a2fb automerge 2009-09-23 14:11:48 +03:00
Alexander Nozdrin
8dd75c98ed Update default.conf. 2009-09-23 14:12:43 +04:00
Alexander Nozdrin
9b9f814d63 Merge from mysql-next-mr. 2009-09-23 14:11:41 +04:00
Alexander Nozdrin
1bb4ba29be Merge from mysql-trunk. 2009-09-23 14:10:04 +04:00
Alexander Nozdrin
04fff1e8fe Update default.conf. 2009-09-23 14:08:38 +04:00
Alexander Nozdrin
e4ebc5c6d9 Update default.conf. 2009-09-23 14:04:08 +04:00
Alexander Nozdrin
928de7ede6 Merge from mysql-trunk. 2009-09-23 13:59:23 +04:00
Alexander Nozdrin
abf845b9d4 Merge from mysql-trunk-alik. 2009-09-23 13:51:45 +04:00
Alexander Nozdrin
72feecb4f0 Update version in configure.in. 2009-09-23 13:50:31 +04:00
Mats Kindahl
5661e72623 BUG#29288: myisam transactions replicated to a transactional
slave leaves slave unstable

Problem: when replicating from non-transactional to
transactional engine with autocommit off, no BEGIN/COMMIT
is written to the binlog. When the slave replicates, it
will start a transaction that never ends.

Fix: Force autocommit=on on slave by always replicating
autocommit=1 from the master.
2009-09-23 11:43:43 +02:00
Sergey Glukhov
185698530e Bug#45989 memory leak after explain encounters an error in the query
the fix is reverted from 5.1, mysql-pe as 
unnecessary(no valgrind warnings there).
2009-09-23 13:40:33 +05:00
Georgi Kodinov
bafc15748b automerge 2009-09-23 11:31:18 +03:00
Georgi Kodinov
6ba7a79111 automerge 2009-09-23 11:29:10 +03:00
Georgi Kodinov
afc64075e5 automerge 2009-09-23 11:27:12 +03:00
Bjorn Munch
e03d7d4c34 merge from 5.1 main 2009-09-23 10:21:16 +02:00
Alexander Nozdrin
665fda8b55 Merge from mysql-trunk(-alik). 2009-09-23 11:17:49 +04:00
Alexander Nozdrin
22ceefcb58 Merge from mysql-5.1. 2009-09-23 11:16:11 +04:00
timothy.smith@sun.com
768f2cdb6a Add --malloc-lib=LIB option to mysqld_safe to LD_PRELOAD a shared library for mysqld 2009-09-23 01:26:08 +02:00
Bjorn Munch
c82ce4629c merge 5.1-mtr -> 5.1 -> trunk 2009-09-23 00:49:34 +02:00
Bjorn Munch
726df480f9 merge from 5.1 of merge from 5.1-mtr 2009-09-22 23:41:37 +02:00
MySQL Build Team
f95558870d Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 3092.1.2 [merge]
> revision-id: joro@sun.com-20090831134035-wndnw04gy8kzogpm
> parent: anurag.shekhar@sun.com-20090831075609-tkpqu41hxtupdeip
> parent: joro@sun.com-20090827114042-h55n7qp9990bl6ge
> committer: Georgi Kodinov <joro@sun.com>
> branch nick: B46749-5.1-bugteam
> timestamp: Mon 2009-08-31 16:40:35 +0300
> message:
>   automerge
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.
2009-09-22 23:05:28 +02:00
MySQL Build Team
55baa0c54d Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 3085 [merge]
> revision-id: sergey.glukhov@sun.com-20090827105925-j56pdghdzb8nlw3p
> parent: alfranio.correia@sun.com-20090827093227-9exafl3k6362bvq7
> parent: sergey.glukhov@sun.com-20090827102219-sgjz0v5t1rfccs14
> committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Thu 2009-08-27 15:59:25 +0500
> message:
>   5.0-bugteam->5.1-bugteam merge
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.
2009-09-22 23:01:19 +02:00
MySQL Build Team
7d520f5104 Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 3075
> revision-id: ramil@mysql.com-20090821055535-a5aeas33epokjjnp
> parent: joro@sun.com-20090820141122-gq6eyozybvar4o4s
> committer: Ramil Kalimullin <ramil@mysql.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Fri 2009-08-21 10:55:35 +0500
> message:
>   Fix for bug #46456 [Ver->Prg]: HANDLER OPEN + TRUNCATE + DROP
>   (temporary) TABLE, crash
>   
>   Problem: if one has an open "HANDLER t1", further "TRUNCATE t1" 
>   doesn't close the handler and leaves handler table hash in an 
>   inconsistent state, that may lead to a server crash.
>   
>   Fix: TRUNCATE should implicitly close all open handlers.
>   
>   Doc. request: the fact should be described in the manual accordingly.
2009-09-22 23:00:30 +02:00
MySQL Build Team
f69f4c09b2 Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 3068
> revision-id: ramil@mysql.com-20090813194928-3djdqvpock0pxhgp
> parent: li-bing.song@sun.com-20090813024857-1emgf5lhj0zikoj8
> committer: Ramil Kalimullin <ramil@mysql.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Fri 2009-08-14 00:49:28 +0500
> message:
>   Fix for bug #46614: Assertion in show_create_trigger() 
>   on SHOW CREATE TRIGGER + MERGE table
>   
>   Problem: SHOW CREATE TRIGGER erroneously relies on fact
>   that we have the only underlying table for a trigger
>   (wrong for merge tables).
>   
>   Fix: remove erroneous assert().
2009-09-22 22:59:11 +02:00
MySQL Build Team
191c0c0b6d Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 3059 [merge]
> revision-id: martin.hansson@sun.com-20090810140851-aw5peehzdxi4gjja
> parent: iggy@mysql.com-20090806145453-ion37sfdsldwwjrj
> parent: martin.hansson@sun.com-20090807115140-7fn6wjx0mrui7zl5
> committer: Martin Hansson <martin.hansson@sun.com>
> branch nick: 5.1bt
> timestamp: Mon 2009-08-10 16:08:51 +0200
> message:
>   Merge
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.
2009-09-22 22:55:02 +02:00
MySQL Build Team
35bac688be Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 3044.1.3
> revision-id: kristofer.pettersson@sun.com-20090729224404-hwevly1cbi7gojf0
> parent: kristofer.pettersson@sun.com-20090729202743-tp9ihd5xavq8eguw
> committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Thu 2009-07-30 00:44:04 +0200
> message:
>   Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al.
>   
>   Fixed wrong prototype declaration which cased build failure on solaris.
2009-09-22 22:54:06 +02:00
MySQL Build Team
a96a92d67b Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 3044.1.1
> revision-id: kristofer.pettersson@sun.com-20090729200708-cb0td7n9r5md0aa0
> parent: davi.arnaut@sun.com-20090728195938-qabe9ldm2l4k8xns
> committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Wed 2009-07-29 22:07:08 +0200
> message:
>   Bug#44521 Executing a stored procedure as a prepared statement can sometimes cause
>             an assertion in a debug build.
>   
>   The reason is that the C API doesn't support multiple result sets for prepared
>   statements and attempting to execute a stored routine which returns multiple result
>   sets sometimes lead to a network error. The network error sets the diagnostic area
>   prematurely which later leads to the assert when an attempt is made to set a second
>   server state.
>   
>   This patch fixes the issue by changing the scope of the error code returned by
>   sp_instr_stmt::execute() to include any error which happened during the execution.
>   To assure that Diagnostic_area::is_sent really mean that the message was sent all
>   network related functions are checked for return status.
2009-09-22 22:52:30 +02:00
MySQL Build Team
868f1fa480 Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 3028 [merge]
> revision-id: davi.arnaut@sun.com-20090715182250-ru0l00nqqlcfqe8n
> parent: ramil@mysql.com-20090715102544-ejid81yz8k39m2fa
> parent: kostja@sun.com-20090715170034-kjzpmq3px90pedw7
> committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
> branch nick: 44495-5.1
> timestamp: Wed 2009-07-15 15:22:50 -0300
> message:
>   Bug#44495: Prepared Statement: CALL p(<x>) - `thd->protocol == &thd->protocol_text' failed
>   
>   Merge Konstantin's patch and add a test case.
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.
2009-09-22 22:43:48 +02:00
MySQL Build Team
0005020fbe Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 3027
> revision-id: ramil@mysql.com-20090715102544-ejid81yz8k39m2fa
> parent: anurag.shekhar@sun.com-20090715101345-6n3o8wf8woyaqlwc
> committer: Ramil Kalimullin <ramil@mysql.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Wed 2009-07-15 15:25:44 +0500
> message:
>   Addition to #45998 fix, result adjusted.
2009-09-22 22:41:25 +02:00
MySQL Build Team
55b0d9772e Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 3019.1.3
> revision-id: ramil@mysql.com-20090714150729-xqv7aicsnoz6epy6
> parent: jimw@mysql.com-20090713191116-c8qxsrjagzbvbytj
> committer: Ramil Kalimullin <ramil@mysql.com>
> branch nick: b45998-5.1-bugteam
> timestamp: Tue 2009-07-14 20:07:29 +0500
> message:
>   Fix for bug#45998: database crashes when running
>   "create as select" (innodb table)
>   
>   Problem: code constructing "CREATE TABLE..." statement
>   doesn't take into account that current database is not set
>   in some cases. That may lead to a server crash.
>   
>   Fix: check if current database is set.
2009-09-22 22:40:02 +02:00
MySQL Build Team
fe8304cf93 Backport into build-200909221805-5.1.37sp1
> ------------------------------------------------------------
> revno: 2949.5.6
> revision-id: jperkin@sun.com-20090824091334-6ktgrhq218vl7zq1
> parent: joerg@mysql.com-20090821095644-12woawc4d2d3u7k4
> committer: Jonathan Perkin <jperkin@sun.com>
> branch nick: mysql-5.1-build
> timestamp: Mon 2009-08-24 10:13:34 +0100
> message:
>   Apply changes from mysql-5.1.38-release clone:
>   
>    - Add conditionals for bundled zlib and innodb plugin.
>    - Apply patch from bug#46834 to install the test suite in RPMs.
>    - Add plugins to RPMs.  Disable example plugins.
2009-09-22 22:38:25 +02:00
timothy.smith@sun.com
1e75548094 Set version number for mysql-5.1.37sp1 release 2009-09-22 20:52:24 +02:00
Marc Alff
12a6ee6da3 Merge mysql-next-mr (revno 2882) --> mysql-trunk-signal 2009-09-22 09:22:22 -06:00
Alexander Nozdrin
46a04938eb Merge from mysql-next-mr. 2009-09-22 18:26:17 +04:00
Alexander Nozdrin
8878213408 Merge from mysql-trunk. 2009-09-22 18:24:53 +04:00
Alexander Nozdrin
d6022269a6 Merge from mysql-trunk. 2009-09-22 18:23:12 +04:00
Alexander Nozdrin
140d81e96d Update version. 2009-09-22 18:21:44 +04:00
Bjorn Munch
edea810223 merge from trunk (with trunk-mtr) 2009-09-22 14:39:18 +02:00
Davi Arnaut
0e7242d895 Bug#45498: Socket variable not available on Windows
The "socket" variable is not available on Windows even though
the --socket option can be used to specify the pipe name for
local connections that use a named pipe.

The solution is to ensure that the variable is always defined.
2009-09-22 08:22:07 -03:00
Bjorn Munch
8e59a23d7d merge from trunk-mtr 2009-09-22 12:52:31 +02:00