sergefp@mysql.com
7ace3f1362
Better comment
2005-04-01 11:05:17 +04:00
msvensson@neptunus.(none)
f4e3bcc015
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-31 10:47:32 +02:00
konstantin@mysql.com
3e2452024b
A fix for Bug#9443 "mysql_client_test fails on linux and some solaris
...
platforms": yet another issue with floating pointer comparisons.
The fix uses the workaround with volatiles.
2005-03-31 03:44:51 +04:00
bell@sanja.is.com.ua
dc87075f86
postmerge fixes
2005-03-30 23:08:03 +03:00
bell@sanja.is.com.ua
c64efa6062
merge
2005-03-30 22:11:08 +03:00
msvensson@neptunus.(none)
b7ab584096
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced
2005-03-30 14:33:55 +02:00
msvensson@neptunus.(none)
9471e922f1
Merge neptunus.(none):/home/msvensson/mysql/bug8807
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced
2005-03-30 14:30:32 +02:00
sergefp@mysql.com
86e3a378ea
Fix for BUG#9213: GROUP BY returns wrong query results:
...
Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen.
2005-03-30 15:57:42 +04:00
msvensson@neptunus.(none)
382a8c0048
BUG#8807 Select crash server
...
- Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare.
2005-03-30 12:14:37 +02:00
ramil@mysql.com
fb87f5b5c4
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-03-30 14:51:23 +05:00
ramil@mysql.com
1a25c55e49
A fix (bug #9401 : type_timestamp segfaults mysqld)
2005-03-30 14:43:56 +05:00
serg@serg.mylan
9db4daf111
merged
2005-03-30 10:52:28 +02:00
serg@serg.mylan
2a297353c6
don't strcmp db if it's a pattern
2005-03-30 10:43:24 +02:00
bell@sanja.is.com.ua
dcdda90a11
Merge
2005-03-30 10:27:36 +03:00
bell@sanja.is.com.ua
4fdb0f48e7
postreview changes
...
fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350)
2005-03-30 10:07:08 +03:00
bar@mysql.com
ba115894c5
Better error message.
...
Bugs#9057: Incorrect errormsg for too-large char field in table definition
2005-03-29 15:43:00 +05:00
konstantin@mysql.com
2115900460
Remove redundant my_security_attr_free() from
...
handle_connections_shared_memory (double free spotted by Monty).
2005-03-29 14:30:34 +04:00
serg@serg.mylan
55d3d94c3b
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-28 13:56:27 +02:00
bar@mysql.com
e60daecc87
Bug#9425 A user variable doesn't always have implicit coercibility
...
Coercibility fixes for numeric types and not defined values were done.
2005-03-28 14:01:57 +05:00
serg@serg.mylan
8207241882
merged
2005-03-26 20:15:18 +01:00
serg@serg.mylan
2dd1847bc2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-26 19:49:24 +01:00
serg@serg.mylan
b100adf750
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-26 19:49:17 +01:00
serg@serg.mylan
72c9ac844b
fixes for "backport wild_compare fix from 4.1 - bug#3924"
2005-03-26 19:46:42 +01:00
konstantin@mysql.com
ff8017f0d3
A fix for Bug#8226 "Cannot connect via shared memory":
...
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
2005-03-26 01:21:52 +03:00
brian@zim.(none)
0c21adf370
Fix upgrade/downgrade issue.
2005-03-25 12:36:04 -08:00
brian@zim.(none)
6e2caeb0ce
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-03-24 16:08:48 -08:00
brian@zim.(none)
e65b96693c
Collection of changes per Bar and Serg.
2005-03-24 16:07:56 -08:00
msvensson@neptunus.(none)
eaa057e97a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-24 20:17:08 +01:00
bar@mysql.com
56b931f818
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-24 18:11:35 +04:00
bar@mysql.com
29ffcad226
Fixed that LEFT OUTER JOIN was replaced with a regulat join
...
in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().
2005-03-24 18:10:46 +04:00
msvensson@neptunus.(none)
ccea1af2ae
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug9303
2005-03-24 14:26:39 +01:00
msvensson@neptunus.(none)
bf2f6ff2d4
BUG#9303 blob field with specified length < 256 does not create tinyblob
2005-03-24 13:48:38 +01:00
msvensson@neptunus.(none)
c4a698ea3e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-24 12:21:55 +01:00
serg@serg.mylan
091f069671
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-23 21:10:01 +01:00
serg@serg.mylan
f21f8f983f
client/mysqltest.c
...
corrected number of fields for --enable_metadata
sql/sql_union.cc
fixed a apparent typo in assert
2005-03-23 20:38:42 +01:00
gbichot@quadita2.mysql.com
bd74a139dc
Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
2005-03-23 19:50:42 +01:00
gbichot@quadita2.mysql.com
19499229ed
"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
...
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
2005-03-23 19:19:36 +01:00
msvensson@neptunus.(none)
a430d5a1a5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-23 09:41:01 +01:00
bell@sanja.is.com.ua
4554b1f263
fixed union types merging and table related metadata (BUG#8824)
2005-03-23 08:36:48 +02:00
brian@zim.(none)
cfcedd85cd
Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.
2005-03-22 16:10:39 -08:00
mskold@mysql.com
2adabcb328
Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index
2005-03-22 17:48:28 +01:00
mskold@mysql.com
27dbed4384
Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index
2005-03-22 17:42:08 +01:00
msvensson@neptunus.(none)
e1e4a08695
Merge neptunus.(none):/home/msvensson/mysql/bug9072
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-22 14:29:34 +01:00
monty@mysql.com
f849ac68a5
Fixed newly introduced bug in ROLLUP
2005-03-22 02:36:31 +02:00
msvensson@neptunus.(none)
a5bb4810ff
BUG#9072 'Max_error_count' system variable cannot be set to zero
...
- Chaned min value in mysqld.cc
- Added testcase to warnings.test
2005-03-21 11:07:31 +01:00
igor@rurik.mysql.com
6f5fbaad59
olap.test:
...
Added a test case for bug #8617 .
sql_select.cc:
Fixed bug #8617 .
Queries with ROLLUP and LIMIT n returned more than n rows
if SQL_CALC_FOUND_ROWS was used.
2005-03-17 20:18:19 -08:00
gbichot@quadxeon.mysql.com
7ee2ecbe5d
Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
...
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon
2005-03-17 17:00:44 +01:00
gbichot@quadxeon.mysql.com
3cb85a4740
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
2005-03-17 15:51:52 +01:00
gbichot@quadxeon.mysql.com
d823bee92a
safer creation of temp files used in replication of LOAD DATA INFILE.
...
When we come to create these, they may already exist and it's necessary to delete these old, useless copies.
2005-03-17 14:39:39 +01:00
ramil@mysql.com
261105a007
Merge
2005-03-17 10:59:25 +04:00