mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52715 commits 2781 branches 343 tags 1.6 GiB
Commit graph

52715 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaa@kaamos.(none)
5671fb90e7 Post-merge fix. 2008-02-17 15:07:41 +03:00
kaa@kaamos.(none)
5647dee192 Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-17 14:57:01 +03: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
kaa@kaamos.(none)
6736c1b9e7 Post-merge fix after merging the patch for bug#31590 to 5.1: 
suppress the "Out of sort memory" error in the error log.
 2008-02-14 16:33:11 +03:00
kaa@kaamos.(none)
eeab00e3d0 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-14 12:54:23 +03:00
mkindahl@dl145h.mysql.com
fd5d7fa761 Fixing test rpl_events to not give false failures. 2008-02-14 10:53:12 +01:00
kaa@kaamos.(none)
88132e290a Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-14 12:49:39 +03:00
kaa@kaamos.(none)
f41a5edfc7 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-02-14 12:48:25 +03: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
gshchepa/uchum@host.loc
e49dffa81d Merge host.loc:/home/uchum/work/5.1-opt-gca 
into  host.loc:/home/uchum/work/5.1-opt
 2008-02-14 01:33:06 +04:00
kaa@kaamos.(none)
7a0800cf7f Post-merge fixes. 2008-02-13 21:57:50 +03:00
gshchepa/uchum@host.loc
814314be6b Merge host.loc:/home/uchum/work/5.0-opt-gca 
into  host.loc:/home/uchum/work/5.0-opt
 2008-02-13 19:47:39 +04:00
gshchepa/uchum@host.loc
e64b879510 Merge host.loc:/home/uchum/work/5.0-opt-gca 
into  host.loc:/home/uchum/work/5.1-opt-gca
 2008-02-13 19:37:05 +04:00
gshchepa/uchum@host.loc
18770a0de8 Fixed bug#31194: Privilege ordering does not order properly 
for wildcard values.
The server ignored escape character before wildcards during
the calculation of priority values for sorting of a privilege
list. (Actually the server counted an escape character as an
ordinary wildcard like % or _). I.e. the table name template
with a wildcard character like 'tbl_1' had higher priority in
a privilege list than concrete table name without wildcards
like 'tbl\_1', and some privileges of 'tbl\_1' was hidden
by privileges for 'tbl_1'.

The get_sort function has been modified to ignore escaped
wildcards as usual.
 2008-02-13 19:34:12 +04:00
gshchepa/uchum@host.loc
8f6ecbca82 Fixed bug#33764: Wrong result with IN(), CONCAT() and implicit 
type conversion.

Instead of copying of whole character string from a temporary
buffer, the server copied a short-living pointer to that string
into a long-living structure. That has been fixed.
 2008-02-13 19:32:19 +04:00
mkindahl@dl145h.mysql.com
32853b9fa5 Removing non-deterministic tests from events_scheduling test. 2008-02-13 12:41:54 +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
kaa@kaamos.(none)
9f194149b8 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-13 12:12:00 +03:00
kaa@kaamos.(none)
a44413741a Merge mbp:src/opt/bug33389/my51-bug25162 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-12 22:51:25 +03:00
kaa@kaamos.(none)
1a67148ccd Merge mbp:src/opt/bug33389/my50-bug25162 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-02-12 22:51:01 +03:00
kaa@kaamos.(none)
762557cc21 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-12 22:42:50 +03:00
kaa@mbp.
bc953966c4 Merge mbp.:/Users/kaa/src/opt/bug33389/my50-bug25162 
into  mbp.:/Users/kaa/src/opt/bug33389/my51-bug25162
 2008-02-12 22:21:33 +03:00
evgen@moonbone.local
f264f92c97 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/31590-bug-5.0-opt-mysql
 2008-02-12 21:58:41 +03: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
kaa@mbp.
97c105cc17 Fix for bug #33389: Selecting from a view into a table from within SP 
or trigger crashes server

Under some circumstances a combination of VIEWs, subselects with outer
references and PS/SP/triggers could lead to use of uninitialized memory
and server crash as a result.

Fixed by changing the code in Item_field::fix_fields() so that in cases
when the field is a VIEW reference, we first check whether the field
is also an outer reference, and mark it appropriately before returning.
 2008-02-12 12:43:55 +03:00
