Commit graph

13968 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
7bda1e9191 Merge neptunus.(none):/home/msvensson/mysql/bug15598/my41-bug15598
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 11:16:29 +01:00
msvensson@devsrv-b.mysql.com
175a946e55 Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598
into  devsrv-b.mysql.com:/space/magnus/my41-bug15598
2006-01-09 10:57:28 +01:00
msvensson@neptunus.(none)
2a05a6ba87 Bug #15598 Server crashes in specific case during setting new password
- When acl_user->host.hostname is NULL compare it as ""
2006-01-09 10:31:07 +01:00
monty@mysql.com
1378eda3c4 After merge fix (Lines lost in manual merge) 2006-01-09 11:10:49 +02:00
monty@mysql.com
c44d6124ed Merge mysql.com:/home/my/mysql-4.0
into  mysql.com:/home/my/mysql-4.1
2006-01-08 19:07:49 +02:00
igor@rurik.mysql.com
bf78fd5438 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-07 23:10:08 -08:00
igor@rurik.mysql.com
05947d9916 Fixed bug #14274: a query with a having clause containing only set function returned a wrong result set. 2006-01-07 23:00:06 -08:00
igor@rurik.mysql.com
d2cfad167b Fixed bug #16016: MIN/MAX optimization was not applied to views. 2006-01-06 22:28:26 -08:00
monty@mysql.com
fd4a040325 Fixes during review of new pushed code:
Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Safety fix for bug #13855 "select distinct with group by caused server crash"
2006-01-06 21:42:17 +02:00
serg@serg.mylan
8dc77f267b merged 2006-01-06 18:26:59 +01:00
jimw@mysql.com
d8a4aafe33 Merge mysql.com:/home/jimw/my/mysql-5.0-14212
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-01-06 08:34:55 -08:00
knielsen@mysql.com
be8f21e8f1 Fix compile failure on QNX. 2006-01-06 14:30:25 +01:00
monty@mysql.com
64cab9d767 After merge fix and a safety fix for handler 2006-01-06 12:48:14 +02:00
monty@mysql.com
b0a5ea01ef Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-01-06 01:08:48 +02:00
monty@mysql.com
6e22e29de6 Review fixes of new pushed code
- Fixed tests
- Optimized new code
- Fixed some unlikely core dumps
- Better bug fixes for:
  - #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  - #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null
2006-01-06 00:47:49 +02:00
jimw@mysql.com
7d551b8a4e Merge mysql.com:/home/jimw/my/mysql-5.0-15185
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-01-05 10:27:06 -08:00
knielsen@mysql.com
ed7c09da36 Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-05 10:45:34 +01:00
konstantin@mysql.com
4a4b8eacc1 Post-merge fixes. 2006-01-04 21:39:39 +03:00
knielsen@mysql.com
f13dff7a72 EADDRINUSE is not defined on Windows. 2006-01-04 16:38:54 +01:00
konstantin@mysql.com
6502e6bba7 Merge mysql.com:/opt/local/work/mysql-4.1-7209-new
into  mysql.com:/opt/local/work/mysql-5.0-merge
2006-01-04 17:49:45 +03:00
konstantin@mysql.com
f7d6fa6f17 A fix for Bug#7209 "Client error with "Access Denied" on updates
when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a 
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.
2006-01-04 17:35:30 +03:00
serg@serg.mylan
30c09d6dc0 merged 2006-01-03 18:12:03 +01:00
serg@serg.mylan
14f94dc0ca many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
gluh@eagle.intranet.mysql.r18.ru
8ce6f3e6ca Fix for bug#15533 crash, information_schema, function, view
enable view prepared mode during getting metedata for I_S table
2006-01-03 14:25:19 +04:00
ingo@mysql.com
4b3b1fc0b2 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug15591
2005-12-29 18:17:02 +01:00
ingo@mysql.com
2547cdc7a3 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug15591
2005-12-29 11:07:27 +01:00
ramil@mysql.com
6ccd21cf97 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15108
2005-12-29 12:39:49 +04:00
msvensson@neptunus.(none)
6de9519966 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
2005-12-29 09:19:25 +01:00
ingo@mysql.com
b1214d232e Bug#15591 Occasional test suite abort due to port in use
If the server is started with --port-open-timeout=# 
retry to bind the TCP port if it fails with EADDRINUSE.
Use the new option in mysql-test-run.sh.
2005-12-28 20:30:57 +01:00
SergeyV@selena.
6d55b423d8 Fixes bug #15634. Eliminates compiler warning 'all return paths are recursive in
Field_date::store function'. Though the Field_date::store function almost unused
when protocol_version=10 additional check was added into it to store 4byte dates 
properly. Effective test routine is not available so far due to protocol_version
is not a dynamic property and can not be modified with mysql-test script.
2005-12-28 19:40:37 +03:00
msvensson@devsrv-b.mysql.com
45864dbf4b Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
into  devsrv-b.mysql.com:/space/magnus/my50-bug15775_part2
2005-12-28 17:37:28 +01:00
msvensson@neptunus.(none)
e1ef24e38c Bug #15775 "drop user" command does not refresh acl_check_hosts
- Update patch for 5.0 
 - Added common function to be called when 'acl_users' has been modified
