jimw@mysql.com
b919b29da6
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:52:10 -07:00
patg@krsna.patg.net
22fe31e4d4
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-28 18:23:23 -07:00
jimw@mysql.com
0e572ff475
Merge mysql.com:/home/jimw/my/mysql-4.1-13796
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:19:19 -07:00
jimw@mysql.com
e55f906130
Fix bug in handling of decimal fields in UNION statements that could
...
cause a crash or write to an incorrect memory location. (Bug #14216 )
2005-10-28 18:12:57 -07:00
sergefp@mysql.com
8b9bab2763
Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment,
...
do advance the source pointer over 2 bytes that specify value length.
2005-10-28 23:31:32 +04:00
sergefp@mysql.com
f220d87476
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug14139
2005-10-28 21:42:01 +04:00
evgen@moonbone.local
cc5d7c0715
Fix bug #14138 ROLLUP and PROCEDURE ANALYSE() hang server
...
Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
that fields_list is a part of all_fields_list. Because select have only
3 columns and analyse() redefines it to have 10 columns, int overrun in
setup_copy_fields() occurs and server goes to almost infinite loop.
Because fields_list used not only to send data ad fields types, it's wrong
to allow procedure redefine it. This patch separates select's fileds_list
and procedure's one. Now if procedure is present, copy of fields_list is
created in procedure_fields_list and it is used for sending data and fields.
2005-10-28 15:24:46 +04:00
evgen@moonbone.local
77723c2438
Fix bug#14186 select datefield is null not updated
...
Date field was declared as not null, thus expression 'datefield is null'
was always false. For SELECT special handling of such cases is used.
There 'datefield is null' converted to 'datefield eq "0000-00-00"'.
In mysql_update() before creation of select added remove_eq_conds() call.
It makes some optimization of conds and in particular performs conversion
from 'is null' to 'eq'.
Also remove_eq_conds() makes some evaluation of conds and if it founds that
conds is always false then update statement is not processed further.
All this allows to perform some update statements process faster due to
optimized conds, and not wasting resources if conds known to be false.
2005-10-28 01:24:11 +04:00
jimw@mysql.com
7a8bd252d2
Merge mysql.com:/home/jimw/my/mysql-4.1-14009
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-27 10:20:38 -07:00
evgen@moonbone.local
71b731e92e
Manually merged
2005-10-27 17:44:28 +04:00
bar@mysql.com
dfe9480497
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13347
2005-10-27 13:41:09 +05:00
patg@krsna.patg.net
bd0497ce3b
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-26 09:22:47 -07:00
patg@krsna.patg.net
7243b7bb49
BUG# 12123
...
Made change to mysqlimport to set character_set_database to binary to
make importing various charsets/columns work correctly.
2005-10-25 14:50:08 -07:00
sergefp@mysql.com
2219ada7f6
BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...."
...
avoid multiplying length of field_X by charset->mbmaxlen twice when calculating space
required for field_X in the new table.
2005-10-26 00:56:17 +04:00
jimw@mysql.com
a01cd74647
Merge mysql.com:/home/jimw/my/mysql-4.1-12925
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-25 10:11:47 -07:00
jimw@mysql.com
e8eed35c6a
Fix incorrect casts in my_getopt code that capped the maximum of longlong
...
options to the wrong value. (Bug #12925 )
2005-10-25 10:10:53 -07:00
evgen@moonbone.local
b5d426623f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14016-bug-4.1-mysql
2005-10-25 20:37:45 +04:00
evgen@moonbone.local
90cf3e78f0
Fix bug #14016 date_format() 2nd parameter was compared using case insensitive
...
collation
By default constant strings in second parameter of date_time() have case
insensitive collation. Because of this expressions date_format(f,'%m') and
date_format(f,'%M') wrongly becomes equal, which results in choosing wrong
column to sort by.
Now if second parameter of date_format() is constant then it's collation is
changed to case sensitive.
2005-10-25 20:37:26 +04:00
evgen@moonbone.local
8cb0dff904
Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATE
...
VALUES() can only refer to table insert going to.
But Item_insert_value::fix_fields() were passing to it's arg full table list,
This results in finding second column which shouldn't be found, and
failing with error about ambiguous field.
Item_insert_value::fix_fields() now passes only first table of full table
list.
2005-10-25 20:04:12 +04:00
bar@mysql.com
a6e1f72d84
Bug#13347: empty result from query with like and cp1250 charset
...
ctype-win1250ch.c:
Like range prefix tables were wrong.
ctype_cp1250_ch.result, ctype_cp1250_ch.test:
Adding test case.
2005-10-25 14:49:04 +05:00
monty@mysql.com
3e653fb922
Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization
2005-10-25 02:27:40 +03:00
sergefp@mysql.com
ea3ea9ed10
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2
2005-10-23 02:49:57 +04:00
jimw@mysql.com
7510c45423
Fix merge of test that left out a drop table.
2005-10-21 19:54:34 -07:00
jimw@mysql.com
2d018862fa
Merge mysql.com:/home/jimw/my/mysql-4.1-11203
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-21 17:57:51 -07:00
bar@mysql.com
a167ddc6e7
Bug#13233
...
select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
Adding test case
sql_yacc.yy:
Adding new syntax.
item_strfunc.h:
Fixing wrong max_length calculation.
Also, adding CHAR(x USING charset),
for easier migrating from 4.1 to 5.0,
according to Monty's suggestion.
2005-10-21 14:41:56 +05:00
sergefp@mysql.com
15a78334c3
BUG#9622, stage 2, work together with fix for BUG#12232:
...
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).
2005-10-21 06:29:17 +04:00
msvensson@neptunus.(none)
c7174f18f9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-10-20 10:28:52 +02:00
jimw@mysql.com
e284a57c88
Merge mysql.com:/home/jimw/my/mysql-4.1-13334
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:45:12 -07:00
sergefp@mysql.com
d6903c4566
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2
2005-10-18 14:08:50 +04:00
jimw@mysql.com
31a79ee3d0
Fix Item_func_abs::fix_length_and_dec() to set maybe_null properly. (Bug #14009 )
2005-10-17 17:00:42 -07:00
hf@deer.(none)
ba82a6a759
Fix for bug #9855 (Inconsistend column type in create select)
2005-10-15 19:47:23 +05:00
bar@mysql.com
3369f5bd89
Merge mysql.com:/usr/home/bar/mysql-4.1.b13145
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-10-14 13:57:38 +05:00
bar@mysql.com
5df9c6c2a3
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 11:54:10 +05:00
bar@mysql.com
58343bede3
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 09:09:25 +05:00
evgen@moonbone.local
aff8dbe130
Fix bug #13855 select distinct with group by caused server crash
...
DISTINCT wasn't optimized away and caused creation of tmp table in wrong
case. This result in integer overrun and running out of memory.
Fix backported from 4.1. Now if optimizer founds that in result be only 1
row it removes distinct.
2005-10-14 01:22:24 +04:00
bell@sanja.is.com.ua
6d6e107f12
- set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236)
...
- fixed test
2005-10-14 00:02:38 +03:00
jimw@mysql.com
8ae2cfb0f7
Force a server restart for the not_embedded_server test to satisfy
...
conditions of its first test. (Bug #13796 )
2005-10-13 11:10:45 -07:00
hf@deer.(none)
27d8bc5b1f
merging
2005-10-13 19:51:07 +05:00
hf@deer.(none)
62ffbea5e4
merging
2005-10-13 19:31:09 +05:00
hf@deer.(none)
c933505d2d
Fix for bug #3874 (Group by field is not considered)
2005-10-13 19:23:52 +05:00
msvensson@neptunus.(none)
1fc54b1045
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug12698/my41-bug12698
2005-10-13 15:53:02 +02:00
msvensson@neptunus.(none)
b81f3ef1ef
Bug #12698 abnormal program termination running mysql_client_test
...
- Move test for bug#93 from mysql_client_test.c to show_check.test
- No need for test written in c
2005-10-13 15:52:22 +02:00
evgen@moonbone.local
818c37ac68
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/13535-bug-4.1-mysql
2005-10-13 17:17:32 +04:00
kent@mysql.com
ab22636120
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-13 14:23:37 +02:00
bar@mysql.com
85243ffd70
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12476
2005-10-13 11:25:08 +05:00
jimw@mysql.com
701a137844
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 16:07:16 -07:00
jimw@mysql.com
f50e7466e3
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 14:38:32 -07:00
evgen@moonbone.local
fb0074a6ad
Manual merged
2005-10-13 01:14:58 +04:00
evgen@moonbone.local
551961b207
select.test, sql_select.cc, sql_lex.cc, item.cc:
...
Bug #7672 after merge fix
2005-10-13 00:58:59 +04:00
jimw@mysql.com
041ae69093
Merge mysql.com:/home/jimw/my/mysql-4.1-12136
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 13:29:49 -07:00