Commit graph

60009 commits

Author SHA1 Message Date
Kent Boortz
0654e74a70 Null merge of change in 5.0 to use -D_WIN32_WINNT=0x0500, Windows 2000
compatibility, not to change the -D_WIN32_WINNT=0x0501 in 5.1, XP
compatibility.
2009-12-11 19:16:04 +01:00
Kent Boortz
794e206347 Define _WIN32_WINNT to the minimum supported Windows version, 0x0500 i.e
Windows 2000.
      
      Visual Studio 2003 and 2005 require
        _WIN32_WINNT >= 0x0500 (Win2000)  for TryEnterCriticalSection.
2009-12-11 19:11:49 +01:00
Alexey Kopytov
ebdef570e5 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-11 19:40:58 +03:00
Georgi Kodinov
35adb5cf7a merge 2009-12-11 17:24:09 +02:00
Georgi Kodinov
ca2d22679e merge 2009-12-11 16:08:28 +02:00
Georgi Kodinov
492ff989fb merge 2009-12-11 16:07:19 +02:00
Georgi Kodinov
a72c4259c8 merge 2009-12-11 16:07:09 +02:00
Georgi Kodinov
97620e3ba8 merge of bug #49250 to 5.1-bugteam 2009-12-11 16:02:47 +02:00
Evgeny Potemkin
684c7aba09 Auto-merged fix for bug#49489. 2009-12-11 16:08:29 +03:00
V Narayanan
360b2ff4ce merging with mysql-5.1-bugteam 2009-12-11 17:27:12 +05:30
Alexander Nozdrin
5676713687 Manual merge from mysql-trunk.
Conflicts:
  - client/mysqltest.cc
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/t/disabled.def
  - sql/mysqld.cc
  - sql/opt_range.cc
  - sql/sp.cc
  - sql/sql_acl.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
2009-12-11 12:39:38 +03:00
Marc Alff
bea4ab9bb6 Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc 2009-12-11 01:58:13 -07:00
Horst.Hunger
239c0a7e49 Fix for bug#46117: This test is replaced by plugin.test also containing a CRESTE TABLE on example db. Example DB only exists as plugin. 2009-12-11 09:30:17 +01:00
V Narayanan
3fded1b6c1 Bug#49521 SHOW CREATE TABLE on IBMDB2I tables has incorrect fk constraint format
The fix inserts newline and comma characters as appropriate
into the constraint reporting code to match the formatting
required by SHOW CREATE TABLE. Additionally, a erroneously
duplicated copy of check_if_incompatible_data() was removed
from db2i_constraints.cc since the correct version is already
in ha_ibmdb2i.cc.

storage/ibmdb2i/db2i_constraints.cc:
  Bug#49521 SHOW CREATE TABLE on IBMDB2I tables has incorrect fk constraint format
  
  - Insert newline and comma characters into the constraint reporting
    code to match the formatting required by SHOW CREATE TABLE.
  
  - Remove an erroneous copy of check_if_incompatible_data() from
    db2i_constraints.cc.
2009-12-11 12:46:57 +05:30
Alexander Nozdrin
efee060831 Auto-merge (empty) from mysql-5.1. 2009-12-11 10:01:27 +03:00
V Narayanan
e3c1ee24fc Bug#49329 example (and other) engines use wrong collation for open tables hash
This fix changes the character set used within the
IBMDB2I handler to hash table names to information
about open tables. Previously, tables with names
that differed only in letter case would hash to the
same data structure. This caused incorrect behavior
or errors when two such tables were in use simultaneously.

mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result:
  Bug#49329 example (and other) engines use wrong collation for open tables hash
  
  Result file for the test case.
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test:
  Bug#49329 example (and other) engines use wrong collation for open tables hash
  
  Test case for the bug fix.
storage/ibmdb2i/ha_ibmdb2i.cc:
  Bug#49329 example (and other) engines use wrong collation for open tables hash
  
  change the character set used within the IBMDB2I
  handler to hash table names to information about
  open tables.
