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

47609 commits

This branch
This branch
All branches
Author SHA1 Message Date
holyfoot/hf@hfmain.(none)
caa38fc80d Merge mysql.com:/home/hf/work/28839/my50-28839 
into  mysql.com:/home/hf/work/28839/my51-28839
 2007-06-21 15:27:12 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
a5b37d95ff rpl_skip_error test fixed 2007-06-21 15:25:28 +05:00
holyfoot/hf@hfmain.(none)
56be687ce8 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28839/my51-28839
 2007-06-21 12:07:52 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
67fcb4c3e2 merging 2007-06-21 11:48:01 +05:00
gkodinov/kgeorge@magare.gmz
23bac8d8df fixed a (merge?) problem running the tests: 
now the cluster related commands have 'use db'
in the binlog.
 2007-06-20 16:26:14 +03:00
gkodinov/kgeorge@magare.gmz
9653bd8d66 Merge bk-internal:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/failed_rpl_test-5.1-opt
 2007-06-20 15:35:27 +03: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
gkodinov/kgeorge@magare.gmz
6782e85059 removed undeterministic tests introduced by the fix for bug 26418 2007-06-20 09:54:42 +03: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
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
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
holyfoot/hf@hfmain.(none)
438422d929 Merge mysql.com:/home/hf/work/29117/my41-29117 
into  mysql.com:/home/hf/work/29117/my50-29117
 2007-06-19 12:31:37 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
5a9d6856de Bug #29117 (init_file test crashes with embedded server) 
we use net->vio in my_net_local_init, but in the my_net_init
implementation we set it after the call, so work with unspecified
net->vio value
 2007-06-19 11:13:11 +05:00
gshchepa/uchum@gleb.loc
9e5ff80218 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-18 18:51:31 +05:00
gshchepa/uchum@gleb.loc
be24ac44cb Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-18 18:48:20 +05:00
gshchepa/uchum@gleb.loc
f015b4332b Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-06-18 18:45:55 +05:00
gshchepa/uchum@gleb.loc
12c13e7d9e Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-18 17:08:56 +05:00
svoj@june.mysql.com
674675a70c Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-06-18 11:49:36 +05:00
svoj@june.mysql.com
621dd1724e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-06-18 11:49:01 +05:00
svoj@june.mysql.com
491e471fb3 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-06-18 11:47:47 +05:00
df@pippilotta.erinye.com
7013c96fdf 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-18 07:58:51 +02:00
df@pippilotta.erinye.com
7cdb354d26 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-18 07:56:29 +02:00
df@pippilotta.erinye.com
f369105aa4 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-18 07:42:13 +02:00
tomas@whalegate.ndb.mysql.com
1bfd45c277 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 22:07:21 +02:00
tomas@whalegate.ndb.mysql.com
795b9de49d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 22:06:47 +02:00
tomas@whalegate.ndb.mysql.com
4547957450 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 22:06:34 +02:00
tomas@whalegate.ndb.mysql.com
04ea0c3357 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-17 22:05:33 +02:00
tomas@whalegate.ndb.mysql.com
8a08ac40fb correct test and result 2007-06-17 22:04:01 +02:00
igor@olga.mysql.com
c27988f991 Post-merge fix 2007-06-17 11:43:49 -07:00
igor@olga.mysql.com
e81be02850 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27130
 2007-06-17 11:35:14 -07:00
igor@olga.mysql.com
63ab91090d Fixed bug #27130. If the third argument of the function SUBSTR was 
represented by an expression of the type UNSIGNED INT and this 
expression was evaluated to 0 then the function erroneously returned
the value of the first argument instead of an empty string. 

This problem was introduced by the patch for bug 10963.

The problem has been resolved by a proper modification of the code of
Item_func_substr::val_str.
 2007-06-17 11:23:19 -07:00
tomas@whalegate.ndb.mysql.com
0d8c48da57 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 19:55:41 +02:00
tomas@whalegate.ndb.mysql.com
d20cc54cb8 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-17 19:54:54 +02:00
tomas@whalegate.ndb.mysql.com
d1516ed29e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 19:53:43 +02:00
tomas@whalegate.ndb.mysql.com
8eb940de27 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 19:52:01 +02:00
tomas@whalegate.ndb.mysql.com
b5f30a99f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-06-17 19:50:07 +02:00
tomas@whalegate.ndb.mysql.com
885ca40f37 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 19:48:51 +02:00
tomas@whalegate.ndb.mysql.com
6b8e7c9484 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 19:47:56 +02:00
tomas@whalegate.ndb.mysql.com
ff804bc546 Bug #28989 hpux11 ps_row warnings 
- do not print 701 dictionary busy error
 2007-06-17 19:47:20 +02:00
tomas@whalegate.ndb.mysql.com
baf9e764dc Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 19:30:09 +02:00
tomas@whalegate.ndb.mysql.com
1e7fdaabee 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-17 19:29:15 +02:00
tomas@whalegate.ndb.mysql.com
9c5183ace9 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 19:28:01 +02:00
tomas@whalegate.ndb.mysql.com
9e3c14fae3 BUG#27640 
- correct test and result file
 2007-06-17 19:27:20 +02:00
tomas@whalegate.ndb.mysql.com
a61907f4fc Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 17:22:27 +02:00