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
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
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
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@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.
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
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
aelkin/andrei@mysql1000.dsl.inet.fi
0eba2cf0bf
Merge mysql1000.dsl.inet.fi:/home/andrei/MySQL/FIXES/5.0/bug32790-assert_mdel_norm_tables
...
into mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/pushed.mysql-5.0-rpl-bug33329-extra_rollback
2008-02-12 12:38:55 +02: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
jani@a88-113-38-195.elisa-laajakaista.fi
1569f152da
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2008-02-12 10:45:08 +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
jani@a88-113-38-195.elisa-laajakaista.fi
62c5ec1285
Removed extra symbol during merge.
2008-02-12 10:43:38 +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
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
istruewing@stella.local
16be963007
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 12:07:19 +01: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
mattiasj@client-10-129-10-147.upp.off.mysql.com
2335bfaa5b
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
...
Problem was that it did not work with corrupted/crashed tables.
Solution is to disable these commands until WL#4176 is completed
2008-02-11 11:32:46 +01:00
istruewing@stella.local
21534505d0
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-11 11:19:06 +01:00
aelkin/andrei@mysql1000.dsl.inet.fi
0cd061e98f
Merge mysql1000.dsl.inet.fi:/home/andrei/MySQL/FIXES/5.0/bug33329-extra_rollback_when_innodb_in
...
into mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/mysql-5.0-rpl-bug33329-extra_rollback
2008-02-11 11:26:02 +02: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
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
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
kostja@dipika.(none)
add76ef5d5
Fix -ansi -pedantic compilation error
2008-02-08 19:33:24 +03:00
kostja@dipika.(none)
e9c887cc3d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 18:55:07 +03:00
kostja@dipika.(none)
0e4b6ea058
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dipika.(none):/opt/local/work/mysql-5.0-runtime
2008-02-08 18:51:07 +03:00
kostja@dipika.(none)
d956281e1e
Don't complain about a failure to write a log message if we were
...
simply killed.
2008-02-08 17:25:20 +03:00
gshchepa/uchum@host.loc
919f86fbb6
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into host.loc:/home/uchum/work/5.0-opt
2008-02-08 17:04:07 +04:00
kostja@dipika.(none)
209d3d2e18
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 15:54:21 +03:00
kostja@dipika.(none)
015cdcad4b
Silence the slow log errors (they won't make it to the client anyway).
2008-02-08 15:53:57 +03:00
davi@endora.local
9a5e3e103c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-08 10:48:16 -02:00
davi@mysql.com/endora.local
15409e87d2
Manual merge of Bug 33798
2008-02-08 10:47:25 -02:00
davi@endora.local
31b22496f4
Merge mysql.com:/Users/davi/mysql/mysql-5.0-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-08 10:21:58 -02:00
gshchepa/uchum@host.loc
2e9f2b678c
Fixed bug#15409: Columns with 64-element SET may not be updated with integers.
...
SET column storing procedure has been modified to be 64bit-clean.
2008-02-08 16:04:01 +04:00
jani@a88-113-38-195.elisa-laajakaista.fi
4f98f3e683
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2008-02-08 12:13:33 +01:00
davi@mysql.com/endora.local
24b9abf36d
Bug#33798 prepared statements improperly handle large unsigned ints
...
The unsignedness of large integer user variables was not being
properly preserved when feeded to prepared statements. This was
happening because the unsigned flags wasn't being updated when
converting the user variable is converted to a parameter.
The solution is to copy the unsigned flag when converting the
user variable to a parameter and take the unsigned flag into
account when converting the integer to a string.
2008-02-08 08:55:55 -02:00
kostja@dipika.(none)
0d4667eb5c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 13:36:39 +03:00
kostja@dipika.(none)
956e955938
Give a more informative message if we failed to write to mysql.general_log
...
table.
2008-02-08 13:35:11 +03:00
evgen@sunlight.local
a927bdbe3e
Bug#31590: Wrong error message on sort buffer being too small.
...
The out of memory error was thrown when the sort buffer size were too small.
This led to a user confusion.
Now filesort throws the error message about sort buffer being too small.
2008-02-08 13:35:00 +03:00
mikael@dator6.(none)
6995b41ba2
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-08 00:29:59 +01:00