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

15802 commits

Author SHA1 Message Date
aivanov@mysql.com
2038e05bb4 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148
 2006-05-04 02:58:11 +04:00
bar@mysql.com
c51d7419e8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18170
 2006-05-03 12:34:51 +05:00
bar@mysql.com
467052aa5b Merge mysql.com:/usr/home/bar/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18170
 2006-05-03 09:08:12 +05:00
dlenev@mysql.com
5cae540501 Merge mysql.com:/home/dlenev/mysql-5.0-bg11081 
into  mysql.com:/home/dlenev/mysql-5.1-merges
 2006-05-02 23:16:53 +04:00
cmiller@zippy.(none)
ba0752e125 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
 2006-05-02 15:09:35 -04:00
aivanov@mysql.com
f6073b2735 WL#3148: Modifying sizes of i_s.processlist columns ('time', 'info'). 2006-05-02 23:08:22 +04:00
cmiller@zippy.(none)
230b52a835 Manually merged 2006-05-02 13:56:43 -04:00
cmiller@zippy.(none)
4d15fc5ee0 Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
 2006-05-02 13:55:03 -04:00
elliot@mysql.com
c0b5b3cd40 Fix spelling in comments as requested by Osku 
This will make charset code easier to understand
 2006-05-02 09:13:58 -04:00
dlenev@mysql.com
c40f8557dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/mysql-5.0-bg11081
 2006-05-02 17:07:23 +04:00
gluh@eagle.intranet.mysql.r18.ru
19de86dd63 WL#2257 REFERENTIAL_CONSTRAINTS view 
added I_S.REFARENTIAL_CONSTRAINTS table
 2006-05-02 16:31:39 +05:00
cmiller@zippy.(none)
1205ae8276 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
 2006-05-01 22:50:36 -04:00
cmiller@zippy.(none)
85ffd9640e SECURITY FIX 
Bug#17667: An attacker has the opportunity to bypass query logging.

This adds a new, local-only printf format specifier to our *printf functions
that allows us to print known-size buffers that must not be interpreted as 
NUL-terminated "strings."

It uses this format-specifier to print to the log, thus fixing this 
problem.
 2006-05-01 22:10:50 -04:00
jimw@mysql.com
052b126853 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-01 11:38:15 -07:00
cmiller@zippy.(none)
21bec19920 Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new
 2006-05-01 13:41:40 -04:00
jimw@mysql.com
189241b03e Merge mysql.com:/home/jimw/my/mysql-5.0-18607 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-01 09:12:36 -07:00
cmiller@zippy.(none)
6af3f88f07 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
 2006-05-01 09:46:00 -04:00
jimw@mysql.com
b4586b2908 Clean up after big merge 2006-05-01 00:14:32 -07:00
jimw@mysql.com
f21c110d13 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-30 13:27:38 -07:00
jimw@mysql.com
3f239914d7 Merge mysql.com:/home/jimw/my/tmp_merge 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-30 09:43:26 -07:00
brian@zim.(none)
8ab2897e93 Merge zim.(none):/home/brian/mysql/tmp_merge 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-04-29 17:43:26 -07:00
elliot@mysql.com
604b5836bb BUG#19145: mysqld crashes if you set the default value of an enum field to NULL 
Now test for NULLness the pointers returned from objects created from the
default value. Pushing patch on behalf of cmiller.
 2006-04-28 12:15:29 -04:00
gkodinov@lsmy3.wdf.sap.corp
6e5cf86f4d Merge lsmy3.wdf.sap.corp:/data/users/gkodinov/mysql-4.1-B18492 
into  lsmy3.wdf.sap.corp:/data/users/gkodinov/mysql-5.0-B18492
 2006-04-28 12:06:54 +02:00
