mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27723 commits 2781 branches 343 tags 1.6 GiB
Commit graph

8845 commits

Author SHA1 Message Date
guilhem@mysql.com
cb1d21eeba sql_parse.cc: 
SCCS merged
 2005-11-04 10:54:51 +01:00
monty@mysql.com
2d39028ef2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-11-04 10:03:31 +02:00
monty@mysql.com
89fdc4f49e DROP created procedures 
(Caused sp-security to fail)
 2005-11-04 10:02:43 +02:00
sergefp@mysql.com
7dfca7b9ff Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-oct03-push
 2005-11-03 22:35:18 +03:00
jani@ua141d10.elisa.omakaista.fi
fcea95c2e5 Disabled ps_protocol for two statements. 2005-11-03 20:29:21 +02:00
holyfoot@deer.(none)
a6ada95d1e test enabled 2005-11-03 21:01:27 +04:00
holyfoot@mysql.com
1d8243c8ed Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.9551
 2005-11-03 20:58:43 +04:00
holyfoot@mysql.com
a8b38c1d5a Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.9551
 2005-11-03 19:47:08 +04:00
jani@ua141d10.elisa.omakaista.fi
2940a338c5 Disabled a test temporarily. 2005-11-03 17:39:40 +02:00
jani@ua141d10.elisa.omakaista.fi
cbf8a00c0b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-11-03 15:39:55 +02:00
sergefp@mysql.com
0cdaa61a8f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-oct03-push
 2005-11-03 16:23:47 +03:00
sergefp@mysql.com
749d78fcd4 Merge mysql.com:/home/psergey/mysql-5.0-bug14026-r2 
into mysql.com:/home/psergey/mysql-5.0-oct03-push
 2005-11-03 16:21:21 +03:00
jani@ua141d10.elisa.omakaista.fi
3d7d8af3aa Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-11-03 15:01:04 +02:00
jani@ua141d10.elisa.omakaista.fi
c66f53e277 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-11-03 14:48:09 +02:00
konstantin@mysql.com
d702915356 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-14210
 2005-11-03 15:24:55 +03:00
holyfoot@mysql.com
bac54a7774 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.9551
 2005-11-03 16:19:46 +04:00
holyfoot@deer.(none)
e529fdc5ee Merging 2005-11-03 16:17:11 +04:00
konstantin@mysql.com
7e3f757f2d A fix and a test case for Bug#14210 "Simple query with > operator on 
large table gives server crash": make sure that when a MyISAM temporary
table is created for a cursor, it's created in its memory root,
not the memory root of the current query.
 2005-11-03 14:20:13 +03:00
jani@ua141d10.elisa.omakaista.fi
b8248334d9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2005-11-03 13:02:05 +02:00
holyfoot@mysql.com
401d19f036 Merge mysql.com:/home/hf/work/mysql-4.1.14183 
into mysql.com:/home/hf/work/mysql-5.0.9551
 2005-11-03 14:58:36 +04:00
evgen@moonbone.local
55790f74bb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14093-bug-5.0-mysql
 2005-11-03 13:55:08 +03:00
evgen@moonbone.local
30fdafea76 Fix bug #14093 Query takes a lot of time when date format is not valid 
Invalid date like 2000-02-32 wasn't converted to int, which lead to not
using index and comparison with field as astring, which results in slow
query execution.

convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
allow such conversion.
 2005-11-03 13:53:49 +03:00
holyfoot@deer.(none)
c5313e8d4f Fix for bug #14268 (Bad FLOAT->DECIMAL conversion) 2005-11-03 13:49:37 +04:00
sergefp@mysql.com
a88ecb9a3d Post-merge fixes 2005-11-03 12:38:46 +03:00
msvensson@neptunus.(none)
d028e8e063 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-11-03 10:34:15 +01:00
jani@ua141d10.elisa.omakaista.fi
d03662cd37 Changed mysql-test-run to correspond to the one in 5.0 tree. 2005-11-03 11:05:52 +02:00
jani@ua141d10.elisa.omakaista.fi
42f36e6fc0 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-11-03 11:01:30 +02:00
holyfoot@mysql.com
284f652980 Merge bk@192.168.21.1:mysql-4.1 
into mysql.com:/home/hf/work/mysql-4.1.14183
 2005-11-03 12:50:28 +04:00
sergefp@mysql.com
7357e470a4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug14026-r2
 2005-11-03 11:20:01 +03:00
msvensson@neptunus.(none)
25f5062886 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-11-03 08:42:02 +01:00
sergefp@mysql.com
8fefb36800 Merged 2005-11-03 10:28:12 +03:00
holyfoot@mysql.com
c2640d292a Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.13573
 2005-11-03 11:05:34 +04:00
igor@rurik.mysql.com
f878cc589d Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-11-02 22:24:36 -08:00
igor@rurik.mysql.com
44dd303c47 Post review fixes. 2005-11-02 22:13:10 -08:00
evgen@moonbone.local
69d985cc9d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14466-bug-5.0-mysql
 2005-11-03 01:51:47 +03:00
