Commit graph

57974 commits

Author SHA1 Message Date
Alexey Kopytov
e544285dc2 Bug : MySQL 5.1.30 crashes on the latest OpenSolaris 10
Change the default optimization level for Sun Studio to "-O1". 
This is a workaround for a Sun Studio bug (see bug  
comments for details): 
 
1. Use $GCC instead of $ac_cv_prog_gcc to check for gcc, since 
the first one is the only documented way to do it. 
 
2. Use $GXX instead of $ac_cv_prog_cxx_g to check for g++, 
since the latter is set to "yes" when the C++ compiler accepts 
"-g" which is the case for both g++ and CC. 
 
3. When building with Sun Studio, set the default values for 
CFLAGS/CXXFLAGS to "-O1", since unlike GCC, Sun Studio 
interprets "-O" as "-xO3" (see the manual pages for cc and CC). 

configure.in:
  1. Use $GCC instead of $ac_cv_prog_gcc to check for gcc, since 
  the first one is the only documented way to do it. 
   
  2. Use $GXX instead of $ac_cv_prog_cxx_g to check for g++, 
  since the latter is set to "yes" when the C++ compiler accepts 
  "-g" which is the case for both g++ and CC. 
   
  3. When building with Sun Studio, set the default values for 
  CFLAGS/CXXFLAGS to "-O1", since unlike GCC, Sun Studio 
  interprets "-O" as "-xO3" (see the manual pages for cc and CC).
2009-06-18 17:11:47 +04:00
Sergey Vojtovich
0fa4924fe5 Fixed build failures.
storage/innodb_plugin/Makefile.am:
  Removed handler0vars.h from source distribution.
win/Makefile.am:
  Fixed incorrect merge.
2009-06-18 13:49:44 +05:00
Martin Hansson
37b2b7fadb Merge 2009-06-18 09:25:46 +02:00
Mikael Ronstrom
c3133e1740 Removed debug comments on Windows CMake fixes 2009-06-17 19:16:49 +02:00
Alexey Kopytov
ac47882b00 Automerge. 2009-06-17 21:03:01 +04:00
Alexey Kopytov
8d59506502 Automerge. 2009-06-17 21:00:39 +04:00
Alexey Kopytov
b74deb21a2 Automerge. 2009-06-17 20:58:46 +04:00
Alexey Kopytov
56dd4d44b1 Automerge. 2009-06-17 20:12:50 +04:00
Alexey Kopytov
5814263583 Disabled embedded server for the test case for bug . 2009-06-17 20:10:48 +04:00
Staale Smedseng
ce7eeb8201 Merge from 5.1-bugteam upstream 2009-06-17 17:50:27 +02:00
Martin Hansson
4f59ca45a0 Merge 2009-06-17 17:34:53 +02:00
Staale Smedseng
f7df81cf65 Merge from upstream 5.1-bugteam 2009-06-17 17:33:22 +02:00
Kristofer Pettersson
b1967ef40e Automerge 2009-06-17 17:07:20 +02:00
Martin Hansson
0d460bcd65 Bug#44684: valgrind reports invalid reads in
Item_func_spatial_collection::val_str
        
When the concatenation function for geometry data collections
reads the binary data it was not rigorous in checking that there
is data available, leading to invalid reads and crashes.
Fixed by making checking stricter.


mysql-test/r/gis.result:
  Bug#44684: Test result
mysql-test/t/gis.test:
  Bug#44684: Test case
sql/item_geofunc.cc:
  Bug#44684: fix(es)
  - Check that there are 4 bytes available for type code.
  - Check that there is at least one point available for linestring.
  - Check that there are at least 2 points in a polygon and
    data for all the points.
2009-06-17 16:58:33 +02:00
Staale Smedseng
2380d465f0 Merge from 5.0-bugteam 2009-06-17 16:56:44 +02:00
Vladislav Vaintroub
87da3df623 merge 2009-06-17 16:32:16 +02:00
Kristofer Pettersson
389fba8403 Bug#43758 Query cache can lock up threads in 'freeing items' state
This patch corrects a misstake in the test case for bug patch 43658.

There was a race in the test case when the thread id was retrieved from the processlist.
The result was that the same thread id was signalled twice and one thread id wasn't
signalled at all.

The affected platforms appears to be limited to linux.

mysql-test/r/query_cache_debug.result:
  There was a race in the test case when the thread id was retrieved from the processlist.
  The result was that the same thread id was signalled twice and one thread id wasn't
  signalled at all.
