Commit graph

66166 commits

Author SHA1 Message Date
Vladislav Vaintroub
ba87d4810a Fix effect of recent mismerge (it made default pid file name ".pid" instead of "hostname.pid") 2011-05-07 19:27:07 +02:00
Michael Widenius
4249382a65 Automatic merge 2011-05-04 22:33:18 +03:00
Michael Widenius
718ddbb2ca Automatic merge with 5.1 2011-05-04 22:25:56 +03:00
Michael Widenius
a67a5dd6f9 Automatic merge 2011-05-04 21:56:29 +03:00
Michael Widenius
a3af6f0f3d Fixed build errors on centos5-amd64-minimal, where we compile with very few character sets
Fixed compiler warnings

client/readline.cc:
  Fixed compiler warning
mysql-test/suite/innodb/t/innodb_bug60049.test:
  This test failed when running with --mysqld=--loose-innodb-fast-shutdown=2 which we do on some machines
mysql-test/t/mysqldump.test:
  Only run test if utf8 is used
sql/log.cc:
  Fixed compiler warning
sql/mysql_priv.h:
  Fixed compiler warnings
tests/mysql_client_test.c:
  Don't abort test if ucs2 is not in use.
2011-05-04 21:51:44 +03:00
Michael Widenius
3c9ae014ca Fixed build errors on centos5-amd64-minimal, where we compile with very few character sets
Fixed compiler warnings

client/readline.cc:
  Fixed compiler warning
mysql-test/t/mysqldump.test:
  Only run test if utf8 is used
sql/log.cc:
  Fixed compiler warning
sql/mysql_priv.h:
  Fixed compiler warnings
tests/mysql_client_test.c:
  Don't abort test if ucs2 is not in use.
2011-05-04 21:28:02 +03:00
Vladislav Vaintroub
10438588a3 merge 2011-05-04 17:11:54 +02:00
Vladislav Vaintroub
ca67f01bae merge 2011-05-04 16:12:39 +02:00
Vladislav Vaintroub
aff371f662 Cherrypick fix for maria recovery bug LPBUG#686006 from 5.2
into 5.1
2011-05-04 16:03:52 +02:00
Vladislav Vaintroub
c34e5a9152 Avoid mtr warning on Windows during startup
The reason for mtr warning is that collect_mysqld_features() starts mysqld with --datadir=/tmp and this 
directory does not exist on Windows.

Fix : instead of passing --datadir=$opt_vardir/tmp in collect_mysqld_features() just use --datadir=.
mysqld does not need a correct directory, just an existing one, as it is started with --help ---verbose -skip-grant-tables.
2011-05-04 15:45:39 +02:00
Vladislav Vaintroub
e4732a765e fix noisy warnings in header files 2011-05-04 14:47:27 +02:00
Michael Widenius
7191a44b4c Automatic merge 2011-05-04 12:04:13 +03:00
Michael Widenius
a9d14f5134 Automatic merge 2011-05-04 11:59:16 +03:00
Michael Widenius
52e4fce886 Automatic merge with 5.1 2011-05-04 11:35:51 +03:00
Michael Widenius
173820a553 Fixed typo that caused compiler warning 2011-05-04 11:31:06 +03:00
Michael Widenius
d2472af7f5 Fixed compiler warning 2011-05-04 11:28:02 +03:00
Vladislav Vaintroub
a9dd346c9b merge 2011-05-03 19:36:06 +02:00
Vladislav Vaintroub
713c86c079 merge 2011-05-03 19:32:17 +02:00
Vladislav Vaintroub
7d8a918c64 Fix warning (unused local variable) 2011-05-03 19:30:21 +02:00
Michael Widenius
547ef66609 Automatic merge with MariaDB 5.1 2011-05-03 19:11:39 +03:00
Michael Widenius
1be5462d59 Merge with MariaDB 5.1 2011-05-03 19:10:10 +03:00
Michael Widenius
f74853053f Automatic merge 2011-05-03 18:27:14 +03:00
Michael Widenius
96c1a87455 Fixed after-merge failures found by buildbot
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Updated test results
mysql-test/suite/pbxt/r/client_xml.result:
  Updated test results
