mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52932 commits 2781 branches 343 tags 1.6 GiB
Commit graph

52932 commits

This branch
This branch
All branches
Author SHA1 Message Date
svoj@mysql.com/june.mysql.com
553d70d0ee BUG#34656 - KILL a query = Assertion failed: m_status == DA_ERROR || 
m_status == DA_OK

Reading from information_scema.tables or information_schema.columns
may cause assertion failure in debug builds. This may happen under
rare circumstances when information_schema fails to get information
about a table (e.g. when a connection is killed).

This happens because open_normal_and_derived_tables() can return an
error without setting an error message in THD. But information_schema
attempts to get an error message from THD unconditionally.

With this fix information_schema attempts to get an error message
from THD only in case error message is set in THD.
 2008-03-07 18:41:50 +04:00
bar@mysql.com/bar.myoffice.izhnet.ru
f83cc8e6db Bug#23924 general_log truncates queries with character set introducers. 
Problem: logging of utf8-incompatible binary strings didn't work
Fix: hex-encoding of incompatible sequences.
 2008-02-29 17:56:50 +04:00
mattiasj@witty.
ef9579619d Removed compiler warning 
(Missed a change of printf format)
 2008-02-26 07:58:46 +01:00
mattiasj@witty.
2e3ed6a216 Post push fix 
Fixed a missed case in the patch for Bug#31931.
Also makes Bug#33722 a duplicate of Bug#31931.
Added tests for better coverage.
Replaced some legacy function calls.
 2008-02-25 21:18:50 +01:00
mattiasj@witty.
eaac5d5f3a Pre push fixes 
Test file fixes for bugs 20129, 31931 and 34225
 2008-02-24 19:13:18 +01:00
mattiasj@witty.
2bf256f8dd Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug20129.2 
into  witty.:/Users/mattiasj/clones/topush-51
 2008-02-24 17:48:57 +01:00
mattiasj@witty.
d3937fd63c Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug31931.2 
into  witty.:/Users/mattiasj/clones/topush-51
 2008-02-24 16:46:35 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
28aaef3ccf Merge mysql.com:/home/ram/work/mysql-5.1-engines 
into  mysql.com:/home/ram/work/b33304/b33304.5.1
 2008-02-24 16:23:43 +04:00
acurtis/antony@ltamd64.xiphis.org
0c80520ad6 Merge xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.0 
into  xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.1
 2008-02-20 22:53:50 -08:00
acurtis/antony@ltamd64.xiphis.org
7401475dcd Merge xiphis.org:/anubis/antony/work/mysql-5.1-engines 
into  xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.1
 2008-02-20 22:47:08 -08:00
acurtis/antony@ltamd64.xiphis.org
9ed3da2c12 Merge xiphis.org:/anubis/antony/work/mysql-5.0-engines 
into  xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.0
 2008-02-20 22:42:24 -08:00
svoj@june.mysql.com
33ad5a480f Merge mysql.com:/home/svoj/devel/mysql/BUG34289/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG34289/mysql-5.1-engines
 2008-02-20 21:22:21 +04:00
tomas@poseidon.ndb.mysql.com
39c20516b7 Upon the sql command flush logs, we need to ensure that all outstanding 
ndb data to be logged has made it to the binary log to get a deterministic
behavior on the rotation of the log.
 2008-02-20 12:52:04 +01:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
d2ad8286a0 backport valgrind cleanups from 6.0-engines 2008-02-19 13:46:54 -08:00
acurtis/antony@ltamd64.xiphis.org
f6c3587eab Merge xiphis.org:/anubis/antony/work/p1-bug34598.2 
into  xiphis.org:/anubis/antony/work/p1-bug34598.2.merge.1
 2008-02-19 13:36:49 -08:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
118ebdf720 Bug#34598 
"crash on hpita: Invalid address alignment"
  Replace dangerous pointer arithmetic - it may occurr where sizeof(int) is
  less than size of machine alignment requirement.
 2008-02-19 12:55:13 -08:00
tomas@poseidon.bredbandsbolaget.se
50d95649f7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-19 20:56:14 +01:00
svoj@mysql.com/june.mysql.com
921e1cc4bb BUG#34289 - Incorrect NAME_CONST substitution in stored procedures 
breaks replication

NAME_CONST() didn't replicate constant character set and collation
correctly.

With this fix NAME_CONST() inherits collation from the value argument.
 2008-02-19 18:16:17 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
0f30fa7218 Merge mysql.com:/home/ram/work/b33304/b33304.5.0 
into  mysql.com:/home/ram/work/b33304/b33304.5.1
 2008-02-16 15:02:49 +04:00
