mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48326 commits 2794 branches 343 tags 1.5 GiB
Commit graph

48326 commits

This branch
This branch
All branches
Author SHA1 Message Date
mats@kindahl-laptop.dnsalias.net
d6570ec66f Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
 2007-06-20 11:43:17 +02:00
mats@kindahl-laptop.dnsalias.net
206b2c72ba Adding missing DROP TABLE statement to ndb_backup_print.test since it 
causes later tests to fail.
 2007-06-20 11:38:51 +02:00
gshchepa/uchum@gleb.loc
88d5d8a268 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-06-20 14:22:32 +05:00
gshchepa/uchum@gleb.loc
0bd3dd9a37 metadata.test, metadata.result: 
Updated test case for bug #28898. Additional cleanup.
 2007-06-20 14:21:48 +05:00
holyfoot/hf@hfmain.(none)
72fd5c0388 Merge mysql.com:/home/hf/work/28839/my50-28839 
into  mysql.com:/home/hf/work/28839/my51-28839
 2007-06-20 14:16:55 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
3b08919f6a Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists. 
slave_sql thread calls thd->clear_error() to force error to be ignored,
though this method didn't clear thd->killed state, what causes
slave_sql thread to stop.

clear thd->killed state if we ignore an error
 2007-06-20 14:05:49 +05:00
anozdrin/alik@ibm.opbmk
c5baa61fe4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  ibm.opbmk:/home/alik/Documents/MySQL/devel/5.0-rt-build
 2007-06-20 12:46:15 +04:00
gshchepa/uchum@gleb.loc
5d056de5ff Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-06-20 13:06:24 +05:00
gshchepa/uchum@gleb.loc
2379f9778d Fixed bug #28898. 
For a join query with GROUP BY and/or ORDER BY and a view reference
in the FROM list the metadata erroneously showed empty table aliases
and database names for the view columns.
 2007-06-20 12:25:07 +05:00
gkodinov/kgeorge@magare.gmz
6782e85059 removed undeterministic tests introduced by the fix for bug 26418 2007-06-20 09:54:42 +03:00
tomas@whalegate.ndb.mysql.com
3bd4019fad Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-20 06:26:23 +02:00
tomas@whalegate.ndb.mysql.com
956b92059b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-20 05:46:36 +02:00
tomas@whalegate.ndb.mysql.com
0510a696a9 Bug #29229 memory corruption in dbtup 2007-06-20 05:41:54 +02:00
dkatz@damien-katzs-computer.local
a197a9aa8a Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-06-19 18:18:59 -04:00
dkatz@damien-katzs-computer.local
bd80d7e465 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50_win
 2007-06-19 18:03:47 -04:00
mats@kindahl-laptop.dnsalias.net
5dd26788cc Some test case fixes. 2007-06-19 22:18:16 +02:00
kostja@bodhi.(none)
4fd8158456 Fix a merge mistake. 2007-06-19 18:04:42 +04:00
tomas@whalegate.ndb.mysql.com
7fa3b3cfa2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-19 15:28:26 +02:00
istruewing@chilla.local
836fe1e32f Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-19 14:42:25 +02:00
mhansson/martin@linux-st28.site
1f8d275eaf Bug #28677: SELECT on missing column gives extra error 
Manual edit in order to merge from mysql-5.0 tree.
 2007-06-19 15:37:52 +03:00
tomas@whalegate.ndb.mysql.com
895f2f15af Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown 2007-06-19 13:56:02 +02:00
gkodinov/kgeorge@magare.gmz
e5acb070aa Merge bk-internal:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26418-5.1-opt
 2007-06-19 14:30:03 +03:00
gkodinov/kgeorge@magare.gmz
bef15b279b Bug #26418: Slave out of sync after 
CREATE/DROP TEMPORARY TABLE + ROLLBACK on master

The transaction ability of the storage engines of
the tables on the replication master and the replication
slave must generally be the same.
When the storage engine type of the slave is 
non-transactional then transactions on the master that 
mix update of transactional and non-transactional tables
should be avoided because they will cause inconsistency of
the data between the master's transactional table and the
slave's non-transactional table.

