Commit graph

19490 commits

Author SHA1 Message Date
ndbdev@dl145b.mysql.com
e17e8b38a3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
2005-09-12 20:41:50 +02:00
SergeyV@selena.
2ca1a688cd Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#05588-mysql-4.1
2005-09-12 22:19:04 +04:00
paul@kite-hub.kitebird.com
d6f32f1361 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into  kite-hub.kitebird.com:/tmp/merge-4.1
2005-09-12 12:53:49 -05:00
paul@kite-hub.kitebird.com
bbb8e309de Merge kite-hub.kitebird.com:/tmp/merge-4.0
into  kite-hub.kitebird.com:/tmp/merge-4.1
2005-09-12 12:44:52 -05:00
paul@kite-hub.kitebird.com
7240863009 README:
Update README (2nd try)
2005-09-12 12:44:13 -05:00
tulin@dl145b.mysql.com
63aef9d58b Corrected construct of faked Node fail signals in ndb SignalSender 2005-09-12 17:49:48 +02:00
gluh@mysql.com
c398940326 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 20:49:48 +05:00
monty@mishka.mysql.com
bdc33e2356 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.mysql.com:/home/my/mysql-4.1
2005-09-12 18:49:47 +03:00
monty@mishka.mysql.com
0965bfa832 Review fixes since last pull
Fix for bug #13025; Server crash in filesort because wrong call to handler::position()
2005-09-12 18:48:17 +03:00
gluh@mysql.com
96e2471a32 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 17:43:02 +05:00
gluh@mysql.com
d91fb61b37 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 17:33:21 +05:00
jonas@eel.(none)
40cc9e5c42 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 14:30:52 +02:00
gluh@eagle.intranet.mysql.r18.ru
d9bd3c11e4 Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
produce warning for 'create database if not exists' if database exists
  do not update database options in this case  
  produce warning for 'create table if not exists' if table exists
2005-09-12 17:09:19 +05:00
tulin@dl145c.mysql.com
f80e113d0e removed a few aborts from mgmapi
corrected typo in ndb Parser
2005-09-12 14:03:23 +02:00
lars@mysql.com
fd85a82559 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
2005-09-12 13:00:55 +02:00
jonas@eel.(none)
f9134bd920 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 11:43:22 +02:00
gluh@eagle.intranet.mysql.r18.ru
2a07350854 ps_6bdb, ps_7ndb tests failure fix 2005-09-12 14:21:38 +05:00
lars@mysql.com
683edc6599 Reverted old fix with sync_slave_with_master and added a replace commands
to eliminate nondeterminism in slave start
2005-09-12 10:50:42 +02:00
jonas@eel.(none)
d00732d97d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 10:40:40 +02:00
lars@mysql.com
e5503c277f Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
2005-09-11 13:46:36 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
27373d1d11 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-11 10:31:55 +03:00
jonas@eel.(none)
8840301681 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-11 08:41:33 +02:00
lars@mysql.com
eff11c53a6 Removed redundant reset_one_shot_variables calls 2005-09-11 00:57:31 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
2917515afc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-10 18:41:37 +03:00
jonas@eel.(none)
38b77e395e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-10 08:22:24 +02:00
evgen@moonbone.local
94f5e80c86 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/12695-bug-4.1-mysql
2005-09-10 02:31:42 +04:00
evgen@moonbone.local
99c0bf333c insert_select.result, insert_select.test:
Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.
2005-09-10 02:30:26 +04:00
jonas@eel.(none)
c6e0e89405 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-09 21:02:24 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
960802928c Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-09 21:30:03 +03:00
aivanov@mysql.com
19d836e235 Merge mysql.com:/home/alexi/mysql-4.1
into  mysql.com:/home/alexi/dev/mysql-4.1-12101
2005-09-09 21:02:13 +04:00
jonas@eel.(none)
1399e061dd Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-09 19:02:13 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ac95c9096b Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type
Added test case.
2005-09-09 20:02:13 +03:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
12ffe0da12 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
2005-09-09 13:02:12 -04:00
aivanov@mysql.com
5eae17bc3c BUG #12101: Additional fix. 2005-09-09 19:06:15 +04:00
jonas@eel.(none)
6ec3fa6ac1 ndb
new testprogram testSRBank
2005-09-09 12:39:06 +02:00
gluh@eagle.intranet.mysql.r18.ru
99bc9607e1 Bug#12817 SHOW STATUS now blob fields
This fix is cancellation of ChangeSet
   1.2329 05/07/12 08:35:30 reggie@linux.site +8 -0
   Bug 7142  Show Fields from fails using Borland's dbExpress interface
   The reason is we can't fix bug#7142 without
   breaking of existing applications/APIs that worked fine with earlier 4.1
   bug 7142 is fixed in 5.0
2005-09-09 13:22:16 +05:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
43f08f752e Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
2005-09-08 19:28:19 -04:00
serg@serg.mylan
819db2471c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-09-09 01:04:54 +02:00
serg@serg.mylan
7e9646f05d Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-09-08 23:11:15 +02:00
serg@serg.mylan
a7f2179c29 BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache 2005-09-08 22:57:27 +02:00
igor@rurik.mysql.com
3b76329f78 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-09-08 12:44:30 -07:00
igor@rurik.mysql.com
19192328f2 sql_select.cc:
Fixed bug #12885.
  Forced inheritence of the maybe_null flag for the expressions
  containing GROUP BY attributes in selects with ROLLUP.
olap.test, olap.result:
  Added test case for bug #12885.
2005-09-08 12:37:16 -07:00
tulin@dl145c.mysql.com
0f4bb8e6ff SignalSender.cpp:
fixed compile error
2005-09-08 19:27:37 +02:00
mronstrom@mysql.com
cd0ae9967c Merge mikael@ndb.mysql.com:/home/mikael/bug12594
into  mysql.com:/Users/mikron/mysql-4.1
2005-09-08 18:30:13 +02:00
mronstrom@mysql.com
43c2bc2f34 Bug #12594: A few fixes 2005-09-08 18:24:42 +02:00
tomas@poseidon.ndb.mysql.com
98a52fa9a4 corrected typo 2005-09-08 16:47:27 +02:00
tomas@poseidon.ndb.mysql.com
b75340e70d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-08 16:44:54 +02:00
tomas@poseidon.ndb.mysql.com
a6c9ebba47 corrected printouts in backup test 2005-09-08 15:43:46 +02:00
tomas@poseidon.ndb.mysql.com
3979938c51 corrected prev fix for bug #13054
so that _only_ backup master replies to API
2005-09-08 15:24:21 +02:00
joerg@mysql.com
3e11aa9fff Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-09-08 12:26:20 +02:00