Commit graph

50675 commits

Author SHA1 Message Date
unknown
737cdfeaeb Fix for bug : loading udfs while --skip-grant-tables is enabled
causes out of memory errors

The code in mysql_create_function() and mysql_drop_function() assumed
that the only reason for UDFs being uninitialized at that point is an
out-of-memory error during initialization. However, another possible 
reason for that is the --skip-grant-tables option in which case UDF 
initialization is skipped and UDFs are unavailable.

The solution is to check whether mysqld is running with
--skip-grant-tables and issue a proper error in such a case.


mysql-test/r/skip_grants.result:
  Added a test case for bug .
mysql-test/t/skip_grants.test:
  Added a test case for bug .
sql/sql_udf.cc:
  Issue a proper error when a user tries to CREATE/DROP a UDF 
  on a server running with the --skip-grant-tables option.
2007-11-09 13:29:43 +03:00
unknown
b56f1c16ef Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
2007-11-08 12:16:24 +03:00
unknown
5a98d8aabf Merge polly.(none):/home/kaa/src/opt/bug32103/my51-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
2007-11-08 12:10:36 +03:00
unknown
a5d7fa746f Merge polly.(none):/home/kaa/src/opt/mysql-4.1-opt
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-11-08 12:08:22 +03:00
unknown
0075aa4960 Merge polly.(none):/home/kaa/src/opt/bug32103/my50-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
2007-11-08 12:06:14 +03:00
unknown
6c5a2e50c4 Merge polly.(none):/home/kaa/src/opt/bug32103/my41-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-4.1-opt
2007-11-08 12:04:48 +03:00
unknown
fcddc280f1 Merge polly.(none):/home/kaa/src/opt/bug32103/my50-bug26215
into  polly.(none):/home/kaa/src/opt/bug32103/my51-bug26215


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item.h:
  Auto merged
2007-11-08 11:50:26 +03:00
unknown
4713575c77 Merge polly.(none):/home/kaa/src/opt/bug32103/my41-bug26215
into  polly.(none):/home/kaa/src/opt/bug32103/my50-bug26215


mysql-test/t/select.test:
  Auto merged
mysql-test/r/select.result:
  Manual merge.
sql/item.h:
  Manual merge.
2007-11-08 11:46:58 +03:00
unknown
b1fc4b9e63 Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE
HOUR(), MINUTE(), ... returned spurious results when used on a DATE-cast.
This happened because DATE-cast object did not overload get_time() method
in superclass Item. The default method was inappropriate here and
misinterpreted the data.

Patch adds missing method; get_time() on DATE-casts now returns SQL-NULL
on NULL input, 0 otherwise. This coincides with the way DATE-columns
behave.


mysql-test/r/cast.result:
  Show that HOUR(), MINUTE(), ... return sensible values when used
  on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
  Show that this coincides with how DATE-columns behave.
mysql-test/t/cast.test:
  Show that HOUR(), MINUTE(), ... return sensible values when used
  on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
  Show that this coincides with how DATE-columns behave.
sql/item_timefunc.cc:
  Add get_time() method to DATE-cast object to overload
  the method in Item superclass that would return spurious
  results. Return zero-result; flag NULL if input was NULL.
sql/item_timefunc.h:
  Add get_time() declaration to DATE-cast object.
2007-11-08 06:08:44 +01:00
unknown
0a7a55d175 Fix for bug : optimizer crash when join on int and mediumint with
variable in where clause.

Problem: the new_item() method of Item_uint used an incorrect
constructor. "new Item_uint(name, max_length)" calls
Item_uint::Item_uint(const char *str_arg, uint length) which assumes the
first argument to be the string representation of the value, not the
item's name. This could result in either a server crash or incorrect
results depending on usage scenarios.

Fixed by using the correct constructor in new_item():
Item_uint::Item_uint(const char *str_arg, longlong i, uint length).


mysql-test/r/select.result:
  Added a test case for bug .
mysql-test/t/select.test:
  Added a test case for bug .
sql/item.h:
  Use the correct constructor for Item_uint in Item_uint::new_item().
2007-11-07 18:45:04 +03:00
unknown
6850e37d3c Merge polly.(none):/home/kaa/src/opt/bug25421/my51-bug31445
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


sql/opt_range.cc:
  Auto merged
