mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47927 commits 2778 branches 343 tags 1.6 GiB
Commit graph

47927 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
95ed412809 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 16:26:35 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
e63f983970 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28144/b28144.5.0
 2007-06-17 10:10:36 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
6ab97748fe Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b28144/b28144.5.1
 2007-06-17 10:09:11 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
3d48942f9d after-merge fix. 2007-06-17 10:07:58 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f47b82906d Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock 
The log tables are by nature PERFORMANCE_SCHEMA tables,
which should not be affected by SET GLOBAL READ_ONLY or FLUSH TABLES
WITH READ LOCK.

The implementation of FLUSH TABLES WITH READ LOCK already ignored log tables.
Now with this patch, the implementation of LOCK TABLE also ignore a
global read lock for log tables, which was the missing symmetry.
 2007-06-17 09:56:33 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d437d2d720 Merge mysql.com:/home/ram/work/b28144/b28144.5.0 
into  mysql.com:/home/ram/work/b28144/b28144.5.1
 2007-06-17 09:40:25 +05:00
gshchepa/uchum@gleb.loc
6fc62a8e4a Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-16 22:40:25 +05:00
gshchepa/uchum@gleb.loc
dac7ce2d12 bigint.test: 
Updated test case for bug #28625.
 2007-06-16 17:00:29 +05:00
istruewing@chilla.local
7d2fc98470 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-16 13:16:09 +02:00
istruewing@chilla.local
938fc3d66e Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-16 13:14:23 +02:00
istruewing@chilla.local
70600c15d8 Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-16 11:34:21 +02:00
tomas@whalegate.ndb.mysql.com
8d31148899 Bug #28949 
- handler binlog's must be shutdoem before logger.cleanup_base
 2007-06-16 11:16:02 +02:00
gshchepa/uchum@gleb.loc
3d4e75d583 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt-28625
 2007-06-16 13:49:26 +05:00
gshchepa/uchum@gleb.loc
8f09a374ea Fixed bug #28625: 
DECIMAL column was used instead of BIGINT for the minimal possible
BIGINT (-9223372036854775808).

The Item_func_neg::fix_length_and_dec has been adjusted to
to inherit the type of the argument in the case when it's an 
Item_int object whose value is equal to LONGLONG_MIN.
 2007-06-16 13:05:07 +05:00
df@pippilotta.erinye.com
0cf4955ab4 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-16 06:41:59 +02:00
df@pippilotta.erinye.com
274bdc626d Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-16 06:29:03 +02:00
df@pippilotta.erinye.com
872c090b83 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-16 06:19:47 +02:00
df@pippilotta.erinye.com
c8f14b1a0a Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-16 06:17:19 +02:00
df@pippilotta.erinye.com
b2b965b534 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-16 06:16:00 +02:00
tsmith@quadxeon.mysql.com
891116551e binlog.result, binlog.test: 
Post-merge fix: replace xid=* with XID to isolate from number of transactions
 2007-06-15 23:57:53 +02:00
malff/marcsql@weblab.(none)
381deba387 Manual merge 2007-06-15 15:38:25 -06:00
iggy@alf.
e0adab8ce7 Merge alf.:D:/src/mysql-5.1-maint 
into  alf.:D:/src/mysql-5.1-maint_winemb
 2007-06-15 14:45:44 -04:00
iggy@alf.
c15a2647a0 Embedded Server doesn't build on Windows. 
- Add build configuration parameter EMBEDDED_ONLY which will configure 
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
 2007-06-15 14:32:16 -04:00
istruewing@chilla.local
9f6ea22b77 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-15 20:24:40 +02:00
istruewing@chilla.local
875cac1ffb Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-15 20:23:20 +02:00
malff/marcsql@weblab.(none)
7e36d37eb0 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-06-15 11:36:31 -06:00
istruewing@chilla.local
b64b1a56d6 Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-15 19:23:29 +02:00
malff/marcsql@weblab.(none)
4b427bde82 Fixed warnings raised from mysqltest (unknown -- commands) 2007-06-15 11:15:22 -06:00
tsmith@maint1.mysql.com
9bc15db2d2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 19:07:59 +02:00
tsmith@maint1.mysql.com
3c331f6be9 Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 19:06:06 +02:00
malff/marcsql@weblab.(none)
e20232cf63 manual merge 2007-06-15 10:59:40 -06:00
tsmith@quadxeon.mysql.com
2095627468 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-15 18:58:07 +02:00
tsmith@maint1.mysql.com
a9ae34b56c Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 18:56:11 +02:00
tsmith@maint1.mysql.com
9f4134267a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 18:03:59 +02:00
tsmith@quadxeon.mysql.com
73035c274f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-15 17:59:04 +02:00
istruewing@chilla.local
f95d0b0f78 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:47:50 +02:00
istruewing@chilla.local
676ea58252 Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:47:02 +02:00
istruewing@chilla.local
dceae35549 Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:45:50 +02:00
mats@kindahl-laptop.dnsalias.net
43d419e9a9 Disabling test case awaiting reply 2007-06-15 17:21:56 +02:00
malff/marcsql@weblab.(none)
b80692b9ff Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-06-15 08:56:40 -06:00
istruewing@chilla.local
52200be6d0 Merge chilla.local:/home/mydev/mysql-4.1-amain 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-06-15 16:24:43 +02:00
cmiller@zippy.cornsilk.net
08ec6652bc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-06-15 08:57:57 -04:00
mats@kindahl-laptop.dnsalias.net
3e2798fb37 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
 2007-06-15 14:23:25 +02:00
mats@kindahl-laptop.dnsalias.net
a35a3cff8e BUG#29130 (The logic for using delete_all_rows() is wrong): 
Correcting the logic for deciding when to use delete_all_rows() so that
the behavior of TRUNCATE to not be dependent on binary logging
format in effect.

A TRUNCATE statement is always logged as a statement, so in this case,
delete_all_rows() can always be used provided the other logic is correct.
If a DELETE FROM without a WHERE clause is used, and row-based binlogging
is used, the rows has to be deleted from the table on a per-row basis.
 2007-06-15 13:50:56 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c9464d566 Fix for bug #28144: "Slave_IO_Running" differs in replication tests 
Problem: show slave status may return different Slave_IO_Running values running some tests.
Fix: wait for a certain slave state if needed to get tests more predictable.
 2007-06-15 16:09:28 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
934ad9e82a Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/mysql-5.1-maint
 2007-06-15 14:30:13 +05:00
df@pippilotta.erinye.com
a78502b254 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-15 11:28:55 +02:00
df@pippilotta.erinye.com
c64fca9e24 follow-up fix 2007-06-15 11:28:15 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
44c3524026 Backport of 
mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_start.inc
mysql-test/include/wait_for_slave_to_stop.inc
from 5.1
 2007-06-15 13:53:36 +05:00
kostja@bodhi.(none)
9e6685dc74 Another attempt to fix the valgrind warning in SHOW PROCESSLIST 
(event_bugs.test)
 2007-06-15 12:40:30 +04:00