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
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
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
ramil@mysql.com
a773916238
A fix (bug #8942 : SUBSTRING_INDEX in UPDATE causes internal loop).
2005-03-17 10:24:50 +04:00
igor@rurik.mysql.com
3103b4cae5
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-03-16 17:50:03 -08:00
igor@rurik.mysql.com
45ba13889d
olap.result, olap.test:
...
Added a test for bug #8615 .
sql_select.cc:
Fixed bug #8615 .
This fix only removed the cause of the reported crash.
It does not resolve other problems of rollup queries
with DISTINCT. They were fixed in the previous patch
for bug 8616.
2005-03-16 15:55:04 -08:00
monty@mysql.com
a085653331
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-03-16 15:44:31 +02:00
bar@mysql.com
a7b877df78
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
...
not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for
debugging purposes.
2005-03-16 17:44:29 +04:00
gluh@gluh.mysql.r18.ru
41487d0b4e
Fix for bug#8656: Crash with group_concat on alias in outer table
...
fixed result_field support of Item_ref
2005-03-16 16:44:28 +03:00
gluh@gluh.mysql.r18.ru
4c3e8b078c
Fix for bug #7100 : relay_log_space_max missing from SHOW VARIABLES
2005-03-16 15:57:57 +03:00
bar@mysql.com
2d8e8c02a5
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1-bug8785
2005-03-16 14:35:44 +04:00
igor@rurik.mysql.com
ce6c390c39
olap.result, olap.test:
...
Added a test case for bug #8616 .
item.h:
Fixed bug #8616 .
Added class Item_null_result used in rollup processing.
sql_select.h, sql_select.cc:
Fixed bug #8616 .
Added JOIN::rollup_write_data to cover rollup queries
with DISTINCT. Modified other rollup methods.
2005-03-15 22:50:54 -08:00
monty@mysql.com
fde941e5b4
Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way
2005-03-16 01:15:45 +02:00
reggie@mdk10.(none)
6c00af77a0
Bug #6660 mysqldump creates bad pathnames on Windows
...
sql_show.cc:
changed strdup to thd->memdup per Serg's advice
2005-03-15 16:24:37 -06:00
reggie@mdk10.(none)
ef86c0af65
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-03-15 11:37:14 -06:00
reggie@mdk10.(none)
887f2a53fe
Bug #6660 mysqldump creates bad pathnames on Windows
...
This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem. With this patch, data directory and index directory will use only forward slashes (/) when on Windows.
mysqldump.c:
Removed fixPaths routine. Was improper fix for bug #6660
sql_show.cc:
Changed append_directory to convert backslashes to foward slashes when on Windows.
2005-03-15 11:33:06 -06:00
bar@mysql.com
c6c887b990
# Bug#8785 Problem with nested concats and
...
character set conversion of a string constant.
2005-03-15 17:15:47 +04:00