mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33637 commits 2776 branches 343 tags 1.6 GiB
Commit graph

9333 commits

Author SHA1 Message Date
monty@mysql.com
d689f2fa70 Cleanups after review of WL#602 
Fixed warnings from test suite
Some fixes in mysql-test-run script to catch more warnings
 2006-05-03 19:40:52 +03:00
monty@mysql.com
9756d7f853 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-05-03 16:03:19 +03:00
monty@mysql.com
343644dd5d Added support for key_block_size for key and table level (WL#602) 
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
 2006-05-03 15:59:17 +03: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
cmiller@zippy.(none)
5de7b78bd2 More merging assistence. 
Logging behavior changed in early 5.1.  (The filename was never right, but
the "opt" file is unnecessary in 5.0 anyway.)
 2006-05-02 15:07:00 -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
44e984276c Fix name of error in view_grant test 2006-05-01 17:12:51 -07:00
jimw@mysql.com
7afa8aa73b Merge mysql.com:/home/jimw/my/mysql-5.1-18495 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-01 11:22:47 -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
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
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
08eb2588bf Fix error in having.test to use name instead of number (fixes merge problem) 2006-04-30 13:06:28 -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
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
knielsen@mysql.com
6c2f477259 Disable unstable test case. 2006-04-28 09:29:40 +02:00
msvensson@shellback.(none)
480a55287d Disable udf.test 2006-04-27 22:30:14 +02: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
msvensson@shellback.(none)
0e5113aead Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is. 
Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library.
 2006-04-27 16:32:40 +02:00
jimw@mysql.com
58cb2f317c Remove obsolete test 2006-04-26 17:09:41 -07: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
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
mskold@mysql.com
6d01bcdf45 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-26 17:01:01 +02: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
mskold@mysql.com
63106c0634 Added test for violation of uniqueness constraint at create index 2006-04-26 17:00:59 +02:00
mleich@mysql.com
578406665a Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
 2006-04-26 17:00:58 +02:00
aivanov@mysql.com
28e20421b5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 19:00:57 +04:00
aivanov@mysql.com
1c98f3e262 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 12:48:12 +04:00
aivanov@mysql.com
419d4980e0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
 2006-04-26 12:45:29 +04:00
aivanov@mysql.com
6f8c03ee69 Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
 2006-04-26 12:43:38 +04:00
aivanov@mysql.com
06c79b143b Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/alexi/innodb/mysql-4.1-innodb
 2006-04-26 12:39:47 +04:00
aivanov@mysql.com
88e7e55bb5 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 11:27:15 +04:00
aivanov@mysql.com
b34ec32b5b Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
 2006-04-26 11:23:43 +04:00
aivanov@mysql.com
11687d2f84 Make innodb_mysql produce a non-empty output. 2006-04-26 11:15:09 +04:00
tomas@poseidon.ndb.mysql.com
c1d0294983 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 08:38:50 +02:00
aivanov@mysql.com
c66893cd54 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
 2006-04-26 09:59:05 +04:00
aivanov@mysql.com
b748835897 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
 2006-04-26 09:56:06 +04:00