evgen@moonbone.local
93cc0de7cf func_gconcat.result: 
Fixed wrong test case
table.cc:
  Fixed wrong DBUG_ENTER placement
 2005-11-03 01:50:36 +03:00
igor@rurik.mysql.com
cb439945c0 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-11-02 14:01:08 -08:00
igor@rurik.mysql.com
fddc99bcd8 #view.test#: 
new file
sql_table.cc, handler.h:
  Fixed bug #14540.
  Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
  to report that an operation cannot be applied for views.
view.test, view.result:
  Added a test case for bug #14540.
errmsg.txt:
  Fixed bug #14540.
  Added error ER_CHECK_NOT_BASE_TABLE.
 2005-11-02 13:44:58 -08:00
msvensson@neptunus.(none)
ce50208814 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-11-02 22:06:00 +01:00
msvensson@neptunus.(none)
9c94aef407 BUG#14514 
- Add tests
 2005-11-02 17:34:40 +01:00
evgen@moonbone.local
c347c60998 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14466-bug-5.0-mysql
 2005-11-02 18:00:13 +03:00
monty@mysql.com
54d9d2e116 Portability fix 
(BDB test failed in Intel64)
 2005-11-02 16:28:58 +02:00
holyfoot@mysql.com
6b5c422fe1 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.13573
 2005-11-02 13:01:21 +04:00
sergefp@mysql.com
96ff1e808a BUG#14026: When doing the end-of-prepare fix up for TABLE_LISTs used in the PS, do the fixup 
for underlying tables of a merge VIEWs, too.
 2005-11-02 07:05:19 +03:00
patg@krsna.patg.net
50817d304b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
 2005-11-01 17:07:13 -08:00
evgen@moonbone.local
db3b5c50bc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14186-bug-5.0-mysql
 2005-11-01 21:55:39 +03:00
andrey@lmy004.
d4d777fdf0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug14381
 2005-11-01 19:41:24 +01:00
andrey@lmy004.
3a08c5257a fix for bug #14381 
(BDB keylength limitted to 255)
 2005-11-01 19:37:59 +01:00
patg@krsna.patg.net
add878e818 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
 2005-11-01 09:08:50 -08:00
evgen@moonbone.local
bbe58c7e26 Manually merged 2005-11-01 19:47:53 +03:00
hf@deer.(none)
0ec768c407 Conflicts resolving 2005-11-01 20:37:27 +04:00
evgen@moonbone.local
47059b89f5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14186-bug-4.1-mysql
 2005-11-01 17:34:19 +03:00
jani@ua141d10.elisa.omakaista.fi
46c4e7b6ea Changed MTR_BUILD_THREAD port reserving policy. 2005-11-01 16:30:55 +02:00
evgen@moonbone.local
2343ff86ca Fix bug #14466 lost sort order in GROUP_CONCAT() in a view 
Item_func_group_concat::print() wasn't printing sort order thus creating wrong
view. This results in reported error.
 2005-11-01 17:27:10 +03:00
monty@mysql.com
e5f48e13bf Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort 
Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements
 2005-11-01 15:54:30 +02:00
hf@deer.(none)
f3502cd983 Additional fix for bug #14445 (analyse.test fails) 2005-11-01 16:14:26 +04:00
monty@mysql.com
19502e8eb5 Review of new pushed code 
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values
 2005-11-01 13:00:02 +02:00
hf@deer.(none)
bb17195a1c Fix for bug #14183 (ctype_cp983.test fails with the embedded server) 2005-11-01 13:18:46 +04:00
hf@deer.(none)
b98c93e0a8 Fix for bug #14445 (analyse.test fails) 2005-11-01 13:08:14 +04:00
hf@deer.(none)
69cd4c1ebf gis.test fixed 2005-11-01 11:43:34 +04:00
patg@krsna.patg.net
35a0ac6aea Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
 2005-10-31 17:28:11 -08:00
patg@krsna.patg.net
d5b252e630 BUG# 14532 
Post-review fixes
 2005-10-31 17:26:45 -08:00
kent@mysql.com
2c6902a093 mysql-test-run.pl: 
Make IM ports change with MTR_BUILD_THREAD
 2005-11-01 02:19:06 +01:00
patg@krsna.patg.net
7b611b33f2 BUG #14532 
Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns
work.
 2005-10-31 17:17:16 -08:00
jani@ua141d10.elisa.omakaista.fi
da64397b69 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-31 12:20:54 +02:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-31 11:54:36 +02:00
hf@deer.(none)
5150bd8f9f Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.12839
 2005-10-31 12:24:43 +04:00
msvensson@neptunus.(none)
531b847f23 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-31 09:14:58 +01:00
sergefp@mysql.com
4ad3313cd7 BUG#14139 - Merge to 5.0 2005-10-31 09:22:33 +03:00
jimw@mysql.com
b919b29da6 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-28 18:52:10 -07:00
patg@krsna.patg.net
22fe31e4d4 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1
 2005-10-28 18:23:23 -07:00
