Commit graph

59124 commits

Author SHA1 Message Date
Mikael Ronstrom
bf7771df3f Review fixes for BUG#48161 and BUG#48447 2009-11-06 11:49:27 +01:00
Mikael Ronstrom
ca9fe97e9f BUG#48447, BUG#48161, fixed a regression from fix of BUG#6045, where binary collations can use indexes/partition pruning for cases using equality conditions, however it cannot be used for any other condition like <, >, <=, >=, <>, also added test case for verification of BUG#47774 in this patch 2009-11-05 15:42:03 +01:00
Mikael Ronstrom
16b603a8b0 Fixed a use of non-initialised variable, cannot use NULL flags if RANGE == NO_MAX_RANGE or NO_MIN_RANGE, so need to check NULL flags after checking the RANGE isn't NO_MAX_RANGE 2009-11-04 09:30:52 +01:00
Mikael Ronstrom
092cf82871 Merge 2009-11-03 12:37:02 +01:00
Alexander Nozdrin
bb5efb2c4b Fix default.conf. 2009-11-03 11:36:16 +03:00
Mikael Ronstrom
9c825ffc78 Fixed test failure 2009-11-02 21:19:56 +01:00
Alexander Barkov
551314f5fa Merging a postfix for Bug#46633 Obsolete Serbian locale
from mysql-next-mr-bar
2009-11-02 21:21:37 +04:00
Alexander Nozdrin
c502279342 Backport a patch from 6.0:
------------------------------------------------------------
revno: 2599.178.12
revision-id: alik@mysql.com-20080812161845-we7cx9f22yrghob1
committer: Alexander Nozdrin <alik@mysql.com>
branch nick: 6.0-rt-build
timestamp: Tue 2008-08-12 20:18:45 +0400
message:
  Fix memory leak.
------------------------------------------------------------
2009-11-02 17:17:14 +03:00
Mikael Ronstrom
8755de32ab Fixed a few bugs in hex string generation, in call to val_str for partition expressions, also made code reusable for DEFAULT handling to fix BUG#48464 by introducing function get_cs_converted_string_value, added partition_utf8 test case for UTF8 outputs 2009-11-02 14:49:26 +01:00
Alexander Nozdrin
a708ba6524 Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
Mikael Ronstrom
1c91799c6a Merge to latest mysql-next-mr 2009-11-02 11:09:15 +01:00
Mikael Ronstrom
6ce3a06feb Added test case for UTF8 strings in partition constants 2009-11-02 11:03:40 +01:00
Mikael Ronstrom
1f94bbc78e Fixed a test error 2009-10-31 10:54:28 +01:00
Mikael Ronstrom
fb1f865c55 Fixed a test error 2009-10-31 10:48:18 +01:00
Alexander Nozdrin
46aa4c2672 Merge from mysql-trunk. 2009-10-31 11:11:58 +03:00
Alexander Nozdrin
7ed5c11c6a Fix default.conf. 2009-10-31 11:11:10 +03:00
Mikael Ronstrom
d931cd9235 Added more comments and a safer error check 2009-10-30 22:35:20 +01:00
Mikael Ronstrom
cf8fddb910 Fixed such that we fail if using integer constants for character set fields, now need to have correct constant types 2009-10-30 21:44:41 +01:00
Mikael Ronstrom
319e843509 Fixed so that character set constants are encoded as hex strings in frm file, but as utf8 strings in the same manner as default values in show create table and information schema tables 2009-10-30 21:08:34 +01:00
Mikael Ronstrom
76e2c7b9dc Ensuring character set constants are safe, first step fix 2009-10-30 17:34:11 +01:00
Mikael Ronstrom
caa4fffa00 Changed COLUMN_LIST to COLUMNS after arch review 2009-10-29 18:04:23 +01:00
Marc Alff
63e732fe61 Bug#33637 SHOW PROCEDURE CODE/SHOW FUNCTION CODE sp_name gives a syntax error.
Backport for 5.5

In non debug builds, the statements:
- SHOW PROCEDURE CODE
- SHOW FUNCTION CODE
used to fail with a "syntax error", which is misleading.

These statements have been changed to return the following error for non
debug builds:
ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you
need MySQL built with '--with-debug' to have it working

For debug builds (./configure --with-debug), nothing is changed.
2009-10-29 10:51:04 -06:00
Kristofer Pettersson
487bfd56d4 post commit fix: missing result file. 2009-10-29 17:18:09 +01:00
Marc Alff
afc87e52ac Bug#38968 Unused mutex LOCK_bytes_sent, LOCK_bytes_received
Backport for 5.5
2009-10-29 09:21:16 -06:00
Marc Alff
48a4658df3 Local merge 2009-10-29 09:10:31 -06:00
Marc Alff
54b5ef84ca Bug#38967 Unused mutex LOCK_Acl
Backport to 5.5
2009-10-29 09:07:29 -06:00
Alexander Nozdrin
f236f9a9dc Automerge from mysql-next-mr. 2009-10-29 18:03:30 +03:00
Mikael Ronstrom
53dc58d841 BUG#48397, set key_part->length to key_part->store_length isn't correct, store_length is a bit longer 2009-10-29 13:08:35 +01:00
Kristofer Pettersson
ddcdacb297 Bug#38551 query cache can still consume [very little] cpu time even when it is off.
When the query cache is disabled, the server shouldn't attempt to take the 
query cache mutex.
                             
By using the command line option --query_cache_type=0, the user can disable
   
(backport from mysql-pe)