istruewing@stella.local
364a70ef09 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-02-15 20:45:29 +01:00
istruewing@stella.local
4bbbd57c81 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-02-15 20:44:33 +01:00
istruewing@stella.local
b620694ba3 Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-02-15 20:06:15 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
fe6d4aef3a Fix for bug #33304: Test 'func_group' hangs on Mac OS X 10.4 PowerPC 64-bit 
Problem: SLEEP(0) never returns on 64-bit Mac OS X due to a bug in 
pthread_cond_timedwait().

Fix: when given a very short timeout just return immediately.
 2008-02-15 16:03:54 +04:00
mkindahl@dl145h.mysql.com
a1a94e238f Adding waits to events_scheduling to prevent the test from 
failing on heavily loaded systems.
 2008-02-15 10:24:13 +01:00
istruewing@stella.local
302beb1def Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-02-14 21:00:50 +01:00
istruewing@stella.local
108013f6a7 Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-02-14 21:00:10 +01:00
istruewing@stella.local
6c977025df Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-02-14 20:24:01 +01:00
istruewing@stella.local
e053763bef Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-02-14 16:53:51 +01:00
istruewing@stella.local
9a4d57e319 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-02-14 16:53:03 +01:00
istruewing@stella.local
fb20c9dd5e Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-02-14 16:51:41 +01:00
istruewing@stella.local
b6c8f8a58b Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-02-14 16:14:30 +01:00
istruewing@stella.local
d00dbff4ce Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-02-14 16:13:51 +01:00
svoj@mysql.com/april.(none)
75495093b0 After merge fix. 2008-02-14 18:23:58 +04:00
svoj@april.(none)
2ab1b8406e Merge mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.1-engines
 2008-02-14 16:47:46 +04:00
svoj@mysql.com/april.(none)
7fa875e42b BUG#33946 - Join on Federated tables with Unique index gives error 1430 
from storage engine

Federated may crash a server, return wrong result set, return
"ERROR 1030 (HY000): Got error 1430 from storage engine" message
when local (engine=federated) table has a key against nullable
column.

The problem was wrong implementation of function that creates
WHERE clause for remote query from key.
 2008-02-14 16:27:01 +04:00
mkindahl@dl145h.mysql.com
fd5d7fa761 Fixing test rpl_events to not give false failures. 2008-02-14 10:53:12 +01:00
mkindahl@dl145h.mysql.com
8906700e13 Fixes to try to handle valgrind warnings identical to those in 
BUG#24387, which is closed since long.
 2008-02-14 09:53:01 +01:00
tomas@poseidon.bredbandsbolaget.se
fe9ee5c7bf correct merge error 2008-02-14 00:02:25 +01:00
tomas@poseidon.bredbandsbolaget.se
be0324b005 correct manual merge 2008-02-13 23:10:47 +01:00
tomas@poseidon.bredbandsbolaget.se
1414ba3aed Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge 
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-13 20:59:55 +01:00
tomas@poseidon.bredbandsbolaget.se
3f95d153f6 correction of merge 2008-02-13 20:52:01 +01:00
mkindahl@dl145h.mysql.com
32853b9fa5 Removing non-deterministic tests from events_scheduling test. 2008-02-13 12:41:54 +01:00
tomas@poseidon.ndb.mysql.com
f9a38a9e4e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-13 12:36:57 +01:00
mkindahl@dl145h.mysql.com
b1fadc4cf9 The test rpl_row_charset and it dependent rpl_ndb_charset is 
irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.

This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.
 2008-02-13 11:37:06 +01:00
mikael@dator6.(none)
2505979575 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
 2008-02-13 11:30:38 +01:00
mikael@dator6.(none)
e1820b2e77 Merge dator6.(none):/home/mikael/mysql_clones/bug32943 
into  dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
 2008-02-13 11:29:50 +01:00
mikael@dator6.(none)
2bff6fd22a Added comments on why we do reopen 
Handle error case of not being able to reopen which
requires us to remove table from thread's open list
and table_cache.
 2008-02-13 11:26:24 +01:00
tomas@poseidon.bredbandsbolaget.se
cc6c696330 Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge 
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-13 08:07:24 +01:00
mkindahl@dl145h.mysql.com
a3fe485dfe Various fixes to fix memory leaks after merging replication 
tree with main.
 2008-02-12 18:21:17 +01:00
tomas@poseidon.ndb.mysql.com
5cdbd24da0 corrected really strange test 2008-02-12 14:50:36 +01:00