Commit graph

29595 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
fe9644fe7e Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 08:01:47 +01:00
msvensson@neptunus.(none)
e17d969618 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 08:00:17 +01:00
igor@rurik.mysql.com
32c7a0b62f Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-09 21:46:33 -08:00
igor@rurik.mysql.com
a3a2f065fb Ajustement after merge 2006-01-09 21:44:42 -08:00
brian@zim.(none)
b296f64c0e Removing unneeded include. 2006-01-09 21:04:58 -08:00
brian@zim.(none)
50dd013cf4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-09 18:53:02 -08:00
brian@zim.(none)
de44001afd Corrections from code review for auto_increment. Added test cases. 2006-01-09 18:41:37 -08:00
paul@snake-hub.snake.net
5088f5b343 errmsg.txt:
Fix word.
  (no test results needed fixing)
2006-01-09 20:13:27 -06:00
reggie@linux.site
74e8c453b6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups
2006-01-09 17:35:25 -06:00
igor@rurik.mysql.com
e4b1399b5a Merge rurik.mysql.com:/home/igor/mysql-4.1
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-01-09 15:20:01 -08:00
knielsen@mysql.com
535515aeb2 Complete missing part of Mats' HPUX NO_FLAGS fix 2006-01-09 22:17:52 +01:00
brian@zim.(none)
be69338259 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-09 13:02:00 -08:00
msvensson@neptunus.(none)
f7ed8e8698 Add simple printout from mysqlslap.test to avoid empty result file 2006-01-09 20:19:06 +01:00
msvensson@neptunus.(none)
e0d3410a3e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-09 20:12:18 +01:00
msvensson@neptunus.(none)
8dab567f25 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 18:06:16 +01:00
msvensson@neptunus.(none)
0d6d232dec Merge neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
into  neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598
2006-01-09 18:04:53 +01:00
msvensson@neptunus.(none)
e72e0fdd5f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
2006-01-09 18:01:00 +01:00
monty@mysql.com
3c808fe928 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2006-01-09 18:52:22 +02:00
joerg@mysql.com
b6bfac0aaa Version number increase. 2006-01-09 17:26:17 +01:00
msvensson@neptunus.(none)
33d5dc041d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 17:18:49 +01:00
msvensson@neptunus.(none)
4bcf141799 Bug Server crashes in specific case during setting new password
- Comparing host string against NULL caused crash. 
- If host.hostname is NULL treat it as ""
2006-01-09 17:12:26 +01:00
msvensson@neptunus.(none)
d7a4c502fe Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
2006-01-09 17:05:36 +01:00
mats@mysql.com
1c0b916ec1 Changes to support HP-UX. 2006-01-09 16:37:24 +01:00
mats@mysql.com
c600d05fec Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/mkindahl/bk/fix-mysql-5.1-new
2006-01-09 16:02:14 +01:00
mats@mysql.com
94d3a8e050 Changes to support aCC on HP-UX. 2006-01-09 15:59:39 +01:00
msvensson@neptunus.(none)
0e7953d8b3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
2006-01-09 15:31:38 +01:00
msvensson@devsrv-b.mysql.com
74d5ae2437 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into  devsrv-b.mysql.com:/space/magnus/my41-bug15598
2006-01-09 15:29:25 +01:00
ingo@mysql.com
211734c36e Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug5390
2006-01-09 12:56:09 +01:00
ingo@mysql.com
e72e4fc35f Merge mysql.com:/home/mydev/mysql-4.0-bug5390
into  mysql.com:/home/mydev/mysql-4.1-bug5390
2006-01-09 12:54:24 +01:00
lars@mysql.com
c57a439be7 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-max
2006-01-09 11:57:58 +01:00
lars@mysql.com
eecec4cf14 Added synchronization to avoid race condition in tests 2006-01-09 11:53:37 +01:00
brian@zim.(none)
9e22159558 This changeset adds support for autoincrements to archive. It allows it to have them with both unique and non-unique indexes.
Test cases will come in the next push (just doing this one so I can get a couple of reviews in). This is not the final patch.
2006-01-09 02:35:40 -08:00
knielsen@mysql.com
e952a7005b Fix "jump to label crosses initialization" compile error. 2006-01-09 11:23:15 +01:00
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
knielsen@mysql.com
848383feb8 Fix template problem with Sun compiler by using anonymous namespace instead
of static for referenged function.
2006-01-09 11:08:23 +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 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
msvensson@neptunus.(none)
dad7268273 Add yassl libs to libmysqlclient_r as well.
Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
Similiar to readline)
2006-01-09 10:01:07 +01:00
mats@mysql.com
373abaf476 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/mkindahl/bk/b15923-mysql-5.1-new
2006-01-09 09:47:23 +01:00
mats@mysql.com
fb0145c55c Bug#15923 (Test ps_7ndb cause master crash):
Always log statements "DELETE FROM x" statement-based.
2006-01-09 09:37:21 +01:00
igor@rurik.mysql.com
7acc12de98 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-08 19:16:36 -08:00
igor@rurik.mysql.com
4477f96365 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-01-08 17:21:26 -08:00
igor@rurik.mysql.com
7dc0ecb4b0 Adjustment after a merge. 2006-01-08 17:17:22 -08:00
pekka@mysql.com
1c599c8eeb Merge mysql.com:/space/pekka/ndb/version/my50
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-09 01:19:37 +01:00
pekka@mysql.com
44ea4f5441 ndb - wl#2972 ndb api test_event_merge 5.0+5.1 2006-01-09 01:09:42 +01:00
igor@rurik.mysql.com
63d94fb9bc Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-01-08 14:46:47 -08: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 : a query with a having clause containing only set function returned a wrong result set. 2006-01-07 23:00:06 -08:00