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
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
msvensson@neptunus.(none)
0684dc1342
Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs
to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
2005-10-18 15:43:59 +02:00
tomas@poseidon.ndb.mysql.com
411559c270
merge
2005-10-06 12:45:30 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
brian@zim.(none)
da101b3b5a
Moving archive from example to sql.
2005-09-28 19:04:51 -07:00
dlenev@mysql.com
6f7928c293
Fix for bug #13546 "Build errors with --with-embedded-server
...
--with-embedded-privilege-control options". One more (hopefully last) build
failure which was introduced during work on WL#2787 "Add view definer/owner
to the view definition..."
2005-09-28 18:43:46 +04:00
dlenev@mysql.com
dc50fc2403
Merge mysql.com:/home/dlenev/src/mysql-4.1-bg13501
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-09-28 15:59:55 +04:00
dlenev@mysql.com
ed1c0cbd07
Fix for bug #13501 "build problem: too many arguments to function my_bool
...
acl_init".
Updated calls to acl_init()/grant_init() in init_embedded_server() - their
signatures were changed recently, now they don't need argument for passing
pointer to THD object (this code was only compiled if one built embedded
server library with --with-embedded-privilege-control switch).
2005-09-27 23:36:02 +04:00
kent@mysql.com
095efe48a5
Makefile.am, configure.in:
...
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
konstantin@mysql.com
2d4c54ba1b
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
konstantin@mysql.com
6f8d3c4844
A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
...
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
2005-09-22 02:11:21 +04:00
bell@sanja.is.com.ua
506c6eb922
postmerge fixes
2005-09-21 08:29:47 +03:00
bell@sanja.is.com.ua
aec371f910
WL#2787 (part 2, ver 3 (merged)) changed securety context switching
2005-09-15 22:29:07 +03:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
hf@deer.(none)
41c83870a2
Merge deer.(none):/home/hf/work/mysql-4.1.9110
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-27 12:56:23 +05:00
hf@deer.(none)
9bab1c09a6
Fix for bug #9110 (Max_join_size error)
2005-07-26 12:08:00 +05:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
e44ee76453
Included partitioning into embedded server
2005-07-21 03:31:49 -04:00
tulin@dl145b.mysql.com
a6c21a0791
merge
2005-07-19 21:56:10 +02:00
monty@mishka.local
21ae963205
Fixes to previous changeset
...
get_defaults_file() -> get_defaults_options()
2005-07-18 20:05:30 +03:00
tomas@poseidon.ndb.mysql.com
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
kent@mysql.com
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
konstantin@mysql.com
f60ebc4815
A fix and a test case for Bug#10794 "mysql_stmt_attr_set no
...
open cursor after mysql_stmt_execute" + post-review fixes.
The bug was caused by wrong flags in stmt->server_status on the client
side: if there was no cursor, the server didn't send server_status
flags to the client, and the old flags were used to set up the
fetch function of a statement. Consequently, stmt_read_row_from_cursor was
used when there was no cursor. The fix fixes the server to always
send server flags to the client.
2005-06-30 16:17:10 +04:00
tulin@dl145b.mysql.com
ebc2050c25
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-17 23:13:38 +02:00
konstantin@mysql.com
b3d977df10
Rename all prepared statements COM_ commands to prefix with COM_STMT_
2005-06-17 23:26:25 +04:00
joreland@mysql.com
84a04b4a9d
merge
2005-06-13 14:09:09 +02:00
serg@serg.mylan
b41f9b36cb
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-10 20:23:37 +02:00
serg@serg.mylan
8954b0d2d0
remove old libmysqld.a before assembling a new one
2005-06-09 22:04:05 +02:00
kent@mysql.com
0005165fa0
mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp:
...
Added /FD flag, to avoid include file warnings
mysqlclient.dsp:
Removed duplicate entry for "strings/ctype-cp932.c"
Added missing "mysys/my_access.c"
libmysqld.dsp:
Added missing "mysys/charset.c"
libmysqld.def:
Added symbol 'get_charset_name'
2005-06-09 00:49:37 +02:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4
Merge
2005-06-04 19:26:35 +02:00
serg@serg.mylan
1cad5c8c4b
assemble libmysqld.a 5-10 times faster!
2005-06-02 22:59:37 +02:00
tulin@dl145c.mysql.com
03590c20bd
merge
2005-05-18 22:26:23 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c63ad3b549
New file default_modify.c. Fixed a typo on mysqld.cc
...
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.
2005-05-18 20:10:17 +03:00
tulin@dl145c.mysql.com
23f79bd1f2
merge
2005-05-17 10:17:53 +02:00
konstantin@mysql.com
89bd09fed2
Manual merge (again)
2005-05-14 12:38:12 +04:00
kent@mysql.com
faf8f825b5
Makefile.am, configure.in:
...
Enable creation of embedded lib when --with-darwin-mwcc
2005-05-10 13:53:47 +02:00
ndbdev@dl145b.mysql.com
58aa78e32d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-09 20:28:54 +02:00
holyfoot@hf-ibm.(none)
5ddaf35c26
Fix for bug #9632 (strict.test fails in -embedded-server mode)
2005-05-09 16:26:06 +05:00
tomas@poseidon.ndb.mysql.com
4f1e27ed00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-03 00:10:52 +02:00
jimw@mysql.com
7bab94f36b
Clean up merge from 4.1
2005-05-02 10:19:37 -07:00
