Commit graph

6968 commits

Author SHA1 Message Date
joreland@mysql.com
3fdc2999b7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-12 20:31:00 +02:00
bell@sanja.is.com.ua
d372284d09 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-08-12 18:38:29 +03:00
vva@eagle.mysql.r18.ru
5406709672 fixed Bug #4358 Problem with HAVING clause that uses alias
from the select list and TEXT field 

make setup_copy_fields to insert Item_copy_string for blobs in 
the beginning of the copy_funcs (push_back instead of push_front)

the thing is that Item_copy_string::copy for function can call 
Item_copy_string::val_int for blob via Item_ref.
But if Item_copy_string::copy for blob isn't called before, 
it's value will be wrong.

So all the Item_copy_string::copy for blobs should be called before 
Item_copy_string::copy for functions.
2004-08-12 20:37:31 +05:00
bell@sanja.is.com.ua
d7ae5de89b in case of compound index fill all parts in optimized IN (BUG#4435) 2004-08-12 17:31:23 +03:00
paul@ice.snake.net
54adeb0976 mysqld.cc:
Help message edit.
2004-08-12 08:47:45 -05:00
guilhem@mysql.com
5332e74a4f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-12 13:13:22 +02:00
guilhem@mysql.com
6345dc4fbd Fix for BUG#4678 "mysql-test-run fails on grant_cache":
do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root')
(such behaviour is a feature of mysql_real_connect(), see the manual).
2004-08-12 13:12:09 +02:00
ingo@mysql.com
123dce2e50 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-08-12 12:42:13 +02:00
joreland@mysql.com
0991df9656 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-12 12:29:41 +02:00
ram@gw.mysql.r18.ru
494a3b0559 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b4898
2004-08-12 14:59:33 +05:00
ram@gw.mysql.r18.ru
407bf3c759 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4878
2004-08-12 14:50:29 +05:00
wax@mysql.com
37b46ed217 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
2004-08-12 14:21:35 +06:00
ingo@mysql.com
68871aee8e bug#4997 - --log-error sometimes generates incorrect default name.
Now replacing domain name by 'err'. If host name doesn't have a
domain name, '.err' is appended as before.
2004-08-12 09:40:32 +02:00
igor@rurik.mysql.com
f2b9c5f491 olap.test, olap.result:
Added test case for bug #4767.
item_sum.cc:
  Added a correct setting of the maybe_null flag for a copy of 
  an Item_sum object where the argument was a field of an inner table
  in an outer join read from a temporary table.
  It's part of the fix for bug #4767.
sql_select.cc:
  Made change_refs_to_tmp_fields work correctly
  for test case of bug #4767 where Item_sum::get_tmp_table_item
  failed to build a correct copy of an Item_sum object referring
  to a field in a temporary table.
  It looks like a hack yet.
2004-08-12 00:02:29 -07:00
mskold@mysql.com
845c47a693 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-12 08:57:15 +02:00
ram@gw.mysql.r18.ru
74c64904c7 A fix (Bug #4878: Service crashes on query execution) 2004-08-12 11:28:39 +05:00
bar@mysql.com
0db8ff2eda Bug#5005 collation cp852_bin makes server crash
ctype-simple.c:
  Check that unicode map was loaded
cp852.xml:
  Missing cp852_bin was added.
2004-08-12 10:46:16 +05:00
ram@gw.mysql.r18.ru
798952dcf2 A fix (Bug#4898: User privileges depending on ORDER BY Settings of table db) 2004-08-12 09:41:35 +05:00
acurtis@pcgem.rdg.cyberkinetica.com
259bce85b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411
2004-08-11 23:26:44 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
bc78a46ac4 Bug#4411
Fix for server hang bug
2004-08-11 23:24:36 +01:00
serg@serg.mylan
6023b58b9f Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflow 2004-08-11 23:43:41 +02:00
sergefp@mysql.com
4ddeee9d2f Fix for BUG#4488: first portion: sign aware '<' and '>' comparisons. 2004-08-11 23:08:20 +04:00
vva@eagle.mysql.r18.ru
e1f264748c fixed Bug #4973 Memory is not released when HEAP table is dropped 2004-08-11 18:55:12 +05:00
mskold@mysql.com
c1c3e31fb6 Fix for bug#4730 2004-08-11 15:06:17 +02:00
joreland@mysql.com
294958a707 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-11 12:38:11 +02:00
wax@mysql.com
33c976e11a Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
2004-08-11 15:17:20 +06:00
wax@kishkin.ru
3a55c4bcae BUG#4315
BUG#4535
BUG#4686
2004-08-11 15:15:37 +06:00
bar@mysql.com
127cf25c01 ctype_recoding.result, ctype_recoding.test, sql_show.cc:
Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
2004-08-11 14:03:24 +05:00
serg@serg.mylan
902518ae48 allow get_format(TIMESTAMP, ...) syntax 2004-08-11 10:27:19 +02:00
joreland@mysql.com
a15b4e5143 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-10 17:42:51 +02:00
marko@hundin.mysql.fi
ecb3518d22 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-08-10 16:16:21 +03:00
mskold@mysql.com
0625aef8c0 Bug fix for bug#3912 2004-08-10 14:38:24 +02:00
marko@hundin.mysql.fi
cd6292d219 InnoDB: Use create_temp_file() when available 2004-08-10 14:17:32 +03:00
wax@mysql.com
08acf5ae7e Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
2004-08-10 15:49:58 +06:00
mskold@mysql.com
a5dd9f8bb4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-10 11:48:43 +02:00
wax@kishkin.ru
d3f1a6f0cb BUG#4315
BUG#4535
BUG#4686
2004-08-10 15:48:22 +06:00
dlenev@brandersnatch.localdomain
f49d4f5350 Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server".
Instead of trying to open time zone tables during calculation of CONVERT_TZ() function
or setting of @@time_zone variable we should open and lock them with the rest of 
statement's table (so we should add them to global table list) and after that use such 
pre-opened tables for loading info about time zones.
2004-08-10 12:42:31 +04:00
dlenev@brandersnatch.localdomain
bcbbfc3bb8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4756
2004-08-10 03:07:07 +04:00
dlenev@brandersnatch.localdomain
9962749fc8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.0-bg4491
2004-08-10 02:57:32 +04:00
ingo@mysql.com
57e2f48b8b Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-08-09 19:10:54 +02:00
paul@kite-hub.kitebird.com
976e0ce3a8 mysqld.cc:
minor option description change.
2004-08-09 10:34:36 -05:00
ingo@mysql.com
50a869d1dc Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-4000
2004-08-09 11:41:50 +02:00
ingo@mysql.com
b88a47db3e bug#4497 - Serious regression if disk based TMP table is used.
Solved performance problems by enabling write buffer.
2004-08-09 11:39:26 +02:00
ingo@mysql.com
41feaae09a Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-08-09 11:28:59 +02:00
ingo@mysql.com
82d54f6d86 bug#4369 - MySQL 4.1 regression in Alter table/tmp table from hash.
Solved performance problems by fixing a typo, which prevented enabling of write buffer.
2004-08-09 11:02:09 +02:00
paul@kite-hub.kitebird.com
651b6893b1 mysqld.cc:
Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.
2004-08-08 21:23:03 -05:00
kent@mysql.com
072818eab5 mysqld.cc:
get_options() did an exit(0) after reporting "Too many arguments"
2004-08-08 15:46:57 +02:00
serg@serg.mylan
e1e1c39bda cleanup 2004-08-07 23:18:13 +02:00
serg@serg.mylan
6e8503142e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-07 18:28:10 +02:00
serg@serg.mylan
eaaedb69a8 bug#4881 - crash in ALTER .. RENAME if rename fails 2004-08-07 18:26:59 +02:00