jimw@mysql.com
0e572ff475 Merge mysql.com:/home/jimw/my/mysql-4.1-13796 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-28 18:19:19 -07:00
sergefp@mysql.com
09a4d0c7a7 4.1->5.0 merge 2005-10-29 02:36:57 +04:00
sergefp@mysql.com
3e76aa38fa Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-oct25-test
 2005-10-29 02:19:38 +04:00
sergefp@mysql.com
8b9bab2763 Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment, 
do advance the source pointer over 2 bytes that specify value length.
 2005-10-28 23:31:32 +04:00
evgen@moonbone.local
ddea0b44e3 Manually merged 2005-10-28 23:17:51 +04:00
sergefp@mysql.com
7be7912135 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-oct25-test
 2005-10-28 22:55:02 +04:00
sergefp@mysql.com
eb57f520ba Merge 2005-10-28 22:31:41 +04:00
sergefp@mysql.com
f220d87476 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug14139
 2005-10-28 21:42:01 +04:00
jimw@mysql.com
f6995841b3 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-28 10:17:37 -07:00
jimw@mysql.com
552c208bfe Update test with changed result after merge 2005-10-28 10:16:44 -07:00
msvensson@neptunus.(none)
06c17bac2a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 19:10:05 +02:00
pem@mysql.com
1eaf95d5ca Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14256/mysql-5.0
 2005-10-28 14:55:01 +02:00
msvensson@neptunus.(none)
1be4e65794 Use replace_result to mask portnumber printed from failing connect 2005-10-28 14:03:24 +02:00
bell@sanja.is.com.ua
186017b468 disabling archive_gis 2005-10-28 14:56:55 +03:00
evgen@moonbone.local
cc5d7c0715 Fix bug #14138 ROLLUP and PROCEDURE ANALYSE() hang server 
Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
that fields_list is a part of all_fields_list. Because select have only 
3 columns and analyse() redefines it to have 10 columns, int overrun in
setup_copy_fields() occurs and server goes to almost infinite loop.

Because fields_list used not only to send data ad fields types, it's wrong 
to allow procedure redefine it. This patch separates select's fileds_list 
and procedure's one. Now if procedure is present, copy of fields_list is 
created in procedure_fields_list and it is used for sending data and fields.
 2005-10-28 15:24:46 +04:00
pem@mysql.com
d201f2443d Fixed BUG#14256: definer in view definition is not fully qualified 
Changed the parser test for wildcards in hostname to checking for empty
  strings instead (analogous with the test in default_view_definer()),
  since wildcards do appear in the definer's host-part sometimes.
 2005-10-28 12:11:32 +02:00
msvensson@neptunus.(none)
be6f7a3f82 Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:00:54 +02:00
bell@sanja.is.com.ua
b5d2e34572 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
 2005-10-28 10:12:36 +03:00
jimw@mysql.com
009bcc7442 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-27 18:46:00 -07:00
jani@ua141d10.elisa.omakaista.fi
ada29913ac Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-28 03:16:28 +03:00
jani@ua141d10.elisa.omakaista.fi
af50eff0d2 Merge 4.1 - 5.0 2005-10-28 02:36:19 +03:00
bell@sanja.is.com.ua
6143c6543e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
 2005-10-28 00:24:13 +03:00
evgen@moonbone.local
77723c2438 Fix bug#14186 select datefield is null not updated 
Date field was declared as not null, thus expression 'datefield is null'
was always false. For SELECT special handling of such cases is used. 
There 'datefield is null' converted to 'datefield eq "0000-00-00"'.

In mysql_update() before creation of select added remove_eq_conds() call.
It makes some optimization of conds and in particular performs conversion
from 'is null' to 'eq'. 
Also remove_eq_conds() makes some evaluation of conds and if it founds that
conds is always false then update statement is not processed further.
All this allows to perform some update statements process faster due to
optimized conds, and not wasting resources if conds known to be false.
 2005-10-28 01:24:11 +04:00
bell@sanja.is.com.ua
1b164c7b83 support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787) 2005-10-28 00:18:23 +03:00
jani@ua141d10.elisa.omakaista.fi
cbe21a8eb6 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-27 23:43:20 +03:00
monty@mysql.com
a9b1ff4095 Add DROP TABLE before trying to create view (in mysqldump) 
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
 2005-10-27 22:45:18 +03:00
jimw@mysql.com
7a8bd252d2 Merge mysql.com:/home/jimw/my/mysql-4.1-14009 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-27 10:20:38 -07:00
evgen@moonbone.local
ec009d6963 select.result: 
After merge fix
 2005-10-27 18:36:11 +04:00
evgen@moonbone.local
71b731e92e Manually merged 2005-10-27 17:44:28 +04:00