mysys/Makefile.am:
  Added back my_port.c
storage/xtradb/buf/buf0buddy.c:
  Removed not used variables
storage/xtradb/fil/fil0fil.c:
  Added casts to fix compiler warnings
2011-05-03 18:17:13 +03:00
Vladislav Vaintroub
b46f14352b Fix Xtradb compile error on Win64 - conversion between pointers of different size 2011-05-03 12:50:09 +02:00
Vladislav Vaintroub
e6926b06da Fix compile errors:
- from xtradb merge
- portability error in bitmap-t.c ( variable size  array in non-portable)
2011-05-02 23:03:26 +02:00
Michael Widenius
90e058e0c6 Automatic merge 2011-05-02 21:42:52 +03:00
Michael Widenius
ee1950dab1 Merge with xtradb fixes 2011-05-02 21:41:02 +03:00
Michael Widenius
e415ba0fb2 Merge with MySQL 5.1.57/58
Moved some BSD string functions from Unireg
2011-05-02 20:58:45 +03:00
unknown
8b046db411 Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1. 2011-04-29 16:16:42 +02:00
unknown
fecd255a16 Updated with changes from Percona Server 5.1.56-12.7, from
lp:~percona-dev/percona-server/release-5.1.56-12.7 percona-server-5.1.56-12.7
as of April 29, 2011.

Merged: revid:ignacio.nin@percona.com-20110427224434-e5a4kpyfwvj641q3
2011-04-29 14:49:04 +02:00
Michael Widenius
046418ad95 Added calls to cleanup_mutexes() for embedded library. 2011-04-28 23:58:00 +03:00
Nirbhay Choubey
a1f7ceb281 BUG#12329909 - BUILDING MYSQL WITH DEBUG SUPPORT
FAILS WITH LIBEDIT

Fixed by checking the return value of the write()
function calls and handling the open files and fd
appropriately.


cmd-line-utils/libedit/vi.c:
  BUG#12329909 - BUILDING MYSQL WITH DEBUG SUPPORT
                 FAILS WITH LIBEDIT
  
  Added a check on the return value of the write()
  function calls.
2011-04-27 17:24:10 +05:30
Sergey Glukhov
a60c39a2ff Bug#11889186 60503: CRASH IN MAKE_DATE_TIME WITH DATE_FORMAT / STR_TO_DATE COMBINATION
calc_daynr() function returns negative result
if malformed date with zero year and month is used.
Attempt to calculate week day on negative value
leads to crash. The fix is return NULL for
'W', 'a', 'w' specifiers if zero year and month is used.
Additional fix for calc_daynr():
--added assertion that result can not be negative
--return 0 if zero year and month is used


mysql-test/r/func_time.result:
  test case
mysql-test/t/func_time.test:
  test case
sql-common/my_time.c:
  --added assertion that result can not be negative
  --return 0 if zero year and month is used
sql/item_timefunc.cc:
  eturn NULL for 'W', 'a', 'w' specifiers
  if zero year and month is used.
2011-04-27 11:35:57 +04:00
Guilhem Bichot
c575254f9d merge from 5.1 2011-04-26 13:06:44 +02:00
Mattias Jonsson
8b9d7ecea3 merge 2011-04-26 12:07:14 +02:00
Mattias Jonsson
bdaaee5d04 post fix for werror build for bug#11766249. 2011-04-26 10:21:09 +02:00
Serge Kozlov
c68a034e83 BUG#12371924. Fxi test case 2011-04-25 23:49:56 +04:00
Mattias Jonsson
bd707d128a merge 2011-04-23 16:57:24 +02:00
Sergey Glukhov
a5e8d9029b Bug#11756928 48916: SERVER INCORRECTLY PROCESSING HAVING CLAUSES WITH AN ORDER BY CLAUSE
Before sorting HAVING condition is split into two parts,
first part is a table related condition and the rest of is
HAVING part. Extraction of HAVING part does not take into account
the fact that some of conditions might be non-const but
have 'used_tables' == 0 (independent subqueries)
and because of that these conditions are cut off by
make_cond_for_table() function.
The fix is to use (table_map) 0 instead of used_tables in
third argument for make_cond_for_table() function.
It allows to extract elements which belong to sorted
table and in addition elements which are independend
subqueries.