The effect described by this bug is actually expected.
A detailed test case is added (to be merged later to
the updated rpl_ddl.test), as there was no coverage 
by the existing tests. 
Some code cleanup is also added by this change.
 2007-06-19 14:27:53 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c0b9f2266 Fix for bug #28772: rpl_row_until fails in pushbuild 
Problem: we use 'sleep 2; wait_for_slave_to_stop;' to reach some slave's states
which is buggy, wasteful of time, platform dependant etc.
Fix: use include/wait_for_slave_***.inc's where it's possible instead.
 2007-06-19 16:06:11 +05:00
kostja@bodhi.(none)
68632318dc Manual merge. 2007-06-19 15:02:08 +04:00
kostja@bodhi.(none)
325b8835c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-06-19 14:53:13 +04:00
bar@mysql.com/bar.myoffice.izhnet.ru
020eedd446 mtr_report.pl: 
Ignore warning about file name
  having question marks.
 2007-06-19 15:34:21 +05:00
gkodinov/kgeorge@magare.gmz
91f3301c03 Bug #29116: Test "rpl_change_master" returns different 
counters from relay

Updated the test to return columns vertically.
 2007-06-19 13:19:20 +03:00
tomas@whalegate.ndb.mysql.com
82976fe018 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-19 12:14:46 +02:00
tomas@whalegate.ndb.mysql.com
79ad6ff22a Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown 2007-06-19 12:14:02 +02:00
df@pippilotta.erinye.com
7621de2374 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-19 12:12:42 +02:00
df@pippilotta.erinye.com
71b4000caa Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-19 12:11:19 +02:00
df@pippilotta.erinye.com
7eea7fff35 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-19 12:10:48 +02:00
df@pippilotta.erinye.com
26d83baeaf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-19 12:05:17 +02:00
df@pippilotta.erinye.com
f927d50509 try again. 2007-06-19 12:03:10 +02:00
tomas@whalegate.ndb.mysql.com
027456393e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-19 11:38:37 +02:00
tomas@whalegate.ndb.mysql.com
b36a87ae91 corrected typo 2007-06-19 11:38:07 +02:00
msvensson@pilot.(none)
b8eee54d0b Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-19 11:34:54 +02:00
tomas@whalegate.ndb.mysql.com
9d8fbc462b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-19 11:31:52 +02:00
msvensson@pilot.(none)
95cf973862 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-19 11:31:34 +02:00
tomas@whalegate.ndb.mysql.com
955c40dece WL#3303 
- get the ndb flags right, so that the behaviour is as before
 2007-06-19 11:31:25 +02:00
msvensson@pilot.(none)
e003d8ad3b Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
 2007-06-19 11:30:45 +02:00
tomas@whalegate.ndb.mysql.com
04f1913789 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-19 11:26:23 +02:00
tomas@whalegate.ndb.mysql.com
a67e755593 turn off binlogging of the updates during wait for not_readonly 2007-06-19 11:25:19 +02:00
mats@kindahl-laptop.dnsalias.net
1447f6318f Fixes to tests and test results. 2007-06-19 11:09:22 +02:00
msvensson@pilot.(none)
f52b9d6150 Merge pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232 
into  pilot.(none):/data/msvensson/mysql/wl3232/my51-wl3232
 2007-06-19 11:08:29 +02:00
msvensson@pilot.(none)
6c22726ebd Merge pilot.(none):/data/msvensson/mysql/wl3232/my41-wl3232 
into  pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232
 2007-06-19 11:07:39 +02:00
msvensson@pilot.(none)
caebb719b2 WL#3232 mysqltest, enable --source $variables/<remaining_path_to_file> 
- Add test case for this already existing feature
 2007-06-19 11:06:02 +02:00
msvensson@pilot.(none)
46f0c05afc Bug#28769 Test case "innodb" fails with --skip-log-bin 
- Move binlog related tests to binlog_innodb.test
 - Remove "source include/have_log_bin.inc" from innodb.test
 2007-06-19 09:56:19 +02:00
holyfoot/hf@hfmain.(none)
46405f5a25 Merge mysql.com:/home/hf/work/29117/my50-29117 
into  mysql.com:/home/hf/work/29117/my51-29117
 2007-06-19 12:32:18 +05:00