2005-12-28 14:43:50 +01:00
ramil@mysql.com
c1287769b9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15108
2005-12-28 14:16:46 +04:00
msvensson@neptunus.(none)
2fb6cb5a5a BUG#15775 "drop user" command does not refresh acl_check_hosts
- DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
     connect's via TCP to fail randomly.
   - 4.1 version
2005-12-28 09:23:27 +01:00
ingo@mysql.com
bd1b724bbf Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-27 19:25:54 +01:00
stewart@mysql.com
efbdf7b225 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-12-28 00:57:18 +11:00
ingo@mysql.com
44ef4989bb Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug5390
2005-12-27 10:36:19 +01:00
ingo@mysql.com
ef52a59418 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-27 10:31:00 +01:00
ramil@mysql.com
f6a61875f7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15108
2005-12-26 11:18:01 +04:00
serg@serg.mylan
d5d6b51422 remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source 2005-12-24 14:32:50 +01:00
serg@serg.mylan
7b049bf2cd correct help text 2005-12-23 12:38:22 +01:00
knielsen@mysql.com
2f1614a9c1 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/mysql-5.0
2005-12-21 16:05:13 +01:00
knielsen@mysql.com
9dceb4f32e BUG#15842: Change in "item.cc" adding Item_sp_variable breaks compile on HP-UX 11.23
Fix: make explicit conversion to non-constant string (char *).
Backported from 5.1 changeset 1.1968 05/12/19 17:36:20 kent@mysql.com +2 -0
2005-12-21 15:19:11 +01:00
dlenev@mysql.com
74ca27b305 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg14836
2005-12-21 15:02:34 +03:00
paul@snake-hub.snake.net
1b106bf4fc errmsg.txt:
Fix typo.
2005-12-20 12:42:35 -06:00
ingo@mysql.com
b0e84cb999 BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.0.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.
2005-12-20 16:35:05 +01:00
gluh@eagle.intranet.mysql.r18.ru
f9ef0df0d3 Fix for bug#14271 I_S: columns has no size for (var)binary columns
set character_octet_length, character_maximum_length for
  binary and varbinary field types
2005-12-19 16:21:02 +04:00
bar@mysql.com
f206a123a1 Bug#15581: COALESCE function truncates mutli-byte TINYTEXT values
field.cc:
  BLOB variations have number-in-bytes limit,
  unlike CHAR/VARCHAR which have number-of-characters limits.
  A tinyblob column can store up to 255 bytes.
  In the case of basic Latin letters (which use 1 byte per character)
  we can store up to 255 characters in a tinyblob column.
  When passing an utf8 tinyblob column as an argument into
  a function (e.g. COALESCE) we need to reserve 3*255 bytes.
  I.e. multiply length in bytes to mbcharlen for the character set.
  Although in reality a tinyblob column can never be 3*255 bytes long,
  we need to set max_length to multiply to make fix_length_and_dec()
  of the function-caller (e.g. COALESCE) calculate the correct max_length
  for the column being created.

ctype_utf8.result, ctype_utf8.test:
  Adding test case.
2005-12-19 15:52:10 +04:00
gluh@eagle.intranet.mysql.r18.ru
f4b052844f Fix for bug#14861 aliased column names are not preserved.
Create tmp table filed using original item name when it's necessary
2005-12-19 15:36:03 +04:00
gluh@eagle.intranet.mysql.r18.ru
c8631b414b Bug#12770 DESC cannot display the info. about temporary table
Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
Bug#15224 SHOW INDEX from temporary table doesn't work.
  Restore thd->temporary_tables to be able to process
  temporary tables(only for 'show index' & 'show columns').
  This should be changed when processing of temporary tables for
  I_S tables will be done.
2005-12-19 14:46:54 +04:00