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
31674 commits 2774 branches 343 tags 1.6 GiB
Commit graph

9040 commits

Author SHA1 Message Date
msvensson@shellback.(none)
b963293595 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-16 15:50:50 +02:00
ramil/rkalimullin@production.mysql.com
4ef5116425 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
 2006-08-16 06:37:39 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b65bf3b4da Merge mysql.com:/usr/home/ram/work/tmp_merge 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-08-15 19:41:23 +05:00
mskold/marty@mysql.com/linux.site
3b42e84c44 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 15:57:36 +02:00
mskold/marty@mysql.com/linux.site
66e8255491 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 13:37:39 +02:00
mskold/marty@mysql.com/linux.site
6a3143e2a0 ndb_lock.test, ndb_lock.result: 
bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
 2006-08-15 13:12:27 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
9f6c76eb20 Merge mysql.com:/usr/home/bar/mysql-4.1.b19741 
into  mysql.com:/usr/home/bar/mysql-5.0.b19741merge
 2006-08-15 12:04:51 +05:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
e2d4aa2ca4 Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-merge
 2006-08-14 21:27:36 -07:00
kostja@bodhi.local
d03b39aaab Fix a test case (proper clean up). 2006-08-14 19:18:33 +04:00
svoj@may.pils.ru
91e94d781f Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0
 2006-08-14 18:08:33 +05:00
svoj@may.pils.ru
d4bdba176f BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1 
Fixed by moving update_key_parts() down to be after write_index().
 2006-08-14 17:05:02 +05:00
svoj@may.pils.ru
07a1ed651f Extended a test case for bug#7391. 2006-08-11 14:41:07 +05:00
cmiller@zippy.cornsilk.net
f6f7eb851e Merge updates. 2006-08-10 12:39:18 -04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
50ae5b7989 Fix for bug #20709: Collation not used in group by on 4.1. 
myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
TEXT and VARTTEXT key segments.
 2006-08-10 15:06:22 +05:00
cmiller@zippy.cornsilk.net
543fcde9b9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
 2006-08-09 22:23:41 -04:00
cmiller@zippy.cornsilk.net
8e4460343f Removed iggy's accidentally checked-in test files. 2006-08-09 13:41:08 -04:00
svoj@may.pils.ru
b5cd11cf0e After merge fix. 2006-08-07 19:35:02 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
7ff64de172 Merge mysql.com:/usr/home/bar/mysql-4.1.b19741v0 
into  mysql.com:/usr/home/bar/mysql-4.1.b19741
 2006-08-07 13:15:23 +05:00
tnurnberg@mysql.com/salvation.intern.azundris.com
f25bf84cf4 grant.result: 
manual merge
 2006-08-07 04:13:05 +02:00
tnurnberg@mysql.com/salvation.intern.azundris.com
f17b889289 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/tnurnberg/work/mysql-5.0-maint-20214
 2006-08-07 01:39:05 +02:00
msvensson@neptunus.(none)
583675f292 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-03 19:18:24 +02:00
jimw@rama.(none)
b876cf5745 Merge rama.(none):/home/jimw/my/mysql-5.0-10668 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-08-03 10:02:47 -07:00
msvensson@neptunus.(none)
b9b2ef9cfb Make test case for bug#21215repeateble by calling "reset master" 2006-08-03 16:47:24 +02:00
msvensson@neptunus.(none)
ac4e03a315 Update result after merge, since the function Item::tmp_table_field_from_field_type() 
now takes mbmaxlen into account when calculating max_length of new field.
 2006-08-03 15:48:28 +02:00
tnurnberg@mysql.com/salvation.intern.azundris.com
35c523a6f8 Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view 
"A SELECT privilege on a view is required for SHOW CREATE VIEW and it will stay
that way because of compatibility reasons." (see #20136)

a test case to illustrate how the ACLs work in this case (and ensure they will continue
to do so in the future)
 2006-08-03 14:58:13 +02:00
msvensson@neptunus.(none)
10a7b8cedf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-03 12:11:07 +02:00
msvensson@neptunus.(none)
61c5d97309 Remove double error printout in mysqldump 2006-08-03 12:09:22 +02:00
msvensson@neptunus.(none)
743948404a Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-08-03 11:48:08 +02:00
svoj@may.pils.ru
395d3c3985 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
 2006-08-03 14:08:43 +05:00
