anozdrin/alik@station.
4852cc7fc4
Fix result files after patch for BUG#31035.
2007-10-31 09:53:58 +03:00
davi@endora.local
cdf589c8b4
Merge endora.local:/Users/davi/mysql/bugs/31669-5.1
...
into endora.local:/Users/davi/mysql/mysql-5.1-runtime
2007-10-31 02:06:17 -02:00
davi@endora.local
53a048662a
Merge endora.local:/Users/davi/mysql/mysql-5.0-runtime
...
into endora.local:/Users/davi/mysql/bugs/31669-5.1
2007-10-31 02:04:04 -02:00
davi@endora.local
f3e0d95f45
Merge endora.local:/Users/davi/mysql/bugs/30904-5.1
...
into endora.local:/Users/davi/mysql/mysql-5.1-runtime
2007-10-30 20:52:21 -02:00
davi@endora.local
756a86f06d
Bug#30904 SET PASSWORD statement is non-transactional
...
The SET PASSWORD statement is non-transactional (no explicit transaction
boundaries) in nature and hence is forbidden inside stored functions and
triggers, but it weren't being effectively forbidden.
The implemented fix is to issue a implicit commit with every SET PASSWORD
statement, effectively prohibiting these statements in stored functions
and triggers.
2007-10-30 20:51:04 -02:00
kostja@bodhi.(none)
230604f33c
In ha_delete_table, use a standard mechanism to intercept the error message
...
and convert it to a warning instead of direct manipulation with the
thread error stack.
Fix a bug in handler::print_erorr when a garbled message was
printed for HA_ERR_NO_SUCH_TABLE.
This is a pre-requisite patch for the fix for Bug#12713 Error in a stored
function called from a SELECT doesn't cause ROLLBACK of statem
2007-10-30 22:35:14 +03:00
kostja@bodhi.(none)
cd72fffa5f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc-2
2007-10-30 20:10:11 +03:00
kostja@bodhi.(none)
e4b353c40c
Use an inline getter method (thd->is_error()) to query if there is an error
...
in THD.
In future the error may be stored elsewhere (not in net.report_error) and
it's important to start using an opaque getter to simplify merges.
2007-10-30 20:08:16 +03:00
davi@moksha.com.br
26f03b0bc6
Merge moksha.local:/Users/davi/mysql/bugs/31669-5.0
...
into moksha.local:/Users/davi/mysql/mysql-5.0-runtime
2007-10-30 09:41:24 -03:00
kostja@bodhi.(none)
5a09edd203
Fix failing init_connect.test (5.1-runtime).
2007-10-30 15:39:50 +03:00
kostja@bodhi.(none)
47c381fbb4
Make sure rpl.rpl_innodb_mixed_dml passes even if rpl_mixed.dat is read-only.
...
This is important for a development environment where not all source files
are checked out.
2007-10-30 15:25:39 +03:00
malff@lambda.weblab
0909d1f8cb
Merge lambda.weblab:/home/malff/TREE/mysql-5.1-base
...
into lambda.weblab:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-29 08:07:27 -06:00
malff@lambda.weblab
1eb8f03eaa
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lambda.weblab:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-29 08:01:40 -06:00
malff@lambda.weblab
6d15d42eca
Merge lambda.weblab:/home/malff/TREE/mysql-5.0-base
...
into lambda.weblab:/home/malff/TREE/mysql-5.0-rt-merge
2007-10-29 07:53:15 -06:00
anozdrin/alik@station.
ee25b4f56f
Fix for BUG#27610: ALTER TABLE ROW_FORMAT=... does not
...
rebuild the table.
The problem was that ROW_FORMAT clause in ALTER TABLE did not trigger
table reconstruction.
The fix is to rebuild a table if ROW_FORMAT is specified.
2007-10-29 15:42:49 +03:00
gluh@eagle.(none)
e3f7762226
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-29 12:38:32 +04:00
joerg@trift2.
00ca6476be
Mimic a rename which Daniel already did in 6.0,
...
to get rid of a name clash among *deleted* files on case-insignificant file systems.
2007-10-25 13:17:44 +02:00
malff@lambda.hsd1.co.comcast.net.
2bc41b7e1e
Bug#30854 (Tables name show as binary in slave err msg on vm-win2003-64-b)
...
The root cause of this defect is that a call to my_error() is using a
'LEX_STRING' parameter instead of a 'char*'
This patch fixes the failing calls to my_error(), as well as similar calls
found during investigation.
This is a compiling bug (see the instrumentation in the bug report), no test cases provided.
2007-10-24 19:01:08 -06:00
gluh@mysql.com/eagle.(none)
97e0180b2b
result fix
2007-10-24 12:49:58 +05:00
anozdrin/alik@station.
9586784366
Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt
2007-10-24 11:43:16 +04:00
gluh@mysql.com/eagle.(none)
b2aeda7699
result fix
2007-10-23 20:12:50 +05:00
gluh@eagle.(none)
d639739022
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 20:11:39 +05:00
gluh@eagle.(none)
53b1c3a299
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-23 20:09:36 +05:00
gluh@mysql.com/eagle.(none)
1d42094d18
after merge fix
2007-10-23 19:28:47 +05:00
gluh@eagle.(none)
17acda6ca8
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 19:08:21 +05:00
anozdrin/alik@station.
b2264ff810
Patch for BUG#30736: Row Size Too Large Error Creating a Table and
...
Inserting Data.
The problem was that under some circumstances Field class was not
properly initialized before calling create_length_to_internal_length()
function, which led to assert failure.
The fix is to do the proper initialization.
The user-visible problem was that under some circumstances
CREATE TABLE ... SELECT statement crashed the server or led
to wrong error message (wrong results).
2007-10-23 18:03:51 +04:00
gluh@eagle.(none)
237383f0fe
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-23 18:51:43 +05:00
gluh@eagle.(none)
331ee71261
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 18:47:18 +05:00
holyfoot/hf@hfmain.(none)
d0f53297f6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-23 17:24:57 +05:00
kaa@polly.(none)
173108956a
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-23 16:24:56 +04:00
holyfoot/hf@hfmain.(none)
f71a1441ee
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 17:09:32 +05:00
kaa@polly.(none)
6f1aef60ed
Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-23 16:09:31 +04:00
kaa@polly.(none)
6832d2cc1b
Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-23 16:07:03 +04:00
davi@moksha.local/moksha.com.br
dac55f09f0
Bug#31669 Buffer overflow in mysql_change_user()
...
The problem is that when copying the supplied username and
database, no bounds checking is performed on the fixed-length
buffer. A sufficiently large (> 512) user string can easily
cause stack corruption. Since this API can be used from PHP
and other programs, this is a serious problem.
The solution is to increase the buffer size to the accepted
size in similar functions and perform bounds checking when
copying the username and database.
2007-10-23 09:05:39 -03:00
gkodinov/kgeorge@magare.gmz
9934eec243
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 15:04:40 +03:00
kaa@polly.(none)
23c65a3b01
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-23 16:03:48 +04:00
kaa@polly.(none)
17a533e0d0
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550
...
into polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
2007-10-23 15:52:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
d029dd89c1
type conversions fixed to get rid of warnings
2007-10-23 16:32:05 +05:00
holyfoot/hf@hfmain.(none)
05f918e999
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 16:28:52 +05:00
holyfoot/hf@hfmain.(none)
9b61281c01
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 16:28:51 +05:00
gkodinov/kgeorge@magare.gmz
58bce232a8
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
2007-10-23 14:28:50 +03:00
gkodinov/kgeorge@magare.gmz
7ac179bc34
merge 5.0-opt -> 5.1-opt for bug 30825
2007-10-23 14:26:57 +03:00
gkodinov/kgeorge@magare.gmz
bc80b86379
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 14:23:18 +03:00
holyfoot/hf@hfmain.(none)
c3033ace1f
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 16:21:51 +05:00
gkodinov/kgeorge@magare.gmz
7c344185bd
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
2007-10-23 14:21:50 +03:00
holyfoot/hf@hfmain.(none)
14c43b980e
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-23 15:35:52 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
36092b373a
type conversion fixed to get rid of warnings
2007-10-23 15:34:10 +05:00
gkodinov/kgeorge@magare.gmz
62737d6d42
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 13:10:35 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
7c8d8b5a74
merging
2007-10-23 14:31:59 +05:00
holyfoot/hf@hfmain.(none)
7fe41df000
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-23 14:31:24 +05:00