2007-11-07 15:26:21 +03:00
unknown
dc0a59a2e7 Fix for bug : MySQL threads don't respond to the kill command
Calculating the estimated number of records for a range scan may take a
significant time, and it was impossible for a user to interrupt that
process by killing the connection or the query.

Fixed by checking the thread's 'killed' status in check_quick_keys() and
interrupting the calculation process if it is set to a non-zero value.


sql/opt_range.cc:
  Check the thread's 'killed' status in check_quick_keys() and
  interrupt the calculation process if it is set to a non-zero value.
2007-11-07 15:08:50 +03:00
unknown
f668665955 Fix for bug : Incorrect order when using range conditions on 2
tables or more

The problem was that the optimizer used the join buffer in cases when
the result set is ordered by filesort. This resulted in the ORDER BY
clause being ignored, and the records being returned in the order
determined by the order of matching records in the last table in join.

Fixed by relaxing the condition in make_join_readinfo() to take
filesort-ordered result sets into account, not only index-ordered ones.


mysql-test/r/select.result:
  Added a test case for bug .
mysql-test/t/select.test:
  Added a test case for bug .
sql/sql_select.cc:
  Relaxed the condition to determine when the join buffer usage must be
  disabled. The condition is now true for cases when the result set is
  ordered by filesort, that is when 'join->order &&
  !join->skip_sort_order' is true.
2007-11-07 14:00:45 +03:00
unknown
024a7b4dfa Better comments 2007-11-06 21:57:51 +03:00
unknown
c02b3c1ae7 fix for pushbuild 'powermacg5' failure
mysql-test/r/information_schema.result:
  result fix
mysql-test/t/information_schema.test:
  test fix
2007-11-06 16:53:02 +04:00
unknown
2b0bc8dbe0 Merge mysql.com:/home/hf/work/31758/my50-31758
into  mysql.com:/home/hf/work/31758/my51-31758
2007-11-05 19:11:38 +04:00
unknown
2e3ea15b53 Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/31758/my51-31758
2007-11-05 19:10:18 +04:00
unknown
2a0f4e4faf Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/31758/my50-31758
2007-11-05 19:07:03 +04:00
unknown
d3891e99ff merging 2007-11-05 18:43:13 +04:00
unknown
c98b7fe5b7 Merge mysql.com:/home/hf/work/31758/my50-31758
into  mysql.com:/home/hf/work/31758/my51-31758


mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.h:
  Auto merged
mysql-test/r/func_str.result:
  merging
2007-11-05 18:27:17 +04:00
unknown
462a6f7d1a merging 2007-11-05 18:23:55 +04:00
unknown
62617b09c3 Merge mysql.com:/home/hf/work/31758/my41-31758
into  mysql.com:/home/hf/work/31758/my50-31758


mysql-test/t/func_str.test:
  Auto merged
mysql-test/r/func_str.result:
  merging
sql/item_strfunc.h:
  merging
2007-11-05 18:12:42 +04:00
unknown
5f5696b65a Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
2007-11-05 14:50:59 +03:00
unknown
9b0c8eca6d Merge polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
2007-11-05 14:48:39 +03:00
unknown
b603746f14 Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged
2007-11-05 14:45:55 +03:00
unknown
9e190d3791 Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215
into  polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215


client/mysql.cc:
  Auto merged
2007-11-05 13:32:14 +03:00
unknown
93f1df5ef7 Fixed code that parses the DELIMITER command to correctly calculate
the length of the remaining input string.

This is to fix mysqldump test failure in PB introduced by the patch
for bug .


client/mysql.cc:
  Fixed code that parses the DELIMITER command to correctly calculate 
  the length of the remaining input string.
2007-11-05 13:30:31 +03:00
unknown
608f4e7d79 Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
2007-11-02 17:28:54 +03:00
unknown
0d45d202ce Merge polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
2007-11-02 17:26:28 +03:00
unknown
e397a7b019 Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged
2007-11-02 17:23:12 +03:00
unknown
2048ac0280 5.1-specific changes for bug after merging the patch from 5.0:
- Added trigger tests back.
- Fixed test cases to match the extended output format of SHOW CREATE ...
- Replaced 'gptr' with 'uchar *'.


client/mysql.cc:
  Replaced 'gptr' with 'uchar *'.
mysql-test/r/mysql_comments.result:
  Fixed test cases to match the extended output format of SHOW CREATE ...
  Added trigger tests back.