svoj@may.pils.ru
67db270c71 BUG#7391 - Cross-database multi-table UPDATE uses active database 
privileges

This problem is 4.1 specific. It doesn't affect 4.0 and was fixed
in 5.x before.

Having any mysql user who is allowed to issue multi table update
statement and any column/table grants, allows this user to update
any table on a server (mysql grant tables are not exception).

check_grant() accepts number of tables (in table list) to be checked
in 5-th param. While checking grants for multi table update, number
of tables must be 1. It must never be 0 (actually we have
DBUG_ASSERT(number > 0) in 5.x in grant_check() function).
 2006-08-03 14:03:08 +05:00
msvensson@neptunus.(none)
7280f63100 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-03 09:32:58 +02:00
jimw@rama.(none)
9d67aacead Merge rama.(none):/home/jimw/my/mysql-5.0-19147 
into  rama.(none):/home/jimw/my/mysql-5.0-16502
 2006-08-02 19:52:11 -07:00
jimw@rama.(none)
41956bee4f Merge rama.(none):/home/jimw/my/mysql-5.0-16881 
into  rama.(none):/home/jimw/my/mysql-5.0-16502
 2006-08-02 19:51:34 -07:00
jimw@rama.(none)
95b3b2ea8d Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-16502
 2006-08-02 19:48:12 -07:00
cmiller@zippy.cornsilk.net
dd5eeaf676 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ
 2006-08-02 14:57:12 -04:00
kostja@bodhi.local
1b145118b9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-08-02 21:54:10 +04:00
cmiller@zippy.cornsilk.net
c9f64f71c8 Bug#9719: DELETE with WHERE on HEAP table just deletes first row of matched 
set.

(Ramil's patch, recreated.)
 2006-08-02 13:06:59 -04:00
kostja@bodhi.local
3d3bf24a93 A post-merge fix. 2006-08-02 19:39:47 +04:00
evgen@moonbone.local
7451ffcd0a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-08-02 18:16:05 +04:00
evgen@moonbone.local
83896aa8f6 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-08-02 18:11:59 +04:00
evgen@moonbone.local
90f23a251a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-08-02 16:48:17 +04:00
evgen@moonbone.local
67c85a170a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-08-02 16:44:56 +04:00
svoj@may.pils.ru
6c6f435b03 BUG#14770 - LOAD DATA INFILE doesn't respect default values for 
columns
Fixed confusing warning.

Quoting INSERT section of the manual:
----
Inserting NULL into a column that has been declared NOT NULL. For
multiple-row INSERT statements or INSERT INTO ... SELECT statements, the
column is set to the implicit default value for the column data type. This
is 0 for numeric types, the empty string ('') for string types, and the
"zero" value for date and time types. INSERT INTO ... SELECT statements are
handled the same way as multiple-row inserts because the server does not
examine the result set from the SELECT to see whether it returns a single
row. (For a single-row INSERT, no warning occurs when NULL is inserted into
a NOT NULL column. Instead, the statement fails with an error.)
----
This is also true for LOAD DATA INFILE. For INSERT user can specify
DEFAULT keyword as a value to set column default. There is no similiar
feature available for LOAD DATA INFILE.
 2006-08-02 17:15:50 +05:00
evgen@moonbone.local
40a1fbdffb Merge moonbone.local:/work/tmp_merge-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-08-02 16:10:52 +04:00
holyfoot/hf@mysql.com/deer.(none)
2119067eee Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1.20317
 2006-08-02 16:57:46 +05:00
kostja@bodhi.local
4bfc67fc3c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-08-02 14:13:01 +04:00
msvensson@neptunus.(none)
502498ed7b Disable test case for for bug 21042 2006-08-02 08:46:58 +02:00
msvensson@neptunus.(none)
31be565d2e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-01 20:24:30 +02:00
igreenhoe@maint1.mysql.com
ff3a640e8f Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/igreenhoe/mysql-5.0-maint
 2006-08-01 13:04:48 +02:00
msvensson@neptunus.(none)
e9b624df99 Change error code to test for "unknown error" with to 10000 2006-08-01 11:29:10 +02:00