mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18272 commits 2784 branches 343 tags 1.6 GiB
Commit graph

8556 commits

Author SHA1 Message Date
acurtis@xiphis.org
e82edda6c6 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776 
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
 2005-04-08 21:40:50 +01:00
reggie@mdk10.(none)
9506fb97b5 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-04-08 14:17:29 -05:00
marko@hundin.mysql.fi
a0af6bb7f5 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/mysql-4.1
 2005-04-08 22:17:28 +03:00
reggie@mdk10.(none)
3f5b8b976c Bug #9665 After registering MySQL service and starting with shared mem, cannot stop 
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server
 2005-04-08 09:17:19 -05:00
reggie@mdk10.(none)
c55a7b651f Bug #9665 After registering MySQL service and starting with shared mem, cannot stop 
The shared memory connect event was not being set in kill_server.
This caused the thread that is handling shared memory connections to never
exit.
 2005-04-08 00:16:02 -05:00
msvensson@neptunus.(none)
960410274c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-07 20:21:17 +02:00
mskold@mysql.com
b716302860 Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post review fix 2005-04-07 20:08:01 +02:00
mskold@mysql.com
b135b175fa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-07 17:51:53 +02:00
mskold@mysql.com
89b140340c Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
sergefp@mysql.com
3f6cdec788 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug8877
 2005-04-07 17:47:37 +04:00
sergefp@mysql.com
0cd5877b02 Post-review fixes: local variable renamed 2005-04-07 17:44:48 +04:00
marko@hundin.mysql.fi
b5328a7dbc InnoDB: Prevent ALTER TABLE ... ENGINE=... 
if there are foreign key constraints on the table. (Bug #5574)
 2005-04-07 12:16:41 +03:00
monty@mysql.com
174c15aee1 Small fixes done while reviewing pushed code 2005-04-06 16:52:41 +03:00
monty@mysql.com
b9fdb65b18 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-06 15:53:32 +03:00
monty@mysql.com
6483a71e82 Fixed that create_time is set properly for cached threads 2005-04-06 15:52:32 +03:00
gluh@mysql.com
85bf400612 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
 2005-04-06 15:19:02 +05:00
bar@mysql.com
1c46a02069 Minor clean-ups for the previous commit. 2005-04-06 15:12:44 +05:00
gluh@mysql.com
decfc86fbb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
 2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables 2005-04-06 14:13:06 +05:00
msvensson@neptunus.(none)
9586a06f85 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-06 10:56:51 +02:00
bar@mysql.com
0134a2b286 Adding a new parameter for well_formed_length to 
return error. We'll use it for better warnign reporting.
 2005-04-06 11:53:15 +05:00
msvensson@neptunus.(none)
36120cd6af Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug6762
 2005-04-05 13:07:46 +02:00
msvensson@neptunus.(none)
f22b8930c3 Fix swedish error message 2005-04-05 13:01:16 +02:00
msvensson@neptunus.(none)
f8ae1e53c8 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug6762
 2005-04-05 11:23:17 +02:00
jimw@mysql.com
247f2ac563 Merge new tests 2005-04-04 18:29:18 -07:00
jimw@mysql.com
59b1a1f62f Merge mysql.com:/home/jimw/my/mysql-4.1-9472b 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-04-04 18:27:27 -07:00
sergefp@mysql.com
53e0b5b5db Removed extra comment 2005-04-05 03:34:39 +04:00
sergefp@mysql.com
d0c9b36224 Fix for BUG#8877: Implementation of 
"Early NULL-values filtering for ref access" (attempt2+post-review fixes)
1. update_ref_and_keys() accumulates info about null-rejecting
predicates in in KEY_FIELD::null_rejecting, add_key_part saves
these to KEYUSE.
2. create_ref_for_key copies them to TABLE_REF.
3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond of
appropiate JOIN_TAB members.

Includes code cleanups: 
* add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
passed to it)
* add_key_fields() params: JOIN_TAB *stat removed (wasn't used)
 2005-04-05 02:42:23 +04:00
jimw@mysql.com
fc3c7d5f74 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-04-04 12:46:43 -07:00
heikki@hundin.mysql.fi
73a8d1bcad ha_innodb.cc: 
Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables
 2005-04-04 19:41:52 +03:00
heikki@hundin.mysql.fi
63aa88638a ha_innodb.cc: 
Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string
 2005-04-04 19:27:28 +03:00
jimw@mysql.com
0f007e5c73 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-04-04 08:42:30 -07:00
msvensson@neptunus.(none)
71ccc569ae Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug6762
 2005-04-04 17:09:53 +02:00
msvensson@neptunus.(none)
41c036a60b BUG#6762 ALTER TABLE gives weird results and error message 
- Better error message when table definition has changed
 2005-04-04 12:26:05 +02:00
dlenev@mysql.com
a663889569 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg8894
 2005-04-03 09:48:09 +04:00
serg@serg.mylan
ddee2fa7fb Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-04-02 21:45:02 +02:00
serg@serg.mylan
7ba99ee324 merged 2005-04-02 20:28:58 +02:00
serg@serg.mylan
3098b93ef8 bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names 
sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)
 2005-04-02 20:13:19 +02:00
