1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Commit Graph

68513 Commits

Author SHA1 Message Date
Bjorn Munch
b7e61a3a20 Some if simplifications in tests 2010-12-20 15:15:01 +01:00
Bjorn Munch
63728717e2 null upmerge 2010-12-20 13:17:17 +01:00
Bjorn Munch
009aca9c90 new merge from 5.1 2010-12-20 12:58:33 +01:00
Bjorn Munch
b986ec32a0 new merge from 5.5 2010-12-20 12:56:02 +01:00
Sven Sandberg
c676f125a2 Fixed pb failure.
Problem: Warnings for truncated data were generated on hosts with
long host names because @@hostname was inserted into a CHAR(40) column.
Fix: Change CHAR(40) to TEXT.
2010-12-20 10:07:35 +01:00
Tor Didriksen
209df51cc9 Bug #59021 Valgrind warning in key_unpack()
Introduced by fix for Bug#57687
2010-12-20 10:00:14 +01:00
Sven Sandberg
4937765c8b Merged BUG#49978 with (BUG#51264 + BUG#51925) in 5.5-bugteam. 2010-12-19 18:27:22 +01:00
Sven Sandberg
fb5c33f5f6 Disabled part of rpl_change_master that fails sporadically because of BUG#59037. 2010-12-19 18:16:01 +01:00
Sven Sandberg
e37c86de18 Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam. 2010-12-19 18:15:12 +01:00
Sven Sandberg
09c80e12c5 BUG#49978: Replication tests don't clean up replication state at the end
Major replication test framework cleanup. This does the following:
 - Ensure that all tests clean up the replication state when they
   finish, by making check-testcase check the output of SHOW SLAVE STATUS.
   This implies:
    - Slave must not be running after test finished. This is good
      because it removes the risk for sporadic errors in subsequent
      tests when a test forgets to sync correctly.
    - Slave SQL and IO errors must be cleared when test ends. This is
      good because we will notice if a test gets an unexpected error in
      the slave threads near the end.
    - We no longer have to clean up before a test starts.
 - Ensure that all tests that wait for an error in one of the slave
   threads waits for a specific error. It is no longer possible to
   source wait_for_slave_[sql|io]_to_stop.inc when there is an error
   in one of the slave threads. This is good because:
    - If a test expects an error but there is a bug that causes
      another error to happen, or if it stops the slave thread without
      an error, then we will notice.
    - When developing tests, wait_for_*_to_[start|stop].inc will fail
      immediately if there is an error in the relevant slave thread.
      Before this patch, we had to wait for the timeout.
 - Remove duplicated and repeated code for setting up unusual replication
   topologies. Now, there is a single file that is capable of setting
   up arbitrary topologies (include/rpl_init.inc, but
   include/master-slave.inc is still available for the most common
   topology). Tests can now end with include/rpl_end.inc, which will clean
   up correctly no matter what topology is used. The topology can be
   changed with include/rpl_change_topology.inc.
 - Improved debug information when tests fail. This includes:
    - debug info is printed on all servers configured by include/rpl_init.inc
    - User can set $rpl_debug=1, which makes auxiliary replication files
      print relevant debug info.
 - Improved documentation for all auxiliary replication files. Now they
   describe purpose, usage, parameters, and side effects.
 - Many small code cleanups:
    - Made have_innodb.inc output a sensible error message.
    - Moved contents of rpl000017-slave.sh into rpl000017.test
    - Added mysqltest variables that expose the current state of
      disable_warnings/enable_warnings and friends.
    - Too many to list here: see per-file comments for details.
2010-12-19 18:07:28 +01:00
Jonathan Perkin
6c70c33f12 bug#51925: 5.5 installed header file layout is incorrect
Additional space-in-directory-name protection.
2010-12-17 23:13:33 +00:00
Jonathan Perkin
a3deb16810 bug#51925: 5.5 installed header file layout is incorrect
The 'mysql' include sub-directory was copied directly into
include/ rather than retaining its own directory.

Fix this, and update mysql_config which needs additional
logic to detect the correct prefix for includes.
2010-12-17 23:08:43 +00:00
Jonathan Perkin
2b39e065d7 bug#51264: MySQL.prefPane fails to run
@prefix@ was erroneously set to '.' with the STANDALONE install
layout, when it should instead be set to CMAKE_INSTALL_PREFIX,
this was likely accidentally copied from scripts/CMakeLists.txt
which has similar handling specifically for mysql_install_db.sh

