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
jimw@mysql.com
78ff49437f
Manually resolve merge
2005-04-29 08:46:03 -07:00
brian@zim.(none)
3e4607a3b8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/mysql-5.1
2005-04-26 19:07:13 -07:00
brian@zim.(none)
2193fd8666
All changes for change to all storage engines being under storage directory.
2005-04-26 19:04:36 -07:00
tomas@poseidon.ndb.mysql.com
033988f014
Merge
2005-04-25 22:21:25 +02:00
lenz@mysql.com
918ce29557
- manual merge
2005-04-21 08:30:59 +02:00
lenz@mysql.com
814b4aa2eb
- manual merge
2005-04-19 17:18:56 +02:00
lenz@mysql.com
a42c7d442e
- added missing copyright headers to several Makefile.am's (noticed
...
while testing changes to the mysql-copyright scripts
2005-04-19 17:00:05 +02:00
lars@mysql.com
1bd55e471e
Merging 5.0->5.1
2005-04-19 11:09:54 +02:00
msvensson@neptunus.(none)
3416e42903
BUG#9391 mysqlshow prints incorrect "rows" information
...
- Removed use of mysql->extra_info
- Removed unused function send_records_num
2005-04-13 12:22:20 +02:00
patg@patrick.local
8e0eb65f9a
5.0 to 5.1 merge
2005-04-01 12:32:17 -08:00
jimw@mysql.com
1476213e52
Fix crash in embedded server due to incorrect storage of results
...
in the query cache. (Bug #9549 )
2005-03-31 19:17:45 -08:00
lars@mysql.com
439a604efa
Fix of build failure of library
2005-04-01 01:33:04 +02:00
brian@zim.(none)
aa44d86235
fixed conflict making embedded server with libmysqld
2005-03-25 14:12:46 -08:00
brian@zim.(none)
013c2ed3be
Fixing blackhole support in libmysqld
2005-03-25 14:09:19 -08:00
serg@serg.mylan
d6bedfa8e0
merged
2005-03-23 09:42:24 +01:00
jimw@mysql.com
5f715b52d0
Fix test_libmysqld link problem on Windows.
2005-03-21 21:51:31 +01:00
konstantin@mysql.com
60e7da0a67
Remove unexistent @MT_INCLUES@
2005-03-18 00:24:35 +03:00
brian@zim.(none)
473e1ffd3a
Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup).
2005-03-16 16:22:56 -08:00
monty@mysql.com
0a6b7aedb2
Remove compiler warnings and remove not used variables
...
(Found during build process)
2005-02-25 16:53:22 +02:00
serg@serg.mylan
530eecbd99
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
hf@deer.(none)
56ea00afbd
Fix for bug #8477 (Embedded query_cache test crashes)
2005-02-12 20:09:40 +04:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
serg@serg.mylan
852f2e0aba
small Makefile.am cleanup
...
clean: targets removed
generated *.h files moved to include/
2005-01-28 17:14:03 +01:00
serg@serg.mylan
3c5060981f
query_id and my_xid -> ulonglong
...
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
patg@krsna.patg.net
7db99fa559
change to Makefile.am per Serg's request
2005-01-25 23:52:47 -08:00
tomas@poseidon.ndb.mysql.com
7b3ec51deb
fix for make error in Makefile.am of mysql_client_test.c
2005-01-25 09:47:00 +01:00
jimw@mysql.com
d11081bd6f
Merge
2005-01-24 13:48:48 -08:00
lenz@mysql.com
e456b6c086
- fixed one missing occasion from the mysql_client_test renaming
2005-01-20 17:00:30 +01:00
lenz@mysql.com
9675b0698f
- renamed client_test -> mysql_client_test
...
- renamed the tests that use the embedded server (client_test ->
mysql_client_test_embedded, mysqltest -> mysql_test_embedded
and changed some Makefiles and scripts so they are installed in $bindir
(required to be able to run the test suite against the embedded server)
2005-01-20 16:25:38 +01:00
jimw@mysql.com
d5ee0a9e3a
Add ha_federated.cc to libmysqld/Makefile.am so that configuring with both
...
embedded server and federated storage engine compiles. (Bug #7920 )
2005-01-18 16:50:09 -08:00
mwagner@here.mwagner.org
f06824ca4b
Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
...
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-01-12 21:09:07 -06:00
mwagner@here.mwagner.org
292ca0959c
libmysqld.def, libmysql.def:
...
Use the invisible tabs (!)
2005-01-12 21:04:31 -06:00
mwagner@here.mwagner.org
6bca7cb857
Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
...
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-01-12 19:58:49 -06:00
mwagner@here.mwagner.org
ffdeb4f880
libmysqld.def, libmysql.def:
...
Add missing 'get_defaults_files' to fix linking error.
2005-01-12 19:56:49 -06:00
hf@deer.(none)
196c95e938
Merging conflicts resolved
2005-01-11 21:00:53 +04:00
hf@deer.(none)
8b3b364893
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.5920
2005-01-11 19:58:52 +04:00
konstantin@mysql.com
dbd6589851
A fix for Bug#7365 "embedded server for MacOS: problem with prepared
...
statements": no test case, the test case is there already,
libmysqld/examples/client_test.c, we just need to run it on a daily basis.
2005-01-11 18:02:44 +03:00
hf@deer.(none)
5eb5fd12be
fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)
2005-01-03 19:21:54 +04:00
serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +01:00
monty@mishka.local
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
hf@deer.(none)
72dd42bee6
Tabs removed
2004-12-21 12:31:38 +04:00
hf@deer.(none)
e91a4ce0be
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 10:26:01 +04:00
hf@deer.(none)
e5125d3e88
Fix to perform correctly with charsets in embedded server
2004-12-21 10:05:58 +04:00
konstantin@mysql.com
9f5f59532c
Fix assertion failure in client_test when linked with the embedded
...
library: stmt_update_metadata (used when we update max_length
in mysql_stmt_store_result) needs valid row->length.
2004-12-19 20:28:52 +03:00
