mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19783 commits 2791 branches 343 tags 1.7 GiB
Commit graph

19783 commits

This branch
This branch
All branches
Author SHA1 Message Date
joreland@mysql.com
c5a43f983a Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-14 08:29:43 +01:00
joreland@mysql.com
93a7878c15 wl1292 - ndb autotest 
fix log reports
 2005-02-14 08:28:47 +01:00
joreland@mysql.com
204c401031 merge 2005-02-12 15:17:41 +01:00
joreland@mysql.com
9b50ee3ada wl1292 - ndb autotest 
Fix 4.1 memleak in Hugo
 2005-02-12 15:12:53 +01:00
joreland@mysql.com
f5a07fd2cc Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-12 15:06:39 +01:00
joreland@mysql.com
7a08f3cc8c wl1292 - ndb autotest 
link to log if it exists, regardless of test result
 2005-02-12 15:05:33 +01:00
joreland@mysql.com
e9b6cb9b16 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-11 08:10:46 +01:00
joreland@mysql.com
8e0cf97a57 ndb - fix compiler warning (error using gcc-3.4.3) 2005-02-11 08:09:47 +01:00
joreland@mysql.com
ecbdcfb783 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-11 06:44:20 +01:00
joreland@mysql.com
0bccea2777 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-11 06:42:57 +01:00
joreland@mysql.com
9a31539f72 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-11 06:41:39 +01:00
joreland@mysql.com
6039a50e00 ndb - old bench rescue 2005-02-11 06:39:00 +01:00
brian@zim.(none)
29af4dffe6 Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks... 2005-02-10 19:04:38 -08:00
jimw@mysql.com
3d265e9777 Merge commit trigger 2005-02-10 14:32:01 -08:00
jimw@mysql.com
b3d2e434ee Merge bk-internal:/home/bk/mysql-4.0 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-02-10 14:23:05 -08:00
lars@mysql.com
8b9679de0e Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6749-4.1 2005-02-10 21:55:36 +01:00
lars@mysql.com
bef05eda10 BUG#6749: If there is no current database, then nothing should be binlogged if 
binlog-do-db or binlog-ignore-db are in effect.   (In the future 5.1? 5.0? I think 
each statement should be verified against the filtering criteria based on the database
it *uses* and not the *current* one.  But, right now the *current* database is what 
counts according to the semantics of the manual.)
 2005-02-10 21:23:48 +01:00
mats@mysql.com
6611d3d2f8 Merge mysql.com:/home/bkroot/mysql-5.0 
into mysql.com:/home/bk/b7853-mysql-5.0
 2005-02-10 19:15:53 +01:00
joreland@mysql.com
b4d232d734 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-10 18:16:09 +01:00
joreland@mysql.com
e0cd99c298 ndb - add more tests to autotest 2005-02-10 18:15:15 +01:00
joreland@mysql.com
3a65f15d46 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-10 17:10:51 +01:00
joreland@mysql.com
d1f5d4887d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-10 17:09:37 +01:00
joreland@mysql.com
f02115a371 ndb - adapt old testprg to changes in ndbapi 2005-02-10 17:07:14 +01:00
joreland@mysql.com
59df6e258b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-10 16:36:32 +01:00
konstantin@mysql.com
957beb9794 Merge mysql.com:/home/kostja/work/mysql-4.1-root 
into mysql.com:/home/kostja/work/mysql-5.0-root
 2005-02-10 18:31:02 +03:00
konstantin@mysql.com
36c992b264 Follow-up for bug#7990 2005-02-10 18:24:26 +03:00
joreland@mysql.com
ce08a8abaf merge 2005-02-10 16:13:06 +01:00
joreland@mysql.com
e4e89f8c76 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-10 16:03:23 +01:00
konstantin@mysql.com
6054f8140c Merge mysql.com:/home/kostja/work/mysql-4.1-root 
into mysql.com:/home/kostja/work/mysql-5.0-root
 2005-02-10 17:53:06 +03:00
konstantin@mysql.com
e9225b2588 Fix -ansi -pedantic compilation failure. 2005-02-10 17:46:27 +03:00
konstantin@mysql.com
4b2b327dcc A fix and test case for Bug#7990 "mysql_stmt_close doesn't 
reset mysql->net.last_error": the solution is to clear
MYSQL->net error before performing COM_CLOSE: if the call
succeeds, the connection is usable for other statements.
More comprehensive fix is to clear MYSQL->net for all
recoverable errors at the time they happen, it will be
implemented in 5.0 as it introduces incompatibility in behavior.
 2005-02-10 17:41:54 +03:00
konstantin@mysql.com
7d735c7207 manual merge 2005-02-10 16:58:02 +03:00
msvensson@neptunus.homeip.net
a172575854 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
 2005-02-10 14:41:52 +01:00
monty@mysql.com
ccb2f3381b Things missing in last changset 
After merge fixes
Don't give duplicate warnings for some ::store() functions
 2005-02-10 15:41:51 +02:00
msvensson@neptunus.homeip.net
8fb1f824ea Change script to avoiud multiple --debug flags when starting master servers 2005-02-10 14:13:23 +01:00
monty@mysql.com
b9e502a99a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-10 14:51:06 +02:00
joreland@mysql.com
03baacaffd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-10 13:05:10 +01:00
konstantin@mysql.com
016544df22 A fix and test case for Bug#8330 "mysql_stmt_execute crashes" (libmysql). 2005-02-10 14:56:20 +03:00
joreland@mysql.com
8bc5e21ed4 Merge mysql.com:/home/jonas/src/mysql-4.1-rel 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-10 11:42:38 +01:00
pem@mysql.comhem.se
51296b5399 Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc. 2005-02-10 11:40:54 +01:00
joreland@mysql.com
216c44e4b9 ndb - Reenable old benchmark 2005-02-10 11:40:32 +01:00
joreland@mysql.com
5b1572e729 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-10 07:51:44 +01:00
jimw@mysql.com
845139731b Merge mysql.com:/home/jimw/my/mysql-4.1-zlib 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-09 16:36:24 -08:00
monty@mysql.com
a1a39fab84 Merge with 4.1 2005-02-10 02:27:37 +02:00
monty@mysql.com
5239605105 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-09 22:03:41 +02:00
monty@mysql.com
b2f4af0013 cleaned up mysql installation code for windows. 
This removes a (small) memory leak.
 2005-02-09 22:02:48 +02:00
bell@sanja.is.com.ua
70797f571f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-02-09 21:14:06 +02:00
bell@sanja.is.com.ua
90c0024217 reverted patch for BUG#7351 (because of performance ussie) 2005-02-09 21:08:08 +02:00
konstantin@mysql.com
c55a2de573 Fix bad 4.1->5.0 merge of Bug#6273 (mysql_config --libs when using bundled 
zlib)
 2005-02-09 21:59:30 +03:00
monty@mysql.com
ab5aed6047 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-09 19:22:35 +02:00