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
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 #15598 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
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@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
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
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
knielsen@mysql.com
8139f36417
BUG#16282: Remove unused gcc.cpp linker input that causes failure in make -j.
2006-01-08 07:42:40 +01:00
serg@serg.mylan
86e35affcf
after merge fix
2006-01-07 16:27:40 +01:00
serg@serg.mylan
923e7cfd73
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-07 14:50:03 +01:00
serg@serg.mylan
cfbaad9952
WL#2935 - SHOW STATUS support in plugins
...
The patch adds DYNAMIC_ARRAY all_status_vars, which is now the
sole source of status information for SHOW STATUS. Status
variables can be added to and removed from the array dynamically.
SHOW STATUS command uses this array instead of static array
from mysqld.cc
Compatibility with the old, global list of status variables is
preserved in init_server_components(), where this global list is
simply appended to all_status_vars.
2006-01-07 14:41:57 +01:00
igor@rurik.mysql.com
aade22bad2
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-01-06 23:26:20 -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
jimw@mysql.com
a4d7edbb0f
Fix result after merge
2006-01-06 15:16:44 -08:00
jimw@mysql.com
96ae7c2e78
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-01-06 10:42:58 -08: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
dca852ff68
BUG#16155: Workaround AIX 5.2 64-bit compiler bug.
2006-01-06 17:02:57 +01:00
knielsen@mysql.com
be8f21e8f1
Fix compile failure on QNX.
2006-01-06 14:30:25 +01:00
knielsen@mysql.com
fdab131bac
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-06 12:42:30 +01:00
knielsen@mysql.com
17ec039433
Disabled mysqlslap test case was errorneously enabled in merge; disable again.
2006-01-06 12:40:32 +01:00
joerg@mysql.com
4a0fe7348a
Compile fix: An "int" function had accidentally lost its "return 0;", re-add it.
2006-01-06 12:21:15 +01:00
monty@mysql.com
64cab9d767
After merge fix and a safety fix for handler
2006-01-06 12:48:14 +02:00
jimw@mysql.com
a3f41bc41e
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-01-05 16:50:46 -08:00
jmiller@mysql.com
d1aacfad69
Test case clean-up do to causing other test failures
2006-01-06 01:09:17 +01:00
jimw@mysql.com
86de67aadc
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-01-05 15:41:54 -08: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