mysql-test/t/query_cache_debug.test:
  There was a race in the test case when the thread id was retrieved from the processlist.
  The result was that the same thread id was signalled twice and one thread id wasn't
  signalled at all.
2009-06-17 16:28:11 +02:00
Vladislav Vaintroub
00182614bd Fixed type defintion for os_thread_id_t on 64 bit Windows.
It used to be declared as ulint, which is 32/64 bit integer depending on OS bitness.
However this declaration lead to problems with os_compare_and_swap_thread_id 
implementation which operated on 32 bit integers (InterlockedCompareExchange)

Using 64 bit int   lead to  wrong result in os_compare_and_swap_thread_id 
and to crash/assertion in  rw_lock_set_writer_id_and_recursion_flag()

The fix is to use 4 byte integer to os_thread_id type definition.
2009-06-17 16:14:08 +02:00
Staale Smedseng
3b0e6e4109 Bug Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2
      
Compiling MySQL with gcc 4.3.2 and later produces a number of 
warnings, many of which are new with the recent compiler
versions.
                  
This bug will be resolved in more than one patch to limit the
size of changesets. This is the second patch, fixing more
of the warnings.
2009-06-17 15:54:01 +02:00
Alexey Kopytov
168557f4c3 Automerge. 2009-06-17 16:38:19 +04:00
Alexey Kopytov
de4d3f2b39 Automerge. 2009-06-17 16:37:10 +04:00
Alexey Kopytov
689901f36f Automerge. 2009-06-17 16:36:45 +04:00
Alexey Kopytov
736fa25e58 Automerge. 2009-06-17 15:50:50 +04:00
Sergey Vojtovich
8469eee8c3 When using bundled zlib, INNODB_PLUGIN was looking for
zlib headers in wrong location.

Fixed by using path exported by zlib.m4 macro.

storage/innodb_plugin/Makefile.am:
  Include zlib headers from a proper location.
2009-06-17 14:38:41 +05:00
Alfranio Correia
4cb4593bde BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind
This is a backport of BUG#43076.
2009-06-16 16:04:30 +01:00
Martin Hansson
aa8677bc32 Bug#45168: assertion with convert() and empty set value
The assertion in String::copy was added in order to avoid
valgrind errors when the destination was the same as the source.
Eased restriction to allow for the case when str == NULL.


mysql-test/r/func_set.result:
  Bug#45168: Test result
mysql-test/t/func_set.test:
  Bug#45168: Test case
sql/item_strfunc.cc:
  Bug#45168: Code cleanup and grammar correction in comment
sql/sql_string.cc:
  Bug#45168: Fix
2009-06-16 16:36:15 +02:00
Mikael Ronstrom
9fa8900734 First attempt at fixing Windows issues in 5.4.0 2009-06-16 15:16:15 +02:00
Jonathan Perkin
a0fcfc0c12 Raise version number after cloning 5.1.36 2009-06-16 14:00:04 +02:00
Georgi Kodinov
b08120eaa7 version change 2009-06-16 13:21:55 +03:00
Georgi Kodinov
48d911e708 Addendum to the fix for bug : move partition dependent test
to a test file that guarantees the presence of partition code
2009-06-16 12:59:57 +03:00
Kristofer Pettersson
86c0346212 Automerge 2009-06-16 10:49:04 +02:00
Kristofer Pettersson
19d5d486fa Automerge 2009-06-16 10:44:36 +02:00
Martin Hansson
00900db5c3 Merge 2009-06-16 10:43:13 +02:00
Kristofer Pettersson
b9e1ee63bb Automerge 2009-06-16 10:42:54 +02:00
Georgi Kodinov
84241af559 automerge 2009-06-16 10:35:42 +02:00
Kristofer Pettersson
02e5ad9881 Bug#43758 Query cache can lock up threads in 'freeing items' state
Early patch submitted for discussion.

It is possible for more than one thread to enter the condition
in query_cache_insert(), but the condition predicate is to
signal one thread each time the cache status changes between
the following states: {NO_FLUSH_IN_PROGRESS,FLUSH_IN_PROGRESS,
TABLE_FLUSH_IN_PROGRESS}

