Commit graph

21407 commits

Author SHA1 Message Date
tsmith@maint1.mysql.com
a9ae34b56c Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 18:56:11 +02:00
tsmith@maint1.mysql.com
9f4134267a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 18:03:59 +02:00
tsmith@quadxeon.mysql.com
73035c274f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-15 17:59:04 +02:00
dkatz@damien-katzs-computer.local
3a1a561322 Merge damien-katzs-computer.local:/Users/dkatz/mysql51
into  damien-katzs-computer.local:/Users/dkatz/51_win
2007-06-14 20:48:11 -04:00
tsmith@maint1.mysql.com
664fa012c0 Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/51
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 02:36:37 +02:00
tsmith@quadxeon.mysql.com
918090030b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
2007-06-15 01:57:33 +02:00
cmiller@zippy.cornsilk.net
85caa3540e Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-06-14 18:17:26 -04:00
tsmith@quadxeon.mysql.com
87fdad4ce8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-14 23:23:30 +02:00
cmiller@zippy.cornsilk.net
d37e579411 Bug#21723: Should be able to dump core after setuid() under Linux
In many cases, binaries can no longer dump core after calling setuid().

Where the PR_SET_DUMPABLE macro is set, use the prctl() system call 
to tell the kernel that it's allowed to dump the core of the server.
2007-06-14 14:24:59 -04:00
holyfoot/hf@hfmain.(none)
1e9373fd60 Merge bk@192.168.21.1:mysql-5.1
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 16:42:43 +05:00
holyfoot/hf@hfmain.(none)
8ccc50b303 Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-06-14 16:41:10 +05:00
holyfoot/hf@hfmain.(none)
76e0a0768a Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 16:35:20 +05:00
dkatz@damien-katzs-computer.local
65e47d59db Bug #28897 UUID() returns non-unique values when query cache is enabled
Removed the ability to cache queries with UUID() and UUID_SHORT().
2007-06-13 17:25:16 -04:00
dkatz@damien-katzs-computer.local
471173c57c Bug #28953 Using events in a replication let the slave crash.
Fixed where the slave code would try to update the Lex->sphead which is NULL on an "alter table" commands.
2007-06-13 16:24:21 -04:00
dkatz@damien-katzs-computer.local
1481bfc87b Bug #28897 UUID() returns non-unique values when query cache is enabled
Removed the ability to cache queries containing "UUID()".
2007-06-13 14:23:25 -04:00
igor@olga.mysql.com
20ad515003 Fixed bug #28980: the result of ROUND(<decimal expr>,<int column>)
was erroneously converted to double, while the result of
ROUND(<decimal expr>, <int literal>) was preserved as decimal.
As a result of such a conversion the value of ROUND(D,A) could
differ from the value of ROUND(D,val(A)) if D was a decimal expression.

Now the result of the ROUND function is never converted to 
double if the first argument is decimal.
2007-06-13 09:32:36 -07:00
gkodinov/kgeorge@magare.gmz
72f395a559 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B27816-5.1-opt
2007-06-12 19:24:48 +03:00
gkodinov/kgeorge@magare.gmz
eb1fb60975 5.0-opt -> 5.1-opt merge 2007-06-12 18:41:56 +03:00
cmiller@zippy.cornsilk.net
da33797903 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
2007-06-12 10:33:39 -04:00
cmiller@zippy.cornsilk.net
5ee2d957cb Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-06-12 10:33:22 -04:00
gkodinov/kgeorge@magare.gmz
fbefe9d552 Merge bk-internal:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
2007-06-12 16:34:54 +03:00
cmiller@zippy.cornsilk.net
10e6bf0f3f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-06-12 08:56:00 -04:00
cmiller@zippy.cornsilk.net
33c59b5d02 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
2007-06-12 08:48:30 -04:00
cmiller@zippy.cornsilk.net
4c9af55908 Bug#28984: crasher on connect with out of range password length in \
protocol

Fixed duplicated code, same as last commit.

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar.
2007-06-12 08:47:36 -04:00
gkodinov/kgeorge@magare.gmz
32d9644489 Merge bk-internal:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28992-5.0-opt
2007-06-12 14:37:14 +03:00
gkodinov/kgeorge@magare.gmz
5ea9964b9f Bug #28992: trigger fails in pushbuild
- fixed wrong test case for bug 20903
 - closed the dangling connections in trigger.test
 - GET_LOCK() and RELEASE_LOCK() now produce more detailed log
 - fixed an omission in GET_LOCK() : assign the thread_id when
    acquiring the lock.