mysql.server init script can now find the install, assuming the
defaults have been chosen.
2010-12-17 23:03:23 +00:00
Mikael Ronstrom
2a294a1989 BUG#59013, make partition handler not miss HA_STATUS_NO_LOCK, add HA_STATUS_VARIABLE_EXTRA to remove InnoDB bottleneck 2010-12-17 21:58:40 +01:00
Sergey Vojtovich
7d5df40277 Merge fix for BUG58948 to 5.5-bugteam. 2010-12-17 19:08:05 +03:00
Georgi Kodinov
1e813daca9 merge 2010-12-17 15:28:40 +02:00
Georgi Kodinov
24a40d0b77 merge 2010-12-17 15:10:40 +02:00
Georgi Kodinov
e26978facb merge 2010-12-17 15:10:15 +02:00
Georgi Kodinov
c8853ae5e5 merge 2010-12-17 15:05:50 +02:00
Georgi Kodinov
89d01ca087 merge 2010-12-17 15:02:10 +02:00
Jorgen Loland
ef0a01abfc BUG#58985: Assertion tab->quick->index != 64 failed in make_join_select()
in sql_select.cc

Follow-up patch. Add sanity check for quick select when it is
decided that it should be used.
2010-12-17 13:52:39 +01:00
Georgi Kodinov
ce80181720 merge 2010-12-17 14:47:33 +02:00
Georgi Kodinov
db5cbc8252 merge 2010-12-17 14:44:35 +02:00
Georgi Kodinov
8165ea21f0 tree details update to main 2010-12-17 14:42:30 +02:00
Georgi Kodinov
fca0f1dbb7 merge 2010-12-17 13:22:19 +02:00
Georgi Kodinov
c901d8a65e merge 2010-12-17 13:18:43 +02:00
Georgi Kodinov
1e80a96870 merge 2010-12-17 13:11:34 +02:00
Georgi Kodinov
82e887e3b2 merge 2010-12-17 13:06:49 +02:00
Georgi Kodinov
4722079474 merge 2010-12-17 13:05:10 +02:00
Alexander Nozdrin
eb63f9e705 Merge follow-up: update test result. 2010-12-17 13:48:00 +03:00
Bjorn Munch
11746c8000 some more if stmt simplifications 2010-12-17 11:30:59 +01:00
Bjorn Munch
5709298591 null upmerge 2010-12-17 10:41:24 +01:00
Bjorn Munch
453d4fab7b merge from 5.5 main 2010-12-17 10:37:46 +01:00
Bjorn Munch
3e596cee79 merge from 5.1 main up to 3474 2010-12-17 10:13:55 +01:00
Jorgen Loland
f7dc30c843 BUG#58985: Assertion tab->quick->index != 64 failed in
make_join_select() in sql_select.cc

Caused by incorrect ASSERT introduced by BUG#58456. Quick selects 
may have index == MAX_KEY if it merges indices.
2010-12-17 10:02:24 +01:00
Sergey Vojtovich
cb2e57c788 BUG#58948 - Valgrind warning in do_handle_one_connection()
Fixed that proxy_user may be used uninitialized.
2010-12-17 11:56:43 +03:00
Georgi Kodinov
63c1731a64 post-merge test result update 2010-12-17 10:22:54 +02:00
Georgi Kodinov
6c3d371441 post-merge test suite update 2010-12-17 10:20:44 +02:00
Sunny Bains
0b099e8723 Bug #18274 - InnoDB auto_increment field reset on OPTIMIZE TABLE
With the above bug fix, the maximum autoinc value is preserved when
a table is optimized. Update resut file to reflect that.
2010-12-17 17:27:41 +11:00
Luis Soares
59fdd56dd1 BUG#46166
Automerge from mysql-5.1-bugteam.
2010-12-17 01:29:53 +00:00
Luis Soares
9e161d3021 BUG#46166
Post-push fixes:

  - fixed platform dependent result files
  - appeasing valgrind warnings:
   
    Fault injection was also uncovering a previously existing 
    potential mem leaks. For BUG#46166 testing purposes, fixed 
    by forcing handling the leak when injecting faults.
2010-12-17 01:17:03 +00:00
Luis Soares
a7087d81eb empty merge from mysql-5.1-bugteam. 2010-12-16 19:15:55 +00:00
Luis Soares
905e21a0cf BUG#46166
Merging to latest mysql-5.5-bugteam.
2010-12-16 19:12:31 +00:00
Luis Soares
60f650069b BUG#46166
Merging to latest mysql-5.1-bugteam.
2010-12-16 19:11:08 +00:00
Alexander Nozdrin
a72186103f Manual merge from mysql-5.5. 2010-12-16 21:43:21 +03:00
Georgi Kodinov
56b06b422e merge 2010-12-16 18:54:03 +02:00
Georgi Kodinov
c6b904abf8 merge mysql-5.5->mysql-5.5-bugteam 2010-12-16 18:44:17 +02:00
Georgi Kodinov
7bdecb1d4a merge 2010-12-16 16:40:52 +02:00
Kristofer Pettersson
4be65039b7 automerge 2010-12-16 15:10:23 +01:00
Kristofer Pettersson
8dc1e33487 merge 5.1-security => 5.5-security 2010-12-16 15:08:26 +01:00