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
anozdrin/alik@quad.
d36d243d3d
Fix for Bug#32538: View definition picks up character set,
...
but not collation.
The problem here was that text literals in a view were always
dumped with character set introducer. That lead to loosing
collation information.
The fix is to dump character set introducer only if it was
in the original query. That is now possible because there
is no problem any more of loss of character set of string
literals in views -- after WL#4052 the view is dumped
in the original character set.
2008-02-12 22:09:16 +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
anozdrin/alik@quad.
931f793c5c
Additional fix for Bug#31222.
2008-02-12 21:42:15 +03:00
kent@mysql.com/kent-amd64.(none)
a5edb90edf
ha_ndbcluster.m4:
...
If the third number in version is followed by a letter, include it
in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD
2008-02-12 19:08:04 +01:00
anozdrin/alik@quad.
d665fc3bd7
Fix for Bug#31222: com_% global status counters
...
behave randomly with mysql_change_user.
The problem was that global status variables were not updated
in THD::check_user(), so thread statistics were lost after
COM_CHANGE_USER.
The fix is to update global status variables with the thread ones
before preparing the thread for new user.
2008-02-12 20:59:09 +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
tomas@poseidon.ndb.mysql.com
5cdbd24da0
corrected really strange test
2008-02-12 14:50:36 +01:00
davi@mysql.com/endora.local
48ac77a95a
Bug#23771 AFTER UPDATE trigger not invoked when there are no changes of the data
...
The problem is that AFTER UPDATE triggers will fire only if the
new data is different from the old data on the row. The trigger
should fire regardless of whether there are changes to the data.
The solution is to fire the trigger on UPDATE even if there are
no changes to the value (because the value is the same).
2008-02-12 09:44:27 -02:00
tomas@poseidon.ndb.mysql.com
f042355aea
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-12 11:25:06 +01:00
tomas@poseidon.ndb.mysql.com
a4d8864b5e
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-rpl-merge
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-12 11:22:07 +01:00
tomas@poseidon.ndb.mysql.com
3a142141ec
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-12 11:21:05 +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
df@pippilotta.erinye.com
72073063cb
Make this build on Windows.
2008-02-11 18:02:37 +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
tomas@poseidon.ndb.mysql.com
bb93040854
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-11 17:39:58 +01:00
tomas@poseidon.ndb.mysql.com
832b498e72
Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-11 17:38:34 +01:00
tomas@poseidon.ndb.mysql.com
3103c2fb8c
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-11 17:37:25 +01:00
tomas@poseidon.ndb.mysql.com
fe364e4c2d
default changed not to run idempotent, but test requires it because of how ndb logs updates as write
2008-02-11 15:26:38 +01:00
tomas@poseidon.ndb.mysql.com
93e218990f
correcting wrong test case
2008-02-11 15:06:07 +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
jonas@perch.ndb.mysql.com
1eefb8c3cb
Fix missing block-constructor
2008-02-10 17:50:53 +01: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
jonas@perch.ndb.mysql.com
a7d4f64be9
remove mysql-test-run from autotest
2008-02-09 07:26:34 +01: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
anozdrin/alik@quad.
dbe77333d5
Bug#34424: query_cache_debug.test leads to valgrind warnings
...
Disable the test case.
2008-02-08 20:07:39 +03:00
anozdrin/alik@quad.
fab537bc89
Fix create.test: use latin1 instead ucs2.
2008-02-08 20:06:05 +03:00