mysql-test/t/mysql_comments.sql:
  Added trigger tests back.
2007-11-02 16:40:08 +03:00
unknown
62f31facdf Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215
into  polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215


client/mysql.cc:
  Manual merge.
2007-11-02 13:44:23 +03:00
unknown
1daa54d697 Fix for:
bug : mysql command line client should not strip comments
              from SQL statements
and
  bug : Keeping comments when storing stored procedures

With the introduction of multiline comments support in the command line
client (mysql) in MySQL 4.1, it became impossible to preserve
client-side comments within single SQL statements or stored routines.
This feature was useful for monitoring tools and maintenance.

The patch adds a new option to the command line client
('--enable-comments', '-c') which allows to preserve SQL comments and
send them to the server for single SQL statements, and to keep comments
in the code for stored procedures / functions / triggers.

The patch is a modification of the contributed patch from bug 
with the following changes:
- code style changes to conform to the coding guidelines
- changed is_prefix() to my_strnncoll() to detect the DELIMITER
command, since the first one is case-sensitive and not charset-aware
- renamed t/comments-51.* to t/mysql_comments.*
- removed tests for comments in triggers since 5.0 does not have SHOW
CREATE TRIGGER (those tests will be added back in 5.1).

The test cases are only for bug . No automated test case for bug
 is possible due to the test suite deficiencies (though the cases
from the bug report were tested manually).


client/mysql.cc:
  Applied the contributed patch from bug11230 with the following changes:
  - code style changes to conform to the coding guidelines
  - changed is_prefix() to my_strnncoll() to detect the DELIMITER
  command, since the first one is case-sensitive and not charset-aware
  
  The patch adds a new option to the command line client which allows to
  preserve SQL comments and send them to the server to ensure better
  error reporting and to, keep comments in the code for stored procedures
  / functions / triggers.
mysql-test/r/mysql_comments.result:
  Added test cases for bug11230.
mysql-test/t/mysql_comments.sql:
  Added test cases for bug11230.
mysql-test/t/mysql_comments.test:
  Added test cases for bug11230.
2007-11-02 13:40:34 +03:00
unknown
7524dbaa89 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/sql_select.cc:
  Auto merged
2007-11-02 13:01:10 +04:00
unknown
db499fbd68 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31794-5.1-opt
2007-11-02 10:40:08 +02:00
unknown
dacf99b5a5 Bug#31630 debug assert with explain extended select ... from i_s
added 'in_rows' column value for 'describe extended' for the case 
when 'describe' handles I_S table


mysql-test/r/information_schema.result:
  test result
mysql-test/t/information_schema.test:
  test case
sql/sql_select.cc:
  added 'in_rows' column value for 'describe extended' for the case 
  when 'describe' handles I_S table
2007-11-02 12:39:14 +04:00
unknown
2c6a5fd27e Bug#31113 mysqldump 5.1 can't handle a dash ("-") in database names
db name should be quoted. this code does communication with the server.
it's always ok to quote names in this case.


client/mysqldump.c:
  db name should be quoted. this code does communication with the server.
  it's always ok to quote names in this case.
mysql-test/r/mysqldump.result:
  test result
mysql-test/t/mysqldump.test:
  test case
2007-11-02 12:24:45 +04:00
unknown
4cb4a53eb4 Merge magare.gmz:/home/kgeorge/mysql/work/B31794-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B31794-5.1-opt


mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2007-11-01 18:49:45 +02:00
unknown
660eb5bb40 Bug : no syntax error on SELECT id FROM t HAVING count(*)>2
The HAVING clause is subject to the same rules as the SELECT list
about using aggregated and non-aggregated columns.
But this was not enforced when processing implicit grouping from
using aggregate functions.
Fixed by performing the same checks for HAVING as for SELECT.


mysql-test/r/func_group.result:
  Bug : test case
mysql-test/t/func_group.test:
  Bug : test case
sql/sql_select.cc:
  Bug : Check HAVING in addition to SELECT list
2007-11-01 18:36:24 +02:00
unknown
61bd5d0fec Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31866-5.1-opt
2007-11-01 14:44:30 +02:00
unknown
124af3f873 Bug : MySQL Server crashes on SHOW CREATE TRIGGER statement
SHOW CREATE TRIGGER was not checking for detected errors 
opening/reading the trigger file. 
Fixed to return the already generated error.


mysql-test/r/trigger.result:
  Bug : test case