jimw@mysql.com
623a5d5a57 Clean up merge of fix for Bug #9468. 2005-04-01 19:00:14 -08:00
jimw@mysql.com
16efc3e333 Merge embedded-server testing changes. 2005-04-01 16:43:35 -08:00
jimw@mysql.com
9e16f12145 Fix handling of max_allowed_packet and net_buffer_length in 
embedded server when a size suffix (K, M, G) is added. (Bug #9472)
 2005-04-01 16:09:20 -08:00
mskold@mysql.com
5adfa12df2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-01 18:02:51 +02:00
mskold@mysql.com
cf7c0e43cb Fix for bug#9435: TIMESTAMP columns don't update 2005-04-01 17:59:46 +02:00
sergefp@mysql.com
7ace3f1362 Better comment 2005-04-01 11:05:17 +04:00
jimw@mysql.com
1476213e52 Fix crash in embedded server due to incorrect storage of results 
in the query cache. (Bug #9549)
 2005-03-31 19:17:45 -08: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
jimw@mysql.com
aa4f352230 Remove result.es files and support for them, which requires splitting 
up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508).
 2005-03-30 17:32:44 -08: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
dlenev@mysql.com
6d6d04a0ba Fix for bug #8894 "TIMESTAMP values scrambled/misaligned when using --new". 
Fixed Field_timestamp::val_int() so now it works correctly in --new mode
(or for TIMESTAMP(19) columns). 
Also removed unused Field_timestamp::fill_and_store() method.
 2005-03-28 23:36:25 +04:00
dlenev@brandersnatch.localdomain
aae37f5ea5 Fix for bug #8068 "TIMEDIFF with first negative argument gives wrong 
result" (and similar bug in ADDTIME/SUBTIME).

Both Item_func_add_time/Item_func_timediff::val_str() now use
calc_time_diff() function which was backported from 5.0 (and which
was was fixed to properly handle microseconds part of its second 
argument). Also now we correctly set sign of result in case when
first argument is negative and second is positive.
 2005-03-28 16:20:55 +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
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
bell@sanja.is.com.ua
80d9cafa8f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-03-16 17:06:04 +02: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
ramil@mysql.com
04328c3dfa A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end). 2005-03-15 15:32:11 +04:00
ramil@mysql.com
ec775b65f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b8799
 2005-03-15 14:13:44 +04:00