mkindahl@dl145h.mysql.com
e91c287ead Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-02-11 18:16:56 +01:00
mkindahl@dl145h.mysql.com
83dac31180 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-02-11 18:10:56 +01:00
mkindahl@dl145h.mysql.com
23d670c33e Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-02-11 18:09:17 +01:00
mkindahl@dl145h.mysql.com
3afb341aaf Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1
 2008-02-11 17:57:02 +01:00
anozdrin/alik@quad.
301ab0d8b7 Disable sporadically failing test cases (Bug#34454). 2008-02-11 14:34:53 +03:00
anozdrin/alik@quad.
524cbe2e4c Disabling declaration of debug variable for non-debug builds. 
(originally from Mats)
 2008-02-11 14:05:27 +03:00
anozdrin/alik@quad.
a52a30e3e6 Patch to eliminate some valgrind warnings in debug printout code. 
(originally from Mats)
 2008-02-11 14:04:30 +03:00
mkindahl@dl145h.mysql.com
ccd09676db Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-02-11 10:06:21 +01:00
mkindahl@dl145h.mysql.com
525a324a77 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-02-11 09:42:28 +01:00
tnurnberg@white.intern.koehntopp.de
72ab603853 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/21567/51-21567
 2008-02-11 01:47:38 +01:00
tnurnberg@white.intern.koehntopp.de
d628eac234 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/21567/50-21567
 2008-02-11 01:45:24 +01:00
holyfoot/hf@hfmain.(none)
bc702deb75 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/33796/my51-33796
 2008-02-10 23:53:59 +04:00
holyfoot/hf@hfmain.(none)
5f4fadefcc Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/33796/my50-33796
 2008-02-10 23:53:09 +04:00
holyfoot/hf@hfmain.(none)
a634b7f640 Merge mysql.com:/home/hf/work/33796/my50-33796 
into  mysql.com:/home/hf/work/33796/my51-33796
 2008-02-10 23:48:17 +04:00
holyfoot/hf@hfmain.(none)
0b0fd39fd6 Merge mysql.com:/home/hf/work/33796/my41-33796 
into  mysql.com:/home/hf/work/33796/my50-33796
 2008-02-10 23:45:41 +04:00
holyfoot/hf@mysql.com/hfmain.mysql.com
367e7e87dd Bug #33796 Memory leak for prepared statements in embedded server. 
Field data for a query was stored to the stmt->alloc that is emptied
with mysql_stmt_close statement only. That means a lot of memory can
be occupied without a reason if used doesn't call mysql_stmt_close often.
 2008-02-10 23:41:57 +04:00
tnurnberg@blasphemy.intern.azundris.com
41461f5dc5 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/tnurnberg/21567/51-21567
 2008-02-10 17:08:35 +01:00
tnurnberg@blasphemy.intern.azundris.com
5e23ea7288 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/tnurnberg/21567/50-21567
 2008-02-10 16:54:41 +01:00
kaa@kaamos.(none)
90858bef13 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-10 16:04:54 +03:00
tnurnberg@blasphemy.intern.azundris.com
f76b9cf63b Merge blasphemy.intern.azundris.com:/home/tnurnberg/21567/50-21567 
into  blasphemy.intern.azundris.com:/home/tnurnberg/21567/51-21567
 2008-02-10 13:54:59 +01:00
sven@riska.(none)
41bb462652 Problem: pushbuild fails in embedded mode on test binlog_base64_flag 
because it uses BINLOG statement, which is not supported in embedded mode.
Fix: disable the test in embedded mode.
 2008-02-09 19:43:32 +01:00
kostja@dipika.(none)
b09af4bef4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
 2008-02-09 14:42:26 +03:00
kostja@dipika.(none)
84713274ba Fix a buffer overflow with strmake(). 2008-02-09 10:31:22 +03:00
malff@lambda.hsd1.co.comcast.net.
20e33c30a0 Fixed buffer overflow 2008-02-08 19:37:57 -07:00
sven@riska.(none)
d1963d066b BUG#33247: mysqlbinlog does not clean up after itself on abnormal termination 
Problem: mysqlbinlog does not free memory if an error happens.
Fix: binlog-processing functions do not call exit() anymore. Instead, they
print an error and return an error code. Error codes are propagated all
the way back to main, and all allocated memory is freed on the way.
 2008-02-08 18:17:00 +01:00