mysql-test/t/trigger.test:
  Bug : test case
sql/sql_show.cc:
  Bug : test for error and return it.
2007-11-01 14:42:14 +02:00
unknown
ee4452dba4 Bug Partitions: crash if subpartitions and engine change.
The new default database engine for altered table was reassigned to
the old one. That's wrong thing by itself, and (as the engine
for a subpartition gets that new value) leads to DBUG_ASSERTION
in mysql_unpack_partition()


mysql-test/r/partition.result:
  Bug  Partitions: crash if subpartitions and engine change.
  
  test result
mysql-test/t/partition.test:
  Bug  Partitions: crash if subpartitions and engine change.
  
  test case
sql/sql_partition.cc:
  Bug  Partitions: crash if subpartitions and engine change.
  
  Don't change part_info->default_engine_type if it's already set
2007-10-31 16:01:29 +04:00
unknown
aaa1c321b2 Merge magare.gmz:/home/kgeorge/mysql/autopush/B31884-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B31884-5.1-opt
2007-10-30 16:22:35 +02:00
unknown
abdb052bae Merge magare.gmz:/home/kgeorge/mysql/work/B31884-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B31884-5.1-opt


sql/item_subselect.h:
  Auto merged
mysql-test/r/subselect.result:
  merged the fix for bug 31884 to 5.1-opt
mysql-test/t/subselect.test:
  merged the fix for bug 31884 to 5.1-opt
2007-10-30 16:21:17 +02:00
unknown
95acd426eb Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31884-5.0-opt
2007-10-30 16:18:56 +02:00
unknown
6bbdacae20 Bug : Assertion + crash in subquery in the SELECT clause.
Item_in_subselect's only externally callable method is val_bool().
However the nullability in the wrapper class (Item_in_optimizer) is 
established by calling the "forbidden" method val_int().

Fixed to use the correct method (val_bool() ) to establish nullability 
of Item_in_subselect in Item_in_optimizer.


mysql-test/r/subselect.result:
  Bug : test case
mysql-test/t/subselect.test:
  Bug : test case
sql/item_subselect.h:
  Bug : Use the correct method to establish nullability
2007-10-30 14:27:21 +02:00
unknown
e722393f51 Bug inet_ntoa, oct crashes server with null+filesort
Item_func_inet_ntoa and Item_func_conv inherit 'maybe_null' flag from an
argument, which is wrong.
Both can be NULL with notnull arguments, so that's fixed.


mysql-test/r/func_str.result:
  Bug  inet_ntoa, oct crashes server with null+filesort
  
  test case
mysql-test/t/func_str.test:
  Bug  inet_ntoa, oct crashes server with null+filesort
  
  test result
sql/item_strfunc.h:
  Bug  inet_ntoa, oct crashes server with null+filesort
  
  missing maybe_null flags set for Item_func_inet_ntoa and Item_func_conv
2007-10-30 12:35:03 +04:00
unknown
f97b8e48b8 after merge fix 2007-10-29 15:49:56 +04:00
unknown
2b3e560622 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
2007-10-29 15:40:41 +04:00
unknown
9e6bb07d38 Bug#30889: filesort and order by with float/numeric crashes server
There are two problems with ROUND(X, D) on an exact numeric 
(DECIMAL, NUMERIC type) field of a table:
1) The implementation of the ROUND function would change the number of decimal
places regardless of the value decided upon in fix_length_and_dec. When the
number of decimal places is not constant, this would cause an inconsistent
state where the number of digits was less than the number of decimal places,
which crashes filesort.

Fixed by not allowing the ROUND operation to add any more decimal places than
was decided in fix_length_and_dec.

2) fix_length_and_dec would allow the number of decimals to be greater than
the maximium configured value for constant values of D. This led to the same 
crash as in (1).

Fixed by not allowing the above in fix_length_and_dec.


mysql-test/r/type_decimal.result:
  Bug#30889: Test result
mysql-test/t/type_decimal.test:
  Bug#30889: Test case
sql/item_func.cc:
  Bug#30889: 
  - Avoid setting number of digits after decimal point (scale) higher than its 
    maximum value.
  - Avoid increasing the number of decimal places in ::decimal_op
sql/item_func.h:
  Bug#30889: Added comments to the declarations of Item_func_numhybrid::<type>_op
  family of methods.
2007-10-29 15:39:56 +04:00