serg@serg.mylan
601d707661
Auto merged
2006-04-12 14:14:03 +02:00
serg@serg.mylan
70c2ff34f7
fixes for 'make dist' and 'make distcheck'
2006-04-12 14:08:24 +02:00
msvensson@neptunus.(none)
c1e9bb8dea
Add 'mysql_get_ssl_cipher' list of functions to export from libmysqld
2006-04-11 15:14:08 +02:00
msvensson@shellback.
afaa4e2be5
Merge 192.168.0.10:mysql/mysql-5.1
...
into shellback.:C:/mysql/my51-bug17368
2006-04-11 12:19:28 +02:00
kent@mysql.com
8f635a9789
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-04-11 02:48:18 +02:00
reggie@big_geek.
ed6ff9cd40
fix cmake generation error
2006-04-10 16:06:17 -05:00
msvensson@shellback.
765024d829
Remove unused variables and label
2006-04-10 18:34:18 +02:00
kent@mysql.com
f957d8e282
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-04-08 04:29:17 +02:00
kent@mysql.com
196521bd99
Makefile.am:
...
After merge correction
2006-04-05 12:56:05 +02:00
knielsen@mysql.com
8a78628f0a
Missing file in last commit.
2006-04-03 10:28:53 +02:00
knielsen@mysql.com
8e7907c36e
Add embedded server build to the CMake build files.
2006-04-03 10:25:36 +02:00
kent@mysql.com
192dbcb1ca
Makefile.am:
...
Strip ending ".libs/" in search path for objects
2006-03-25 22:26:03 +01:00
knielsen@mysql.com
bc6628d27f
Some changes to make it possible to build for Windows with CMake from
...
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01:00
serg@serg.mylan
84ff8192ff
merged
2006-03-06 23:20:19 +01:00
serg@serg.mylan
5a1672dd66
compilation fixes
2006-03-06 22:08:29 +01: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
reggie@linux.site
cb10b77c31
BUG #15408 - Partitions: subpartition names are not unique
2006-02-21 17:40:07 -06:00
reggie@linux.site
1527e94fc8
BUG# 15408 Partitions: subpartition names are not unique
...
THis patch goes along with 1.2098.23.1 to form the complete patch
2006-02-16 15:02:44 -06:00
serg@serg.mylan
4d2173d997
gcc295 fixes for embedded
2006-01-26 20:56:56 +01:00
holyfoot@deer.(none)
0b8ebc2454
Fixes about the embedded-server in 5.1
2006-01-23 11:58:14 +04: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
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
4b731ddfb4
wl2325 wl2324
2006-01-12 19:51:02 +01:00
andrey@lmy004.
0a140a3752
delete the stale file and this should fix the build
...
after my push of WL#1034 (Internal CRON) into 5.1
2006-01-12 01:22:52 +01:00
andrey@lmy004.
8515610f2e
manual merge
2006-01-11 12:01:36 +01:00
jonas@perch.ndb.mysql.com
161645c81e
wl2723 - ndb opt. nr
2006-01-11 11:35:25 +01:00
anozdrin@mysql.com
b04b851ef9
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
...
There are two main idea of this fix:
- introduce a common function for server and client to split user value
(<user name>@<host name>) into user name and host name parts;
- dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
andrey@lmy004.
7c049782fa
WL #1034 (Internal CRON)
...
merge before push
2006-01-10 21:02:19 +01:00
holyfoot@deer.(none)
e8697cf428
Big patch to make embedded-server working in 5.x
...
Now it supports queries returning several results
(particularly important with the SP)
2006-01-04 14:20:28 +04:00
brian@zim.(none)
f86fd78261
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/archive-5.1
2005-12-22 20:06:05 -08:00
brian@zim.(none)
3ee76a3e3c
Update to add in support for AZIO.
...
AZIO differs in that it uses mysys methods and removes all of the malloc calls.
2005-12-22 19:50:10 -08:00
brian@zim.(none)
680762498a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/cluster-5.1
2005-12-22 10:39:41 -08:00
knielsen@mysql.com
d4c6aff386
Cleanup "make dist" and Windows builds after push of pluggable storage engines.
2005-12-22 13:18:06 +01:00
brian@zim.(none)
fe7ecfd5f1
This patch does the following:
...
1) Fixes breakage in embedded server build for XMLPath push.
2) Hides PARTITION engine from view.
3) Add ENGINES information schema (and it should now be clear from this patch on how to turn any show command into an information schema).
2005-12-22 01:07:47 -08:00
bar@mysql.com
519f9d628c
Adding XPath support: ExtractValue and UpdateXML functions.
...
libmysqld/Makefile.am:
sql/Makefile.am:
Adding new source files.
Adding new file into build process.
include/my_xml.h:
strings/xml.c:
Adding new XML parse flags to skip text normalization and
to use relative tag names. Adding enum for XML token types.
sql/lex.h:
Making parser aware of new SQL functions.
sqll/item_create.h, sql/item_create.cc:
Adding creators for ExtractValue and UpdateXML.
sql/item.h:
Adding new Item types: nodeset and nodeset comparator.
sql/item_xmlfunc.h
sql/item_xmlfunc.cc
Adding new classes implementing XPath functions.
mysql-test/t/xml.test, mysql-test/r/xml.result:
New files: adding test case
2005-12-21 17:13:52 +04:00
andrey@lmy004.
ab953ea8c1
WL#1034 update
...
make compile-pentium-debug-max work
2005-12-15 19:11:08 +01:00
andrey@lmy004.
fd0613f59e
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl1034
...
into lmy004.:/work/mysql-5.1-tt-copy-works
2005-12-14 12:15:48 +01:00
andrey@lmy004.
ebe90857cb
add these, forgotten in the previous commit
2005-12-02 13:22:15 +01:00
andrey@lmy004.
a370c2d907
WL1034 update for latest 5.1 sources
2005-12-02 13:07:02 +01:00
pem@mysql.com
b2a9961abf
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-11-28 20:14:12 +01:00
msvensson@devsrv-b.mysql.com
8f457699a8
Bug #15168 yassl failure on amd64
...
- Use libtool to build libraries
2005-11-24 17:17:36 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
svoj@poseidon.ndb.mysql.com
3791197f0d
WL#2575 - Fulltext: Parser plugin for FTS
...
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
2005-11-06 13:13:06 +01:00
monty@mysql.com
cdf64f0f57
Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)
...
This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
2005-11-05 13:20:35 +02:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
kent@mysql.com
4742f585b1
Merge
2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-04 01:15:35 +01:00
msvensson@neptunus.(none)
68fa03258a
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
bb571de368
BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Remove yassl_libsfrom CLIENT_LIBS var
- Add yassl_libs to libmysql and libmysqld
2005-10-27 21:48:43 +02:00