ramil@mysql.com
46613bafbe A fix (bug #8489: Strange auto_increment behaviour with HEAP table). 2005-03-15 13:32:12 +04:00
sergefp@mysql.com
e7e2a8c8eb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug8510
 2005-03-15 04:09:41 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
9ec8d87328 Updated error message to be more informative. Previous error message 
"Access denied to database mysql" was actually not just misleading, but
also wrong.

Bug#7905.
 2005-03-14 16:59:09 +02:00
msvensson@neptunus.(none)
13ec961c3a BUG#6554 Problem Building MySql on Fedora Core 3 
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3
 2005-03-14 12:07:49 +01:00
serg@serg.mylan
18343b9454 correct not_null_tables() for XOR and AND 
correct top_level_item for XOR
 2005-03-13 16:34:40 +01:00
igor@rurik.mysql.com
a90d2bd97c join_outer.result, join_outer.test: 
Added a test case for bug #9017.
item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid.
 2005-03-12 23:31:52 -08:00
jimw@mysql.com
50f9fc3368 Merge test and results 2005-03-11 11:07:32 -08:00
sergefp@mysql.com
763039a17b Merge 2005-03-11 02:23:16 +03:00
sergefp@mysql.com
5d865045c9 Fix for BUG#8711: "<=>" may have true value for NULL arguments, so make 
Item_func_equal::not_null_tables() always return 0.
 2005-03-11 02:17:03 +03:00
bell@sanja.is.com.ua
056d5a3934 fixed left expression of IN/ALL/ANY subquery transformation support (BUG#8888) 2005-03-10 14:01:22 +02:00
timour@mysql.com
abf659dee9 Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425 
into mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-03-10 11:50:55 +02:00
igor@rurik.mysql.com
af5d21357e Manual merge 2005-03-09 10:58:52 -08:00
timour@mysql.com
f489e56291 Fix for BUG#7425. 
The reported problems were due to two completely unrelated omissions.
1) The file sort procedure didn't correctly create the sort key in
   make_sortkey when the sortkey was an unsigned integer.
2) The name resolution procedure for column references inside a HAVING
   clause did not propagate the unsigned_flag of the resolved references.
This patch corrects both problems.
 2005-03-09 16:51:03 +02:00
serg@serg.mylan
6121422820 sql/mysqld.cc 
preserve backward compatibility
 2005-03-09 13:41:57 +01:00
igor@rurik.mysql.com
4559fb998b func_str.result, func_str.test: 
Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.
 2005-03-09 00:15:51 -08:00
marko@hundin.mysql.fi
fa001505e3 mysqld.cc: 
main(): add missing parameter to printf(ER(ER_READY),...) call
 2005-03-08 22:33:11 +02:00
serg@serg.mylan
5a2c426eb8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-08 19:47:49 +01:00
serg@serg.mylan
9272081ebb BUG#6635 - test_if_skip_sort_order() thought it can skip filesort 
for fulltext searches too
 2005-03-08 19:45:55 +01:00
