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

19757 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
ae1aa19576 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-02-10 15:09:44 -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
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
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
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
pem@mysql.comhem.se
51296b5399 Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc. 2005-02-10 11:40:54 +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
lenz@mysql.com
afa2a462a1 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-merge
 2005-02-09 17:58:29 +01:00
lenz@mysql.com
420d29159f Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-5.0
 2005-02-09 17:52:31 +01:00
lenz@mysql.com
a0089319d2 - make sure to include the embedded test results in the source distribution 2005-02-09 17:49:43 +01:00
lenz@mysql.com
8999d5ab11 - added copyright header on top of the fill_help_tables.sql file (BUG#5772) 
- updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the
  commercial distribution
 2005-02-09 17:40:10 +01:00
kent@mysql.com
9a564f832a Merge 2005-02-09 16:56:58 +01:00
msvensson@neptunus.homeip.net
b8490b5524 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
 2005-02-09 16:26:06 +01:00
msvensson@neptunus.homeip.net
0ed971878d Fix so that master and master1 does not write to same .trace file 2005-02-09 16:23:22 +01:00
wax@mysql.com
00cc3cbfed Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/wax/mysql/mysql-5.0
 2005-02-09 19:20:53 +05:00
serg@serg.mylan
3e708a27b1 Merge 2005-02-09 15:16:47 +01:00
serg@serg.mylan
184410c475 gone: 
merged
  auto-union
 2005-02-09 15:16:14 +01:00
wax@mysql.com
bc9e89a85d Merge mysql.com:/home/wax/mysql/mysql-5.0 
into mysql.com:/home/wax/mysql/mysql-5.0test
 2005-02-09 19:16:00 +05:00
wax@kishkin.ru
a0507f98b9 merge 2005-02-09 19:13:20 +05:00
msvensson@neptunus.homeip.net
e64145818b Fix core dump in ha_ndbcluster::print_results 2005-02-09 15:09:13 +01:00
mskold@bk-internal.mysql.com
14e3d36ad4 Removed old files 2005-02-09 14:35:50 +01:00
joreland@mysql.com
5b251f5e03 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-09 14:25:29 +01:00
joreland@mysql.com
9b77596587 ndb - 
Fix bug in bug fix in FastScheduler
  remove possibility of endless loop
  resulting in APZJobBuffer overflow due to statistics reporting
 2005-02-09 14:24:25 +01:00
serg@serg.mylan
78cf24fb8c clean up gone 2005-02-09 14:05:01 +01:00
serg@serg.mylan
902e78ffb0 Merge serg.mylan:/usr/home/serg/Abk/m50-broken 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-02-09 13:48:31 +01:00
hf@deer.(none)
dca227bac6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-02-09 16:34:03 +04:00
hf@deer.(none)
2f7f2dfe5d Fix for NCHAR bug appeared during the merging 2005-02-09 16:32:43 +04:00
msvensson@neptunus.homeip.net
a995633ab7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
 2005-02-09 11:16:50 +01:00
msvensson@neptunus.homeip.net
facc7b4da1 Updated style after review 2005-02-09 11:14:02 +01:00
bell@sanja.is.com.ua
7df94d5e9b fixed C++ syntax in C code 
fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
ignore my_decimal.cc in libmysqld directory
 2005-02-09 11:35:22 +02:00
hf@deer.(none)
96558f6ad3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-02-09 02:54:08 +04:00