mysql-test/t/query_cache_disabled-master.opt:
  * added test case for bug38551
mysql-test/t/query_cache_disabled.test:
  * added test case for bug38551
sql/set_var.cc:
  * Added before-trigger to verify that query_cache_type wasn't turned off or on during
  runtime.
sql/set_var.h:
  * Changed order on how the enumeration is processed. By first projecting the
  character representation of the variable to a temporary integer we can have
  one function instead of two to check if the value is valid.
sql/share/errmsg-utf8.txt:
  * Added error message for query cache disabled state
sql/sql_cache.cc:
  * If the query cache is disabled at start up, shorten the execution path and avoid
  grabbing the query cache mutex each time the invalidate interface methods are called.
sql/sql_cache.h:
  * Added new methods to set the query cache into a disabled state.
2009-10-29 12:19:36 +01:00
Alexander Barkov
18f63cbcb9 A postfix for Bug#46633 Obsolete Serbian locale name
Re-Allowing sr_YU with a "deprecated" warning.
2009-10-29 15:10:36 +04:00
Alexey Botchkov
eff49de23e mysql_upgrade test fixed
per-file comments:
  mysql-test/r/mysql_upgrade.result
     result updated
  mysql-test/t/mysql_upgrade.test
     --skip-verbose option added to the call
2009-10-29 10:03:16 +04:00
Mikael Ronstrom
470a44c70d Fixed code review change to ensure that VALUES constants are of the same result type as the field they are constants for 2009-10-28 19:20:32 +01:00
Mikael Ronstrom
c94237e530 Merge 2009-10-28 18:32:48 +01:00
Mikael Ronstrom
072c13d939 Merged WL#3352 into mysql-next-mr 2009-10-28 18:22:36 +01:00
Mikael Ronstrom
315d13a6c8 Merge 2009-10-28 17:52:55 +01:00
Mattias Jonsson
4083216d73 merge 2009-10-28 17:30:58 +01:00
Tor Didriksen
667a72ad88 update .bzrignore to ignore libmysqld/rpl_handler.cc link 2009-10-28 15:46:11 +01:00
Tor Didriksen
b2baeed4a7 Bug#48060 Memory leak - Item::val_bool() (item.cc:184) from optimizer_subquery grammar
Item_sum::set_aggregator() may be called multiple times during query preparation.
On subsequent calls: verify that the aggregator type is the same,
and re-use the existing Aggregator.


sql/item_sum.cc:
  In Item_sum::set_aggregator(): re-use existing Aggregator if already set.
  
  Remove some friend declarations, add some accessor functions.
  Cleanup some DBUG_ENTER and DBUG_RETURN code.
sql/item_sum.h:
  Make some member fields private, add accessors instead.
  Remove some un-necessary friend declarations.
  Remove some default arguments from constructors.
sql/opt_sum.cc:
  Use accessor functions in Item_sum.
sql/sql_select.cc:
  Fix mis-spelled DBUG_ENTER text.
  Use accessor functions in Item_sum.
sql/sql_yacc.yy:
  Use explicit true/false rather than default arguments when constructing
  Item_sum_xxx objects.
2009-10-28 11:07:30 +01:00
Alexey Botchkov
36299d59ef WL#4991 mysql_upgrade --fix-privilege-tables
(backport)
   mysql_upgrade script accepts --upgrade-system-tables option,
   fixing only system tables in this case.

per-file comments:
  client/mysql_upgrade.c
WL#4991 mysql_upgrade --fix-privilege-tables
    --upgrade-system-tables option added.
   if it is set, the tool won't look for the mysqlcheck then
   run_mysqlcheck_fixnames() and run_mysqlcheck_upgrade won't be called.
  mysql-test/r/mysql_upgrade.result
WL#4991 mysql_upgrade --fix-privilege-tables
    test result added
  mysql-test/t/mysql_upgrade.test
WL#4991 mysql_upgrade --fix-privilege-tables
    test case added
2009-10-28 14:02:00 +04:00
Alexander Nozdrin
42cdc4df8f Fix automerge: s/hash_search/my_hash_search/. 2009-10-28 11:42:18 +03:00
Alexander Nozdrin
22fe8e10e2 Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
Alexander Nozdrin
55b8f07a99 Automerge from mysql-next-mr. 2009-10-28 10:48:53 +03:00
Mikael Ronstrom
10fed1aca0 BUG#48165, needed to introduce length restrictions on partitioning fields to ensure that no stack overruns occur 2009-10-28 01:11:17 +01:00
Mikael Ronstrom
cc43a2089c Fixed sql_mode issue in BUG#48164, will ignore sql_mode when generating constants, also warnings will not be tolerated 2009-10-28 00:06:11 +01:00
Vladislav Vaintroub
afcb7b8597 merge 2009-10-27 13:51:59 +01:00
Alexander Nozdrin
455bcad07f Automerge from mysql-trunk-bugfixing. 2009-10-27 13:05:40 +03:00
Alexander Nozdrin
cd56f6ffe9 Make rpl_timezone experimental due to Bug#47017. 2009-10-27 13:05:06 +03:00
Alexander Nozdrin
47c9089ef5 Automerge from mysql-next-mr. 2009-10-27 12:59:09 +03:00
Alexander Nozdrin
cd6e159890 Automerge from mysql-next-mr. 2009-10-27 12:57:44 +03:00
Alexander Nozdrin
453eb014f7 Fix default.conf. 2009-10-27 12:44:23 +03:00