2007-06-12 14:35:36 +03:00
gkodinov/kgeorge@magare.gmz
0fa279e5e2 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28934-5.0-opt
2007-06-12 11:11:12 +03:00
gkodinov/kgeorge@magare.gmz
b9876c6e9c Bug #28934: server crash when receiving malformed com_execute packets
Sometimes a parameter slot may not get a value because of the protocol
 data being plain wrong.
 Such cases should be detected and handled by returning an error.
 Fixed by checking data stream constraints where possible (like maximum
 length) and reacting to the case where a value cannot be constructed.
2007-06-12 11:02:34 +03:00
kaa@polly.local
120dae4c21 Merge polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-06-12 11:48:43 +04:00
kaa@polly.local
780a3dae0c Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-06-12 11:42:39 +04:00
kaa@polly.local
80f839a36e Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895
into  polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
2007-06-12 09:42:19 +04:00
evgen@moonbone.local
4cdbe25a6b Bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it shouldn't.
When the INSERT .. ON DUPLICATE KEY UPDATE has to update a matched row but
the new data is the same as in the record then it returns as if
no rows were inserted or updated. Nevertheless the row is silently
updated. This leads to a situation when zero updated rows are reported 
in the case when data has actually been changed.

Now the write_record function updates a row only if new data differs from
that in the record.
2007-06-12 01:41:23 +04:00
cmiller@zippy.cornsilk.net
19b54e394f Bug#28984: crasher on connect with out of range password length in \
protocol

Update for function moved to new file in 5.1.

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.
  
Instead, cast the *passwd char to uchar.
2007-06-11 16:03:05 -04:00
cmiller@zippy.cornsilk.net
bccc6ad13a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-06-11 15:55:28 -04:00
kaa@polly.local
0f5a1e5910 Fix for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.
2007-06-11 23:06:20 +04:00
evgen@moonbone.local
24ea0909c9 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-06-11 17:14:16 +04:00
evgen@moonbone.local
e1cde8aabe error_simulation.result, item.cc, subselect.result, error_simulation.test:
Post merge fix.
2007-06-11 17:02:16 +04:00
evgen@moonbone.local
76f4f23f54 Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-06-11 14:20:52 +04:00
evgen@moonbone.local
dcc1d8229b item_cmpfunc.cc, field.cc, sql_insert.cc, sql_class.h, sql_yacc.yy:
Post merge fix.
2007-06-11 13:38:37 +04:00
evgen@moonbone.local
a52c981d6a Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-06-11 00:16:00 +04:00
gluh@mysql.com/eagle.(none)
c25c178112 compiler warning fix 2007-06-09 18:18:34 +05:00
gluh@mysql.com/eagle.(none)
068f1f7dbf Bug#28149 overflow in some "SHOW STATUS"-variables
changed bytes_received, bytes_sent status variables to longlong
2007-06-09 17:46:09 +05:00
gluh@mysql.com/eagle.(none)
47ecabe915 Bug#28266 IS_UPDATABLE field on VIEWS table in I_S database is wrong
IS_UPDATABLE flag is set to 'yes' when the view has at least one updatable column and
the algorithm is not 'temporary'.
2007-06-09 16:52:37 +05:00
gluh@mysql.com/eagle.(none)
70e7487db3 compilation error fix 2007-06-09 16:05:43 +05:00
gkodinov/kgeorge@magare.gmz
241c49c6b9 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28754-5.0-opt
2007-06-09 09:02:21 +03:00
cmiller@zippy.cornsilk.net
f0dd5d9cf1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/41gca
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2
2007-06-08 17:06:29 -04:00
cmiller@zippy.cornsilk.net
3ab51acf6a Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-06-08 16:52:40 -04:00
cmiller@zippy.cornsilk.net
4584ac2c73 Bug #28984: crasher on connect with out of range password length in \
protocol

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar.
2007-06-08 16:10:53 -04:00
igor@olga.mysql.com
e2e672b56d Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28811
2007-06-08 09:59:07 -07:00
gkodinov/kgeorge@magare.gmz
949d96f175 Bug #27816: Log tables ran with partitions crashes the server
when logging is enabled.
Currently the partition engine doesn't allow log tables to
be partitioned. But this was not checked and the server crashed.
Fixed by adding a check in ALTER TABLE to disable partitioning the
log tables.
While working on the cause of the problem improved the way the log
thread structures are initialized before opening the log tables.
2007-06-08 17:12:42 +03:00