kent@mysql.com
5d722a8491
Merge
2006-02-28 23:29:58 +01:00
dlenev@mysql.com
8dbdf5237e
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:00:07 +03:00
msvensson@neptunus.(none)
44a2855382
Bug#17716 Slave crash in net_clear on qnx
...
- Set FD_SETSIZE before including "sys/select.h"
2006-02-27 10:08:35 +01:00
kent@mysql.com
9571e81f04
config-win.h:
...
Enable row based replication for Windows build
replication.m4:
Made help text more clear, default is with row based replication enabled
2006-02-25 21:27:49 +01:00
brian@zim.(none)
cb07d52a7e
This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.
2006-02-24 13:20:51 -08:00
monty@mysql.com
82b77cdd90
Fixes to embedded server to be able to run tests with it
...
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
msvensson@neptunus.(none)
8e760bc6cc
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 10:37:10 +01:00
msvensson@neptunus.(none)
40fe710394
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
msvensson@neptunus.(none)
01cd7a05c7
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
2006-02-17 12:16:36 +01:00
holyfoot@mysql.com
be02944df6
Merging 5.0->5.1
2006-02-17 11:26:03 +04:00
holyfoot@deer.(none)
053d90a234
WL#2645 (CHECK TABLE FOR UPGRADE)
...
necessary implementation in the server
mysql_upgrade script added
2006-02-17 10:52:32 +04:00
msvensson@neptunus.(none)
cb9b610586
#define popen(A,B) _popen((A),(B))
2006-02-16 23:05:15 +01:00
serg@serg.mylan
48b8e842ca
Automerge
2006-02-15 00:01:46 +01:00
serg@serg.mylan
94d225aa6f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-14 22:57:12 +01:00
serg@serg.mylan
a511d770ee
my_bool is internal type, so should be SHOW_MY_BOOL
2006-02-14 22:51:16 +01:00
serg@serg.mylan
63cfd11859
dbug changes:
...
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
2006-02-14 22:36:11 +01:00
svoj@april.(none)
7e8b145b94
BUG#17117: header fille "plugin.h" does not have a namespace prefix
...
plugin.h has been moved into include/mysql/plugin.h
2006-02-14 13:51:25 +04:00
aivanov@mysql.com
f8f8af970e
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-02-10 01:15:45 +03:00
aivanov@mysql.com
e22d2f1150
Fixed BUG#9680: Wrong error from cascading update
...
Applied 9680.patch (by Osku Salerma)
2006-02-09 20:43:10 +03:00
konstantin@mysql.com
5ed755d0d8
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 23:53:45 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
d955abd292
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-02-05 11:06:29 +02:00
konstantin@mysql.com
98091b152a
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-02-02 18:17:18 +03:00
jani@ua141d10.elisa.omakaista.fi
2dcc483e6c
Several Netware specific fixes.
2006-02-02 16:22:31 +02:00
konstantin@mysql.com
92b41ba92a
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 16:57:34 +03:00
bar@mysql.com
d7c773834b
WL#1386 - CTYPE table for unicode character sets
...
A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
Adding new function
Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
Adding new member into MY_CHARSET_HANDLER
Makefile.am:
Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
new files:
ctype data for unicode,
and the tool to generate it from
a Unicode Character Database file.
2006-02-02 10:07:47 +04:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a69827f152
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 09:29:59 -05:00
serg@serg.mylan
cbd98c01cf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-26 09:51:24 +01:00
brian@zim.tangent.org
570bffe8c7
Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
...
my_stat() gettinng the correct parameter list may be next :)
2006-01-25 19:54:42 -08:00
andrey@lmy004.
91ff153dcb
Merge
2006-01-23 13:07:31 +01:00
holyfoot@mysql.com
09359dce59
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
2006-01-23 11:59:31 +04:00
knielsen@mysql.com
113b1e4e6c
Merge mysql.com:/usr/local/mysql/ab/mirrors/pullers/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmp5.1
2006-01-19 21:50:57 +01:00
serg@serg.mylan
2dee3a7216
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-19 19:33:51 +01:00
holyfoot@mysql.com
53a379d041
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
2006-01-19 18:05:57 +04:00
cps@outpost.site
ce2eb6d8cb
WL1019: complete patch. Reapplied patch to the clean
...
tree to get rid of multiple typos in CS comments and
unify the patch.
2006-01-19 05:56:06 +03:00
andrey@lmy004.
0322cb1df8
- fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON)
...
Before the interval expression was considered to be in seconds, now it is
just a number and the type of interval is considered.
- this changeset introduces also fix for bug#16432 (Events: error re interval
misrepresents the facts)
the code of event_timed::set_interval() was refactored anyway so it is meaningful to
fix the bug in the same changeset.
2006-01-18 20:41:22 +01:00
bar@mysql.com
0e665a7aa5
sql_show.cc:
...
Don't display charsets/collations with HIDDEN flag.
ctype-utf8.c:
Adding HIDDEN flag to "filename"
Changeing ID to 17 which was previosly
used by deprecated "win1251", removed in 4.1.
charset-def.c:
Adding "filename" as a hidden charset, for test purposes.
m_ctype.h:
Adding MY_CS_HIDDEN flag,
to hide charsets and collations from
being displayed in SHOW.
2006-01-18 12:27:02 +04:00
knielsen@mysql.com
2ad568d421
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-relmerge
2006-01-17 18:35:16 +01:00
serg@serg.mylan
442e328ee9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-17 18:35:13 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
6bf5c9113d
WL #2747 : Fix such that backup and restore works for user defined
...
partitioned tables in NDB
2006-01-17 09:25:12 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
e802a94284
WL #2604 : Partition Management
...
Optimised version of ADD/DROP/REORGANIZE partitions for
non-NDB storage engines.
New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
Quite a few bug fixes
2006-01-17 08:40:00 +01:00
serg@serg.mylan
ae3d815b41
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2006-01-16 18:09:04 +01:00
serg@serg.mylan
5b9b3ccb4c
only use "public" types in plugin API
2006-01-16 15:17:45 +01:00
evgen@moonbone.local
7f0aa55e36
Manually merged
2006-01-16 16:57:15 +03:00
knielsen@mysql.com
12cb3f4c5e
Windows/Visual Studio 2003 fixes for the 5.1.5 release.
2006-01-13 22:09:48 +01:00
anozdrin@mysql.com
4e1ccbe244
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15103
...
into mysql.com:/home/alik/MySQL/devel/5.1-tree
2006-01-13 19:46:39 +03:00
anozdrin@mysql.com
b1705ae5c4
Merge BUG#15110 from 5.0 into 5.1.
...
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:09:27 +03:00
tomas@poseidon.ndb.mysql.com
e648a8fe52
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/v7
2006-01-13 03:17:09 +01:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4
wl2325 wl2324
2006-01-12 19:51:02 +01:00
jani@ua141d10.elisa.omakaista.fi
617585eb33
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-01-12 20:28:23 +02:00
jani@ua141d10.elisa.omakaista.fi
8c6a32b997
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2006-01-12 17:47:58 +02:00