Commit graph

55802 commits

Author SHA1 Message Date
Mats Kindahl
450cc26b47 Post-merge fixes to fix test cases. 2008-10-29 18:38:18 +01:00
Sven Sandberg
2dca77e466 BUG#40257: Please remove --loose-skip-innodb from suite/rpl/rpl_1slave_base.cnf
Removed the flag that disables innodb on slave in the default
configuration of replication tests. That made the explicit
--innodb flag in -slave.opt files redundant, so lots of -slave.opt
files could be removed. Also, -master.opt files containing reduntant
--innodb flag were removed (those were redundant even without
changing the default). Removing .opt files is good because .opt
files cause server restarts and make tests less readable.
Also fixed a bug where rpl_innodb_mixed_ddl unintentionally
used myisam on slave.
2008-10-29 14:25:03 +01:00
Mats Kindahl
a7b0312c75 Merging with 5.1-rpl 2008-10-29 10:42:45 +01:00
kent.boortz@sun.com
eba4984e85 Merge from mysql-5.1.29-rc-release 2008-10-27 22:26:58 +01:00
Joerg Bruehe
64dc750b17 Merge a correction for the 38098 bug into 5.0-build,
it will also be used in the 5.0.72 release.
2008-10-27 19:52:24 +01:00
Joerg Bruehe
2d5c0273b4 Merge main 5.0 -> 5.0-build
Include fixing ".bzr-mysql/default.conf", which again listed the wrong tree.
2008-10-27 19:48:06 +01:00
Alexey Botchkov
3e85defa86 merging 2008-10-27 19:56:43 +04:00
Evgeny Potemkin
4b7d4b4f7c Merged fix for the bug#37870. 2008-10-27 19:36:27 +03:00
Evgeny Potemkin
a0ae05079b Corrected fix for the bug#37870. 2008-10-27 19:19:26 +03:00
Alexey Botchkov
979c11321c Bug#39102 valgrind build does not compile in realpath, which make DATA/INDEX DIR fail
#ifdef HAVE_purify removed

per-file comments:
  mysql-test/t/partition_not_windows.test
Bug#39102 valgrind build does not compile in realpath, which make DATA/INDEX DIR fail 
    test reenabled

  mysys/my_symlink.c
Bug#39102 valgrind build does not compile in realpath, which make DATA/INDEX DIR fail 
  superfluous ifdef removed, comments fixed