Consider three threads THD1, THD2, THD3

   THD2: select ... => Got a writer in ::store_query
   THD3: select ... => Got a writer in ::store_query
   THD1: flush tables => qc status= FLUSH_IN_PROGRESS;
                      new writers are blocked.
   THD2: select ... => Still got a writer and enters cond in
                       query_cache_insert
   THD3: select ... => Still got a writer and enters cond in
                       query_cache_insert
   THD1: flush tables => finished and signal status change.
   THD2: select ... => Wakes up and completes the insert.
   THD3: select ... => Happily waiting for better times. Why hurry?

This patch is a refactoring of this lock system. It introduces four new methods:
   Query_cache::try_lock()
   Query_cache::lock()
   Query_cache::lock_and_suspend()
   Query_cache::unlock()

This change also deprecates wait_while_table_flush_is_in_progress(). All threads are
queued and put on a conditional wait. On each unlock the queue is signalled. This resolve
the issues with left over threads. To assure that no threads are spending unnecessary
time waiting a signal broadcast is issued every time a lock is taken before a full
cache flush.

mysql-test/r/query_cache_debug.result:
  * Added test case for bug43758
mysql-test/t/query_cache_debug.test:
  * Added test case for bug43758
sql/sql_cache.cc:
  * Replaced calls to wait_while_table_flush_is_in_progress() with
    calls to try_lock(), lock_and_suspend() and unlock().
  * Renamed enumeration Cache_status to Cache_lock_status.
  * Renamed enumeration items to UNLOCKED, LOCKED_NO_WAIT and LOCKED.
    If the LOCKED_NO_WAIT lock type is used to lock the query cache, other
    threads using try_lock() will fail to acquire the lock.
    This is useful if the query cache is temporary disabled due to 
    a full table flush.
sql/sql_cache.h:
  * Replaced calls to wait_while_table_flush_is_in_progress() with
    calls to try_lock(), lock_and_suspend() and unlock().
  * Renamed enumeration Cache_status to Cache_lock_status.
  * Renamed enumeration items to UNLOCKED, LOCKED_NO_WAIT and LOCKED.
    If the LOCKED_NO_WAIT lock type is used to lock the query cache, other
    threads using try_lock() will fail to acquire the lock.
    This is useful if the query cache is temporary disabled due to 
    a full table flush.
2009-06-16 10:34:47 +02:00
Martin Hansson
5d44b2f3a5 Merge 2009-06-16 10:34:32 +02:00
Georgi Kodinov
4cd97cc70b automerge 2009-06-16 10:33:13 +02:00
Georgi Kodinov
46f95f0b82 fixed version 2009-06-16 10:27:53 +02:00
Davi Arnaut
3cc3aa7d70 Post-merge fix: modify regular expression to better handle 24 hour
times (ie: 2:16:20).

mysql-test/r/log_tables_debug.result:
  Update test case result.
mysql-test/t/log_tables_debug.test:
  Skip spaces and handle case when a leading zero is not printed.
2009-06-15 20:27:27 -03:00
Davi Arnaut
cebad07c5d Disable session debugging after its not necessary anymore.
mysql-test/t/log_tables_debug.test:
  Remove spurious spaces and disable session debugging.
2009-06-15 20:02:25 -03:00
Georgi Kodinov
e7bec65501 automerge 2009-06-15 18:17:34 +02:00
Staale Smedseng
37a5f2d421 Bug Information about statement id for prepared
statements missed from general log

A FLUSH LOGS is added to ensure that the log info hits
the file before attempting to process.

mysql-test/t/log_tables_debug.test:
  A FLUSH LOGS is added, and in the event that a match is
  not found, <FILE> is reset and the contents of the log
  file is dumped for debugging purposes.
2009-06-15 18:03:25 +02:00
Georgi Kodinov
778999907f automerge 2009-06-15 17:58:23 +02:00
Georgi Kodinov
04483bcd8d automerge 2009-06-15 17:57:06 +02:00
Georgi Kodinov
8e62452418 merged 5.1-main -> 5.1-bugteam 2009-06-15 17:53:45 +02:00
Georgi Kodinov
9d0d363be3 merged 5.0-main to 5.0-bugteam 2009-06-15 17:29:26 +02:00
Bernt M. Johnsen
32b6311005 nullmerge 2009-06-15 17:27:58 +02:00
Bernt M. Johnsen
d6a9e61c45 Bug#32357 Prepared for push on 5.0-bugteam branch 2009-06-15 17:14:00 +02:00
Georgi Kodinov
f264697084 automerge 2009-06-15 17:36:51 +03:00