mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33713 commits 2774 branches 343 tags 1.6 GiB
Commit graph

11693 commits

Author SHA1 Message Date
jmiller@mysql.com
9d1f5003c1 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-05 16:54:24 +02:00
tomas@poseidon.ndb.mysql.com
f8c37502b3 do not install ndb slave if no slaves 
fixed memleak in ndbcluster_end
 2006-05-05 15:34:46 +02:00
tomas@poseidon.ndb.mysql.com
f814a2184a ndb disabled test case against verified bug 2006-05-05 00:06:44 +02:00
tomas@poseidon.ndb.mysql.com
831031ec02 disable test case since it causes failure in ndb_lock occationally, bug report referenced 2006-05-04 23:35:37 +02:00
tomas@poseidon.ndb.mysql.com
f6ede396c0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-04 21:55:12 +02:00
tomas@poseidon.ndb.mysql.com
f67be8de63 ndb: now no difference in behaviour between row and statement based 2006-05-04 18:26:36 +02:00
tomas@poseidon.ndb.mysql.com
37e8b5ac06 removing the usage if the ndb local dict cache to adress the 241 errors we get now and then 2006-05-04 13:58:17 +02:00
cmiller@zippy.(none)
7bbd8fb051 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
 2006-05-03 18:58:13 -04:00
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
cmiller@zippy.(none)
b07bb71291 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
 2006-05-03 10:04:04 -04:00
cmiller@zippy.(none)
a5789854ee Added code to remove closing comment code from event text, as would be 
supplied inside a  /*!VERSION event-text */  segment.  (Fixes Bug#18078
 2006-05-03 09:55:34 -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
cmiller@zippy.(none)
9648920963 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
 2006-05-02 18:41:42 -04:00
jmiller@mysql.com
614da47ccc rpl_loaddatalocal.result, rpl_loaddatalocal.test: 
updated for ndb cluster testing
 2006-05-02 22:56:53 +02: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)
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
jmiller@mysql.com
2fcfe0a5c9 rpl_sp_effects.result, rpl_sp_effects.test: 
Updated with order by's to allow ndb engine to pass when using this test.
 2006-05-02 20:10:02 +02: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
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
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
msvensson@devsrv-b.mysql.com
580111eab2 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
 2006-04-28 16:05:05 +02: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@neptunus.(none)
44322185b5 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-28 08:30:49 +02:00
jimw@mysql.com
b1c3801047 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/nfstmp1/jwinstead/mysql-5.0-clean
 2006-04-28 00:33:47 +02:00
msvensson@shellback.(none)
480a55287d Disable udf.test 2006-04-27 22:30:14 +02:00
msvensson@shellback.(none)
6aa775f348 Return empty string if file does not exist 
Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example
 2006-04-27 21:26:24 +02:00
jimw@mysql.com
36155b63eb Bug #19393: Federated tests fail on Windows under pushbuild 
Supplying --skip-rpl to mysql-test-run.pl would always disable the
  slaves, but those slaves may still be needed for the federated tests.
  Now we only disable the slaves when they are not used by any of the
  tests.
 2006-04-27 10:53:19 -07: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@neptunus.(none)
98a7bbe109 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-27 17:30:56 +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
mskold@mysql.com
8af6442ead Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
 2006-04-27 15:31:32 +02:00
mskold@mysql.com
f42ceea8e6 Disabled rpl_ndb_dd_partitions, new slogan 2006-04-27 15:29:10 +02:00
mskold@mysql.com
92cac65fc1 Added verification test of on-line (non-copying) alter table 2006-04-27 15:13:21 +02:00