2009-12-11 12:31:16 +05:30
Alexander Nozdrin
6bb9b184b3 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-11 09:24:29 +03:00
Alexander Nozdrin
04bafb1b33 Auto-merge from mysql-next-mr. 2009-12-11 09:21:34 +03:00
Alexander Nozdrin
376cf4275f Auto-merge from mysql-trunk. 2009-12-11 09:20:49 +03:00
Alexander Nozdrin
f187906c4e Auto-merge from mysql-trunk. 2009-12-11 09:20:33 +03:00
Alexander Nozdrin
ceefe7bb50 Remove BitKeeper dir and .cvsignore. 2009-12-11 09:19:51 +03:00
Alexander Nozdrin
160322439a Auto-merge (empty) from mysql-next-mr. 2009-12-11 09:03:38 +03:00
Alexander Nozdrin
a440ea2821 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-11 09:02:32 +03:00
Alexander Nozdrin
583424ee3c Auto-merge (empty) from mysql-next-mr. 2009-12-11 09:01:18 +03:00
Alexander Nozdrin
4eb8577977 Auto-merge (empty) from mysql-trunk. 2009-12-11 09:00:57 +03:00
Alexander Nozdrin
f14483b0d4 Auto-merge (empty) from mysql-trunk. 2009-12-11 08:56:28 +03:00
Alexander Nozdrin
763b0810f1 Auto-merge from mysql-next-mr-bugfixing. 2009-12-11 08:54:53 +03:00
Alexander Nozdrin
eae0cd2a40 Auto-merge from mysql-trunk-bugfixing. 2009-12-11 08:54:36 +03:00
unknown
ba71a9e5d6 Bug #48742 Replication: incorrect help text for --init-slave
The help text for --init-slave=name:
"Command(s) that are executed when a slave connects to this master".
This text indicate that the --init-slave option is set on a  master 
server, and the master server passes the option's argument to slave 
which connects to it. This is wrong. Actually the --init-slave option 
just can be set on a slave server, and then the slave server executes 
the argument each time the SQL thread starts.

Correct the help text for --init-slave option as following:
"Command(s) that are executed by a slave server each time the SQL thread starts."


sql/mysqld.cc:
  Correct the help text for --init-slave option.
2009-12-11 10:12:18 +08:00
unknown
18d09c0183 Bug #48742 Replication: incorrect help text for --init-slave
The help text for --init-slave=name:
"Command(s) that are executed when a slave connects to this master".
This text indicate that the --init-slave option is set on a  master 
server, and the master server passes the option's argument to slave 
which connects to it. This is wrong. Actually the --init-slave option 
just can be set on a slave server, and then the slave server executes 
the argument each time the SQL thread starts.

Correct the help text for --init-slave option as following:
"Command(s) that are executed by a slave server each time the SQL thread starts."


sql/mysqld.cc:
  Correct the help text for --init-slave option.
2009-12-11 09:57:38 +08:00
Alexander Nozdrin
c323c2d8bf Auto-merge from mysql-next-mr-bugfixing. 2009-12-10 22:27:28 +03:00
Georgi Kodinov
7b174dcafc merge 2009-12-10 17:38:01 +02:00
Alexander Nozdrin
26e2802cf0 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-10 17:48:40 +03:00
Alexander Nozdrin
88c4f57ec9 Auto-merge (empty) from mysql-trunk. 2009-12-10 17:45:22 +03:00
Alexander Nozdrin
97928f59b8 Auto-merge from mysql-next-mr. 2009-12-10 17:44:36 +03:00
Georgi Kodinov
30e51fe854 Bug #49250 : spatial btree index corruption and crash
SPATIAL and FULLTEXT indexes don't support algorithm
selection. 
Disabled by creating a special grammar rule for these
in the parser.
Added some encasulation of duplicate parser code.
2009-12-10 11:28:38 +02:00
Sergey Vojtovich
9b0e649a2c After merge fix: pthread_mutext_[un]lock -> mysql_mutex_[un]lock. 2009-12-10 13:19:06 +04:00
Ramil Kalimullin
e1d4ad3931 Auto-merge. 2009-12-10 11:03:23 +04:00
Ramil Kalimullin
c888a4a239 Manual merge. 2009-12-10 10:31:52 +04:00
Gleb Shchepa
3246383301 Bug #49480: WHERE using YEAR columns returns unexpected results
A few problems were found in the fix for bug 43668:
1) Comparison of the YEAR column with NULL always returned TRUE;
2) Comparison of the YEAR column with constants always returned
   unpredictable result;
3) Unnecessary conversion warnings when comparing a non-integer
   constant with a NULL value in the YEAR column;

The problems described above have been resolved with an
exception: zero (i.e. invalid) YEAR column value comparison
with 00 or 2000 still fail (it is not a regression and it was
not a regression), so MIN/MAX on YEAR column containing zero
value still fail.


mysql-test/r/type_year.result:
  Test case for bug #49480.
mysql-test/t/type_year.test:
  Test case for bug #49480.