joerg@mysql.com
a67b670a08 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1 2005-03-08 14:30:17 +01:00
joerg@mysql.com
28b65497da Manual merge, no effect on 4.1. 2005-03-08 14:17:57 +01:00
jimw@mysql.com
df84c534dd Flush entries from the query cache for tables used in 
administrative statements that may alter the table, such
as REPAIR TABLE. (Bug #8480)
 2005-03-07 18:15:19 -08:00
gluh@gluh.mysql.r18.ru
00449b8f9c Fix for bug#8978 : Crash on 'select format ...' 2005-03-07 18:56:18 +03:00
serg@serg.mylan
c36fa576c6 additional safety 2005-03-07 16:45:19 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
5eb393973f Bug#6776 
Failure to delete rows from mysql.func table caused by missing
  charset conversion for index read by pk.
 2005-03-07 13:37:10 +00:00
serg@serg.mylan
d6fa7288c8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-07 14:28:10 +01:00
serg@serg.mylan
2472810489 Fixed crash if max_connections is exceeded. BUG#8996 2005-03-07 13:59:28 +01:00
joerg@mysql.com
88773a8c8d Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-03-07 11:46:31 +01:00
mskold@mysql.com
ce87085294 Review fixes for Bug #8753 Invalid schema 
object version after dropping index
 2005-03-07 10:53:16 +01:00
joerg@mysql.com
ab271b4d84 Manual merge. 2005-03-07 10:29:50 +01:00
joerg@mysql.com
c45cfb7c07 Manual merge of the 4.0.24 compile changes into the 4.1 tree. 2005-03-07 10:27:20 +01:00
mskold@mysql.com
6fc6a7521a Fix for Bug #8753 Invalid schema object version after dropping index 2005-03-07 10:21:38 +01:00
igor@linux.local
6d7862aeaf logging_ok: 
Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
  Added a test case for bug #8893.
opt_sum.cc:
  A misplaced initialization for the returned parameter
  prefix_len in the function find_key_for_maxmin caused
  usage of a wrong key prefix by the min/max optimization
  in cases when the matching index was not the first index
  that contained the min/max field.
 2005-03-04 20:24:13 -08:00
marko@hundin.mysql.fi
a8aced1e64 ha_innodb.cc: 
write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
  will commit at every 10,000 copied rows.
 2005-03-04 15:53:05 +02:00
bar@mysql.com
7e8e033290 type_blob.result, func_system.result, func_str.result, ctype_collate.result: 
fixing test results accordingly.
func_system.test:
  New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
    safe_charset_converter() was added for system constants.
item_strfunc.cc:
  safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
  Version is a system constant too.
 2005-03-04 14:20:49 +04:00
joerg@mysql.com
136c1ea181 Changed C++ style comment to C style for 'sql/net_serv.cc' which will be symlinked 
to 'libmysql/net.c'.
 2005-03-04 11:07:56 +01:00
ingo@mysql.com
b5775ee16c Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-03-04 09:35:21 +01:00
serg@serg.mylan
f2c414e024 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-04 00:05:52 +01:00
serg@serg.mylan
3de51f273b after merge fixes 2005-03-03 23:57:48 +01:00
serg@serg.mylan
08d5ef6507 typos fixed 2005-03-03 23:10:23 +01:00
serg@serg.mylan
e47d0a0e2d merge 2005-03-03 23:07:20 +01:00
serg@serg.mylan
45641ff65c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-03-03 21:13:57 +01:00
serg@serg.mylan
f84bd700b3 uninit variable fixed 2005-03-03 21:13:33 +01:00
serg@serg.mylan
8d9a53a78c Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it) 2005-03-03 19:51:29 +01:00
jimw@mysql.com
0e8a5dbe08 Merge mysql.com:/home/jimw/my/mysql-4.1-3309 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-03-03 10:47:20 -08:00
sergefp@mysql.com
00a560c727 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bugs
 2005-03-03 05:04:00 +03:00
sergefp@mysql.com
eeae2c4dee Comments added 2005-03-03 05:03:21 +03:00
jimw@mysql.com
5d2bedc391 Fix bug in checking of table-specific grats that caused IP/NETMASK 
hostnames to not be matched correctly. (Bug #3309)
 2005-03-02 16:30:24 -08:00
ramil@mysql.com
89d44e039e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1
 2005-03-02 20:04:38 +04:00
ramil@mysql.com
89a105abc5 a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used) 2005-03-02 20:00:48 +04:00
guilhem@mysql.com
c6f1a2e453 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-03-02 11:38:38 +01:00
guilhem@mysql.com
11a1c83c03 Fix for BUG#8325 "Deadlock in replication thread stops replication": 
in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).
 2005-03-02 11:29:48 +01:00
