sergefp@mysql.com
65566e449d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug11869-part3
2005-08-07 21:32:26 +00:00
sergefp@mysql.com
d9ce6e8f25
BUG#11869:part 2: post-review fixes: merging into 5.0
...
We're out of bits in st_select_lex->options so make TMP_TABLE_FORCE_MYISAM ==
OPTION_FOUND_COMMENT (the latter is not used by create_tmp_table).
2005-08-07 21:21:30 +00:00
evgen@moonbone.local
1894cff045
Manual merge of #11335 bugfix
2005-08-05 00:34:42 +04:00
igor@rurik.mysql.com
7322441dc7
Manual merge
2005-08-02 13:17:49 -07:00
igor@rurik.mysql.com
5e851429de
item_sum.cc:
...
Reversed the changes to fix bug #12095 after review
done by SergeyG. Applied a fix suggested by him.
Added my comment.
2005-08-02 13:12:41 -07:00
igor@rurik.mysql.com
f4c1b3bae4
Merge
2005-07-31 02:44:18 -07:00
igor@rurik.mysql.com
fea0fb2c8b
Fixed bug #12095 : a join query with GROUP_CONCAT over a single row table.
...
If GROUP_CONCAT is calculated we always put its argument into a temp
table, even when the argument is a constant item.
2005-07-31 02:32:33 -07:00
evgen@moonbone.local
fa0ea36507
Fix bug #11335 View redefines TinyInt(1) column definition
...
Item_type_holder doesn't store information about length and exact type of
original item which results in redefining length to max_length and geometry
type to longtext.
Changed the way derived tables except unions are built. Now they are created
from original field list instead of list of Item_type_holder.
2005-07-30 05:53:35 +04:00
bar@mysql.com
0255803b4e
Merge mysql.com:/usr/home/bar/mysql-4.1.b10201
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 13:25:18 +05:00
bar@mysql.com
0c2035b7bd
func_gconcat.result, func_gconcat.test:
...
Adding test
item_sum.cc:
Adding a call for collation/charset aggregation,
to collect attributes from the arguments. The actual bug fix.
item_func.h, item_func.cc, item.h, item.cc:
- Removing collation aggrgation functions from Item_func class
in item.cc, and adding it as non-class functions in item.cc
to be able to reuse this code for group_concat.
- Adding replacement for these functions into Item_func class
as wrappers for moved functions, to minizize patch size,
2005-07-26 12:52:02 +05:00
bell@sanja.is.com.ua
d3905f3d0e
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
bell@sanja.is.com.ua
a11677026f
fixed printing of sum(distinct ) & avg(distinct ) & cast(... as decimal) (BUG#7015, BUG#11387)
2005-06-17 17:27:47 +03:00
monty@mysql.com
068bd3eb97
After merge fixes
2005-06-07 05:43:59 +03:00
monty@mysql.com
775f17667b
Merge with 4.1
2005-06-07 00:31:53 +03:00
serg@serg.mylan
6a5349028c
a compiler must see '#pragma implementation' *before*
...
'#pragma interface' (that comes with the #include'd header file)
2005-06-05 19:38:52 +02:00
monty@mysql.com
4b7882dc73
merge
2005-06-05 17:19:50 +03:00
monty@mysql.com
29fd1f2fd9
Move USE_PRAGMA_IMPLEMENTATION to proper place
...
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
2005-06-03 23:46:03 +03:00
kent@mysql.com
f0fcc54b0c
Merge
2005-06-02 04:45:09 +02:00
kent@mysql.com
bd48eed988
tztime.cc:
...
Set #pragma implementation" earlier
Many files:
Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
2005-06-02 02:43:32 +02:00
monty@mysql.com
a69f432115
Code cleanups during code reviews
...
Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge
2005-06-01 16:35:09 +03:00
ramil@mysql.com
cc0061a122
a fix (bug #7405 : group_concat with distinct and rollup => ignores distinct in some rows).
2005-05-31 10:54:33 +05:00
msvensson@neptunus.(none)
697cfe7f07
Merge from 4.1
2005-05-26 21:01:55 +02:00
msvensson@neptunus.(none)
83d430353e
Add ifdefs to control when "#pragma implementation" should be used
...
Added some more ifdefs for "#pragma interface"
2005-05-26 12:09:14 +02:00
monty@mysql.com
0b75f6e37b
compatibility issues
...
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00
dlenev@mysql.com
e7f29e1904
Manual merge of fix for bug #9913 into 5.0 tree.
2005-05-09 16:21:57 +04:00
jani@ibmlab.site
56a98396ab
Fixed bugs 9820, 9799 and 9800.
2005-05-06 17:32:46 +03:00
holyfoot@hf-ibm.(none)
2c8e9df232
A lot of fixes to Precision math
...
Mostly about precision/decimals of the results of the operations
2005-05-05 20:06:49 +05:00
dlenev@brandersnatch.localdomain
8ee6d33bdd
Fix for Bug #9913 "udf_deinit is not called after execution of PS"
...
(aka "deinit is not called when calling udf from trigger").
We should call udf_deinit() function during cleanup phase after prepared
(or ordinary) statement execution instead of calling it from Item's
desctructor.
No test case is provided since it is hard to test UDF's from our test
suite.
2005-04-30 20:23:40 +04:00
msvensson@neptunus.(none)
c12ee8dc16
BUG#9714 libsupc++ problem
...
- Remove linking of libsupc++
- Move all local static variables to filescope
2005-04-27 11:25:08 +02:00
jimw@mysql.com
9b4f106045
Fix warning and error when compiling on Windows.
2005-04-09 03:05:47 +02:00
jimw@mysql.com
bb215f648b
Merge
2005-04-04 23:03:56 -07:00
monty@mysql.com
201ee3eb78
Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902 )
...
CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912 )
ALTER TABLE now fails in STRICT mode if it generates warnings.
Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933 )
2005-04-01 15:04:50 +03:00
ramil@mysql.com
8098ef79f0
after merge fix/
2005-03-30 18:57:56 +05:00
serg@serg.mylan
d6bedfa8e0
merged
2005-03-23 09:42:24 +01:00
jimw@mysql.com
4c67678f15
Fix Windows compile warnings, declarations of walk functions
2005-03-22 00:00:24 +01:00
monty@mysql.com
d8b078e423
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-21 23:46:11 +02:00
monty@mysql.com
a1ab786091
Cleanups during review of code
...
Fixed newly introduced bug in rollup
2005-03-21 23:41:28 +02:00
joerg@mysql.com
86574f4836
Merge mysql.com:/M50/build-5.0.3 into mysql.com:/M50/push-5.0
2005-03-21 16:46:11 +01:00
joerg@mysql.com
d9354fb8a6
Code cleanup: should use 'element_count' here, see include/my_tree.h
...
(Change done by Ramil and sent via IRC)
2005-03-21 16:31:15 +01:00
dlenev@mysql.com
ea8adbff36
Manual merge of csets from -build tree into main 5.0 tree.
2005-03-21 11:39:47 +03:00
jimw@mysql.com
7de90716b0
Fix Windows compile errors.
2005-03-18 16:15:33 -08:00
konstantin@mysql.com
371850a459
Cleanup of Item_func_group_concat
2005-03-18 00:41:03 +03:00
monty@mysql.com
594ef41b2d
Cleanup during reviews
...
Removed some optional arguments
Fixed portability problem in federated tests
2005-03-16 16:11:01 +02:00
konstantin@mysql.com
021f8d2170
Cleanup
2005-03-15 16:54:11 +03:00
konstantin@mysql.com
6a2ef5577c
WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up
...
Item_sum_count_distinct, and
deploy Unique for use with COUNT(DISTINCT) if there is no blob
column in the list of DISTINCT arguments.
2005-03-15 03:46:19 +03:00
konstantin@mysql.com
983c75f05e
WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) and
...
implementation of AVG(DISTINCT) which utilizes the approach with Fields.
The patch implemented in October is portede to the up-to-date tree
containing DECIMAL type.
Tests for AVG(DISTINCT) (although there is not much to test provided
that SUM(DISTINCT) works), cleanups for COUNT(DISTINCT) and GROUP_CONCAT()
will follow in another changeset.
2005-03-13 23:50:43 +03:00
jani@ua141d10.elisa.omakaista.fi
111e1cb29d
Fix for Bug#5615 and merge from 4.1
2005-03-01 22:19:19 +02:00
svoj@mysql.com
af026ef164
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/stddev-mysql-5.0
2005-02-27 13:33:20 +04:00
svoj@mysql.com
800aaae1fb
BUG#3190 fix (request for STDDEV_SAMP, VAR_SAMP).
...
This bug is also known as WL#1639.
2005-02-25 22:19:04 +04:00
monty@mysql.com
0a6b7aedb2
Remove compiler warnings and remove not used variables
...
(Found during build process)
2005-02-25 16:53:22 +02:00