2008-10-27 19:25:11 +04:00
Sergey Glukhov
918b26b26a automerge 2008-10-27 17:11:44 +04:00
Evgeny Potemkin
314048bd7d Merged fix for the bug#37870. 2008-10-27 15:04:51 +03:00
Sergey Glukhov
156823c849 5.0-bugteam->5.1-bugteam merge(bug#39040) 2008-10-27 15:58:51 +04:00
Sergey Glukhov
f3a4a18640 Bug#39040 valgrind errors/crash when creating views with binlog logging enabled
A string buffers which were included in the 'view' data structure
were allocated on the stack, causing an invalid pointer when used
after the function returned.
The fix: use copy of values for view->md5 & view->queries
2008-10-27 14:22:38 +04:00
Evgeny Potemkin
170215e696 Bug#37870: Usage of uninitialized value caused failed assertion.
The convert_constant_item function converts a constant to integer using
field for condition like 'field = a_constant'. When the convert_constant_item
is called for a subquery the outer select is already being executed, so
convert_constant_item saves field's value to prevent its corruption.
For EXPLAIN field's value isn't initialized thus when convert_constant_item
tries to restore saved value it fails assertion.
      
Now the convert_constant_item doesn't save/restore field's value
for EXPLAIN.
2008-10-27 12:26:32 +03:00
V Narayanan
10b525d0bc Bug#39571 abi_check Does not create all prerequisites
The abi_check target instroduced as part of WL#4380 verifies
changes to mysql.h. mysql.h in turn includes mysql_version.h.
mysql_version.h is a file that is generated during the configure
phase. We must ensure that mysql_version.h is cleaned only during
distclean and not during clean.
2008-10-27 12:53:28 +05:30
Serge Kozlov
c0db5ae4ea Bug#22442, removed number of port 2008-10-26 22:34:24 +03:00
Serge Kozlov
9740e4b571 Bug#22442.
1. Replace --sleep by wait_* primitive
2. Vertical output for SHOW SLAVE STATUS
3. Updated result file
2008-10-26 21:53:21 +03:00
Davi Arnaut
b94e41a1a2 Post-merge fix: Update warning number due to repositioning in the error list. 2008-10-26 15:05:24 -02:00
Joerg Bruehe
927534d525 Fix a "configure" syntax error.
It had been introduced with the patch for bug entry 37098
and affected runs "--without-server" only.
2008-10-24 17:34:17 +02:00
Davi Arnaut
be7629e370 Merge from mysql-5.1-5.1.29-rc into mysql-5.1-bugteam 2008-10-24 11:58:48 -02:00
Mats Kindahl
533cf7950e Manual merge of 5.1 into 5.1-rpl 2008-10-24 14:51:06 +02:00
Davi Arnaut
1585368047 Merge from mysql-5.0-bugteam into mysql-5.1-bugteam 2008-10-24 10:50:59 -02:00
joerg@mysql.com
51a960e3bb Raise version number after cloning 5.0.72 2008-10-24 11:37:40 +02:00
Ramil Kalimullin
adf630dcee Fix for bug#23113: Different behavior on altering ENUM fields between 5.0 and 5.1
Problem: mysqld doesn't detect that enum data must be reinserted performing
'ALTER TABLE' in some cases.

Fix: reinsert data altering an enum field if enum values are changed.
2008-10-24 13:00:03 +05:00
Sergey Petrunia
5fd9914910 Merge 2008-10-24 06:37:29 +04:00
Sergey Petrunia
5249c0493e BUG#38072: Wrong result: HAVING not observed in a query with aggregate
- Make send_row_on_empty_set() return FALSE when simplify_cond() has found out
  that HAVING is always FALSE
re-committing to put the fix into 5.0 and 5.1
2008-10-24 06:16:22 +04:00
Davi Arnaut
2bf160b05e Merge from mysql-5.1-5.1.29-rc into mysql-5.1-bugteam 2008-10-23 19:03:26 -02:00
Davi Arnaut
5b8c8a6cf3 Merge from mysql-5.0-5.1.29-rc into mysql-5.0-bugteam 2008-10-23 18:56:03 -02:00
Mattias Jonsson
5e353415f8 Bug#40176: update as first partitioning statement
breaks auto increment

The auto_increment value was not initialized if
the first statement after opening a table was
an 'UPDATE'.

solution was to check initialize if it was not,
before trying to increase it in update.
2008-10-23 22:14:07 +02:00
Vladislav Vaintroub
a68f6a9cd7 merge 2008-10-23 22:05:47 +02:00
Mats Kindahl
1f29c52581 Merging 5.1 main into 5.1-rpl 2008-10-23 21:27:09 +02:00
Vladislav Vaintroub
8fe1cce5b5 merge fix for Bug40280 from 5.0 2008-10-23 17:59:22 +02:00
Sven Sandberg
39987388a0 BUG#35701: please allow test language variables in connection and sync_slave_with_master
Problem: In the mysqltest language, it was not possible to set the current
connection from a variable, and it was not possible to read the current
connection.
Fix: Allow setting the connection from a variable, like:
connection $variable;
and introduce the mysqltest language variable $CURRENT_CONNECTION, which
holds the name of the current connection.
2008-10-23 16:23:13 +02:00
Georgi Kodinov
a4890f896c merged 5.0-5.1.29-rc -> 5.1-5.1.29-rc 2008-10-23 17:09:19 +03:00
Georgi Kodinov
07c6d5cbd0 merged 5.1-main to 5.1-5.1.29-rc 2008-10-23 16:39:21 +03:00
Georgi Kodinov
b6fbc38c13 merged 5.0 main -> 5.0-5.1.29-rc 2008-10-23 16:35:44 +03:00
Vladislav Vaintroub
f14edb91fb Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.
Visual Studio 2008 Express edition does not include message compiler mc.exe
It is not possible to build MySQL server if only VC2008 Express is installed,
because we use mc.exe to generate event log messages.

This patch removes the mc.exe dependency. Generated files message.h, 
message.rc and MSG00001.bin  are checked into source code repository.
Instructions on how to add or change messages are added to messages.mc
2008-10-23 15:28:53 +02:00
Joerg Bruehe
fac7b57d08 Upmerge 5.0-build -> 5.1-build
(null-merge, just the merge changesets, all base changes are already in)
2008-10-23 12:02:00 +02:00
Joerg Bruehe
43b1027c10 Merge main 5.1 -> 5.1-build 2008-10-23 11:51:30 +02:00
Sven Sandberg
cf10a465f8 Merged new test case for BUG#39812 to the head of 5.1 2008-10-22 16:45:29 +02:00
Sven Sandberg
01b3315922 BUG#39812: Make statement replication default for 5.1 (to match 5.0)
Added test case to check the default value of @@binlog_format.
2008-10-22 16:00:45 +02:00
Davi Arnaut
dc324e86b2 Merge post-merge fix from mysql-5.0-bugteam. 2008-10-21 19:07:31 -02:00
Davi Arnaut
e139d9c775 Post-merge fix: drop table at the end of test. 2008-10-21 19:02:26 -02:00
Davi Arnaut
188293f5b3 Merge Bug#28323 to mysql-5.1.29-rc 2008-10-21 18:28:01 -02:00
Davi Arnaut
b0d673fc4d Bug#28323: Server crashed in xid cache operations
The problem was that the server did not robustly handle a
unilateral roll back issued by the Resource Manager (RM)
due to a resource deadlock within the transaction branch.
By not acknowledging the roll back, the server (TM) would
eventually corrupt the XA transaction state and crash.

The solution is to mark the transaction as rollback-only
if the RM indicates that it rolled back its branch of the
transaction.
2008-10-21 16:07:31 -02:00
Davi Arnaut
ca53651d40 Bug#28323: Server crashed in xid cache operations
The problem was that the server did not robustly handle a
unilateral roll back issued by the Resource Manager (RM)
due to a resource deadlock within the transaction branch.
By not acknowledging the roll back, the server (TM) would
eventually corrupt the XA transaction state and crash.

The solution is to mark the transaction as rollback-only
if the RM indicates that it rolled back its branch of the
transaction.
2008-10-21 15:45:43 -02:00
timothy.smith@sun.com
bc51b15d75 Merge from mysql-5.0.70-release 2008-10-21 17:21:23 +02:00
Kristofer Pettersson
3c76b5a104 Bug#39451 Debug builds broken with Sun Studio compiler
Debug builds of MySQL 5.1, 6.0 with Sun Studio 12 broke because of
use of gcc specific feature.
            
The fix is to replace __FUNCTION__ with the corresponding character string
2008-10-21 14:18:38 +02:00
Georgi Kodinov
b84bc62bc4 merge 5.1-bugteam -> bug 38693-5.1-bugteam 2008-10-21 11:00:08 +03:00