Commit graph

28493 commits

Author SHA1 Message Date
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
knielsen@mysql.com
64f7425ac9 Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxfix
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-04 16:14:49 +01:00
knielsen@mysql.com
f6b1f10707 Fix QNX test abort in release builds and pushbuild, avoid killing our
parent when we are not the process group leader.
2006-01-04 16:02:41 +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
knielsen@mysql.com
85575904fa BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
the bug is fixed.
2006-01-04 15:25:32 +01:00
jonas@perch.ndb.mysql.com
66b38bc69b Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-01-04 11:41:43 +01:00
jonas@perch.ndb.mysql.com
aa6400a356 ndb - Make testDatabuffer clean up tables 2006-01-04 11:38:58 +01:00
knielsen@mysql.com
b6faf80f20 Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxtestsock
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-04 10:34:47 +01:00
knielsen@mysql.com
3524b80092 Avoid double slash (//) in socket paths, breaks on QNX. 2006-01-04 10:32:52 +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
jonas@perch.ndb.mysql.com
8d756c5bdd Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-01-02 14:49:02 +01:00
jonas@perch.ndb.mysql.com
805655d889 bug#16125 - ndb bitfield of exact 32 bits, incorrect assertion (i.e. only noticable in debug compiled) 2006-01-02 14:38:38 +01:00
pekka@mysql.com
ec753efd43 ndb - wl#2972 (4.1) copy detached trigger fix from 5.0 2005-12-31 10:54:36 +01: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
joerg@mysql.com
59ea719936 Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0 2005-12-29 13:41:56 +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
msvensson@neptunus.(none)
43a559ac70 Improved error message for failing with wrong error 2005-12-29 09:48:43 +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
kent@mysql.com
eaffb7eb73 config-win.h:
Backported Windows MAX_INDEXES handling from 5.1
2005-12-28 18:35:22 +01: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
evgen@moonbone.local
45abf0dabd Manual merge 2005-12-28 17:23:08 +03: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
evgen@moonbone.local
535b23bec5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14583-bug-4.1-mysql
2005-12-28 16:00:10 +03: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)
cdd1f5c6fc Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
2005-12-28 09:31:40 +01: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
eecf49999d Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-28 09:18:57 +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
pekka@mysql.com
76bdccd08a Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2005-12-27 18:56:33 +01:00
evgen@moonbone.local
d91cbf34ff Fix bug#14583
When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result. 
Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.

my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.
2005-12-27 20:16:59 +03:00
pekka@mysql.com
a4fc69dbfb ndb - wl#2972 (5.0) fix detached trigger opType + new pgm test_event_merge 2005-12-27 16:57:50 +01:00
stewart@mysql.com
cb25f0f039 5.0 ndb build fix. 2005-12-28 01:32:03 +11: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
9014fef4f9 Merge mysql.com:/home/mydev/mysql-4.0
into  mysql.com:/home/mydev/mysql-4.0-bug5390
2005-12-27 10:35:33 +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
bell@sanja.is.com.ua
14384b8401 Avoiding conditional jump on uninitialized variable (BUG#14904). 2005-12-27 02:01:58 +02:00
ingo@mysql.com
bd72782899 Merge mysql.com:/home/mydev/mysql-4.1-bug5390
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-26 10:32:54 +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
5bde71e4cb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-12-24 11:00:31 +01:00
serg@serg.mylan
c063819075 locking issues,
test for LONGLONG_MIN in decimal.c
2005-12-23 20:50:28 +01:00
serg@serg.mylan
7b049bf2cd correct help text 2005-12-23 12:38:22 +01:00
bar@mysql.com
7f843ffe87 ctype_uca.result, ctype_uca.test:
Adding test case.
charset-def.c:
  Initialize new collation.
ctype-uca.c:
  Adding simplified Hungarian collation.
2005-12-23 14:20:00 +04:00
paul@frost.snake.net
8fa6d83be2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0
2005-12-22 13:05:52 -06:00
paul@frost.snake.net
e5281df9f7 mysqltest.c:
Put options in order.
  Add #ifdef around --debug for non-debug builds.
2005-12-22 13:02:53 -06:00