ram@gw.mysql.r18.ru
8c043a299b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-25 11:06:12 +04:00
jimw@mysql.com
09aaba03cf
Merge mysql.com:/home/jimw/my/mysql-4.1-7887
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-24 12:47:19 -08:00
jimw@mysql.com
fa1098618e
Set lower_case_file_system when it is being tested to check if
...
lower_case_tables_names=2 is sensible. Related to Bug #7887 .
2005-01-24 12:31:14 -08:00
serg@serg.mylan
79240013b2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00
igor@rurik.mysql.com
0b61a16fd2
Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-01-22 02:42:54 -08:00
igor@rurik.mysql.com
8527f256c0
select_found.result, select_found.test:
...
Added a test case for bug #7945 .
sql_select.cc:
Fixed bug #7945 . If DISTINCT is used only with constants
in a query with GROUP BY, we can apply an optimization
that set LIMIT to 1 only in the case when there is
no SQL_CALC_FOUND_ROWS.
2005-01-22 02:40:27 -08:00
timour@mysql.com
b266ad2c24
Merge mysql.com:/home/timka/mysql/src/4.1-bug-4285
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-01-21 16:47:51 +02:00
bar@mysql.com
2f6e0864ad
Bug#7943: Wrong prefix lengths reported on UTF-8 columns
...
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
2005-01-21 16:49:20 +04:00
ram@gw.mysql.r18.ru
9c3c566fcb
A fix (bug #7261 : Alter table loses temp table with lower_case_table_names=2).
2005-01-21 15:14:31 +04:00
bar@mysql.com
ca48cfbfcc
item_cmpfunc.cc:
...
Bug#7834 Illegal mix of collations in IN operator
IN was the first function supporting
character set convertion.
agg_arg_charsets() was written afterwards,
which is more flexible.
Now IN just reuses this function.
2005-01-20 15:38:56 +04:00
bar@mysql.com
07be090e6e
errmsg.txt:
...
Minor fix after character set conversion.
2005-01-20 13:08:16 +04:00
bar@mysql.com
1650728655
errmsg.txt:
...
new file
2005-01-20 12:37:02 +04:00
jimw@mysql.com
3bdfe44859
Warn when mysqld starts up with lower_case_table_names=2 but datadir is
...
on a case-sensitive filesystem. (Bug #7887 )
2005-01-19 12:23:24 -08:00
sergefp@mysql.com
b1c3e43060
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
2005-01-19 23:02:28 +03:00
timour@mysql.com
7fb0de20f3
Final patch for BUG#4285.
...
This patch collects all previous patches into one.
The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
2005-01-19 12:55:54 +02:00
joreland@mysql.com
b0b8f9115a
bug#7693 - ndb
...
when using shm transporter, set sigmask on each thread using pthread_sigmask
2005-01-19 07:23:20 +01:00
jimw@mysql.com
06f60f6d65
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-18 13:34:22 -08:00
Sinisa@sinisa.nasamreza.org
08639a88b2
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-01-18 23:29:47 +02:00
Sinisa@sinisa.nasamreza.org
477047401c
fixing wrong value for "examined rows" when UNION's are used.
2005-01-18 23:13:29 +02:00
jimw@mysql.com
59ffad87cc
Merge mysql.com:/home/jimw/my/mysql-4.1-6913
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-18 12:27:00 -08:00
jimw@mysql.com
2fac8bd044
Merge changed tests
2005-01-18 12:25:56 -08:00
jimw@mysql.com
bc35532bcc
Merge mysql.com:/home/jimw/my/mysql-4.0-7700
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-01-18 11:39:10 -08:00
sergefp@mysql.com
b1d55200b1
Fix for BUG#7885
2005-01-18 17:26:05 +03:00
dlenev@mysql.com
3d4eb575a2
Manual merge of fix for bug #7884 "Able to add invalid unique index on
...
TIMESTAMP prefix" into 4.1 tree.
2005-01-18 17:23:46 +03:00
dlenev@mysql.com
9e8d33ca35
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg7884
2005-01-18 17:05:09 +03:00
dlenev@mysql.com
b894c47d1d
Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum()
...
macros.
It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".
2005-01-18 17:04:16 +03:00
bar@mysql.com
8cfe729678
1. Item now uses my_charset_bin by default,
...
not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.
2005-01-18 17:41:06 +04:00
serg@serg.mylan
b53757ba91
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-18 11:45:41 +01:00
guilhem@mysql.com
9569b0226f
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-18 10:24:25 +01:00
bar@mysql.com
8f23e90232
#7874 : CONCAT() gives wrong results mixing latin1 field and utf8 string literals
...
We should not overwrite res if it is returned from a const item.
2005-01-18 10:42:29 +04:00
monty@mysql.com
edffca827e
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
2005-01-18 03:52:15 +02:00
jimw@mysql.com
a35c324358
Fix over-optimization that could result in an unsigned double field being
...
set to a negative value. (Bug #7700 )
2005-01-17 16:13:56 -08:00
monty@mysql.com
5ba79d72a7
Anoter fix for moved IO_CACHE object
2005-01-18 02:04:41 +02:00
bell@sanja.is.com.ua
fd3d976f64
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
2005-01-18 01:11:02 +02:00
serg@serg.mylan
83ef8c58a7
make the code to look safe, not only be safe
2005-01-17 22:35:53 +01:00
guilhem@mysql.com
5e43cf86a6
Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'":
...
Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)
2005-01-17 21:26:14 +01:00
jimw@mysql.com
dbe43d34a6
Print a warning when an old table (with no character set stored) is opened
...
and the default character set is multi-byte, which will result in character
column size changes. (Bug #6913 )
2005-01-17 12:22:23 -08:00
reggie@bob.(none)
da9f7c7ec4
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bob.(none):/home/reggie/bk/mysql-4.1
2005-01-17 14:08:36 -06:00
reggie@bob.(none)
e1dc421a04
Bug #7966 query cache doesn't work properly with batch statements
...
sql_lex.cc:
Set query to not cacheable if we are using multistatements and there are multiple statements in this query
2005-01-17 13:40:36 -06:00
bell@sanja.is.com.ua
dcfdf011c6
backported from 5.0 patch initialization of main select for commands where subqueries are possible
2005-01-17 19:52:07 +02:00
timour@mysql.com
06fce173c0
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
2005-01-17 12:41:59 +02:00
bar@mysql.com
e7e5e8b1e7
user_var.result, func_str.result, item_strfunc.cc:
...
bug#7839 ncorrect collation for char(ascii('a'))
2005-01-17 10:38:35 +04:00
guilhem@mysql.com
6cc7f39da0
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-16 15:14:06 +01:00
monty@mysql.com
f34bc883ab
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-15 12:00:56 +02:00
guilhem@mysql.com
09f36a69b9
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-15 10:21:50 +01:00
igor@rurik.mysql.com
cd577f2590
func_gconcat.result, func_gconcat.test:
...
Added a test case for bug #7769 .
item_sum.h:
Fixed bug #7769 : a crash for queries with group_concat and
having when the query table was empty.
The bug was due an unsafe dereferencing.
2005-01-15 01:05:00 -08:00
monty@mysql.com
7681e62422
Merge
2005-01-15 03:49:07 +02:00
monty@mysql.com
6d280ac161
Fixed possible access to unintialized memory in filesort when using many buffers
2005-01-15 03:47:06 +02:00
serg@serg.mylan
5ebcb21f12
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-14 19:51:29 +01:00