Commit graph

29233 commits

Author SHA1 Message Date
knielsen@mysql.com
535515aeb2 Complete missing part of Mats' HPUX NO_FLAGS fix 2006-01-09 22:17:52 +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
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
knielsen@mysql.com
e952a7005b Fix "jump to label crosses initialization" compile error. 2006-01-09 11:23:15 +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
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
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
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
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
jmiller@mysql.com
5ffdab0059 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-06 00:07:03 +01:00
jmiller@mysql.com
35a039ffc0 File needs to be removed 2006-01-06 00:06:04 +01: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
knielsen@mysql.com
b41bbfa564 Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-05 23:45:52 +01:00
knielsen@mysql.com
b197c9abea Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-05 23:41:10 +01:00
knielsen@mysql.com
71215d0cbc Port to Win64/x64 in Visual Studio 2005 2006-01-05 23:39:45 +01:00
jimw@mysql.com
078d7ac27b Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-01-05 14:08:47 -08:00
jmiller@mysql.com
5e45dc2738 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-05 22:18:43 +01:00
jimw@mysql.com
8ff08459c1 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-01-05 11:59:26 -08: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
e523847e8b Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-05 14:19:02 +01:00
knielsen@mysql.com
46772f0c2f Some header files were missing from "make dist". 2006-01-05 14:17:05 +01:00
jmiller@mysql.com
a0c4cfd015 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/5.1-new2
2006-01-05 13:07:29 +01:00
knielsen@mysql.com
eed5285e8c Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-05 10:54:14 +01:00
mats@mysql.com
e46dab62c1 Bug#15923 (Test ps_7ndb cause master crash):
Always logging statements of the form "DELETE FROM x" statement-based.
2006-01-05 10:52:58 +01: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
9bf1e22b4c Fix -ansi -pedantic compile 2006-01-05 11:18:26 +03:00
konstantin@mysql.com
8e9af5d72a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-01-05 11:05:27 +03:00
jmiller@mysql.com
28dba4c690 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-05 04:08:55 +01:00
jmiller@mysql.com
32b19cd1ec New rbr blob test requested by Lars 2006-01-05 03:56:22 +01:00
konstantin@mysql.com
f4cc6c4d15 Merge mysql.com:/opt/local/work/mysql-5.0-merge
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-01-05 00:38:51 +03:00
paul@snake-hub.snake.net
ebe0b0b8b3 set_var.cc:
Fix out of order system variable.
2006-01-04 13:43:21 -06:00