mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31923 commits 2793 branches 343 tags 1.7 GiB
Commit graph

10998 commits

Author SHA1 Message Date
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
35af3d5578 Disable a failing test case (filed a p1 bug) 2006-08-02 22:21: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
7f0a080660 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-08-02 16:46:55 +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
evgen@moonbone.local
cac5ad03b9 Merge moonbone.local:/work/tmp_merge-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-08-02 16:40:32 +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
holyfoot/hf@mysql.com/deer.(none)
f069fcdb11 Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.14807
 2006-08-02 14:03:20 +05:00
msvensson@neptunus.(none)
502498ed7b Disable test case for for bug 21042 2006-08-02 08:46:58 +02:00
tsmith@maint1.mysql.com
438b94e204 .del-sp.test.orig: 
Delete: mysql-test/t/sp.test.orig
 2006-08-02 02:21:36 +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
msvensson@neptunus.(none)
09a36146b8 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-01 15:22:54 +02:00
msvensson@neptunus.(none)
c1f0f4dc58 Add missing $ 2006-08-01 15:21:09 +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)
111513f09f Bug#21367 IM tests do not recognize "win2003-amd64" as Windows 
- Disable Instance manager on Windows
 2006-08-01 11:35:37 +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
gkodinov/kgeorge@rakia.(none)
8cf5a4c04e Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B20103-5.0-opt
 2006-08-01 11:17:14 +03:00
gkodinov/kgeorge@macbook.gmz
7b5e4ed026 Bug #20103: Escaping with backslash does not work 
- make the client to respect the server-side 
   no_backslash_escapes option and disable the 
   special meaning of backslash also at client side.
 2006-08-01 11:05:54 +03:00
gkodinov/kgeorge@rakia.(none)
63d198af1c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
 2006-08-01 06:11:11 +03:00
evgen@sunlight.local
6806776eed Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
 2006-08-01 06:42:33 +04:00
rburnett@bk-internal.mysql.com
a35d3241f4 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-07-31 23:17:18 +02:00
igreenhoe/greenman@anubis.greendragongames.com
d97a344e7a Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-5.0-maint
 2006-07-31 13:04:01 -07:00
malff/marcsql@weblab.(none)
2336834e08 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-21269
 2006-07-31 12:11:08 -07:00
evgen@moonbone.local
b43b2a2fe0 select.result, func_group.result, sql_select.cc: 
After merge fix
 2006-07-31 23:05:54 +04:00
malff/marcsql@weblab.(none)
ab86e0b3cb Bug#21269 (DEFINER-clause is allowed for UDF-functions) 
The problem was that the grammar allows to create a function with an optional
definer clause, and define it as a UDF with the SONAME keyword.
Such combination should be reported as an error.

The solution is to not change the grammar itself, and to introduce a
specific check in the yacc actions in 'create_function_tail' for UDF,
that now reports ER_WRONG_USAGE when using both DEFINER and SONAME.
 2006-07-31 12:01:43 -07:00
gkodinov/kgeorge@rakia.(none)
a5e56e8942 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
 2006-07-31 21:17:20 +03:00
gkodinov/kgeorge@macbook.gmz
8084a9e5fb Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE 
made DROP VIEW to continue on error and report an aggregated error 
 at its end. This makes it similar to DROP TABLE.
 2006-07-31 20:56:06 +03:00
gkodinov/kgeorge@macbook.gmz
8d4684b6b4 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21080-5.0-opt
 2006-07-31 17:40:09 +03:00
gkodinov/kgeorge@macbook.gmz
8944564fd8 Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM 
When executing ALTER TABLE all the attributes of the view were overwritten.
  This is contrary to the user's expectations.
  So some of the view attributes are preserved now : namely security and 
  algorithm. This means that if they are not specified in ALTER VIEW
  their values are preserved from CREATE VIEW instead of being defaulted.
 2006-07-31 17:33:37 +03:00
msvensson@neptunus.(none)
1b88a957c5 Merge neptunus.(none):/home/msvensson/mysql/my41-bug21125 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-07-31 14:40:21 +02:00
msvensson@neptunus.(none)
2461e48698 Bug#21042 mysql client segfaults on importing a mysqldump export 
- Use strmake, that will both protect the buffer and make sure it's terminated by a zero
 - Add test case
 2006-07-31 14:22:32 +02:00
msvensson@neptunus.(none)
d8a5ea2621 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-07-31 13:12:49 +02:00
msvensson@neptunus.(none)
823ead0775 perror returns 2 if it does not understand the option --ndb 
Move that perror test to ndb_basic so it's only run when there is support for --ndb
 2006-07-31 13:11:21 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
fa695edaba N'xxx' and _utf8'xxx' are not equivalent 
Problem: Unescaping of '\' characters didn't work when processing N'xxx'.
Fix: using get_text() instead of get_token() when scanning nationa strings.
 2006-07-31 12:47:01 +05:00
evgen@sunlight.local
3ca575dc89 Merge sunlight.local:/local_work/tmp_merge-4.1-opt-mysql 
into  sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
 2006-07-29 23:59:53 +04:00
kroki/tomash@moonlight.intranet
5c90b6f810 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
 2006-07-29 13:43:34 +04:00
igreenhoe/greenman@anubis.greendragongames.com
61a3a8e95c Fix for bug #16226 (timestamp_diff truncation issue when requesting 
difference between timestamp in values of months and quarters.)

Problem:  when requesting timestamp diff in months or quarters, it
would only examine the date (and not the time) for the comparison.

Solution:  increased precision of comparison.
 2006-07-28 20:51:17 -07:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
bd47f4f3be udf_example.c, udf.test, Makefile.am: 
Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336)
 2006-07-29 04:41:50 +02:00
jimw@rama.(none)
ad78212d9f Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-16881
 2006-07-28 12:19:13 -07:00
tsmith@maint1.mysql.com
28df542a7a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  maint1.mysql.com:/data/localhome/tsmith/bk/global-50
 2006-07-28 17:40:33 +02:00