mysql-test/r/having.result:
  test case
mysql-test/t/having.test:
  test case
sql/sql_select.cc:
  The fix is to use (table_map) 0 instead of used_tables in
  third argument for make_cond_for_table() function.
  It allows to extract elements which belong to sorted
  table and in addition elements which are independend
  subqueries.
2011-04-22 11:20:55 +04:00
Mattias Jonsson
b3d86f12eb merge 2011-04-20 18:10:15 +02:00
Mattias Jonsson
046b57450d merge 2011-04-20 18:00:50 +02:00
Mattias Jonsson
bd92ea4311 Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK
Update for previous patch according to reviewers comments.

Updated the constructors for ha_partitions to use the common
init_handler_variables functions

Added use of defines for size and offset to get better readability for the code that reads
and writes the .par file. Also refactored the get_from_handler_file function.
2011-04-20 17:52:33 +02:00
Jon Olav Hauglid
f3b024cafa BUG#12377872 ASSERTION FAILED: !_ENTERED WHEN GETHOSTBYADDR_R
FAILS ON SOLARIS

This assertion was triggered if gethostbyaddr_r cannot do a
reverse lookup on an ip address. The reason was a missing
DBUG_RETURN macro. The problem affected only debug versions of
the server.

This patch fixes the problem by replacing return with DBUG_RETURN.
No test case added.
2011-04-20 11:32:28 +02:00
Sergey Glukhov
90bbf9d615 Bug#11765923 58937: MANY VALGRIND ERRORS AFTER GROUPING BY RESULT OF DECIMAL COLUMN FUNCTION
Bug#11764671  57533: UNINITIALISED VALUES IN COPY_AND_CONVERT (SQL_STRING.CC) WITH CERTAIN CHA
When ROUND evaluates decimal result it uses Item::decimal
value as fraction value for the result. In some cases
Item::decimal is greater than real result fraction value
and uninitialised memory of result(decimal) buffer can be
used in further calculations. Issue is introduced by
Bug33143 fix. The fix is to remove erroneous assignment.


mysql-test/r/func_math.result:
  test case
mysql-test/t/func_math.test:
  test case
sql/item_func.cc:
  remove erroneous assignment
2011-04-20 11:39:20 +04:00
Serge Kozlov
dba184237a BUG#12371924
Update test case
2011-04-18 23:59:15 +04:00
Sven Sandberg
7b1967ad4e test fails on more platforms, removed @freebsd from default.experimental. 2011-04-18 14:42:14 +02:00
Martin Hansson
8dabe8aa92 Bug 11758558 - 50774: WRONG RESULTSET WHEN TIMESTAMP VALUES ARE APPENDED WITH
.0

The bug was fixed by the patch for bug number BUG 11763109 - 55779: SELECT
DOES NOT WORK PROPERLY IN MYSQL SERVER VERSION "5.1.42 SUSE MYSQL (Exact same
fix as was proposed for this bug.) Since the motivation for the two bug
reports was completely different, however, it still makes sense to push the
test case.

This patch contains only the test case.
2011-04-18 10:44:41 +02:00
Bjorn Munch
5d53587949 merge from 5.1-mtr 2011-04-16 16:46:51 +02:00
Bjorn Munch
0c36269494 merge from 5.1 main 2011-04-15 15:51:31 +02:00
Sergey Glukhov
bba7b9ca0c Bug#11765139 58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS AND WRITES WITH U
Some multibyte sequences could be considered by my_mbcharlen() functions
as multibyte character but more exact my_ismbchar() does not think so.
In such a case this multibyte sequences is pushed into 'stack' buffer which
is too small to accommodate the sequence.
The fix is to allocate stack buffer in
compliance with max character length.


mysql-test/r/loaddata.result:
  test case
mysql-test/t/loaddata.test:
  test case
sql/sql_load.cc:
  allocate stack buffer in compliance with max character length.
2011-04-15 12:51:34 +04:00