gkodinov@lsmy3.wdf.sap.corp
ca79343359 BUG#18492: mysqld reports ER_ILLEGAL_REFERENCE in --ps-protocol 
In the code that converts IN predicates to EXISTS predicates it is changing
the select list elements to constant 1. Example :
SELECT ... FROM ...  WHERE a IN (SELECT c FROM ...)
is transformed to :
SELECT ... FROM ... WHERE EXISTS (SELECT 1 FROM ...  HAVING a = c)
However there can be no FROM clause in the IN subquery and it may not be
a simple select : SELECT ... FROM ... WHERE a IN (SELECT f(..) AS
c UNION SELECT ...) This query is transformed to : SELECT ... FROM ...
WHERE EXISTS (SELECT 1 FROM (SELECT f(..) AS c UNION SELECT ...)
x HAVING a = c) In the above query c in the HAVING clause is made to be
an Item_null_helper (a subclass of Item_ref) pointing to the real
Item_field (which is not referenced anywhere else in the query anymore).
This is done because Item_ref_null_helper collects information whether
there are NULL values in the result.  This is OK for directly executed
statements, because the Item_field pointed by the Item_null_helper is
already fixed when the transformation is done.  But when executed as
a prepared statement all the Item instances are "un-fixed" before the
recompilation of the prepared statement. So when the Item_null_helper
gets fixed it discovers that the Item_field it points to is not fixed
and issues an error.  The remedy is to keep the original select list
references when there are no tables in the FROM clause. So the above
becomes : SELECT ... FROM ...  WHERE EXISTS (SELECT c FROM (SELECT f(..)
AS c UNION SELECT ...) x HAVING a = c) In this way c is referenced
directly in the select list as well as by reference in the HAVING
clause. So it gets correctly fixed even with prepared statements.  And
since the Item_null_helper subclass of Item_ref_null_helper is not used
anywhere else it's taken out.
 2006-04-28 11:23:31 +02:00
elliot@mysql.com
5617f3387a Fix merge 2006-04-27 17:42:55 -04:00
elliot@mysql.com
bd01c06791 Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge-tiny
 2006-04-27 17:16:27 -04:00
msvensson@shellback.(none)
e5004d1312 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-04-27 17:35:29 +02:00
paul@polar.kitebird.com
46ee4ea0df Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2006-04-27 07:53:15 -05:00
paul@polar.kitebird.com
7162fa4a1a set_var.cc: 
System variable was added out of lexical order.
 2006-04-27 07:51:56 -05:00
tomas@poseidon.ndb.mysql.com
a18e5b88f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-27 08:37:45 +02:00
jimw@mysql.com
f8bfecdf2f Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-26 15:29:32 -07:00
tomas@poseidon.ndb.mysql.com
5c31b5d6c5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-26 23:10:36 +02:00
tomas@poseidon.ndb.mysql.com
33d169f89b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-26 23:10:32 +02:00
jimw@mysql.com
ca2b14e7b4 Merge mysql.com:/home/jimw/my/mysql-5.0-12792 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-26 11:39:48 -07:00
evgen@moonbone.local
611d83b5b0 Merge 2006-04-26 22:35:40 +04:00
jimw@mysql.com
74ca82c857 Merge mysql.com:/home/jimw/my/mysql-5.0-16195 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-26 11:34:45 -07:00
jimw@mysql.com
960c5621eb Bug #17849: sql_big_selects not shown in SHOW VARIABLES output 
This patch simply adds sql_big_selects to the list of variables
  output by SHOW VARIABLES.
 2006-04-26 09:21:53 -07:00
brian@zim.(none)
11ec75e367 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2006-04-26 09:20:58 -07:00
elliot@mysql.com
d96fbd738d The fix for bug#17248 accidentally removed the sync_binlog variable. 
This patch restores sync_binlog.
 2006-04-26 11:55:26 -04:00
tomas@poseidon.ndb.mysql.com
f12c6e9940 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-26 17:01:00 +02:00
ingo@mysql.com
af385df39a Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug18129
 2006-04-26 17:00:58 +02:00
tomas@poseidon.ndb.mysql.com
edba345e56 Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error 
- added retry handling of temporary transaction errors
 2006-04-26 16:57:44 +02:00
bell@sanja.is.com.ua
0e331dfb92 fixed error message text 2006-04-26 17:57:41 +03:00
serg@sergbook.mysql.com
ed3f3fa0c7 after merge 2006-04-25 22:39:59 -07:00
serg@sergbook.mysql.com
ab2820e80f Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2006-04-25 21:32:30 -07:00
serg@sergbook.mysql.com
54c97e6150 after merge fix 2006-04-25 17:12:06 -07:00
tomas@poseidon.ndb.mysql.com
0e8ccc1bee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-26 01:13:16 +02:00
sergefp@mysql.com
078ec307ae Fix compile failure on Win32 2006-04-26 01:21:33 +04:00
serg@sergbook.mysql.com
c97d923cfd merged 2006-04-25 14:06:04 -07:00
serg@sergbook.mysql.com
3144d5eb48 buffer overflow and information exposure bugs fixed 
(reported by Stefano Di Paola)
 2006-04-25 13:37:33 -07:00