sql/item_cmpfunc.cc:
  - The get_year_value() function has been modified to make its
    return value compatible with the get_datetime_value() return
    value (i.e. to convert numeric values into the YYYY0000000000
    (YYYY-00-00 00:00:00) form.
  
  - The Arg_comparator::set_cmp_func method has been modified to
    use the get_year_value function if get_datetime_value() is not
    applicable.
    From now only 2 cases have a special processing there:
    * both comparing items have MYSQL_TYPE_YEAR field type
            or
    * one item have is MYSQL_TYPE_YEAR and other one is
      is_datetime()-compliant.
  
  - New helper function try_year_cmp_func() has been
    added for the better code readability to call from
    Arg_comparator::set_cmp_func().
  
  - The Arg_comparator::compare_year method has been removed
    since get_year_value() is compatible with the old
    Arg_comparator::compare_datetime method that doesn't have
    problems #1-#3 (see whole patch entry commentary).
sql/item_cmpfunc.h:
  - New helper function try_year_cmp_func() has been
    added for the better code readability to call from
    Arg_comparator::set_cmp_func().
  
  - Unnecessary Arg_comparator::year_as_datetime and
    Arg_comparator::compare_year() declarations have been
    removed.
2009-12-10 10:05:44 +04:00
Ramil Kalimullin
36e019c933 Auto-merge. 2009-12-10 09:51:08 +04:00
He Zhenxing
34c08c158c Auto merge 2009-12-10 12:56:10 +08:00
He Zhenxing
f8d1633251 Merge from 5.0-bugteam 2009-12-10 11:51:42 +08:00
He Zhenxing
9168949047 Post fix for bug#45520
mysql-test/include/kill_query.inc:
  Error 1034 can be generated when change MyISAM table indexes was interrupted
mysql-test/r/rpl_killed_ddl.result:
  table t4 may not exists because the ALTER above was interrupted
mysql-test/t/rpl_killed_ddl.test:
  table t4 may not exists because the ALTER above was interrupted
2009-12-10 11:44:19 +08:00
Marc Alff
c082955f06 WL#2360 Performance schema
Part III: mysys instrumentation
2009-12-09 20:19:51 -07:00
Evgeny Potemkin
1285ecd468 Bug#49489: Uninitialized cache led to a wrong result.
Arg_comparator uses Item_cache objects to store constants being compared when
they're need a type conversion. Because this cache wasn't initialized properly
Arg_comparator might produce wrong comparison result.

The Arg_comparator::cache_converted_constant function now initializes cache
prior to usage.

mysql-test/r/select.result:
  Added a test case for he bug#49489.
mysql-test/t/select.test:
  Added a test case for he bug#49489.
sql/item_cmpfunc.cc:
  Bug#49489: Uninitialized cache led to a wrong result.
  The Arg_comparator::cache_converted_constant function now initializes cache
  prior to usage.
2009-12-09 18:43:45 +03:00
Sergey Vojtovich
cda5ad508a Merge mysql-next-mr to mysql-next-mr-svoj. 2009-12-09 15:03:34 +04:00
Alfranio Correia
62551f071b merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam 2009-12-09 11:03:01 +00:00
Olav Sandstaa
9060aa68af Fix for Bug#49506 Valgrind error in make_cond_for_table_from_pred
This fix has been proposed by Sergey Petrunya and has been contributed
under SCA by sca@askmonty.org.
      
The cause for this valgrind error is that in the function
add_cond_and_fix() in sql_select.cc an Item_cond_and object is
created. This is marked as fixed but does not have a correct
table_map() attribute. Later, in make_join_select(), if
engine_condition_pushdown is in use, this table map is used and
results in the valgrind error.
      
The fix is to add a call to update_used_tables() in add_cond_and_fix()
so that the table map is updated correctly.
      
This patch is tested by multiple existing tests (e.g. the tests
innodb_mysql, innodb, fulltext, compress all produces this valgrind
warning/error without this fix).


sql/sql_select.cc:
  In add_cond_and_fix() add a call to update_used_tables() to ensure
  the table map is updated.
2009-12-09 10:16:11 +01:00
Sergey Vojtovich
6b8cd32eaa An addition to backport of
WL#3951 - MyISAM: Additional Error Logs for Data Corruption
Fixed partition_repair_myisam.test.

mysql-test/suite/parts/t/partition_repair_myisam.test:
  Suppress some extra warnings produced by MyISAM.
2009-12-09 11:33:28 +04:00