jimw@mysql.com
ac69a4a22c Make sure that the filename for temporary tables is built with fn_format() 
so that extra slashes are handled in tmpdir. (Bug #8497)
 2005-03-01 19:05:48 -08:00
marko@hundin.mysql.fi
af2999b753 InnoDB: Commit inserts to the temporary tables created by 
CREATE INDEX and DROP INDEX every 10,000 rows,
similar to ALTER TABLE.
 2005-03-01 16:09:22 +02:00
jani@ua141d10.elisa.omakaista.fi
530b12166e Fixed Bug#7906, "Cmdline help for mysqld --ansi option misses some info". 2005-03-01 14:13:25 +02:00
ramil@mysql.com
c862c11aab Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b6089
 2005-03-01 14:19:32 +04:00
ramil@mysql.com
8f90906961 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b6089
 2005-03-01 12:31:05 +04:00
ramil@mysql.com
4225b8e8ff Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b5615
 2005-03-01 12:20:55 +04:00
sergefp@mysql.com
d2fec05179 Fix for BUG#8562: In Item_int_with_ref::new_item() create Item_int or Item_uint 
depending on ref->unsigned_flag. Item_int_with_ref can refer to both signed and 
unsigned integers.
 2005-02-28 23:50:06 +03:00
sergefp@mysql.com
a6ad8a4d0f Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::error to -1 to cause 
the error to be sent to the client.
 2005-02-28 20:21:21 +03:00
ramil@mysql.com
c896fcb483 merging 2005-02-28 19:59:38 +04:00
ramil@mysql.com
883ff0cc81 merging 2005-02-28 18:11:18 +04:00
sergefp@mysql.com
a06c6d41bb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/psergey/mysql-4.0-look
 2005-02-28 15:40:45 +03:00
monty@mysql.com
253bfcf783 Fixed wrong memory references found by purify 
(No really critical errors found, but a few possible wrong results)
 2005-02-28 11:59:46 +02:00
ramil@mysql.com
dee22632f7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b4802
 2005-02-25 15:47:36 +04:00
joreland@mysql.com
c25ce0e362 Merge mysql.com:/home/jonas/src/fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-24 18:59:56 +01:00
joreland@mysql.com
15de06f290 bug#8786 - ndb autodiscover, sometimes fails 
remove dict forwarding
  add api retries on NotMaster
 2005-02-24 18:58:56 +01:00
jimw@mysql.com
624f855e94 Make sure that warning message when GROUP_CONCAT() cuts values is also 
updated with the correct number of lines. (Bug #8681)
 2005-02-23 17:58:20 -08:00
mats@mysql.com
30ade5b57e Bug#8412: Setting error code to 0 on statements that cannot fail. 2005-02-23 20:59:00 +01:00
mats@mysql.com
6ad51ffb3c Bug#8412: Merge from 4.0 2005-02-23 19:58:54 +01:00
mats@mysql.com
a4cdb93b38 Merge mysql.com:/home/bkroot/mysql-4.0 
into mysql.com:/home/bk/b8412-mysql-4.0
 2005-02-23 19:40:31 +01:00
guilhem@mysql.com
772b1cedcd Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-02-23 18:18:22 +01:00
gluh@gluh.mysql.r18.ru
fc9c20995f Fix for bug #6572: SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
guilhem@mysql.com
086c2a915a FIx for BUG#8682 "flush_block_commit test hangs on HPUX": 
start_waiting_global_read_lock() should wake up all those who are waiting
for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
AND those registered in global_read_lock_blocks_commit.
 2005-02-23 17:38:51 +01:00
gluh@gluh.mysql.r18.ru
2b5ee94a33 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03:00
jimw@mysql.com
a50be4d42b Merge mysql.com:/home/jimw/my/mysql-4.1-7989 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-22 13:15:34 -08:00
jimw@mysql.com
df3c8db4f3 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-22 13:14:49 -08:00
lars@mysql.com
c583eb6954 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 14:17:17 +01:00
lars@mysql.com
6b06ff5956 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/bkroot/mysql-4.1
 2005-02-22 14:12:42 +01:00
lars@mysql.com
d59fa45596 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 14:12:23 +01:00
lars@mysql.com
f09466e0d7 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b8297-4.1 2005-02-22 14:03:01 +01:00
monty@mysql.com
7914e24409 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-22 14:43:14 +02:00
lars@mysql.com
e31ea39d0c Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:39:41 +01:00
bell@51.0.168.192.in-addr.arpa
babcdb6407 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
 2005-02-22 14:34:59 +02:00
lars@mysql.com
d2ecf8e6a5 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:29:20 +01:00
lars@mysql.com
2d1089e8c1 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1 2005-02-22 13:22:34 +01:00
bar@mysql.com
89a5530822 A user variable are now always have IMPLICIT coercibility, 
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with 
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.
 2005-02-22 15:55:40 +04:00