mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28071 commits 2784 branches 343 tags 1.6 GiB
Commit graph

13406 commits

Author SHA1 Message Date
ingo@production.mysql.com
e55fd656dc Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-16 18:47:17 +01:00
eric@mysql.com
a316a30d5e BUG#12659 error handling in federated needs improvement. Sanja pointed out that we were copying an entire buffer, most of which was probably garbage, and possibly hidden by null termination in the middle of the buffer. Now we are only copying the error message. 2005-11-16 08:22:25 -08:00
ingo@production.mysql.com
82d91620ce Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-16 16:04:34 +01:00
ingo@mysql.com
41bb21de16 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
After merge fix.
 2005-11-16 15:58:17 +01:00
serg@serg.mylan
60875d3236 bug#14433 - archive uses wrong ref_length 2005-11-16 15:17:08 +01:00
bell@sanja.is.com.ua
a60a6b0f7f Issuing error about presence of commit/rollback statements in stored functions and triggers added to SP parsing procedure (BUG#13627) 
The crash mentioned in original bug report is already prevented by one
of previous patches (fix for bug #13343 "CREATE|etc TRIGGER|VIEW|USER
don't commit the transaction (inconsistency)"), this patch only improve
error returning.
 2005-11-16 14:09:06 +02:00
ingo@mysql.com
3df2007147 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-11-16 10:23:42 +01:00
ingo@mysql.com
e66b88bb7d Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-11-16 10:10:53 +01:00
evgen@moonbone.local
7749b8d15b Merge 2005-11-16 02:08:20 +03:00
ingo@mysql.com
74781d6559 Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash 
Version for 5.0.
It fixes three problems:
1. The cause of the bug was that we did not check the table version for
 the HANDLER ... READ commands. We did not notice when a table was
 replaced by a new one. This can happen during ALTER TABLE, REPAIR
 TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
 for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
 Though the function comment clearly said it must.
 I changed the code so that the locking is done when required. I call
 the fix for this problem "the secondary fix".
3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in
 concur with FLUSH TABLES WITH READ LOCK. I call the fix for this
 problem "the 5.0 addendum fix".
 2005-11-15 21:57:02 +01:00
sasha@asksasha.com
cb6d69f6f4 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
 2005-11-15 13:38:48 -07:00
evgen@moonbone.local
3a8e7b7fb9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14850-bug-5.0-mysql
 2005-11-15 22:47:03 +03:00
ingo@mysql.com
6bc4636b64 Merge mysql.com:/home/mydev/mysql-4.0-4000 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-15 18:09:40 +01:00
ingo@mysql.com
1aa15c25c7 Merge mysql.com:/home/mydev/mysql-4.0-bug14397 
into  mysql.com:/home/mydev/mysql-4.0-4000
 2005-11-15 16:47:15 +01:00
ingo@mysql.com
8996fd40cf Merge mysql.com:/home/mydev/mysql-4.0-bug14616 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-15 16:07:05 +01:00
pem@mysql.com
15df2c2298 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14723/mysql-5.0
 2005-11-15 13:27:00 +01:00
evgen@moonbone.local
35f7b50b18 Fix bug #14816 test_if_order_by_key() expected only Item_fields. 
test_if_order_by_key() expected only Item_fields to be in order->item, thus
failing to find available index on view's field, which results in reported
error.

Now test_if_order_by_key() calls order->item->real_item() to get field for
choosing index.
 2005-11-14 22:10:34 +03:00
ingo@mysql.com
88b6d28aba Bug#13707 - Server crash with INSERT DELAYED on MyISAM table 
After push fix. Must not access new_field if it is NULL.
 2005-11-14 19:53:41 +01:00
evgen@moonbone.local
70e1974f76 Fix bug #14850 Item_ref's null_value wasn't updated 
Item_ref's null_value wasn't updated in save_org_in_field() causing reported
error.
 2005-11-14 21:52:39 +03:00
SergeyV@selena.
43bbd352e3 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#14569-mysql-5.0
 2005-11-14 17:42:14 +03:00
pem@mysql.com
b614c82b10 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14723/mysql-5.0
 2005-11-14 15:18:05 +01:00
SergeyV@selena.
450909f0d3 Merge selena.:H:/MYSQL/bkt/mysql-5.0-rel 
into  selena.:H:/MYSQL/bkt/mysql-5.0
 2005-11-14 16:16:29 +03:00
SergeyV@selena.
00990f9774 Fixes bug #13377. my_open() & my_create() functions changed to use 
my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to 
allow deleting opened files. my_sopen() implementation is added to
support this functionality.
 2005-11-14 16:01:10 +03:00
bar@mysql.com
8894bd8d55 Bug#14406 GRANTS ON objects with non-ascii names borked after FLUSH PRIVILEGES 
ps_grant.result:
  Fixing result order.
grant.result:
  Adding test case,
  fixing result order.
grant.test:
  Adding test case.
sql_acl.cc:
  Fixed that my_charset_latin1 was incorrectly used instead of system_charset_info.
  This problem was previously fixed by Ingo in 5.0.
  This patch is basically a backport of the same changes into 4.1.
 2005-11-14 16:36:06 +04:00
SergeyV@selena.
95e0c72eb2 Fixed number of compiler errors on win32. 2005-11-14 15:19:52 +03:00
SergeyV@selena.
dbb29d11ee Fixes bug #14569. When no db is selected as current and we do create procedure db.sp()... 
we changing current db temporarily and restore it when sp is created. however thd->db
in this case becomes empty string rather than NULL and so all checks of thd->db == NULL 
will be false. So if after this we'll issue create procedure sp2()... without specifying
db it will succeed and create sp with db=NULL, which causes mysqldto crash on 
show procedure status statement.

This patch fixes the problem.
 2005-11-11 21:01:48 +03:00
pem@mysql.com
b607fdb04d Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14723/mysql-5.0
 2005-11-11 18:12:40 +01:00
evgen@moonbone.local
508824f7c4 Fix bug #13622 Wrong view .frm created if some field's alias contain \n 
View .frm parser assumes that query string will take only 1 line, with \n in
aliases query stringmay take several lines thus produces bad .frm file.

'query' parameter type changed from 'string' to 'escaped string'
 2005-11-11 20:03:32 +03:00
SergeyV@selena.
d2042caca6 Fixes bug #14569. In addition to check current db of not being NULL value 
it is added a check of not being empty value. When modifying SP with Admin 
application on win32 it does not pass curent database so sp is stored with
db=null which causes a crash later on show procedure status;
 2005-11-11 19:06:18 +03:00
pem@mysql.com
7d134961df Fixed BUG#14723: Dumping of stored functions seems to cause corruption 
in the function body
  Changed the way the end of query was found from the lex state.
  The routine body was not extracted correctly when using the
  /*!version ... */ wrapper (in dump files); for some types of routines
  (e.g. with a label at the first begin), the trailing "*/" was not skipped.
 2005-11-11 11:10:52 +01:00
timour@mysql.com
13260ea8f3 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-14662
 2005-11-11 12:10:19 +02:00
timour@mysql.com
99257a935e Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-14662
 2005-11-11 11:41:21 +02:00
timour@mysql.com
225e94fb75 Fix for BUG#14662: view column in ORDER BY considered ambiguous if SELECT contains 
the same column as an aliased and as a non-aliased column.

The problem was that Item_direct_view_ref::eq() was first comparing view columns
by name, and in this case the name of one of them is different since it is aliased.
 2005-11-11 11:40:35 +02:00
gluh@eagle.intranet.mysql.r18.ru
7803d80aa4 Fix for bug#13818 SHOW CREATE VIEW / TABLE and information_schema.views fail 
for invalid view
 Permit SHOW CREATE VIEW, SHOW CREATE TABLE, and retrieval of metadata from
 information_schema for invalid views
 2005-11-11 13:39:46 +04:00
anozdrin@mysql.com
1d3867faa5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818
 2005-11-11 03:25:24 +03:00
anozdrin@mysql.com
3543f9d36c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818
 2005-11-11 00:57:36 +03:00
brian@zim.(none)
44d54791ae Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-11-10 13:55:14 -08:00
bell@sanja.is.com.ua
32dc644e66 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-11-10 21:57:04 +02:00
anozdrin@mysql.com
f23f49ed57 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818
 2005-11-10 22:48:00 +03:00
anozdrin@mysql.com
491e4f89f5 WL#2818 (Add creator to the trigger definition for privilege 
checks on trigger activation)
 2005-11-10 22:25:03 +03:00
jimw@mysql.com
9d670ddbf4 Merge mysql.com:/home/jimw/my/mysql-5.0-12570 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-10 11:22:13 -08:00
bell@sanja.is.com.ua
8cedaeb971 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-11-10 21:16:56 +02:00
guilhem@mysql.com
dda1756789 Merge mysql.com:/home/mysql_src/mysql-5.0-release 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-11-10 18:14:07 +01:00
guilhem@mysql.com
ff46e54932 WL#2971 "change log-bin-trust-routine-creators=0 to apply only to functions". 
Indeed now that stored procedures CALL is not binlogged, but instead the invoked substatements are,
the restrictions applied by log-bin-trust-routine-creators=0 are superfluous for procedures.
They still need to apply to functions where function calls are written to the binlog (for example as "DO myfunc(3)").
We rename the variable to log-bin-trust-function-creators but allow the old name until some future version (and issue a warning if old name is used).
 2005-11-10 17:50:51 +01:00
brian@zim.(none)
47f9ada913 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-11-10 08:28:50 -08:00
brian@zim.(none)
510d0f24c8 Added handlerton flag to make storage engines invisable via flag. 2005-11-10 08:24:21 -08:00
bell@sanja.is.com.ua
69c2076c03 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-11-10 16:49:30 +02:00
guilhem@mysql.com
27a6670747 Merge mysql.com:/home/mysql_src/mysql-4.1-gca 
into  mysql.com:/home/mysql_src/mysql-4.1
 2005-11-10 15:14:17 +01:00
guilhem@mysql.com
1379dd180f Merge mysql.com:/home/mysql_src/mysql-4.1-gca 
into  mysql.com:/home/mysql_src/mysql-5.0-release
 2005-11-10 15:13:12 +01:00
guilhem@mysql.com
2df7d97281 Declaring some class members public for BUG#12377: 
"Item_date_add_interval needs to have the int_type member as Public".
As explained in the bug report, this change is is to help http://search.cpan.org/~philips/DBIx-MyParse-0.20/
So please keep those members public.
 2005-11-10 15:12:22 +01:00
konstantin@mysql.com
0d4dbfd1b7 Fix a comment. 2005-11-10 17:05:19 +03:00
pem@mysql.com
2636f3cc6f Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14719/mysql-5.0
 2005-11-10 12:26:43 +01:00
konstantin@mysql.com
b318ed1768 A fix and a test case for Bug#13488 "Left outer join query incorrectly 
gives MYSQL_DATA_TRUNCATED"
 2005-11-09 20:31:01 +03:00
pem@mysql.com
b01e7393bf Fixed BUG#14719: Views DEFINER grammar is incorrect 
Corrected the syntax for the current_user() case.
  (It's "definer = current_user[()]", not just "current_user[()]".)
 2005-11-09 16:51:00 +01:00
kent@mysql.com
b269caecb1 Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00
sergefp@mysql.com
dded290d1f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-nov08-push
 2005-11-09 10:14:49 +03:00
sergefp@mysql.com
c6a902f20c Merge mysql.com:/home/psergey/mysql-4.1-nov08-push 
into mysql.com:/home/psergey/mysql-5.0-oct08-push
 2005-11-09 10:12:58 +03:00
sergefp@mysql.com
f12212f74e BUG#14480: post-fix: use the default field value from CREATE list too. 2005-11-09 09:34:46 +03:00
ingo@production.mysql.com
cae673d0a9 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-08 20:18:08 +01:00
pem@mysql.com
718f837410 Fixed BUG#14643: Stored Procedure: Continuing after failed var. 
initialization crashes server.
  Make sure variables are initialized to something (like null) when
  the default initialization fails and a continue handler is in effect.
 2005-11-08 14:47:33 +01:00
sergefp@mysql.com
c5276ebcb0 Merge, will need post-merge fixes. 2005-11-08 11:22:51 +03:00
sergefp@mysql.com
5656740542 Merge mysql.com:/home/psergey/mysql-4.1-bug14480 
into mysql.com:/home/psergey/mysql-4.1-nov08-push
 2005-11-08 05:34:56 +03:00
jimw@mysql.com
a6aa8fa6d0 Fix handling of comparisons done by IN() to be consistent with how they 
are done for the = operator, such as when doing a comparison with a large
unsigned number that was quoted. (Bug #12612)
 2005-11-07 14:59:52 -08:00
petr@mysql.com
0f373f9501 Merge mysql.com:/home/cps/mysql/trees/mysql-4.1 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-11-08 01:27:15 +03:00
sasha@asksasha.com
aaaee3f23b Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
 2005-11-07 15:10:48 -07:00
sasha@asksasha.com
41752fa9a0 fix for BUG#7947 - failure to log DO RELEASE_LOCK() if we disconnect in the middle of 
transaction while holding the lock. Also test to make sure other binlogging issues
reported in the bug have been addressed.
 2005-11-07 15:09:35 -07:00
ingo@mysql.com
7533d92b23 Bug#13707 - Server crash with INSERT DELAYED on MyISAM table 
Initialized 'ptr' for a newly instantiated varstring field.
This is required by INSERT DELAYED.

No test case. This is a migration issue. There are two shell
scripts attached to the bug report. They can be used for testing.
 2005-11-07 18:31:48 +01:00
guilhem@mysql.com
ef415ceb14 Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)": 
test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).
 2005-11-07 16:18:46 +01:00
kent@mysql.com
58dd64612c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-07 13:39:03 +01:00
guilhem@mysql.com
517e51f1ed Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-11-07 13:04:27 +01:00
ingo@mysql.com
1f3df2e669 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
Initialized usable_keys from table->keys_in_use instead of ~0
in test_if_skip_sort_order(). It was possible that a disabled
index was used for sorting.
 2005-11-07 12:16:49 +01:00
bar@mysql.com
1946d68f99 Bug#14146 CHAR(...USING ...) and CONVERT(CHAR(...) USING...) produce different results 
ctype_utf8.result, ctype_utf8.test:
  Adding test case.
item_strfunc.cc:
item_strfunc.h:
  Moving the well formed checking code into a method,
  to reuse in several Item_func_xxx. Reusing the new
  method in Item_func_char and Item_func_charset_conv.
 2005-11-07 12:34:19 +04:00
sergefp@mysql.com
edd094b194 BUG#14480, attempt2: In CREATE ... SELECT ..., don't count the same field twice 
when calculating table->null_fields.
 2005-11-07 09:23:43 +03:00
igor@rurik.mysql.com
60a4b4fb16 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-11-05 22:45:54 -08:00
igor@rurik.mysql.com
0960f5fedc Post review fixes. 2005-11-05 22:41:36 -08:00
petr@mysql.com
038b300753 Fix Bug#14672 Bug in deletion 2005-11-06 02:11:12 +03:00
petr@mysql.com
a1f56ea5a6 Fix Bug#13894 Server crashes on update of CSV table 2005-11-05 15:08:15 +03:00
sergefp@mysql.com
33026e5237 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-oct03-push
 2005-11-05 05:46:41 +03:00
igor@rurik.mysql.com
84ad20364d Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-11-04 15:03:29 -08:00
petr@mysql.com
085b48427d fix --ansi --pedantic compilation failure 2005-11-04 16:17:43 +03:00
monty@mysql.com
303f6b4a7a Reorder struct elements to be more optimal for 64 bit computers 
(Main reason for reordering was to get rid of compiler warnings for order of element initialization)
 2005-11-04 15:12:22 +02:00
bell@sanja.is.com.ua
4f42b35bba avoiding of calling Item::val_* methods family with opt_range mem_root, because its life time is too short. (BUG#14342) 2005-11-04 13:16:46 +02:00
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
jimw@mysql.com
5764170898 Merge mysql.com:/home/jimw/my/mysql-5.0-9815 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-03 17:24:24 -08:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-04 01:15:35 +01:00
monty@mysql.com
90ca9150a4 Fixes during review of new code 
Destroy LOCK_uuid_generator
 2005-11-03 22:42:25 +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
ingo@mysql.com
1b99d30c23 Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash 
Version for 4.0.
It fixes two problems:
1. The cause of the bug was that we did not check the table version for
   the HANDLER ... READ commands. We did not notice when a table was
   replaced by a new one. This can happen during ALTER TABLE, REPAIR
   TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
   for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
   Though the function comment clearly said it must.
   I changed the code so that the locking is done when required. I call
   the fix for this problem "the secondary fix".
 2005-11-03 18:24:12 +01:00
jani@ua141d10.elisa.omakaista.fi
c4aa14fad7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-11-03 19:01:28 +02: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
0f83ba137a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-11-03 16:43:05 +02:00
evgen@moonbone.local
e92452c8ed opt_range.cc: 
Additional fix for bug#14093
 2005-11-03 17:43:03 +03:00
jani@ua141d10.elisa.omakaista.fi
0ee589b4d6 Changes in get_table_type() and mysql_frm_type(). The main problem was 
that in mysql_rm_table_part2_with_lock() previously we needed to open
same file twice. Now once is enough.
 2005-11-03 16:10:11 +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
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
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
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
holyfoot@mysql.com
e9f256e2bd 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 14:54:13 +04: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
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
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
jimw@mysql.com
90e4346396 Don't allow startup when default storage engine is specified to be a 
storage engine that is disabled. This was fixed once in 4.1, but regressed
in 5.0 because of changes to storage engine initialization. (Bug #9815)
 2005-11-02 17:56:12 -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)
f0f7b941d1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-11-02 20:20:56 +01:00
evgen@moonbone.local
005eaff6b8 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14466-bug-5.0-mysql
 2005-11-02 21:47:35 +03:00
monty@mysql.com
9946b15b3d Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/my/mysql-5.0
 2005-11-02 19:44:10 +02:00
konstantin@mysql.com
c2f224be5e Fix -ansi -pedantic compilation failure 2005-11-02 20:44:09 +03:00
monty@mysql.com
f2f4bf5240 wait_for_update must unlock mutex. 
(Fixed failure in rpl0000008.test)
 2005-11-02 19:28:49 +02:00
monty@mysql.com
9cab1f08fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-11-02 19:09:29 +02: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
holyfoot@mysql.com
dc78f2ea4d 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 18:58:25 +04:00
msvensson@neptunus.(none)
8e7dfad543 BUG#14514 Creating table with packed key fails silently 2005-11-02 15:53:04 +01:00
bell@sanja.is.com.ua
efbdd24c96 found problem removed 2005-11-02 15:17:57 +02:00
monty@mysql.com
164b469660 Fixed wrong merge 
Optimize new pushed code
 2005-11-02 14:43:25 +02:00
monty@mysql.com
438e8b6d6a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-11-02 14:35:07 +02:00
bell@sanja.is.com.ua
35cc6325a7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner-5.0
 2005-11-02 12:56:19 +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
monty@mysql.com
57f15d10ba Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-11-01 22:58:24 +02:00
monty@mysql.com
3a072a0eef Added missing DBUG_ENTER (bug in last push) 2005-11-01 21:59:24 +02:00
monty@mysql.com
f10399d77e Add missing return 
Compile max with --yassl instead of --with-openssl
 2005-11-01 21:57:24 +02:00
jimw@mysql.com
15da5308c3 Avoid possible race condition in accessing slave statistics 
during shutdown. (Bug #11796)
 2005-11-01 11:48:55 -08:00
jimw@mysql.com
c3efdc92e7 Fix compile using libwrap with gcc 4.0.2. (Bug #12570) 2005-11-01 11:08:20 -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
evgen@moonbone.local
6d3bd1e0ee sql_update.cc: 
After merge fix
 2005-11-01 20:53:27 +03: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
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
pem@mysql.com
c4c2dc079b Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14376/mysql-5.0
 2005-11-01 15:03:41 +01:00
pem@mysql.com
4e9e038ff9 Fixed BUG#14376: MySQL crash on scoped variable (re)initialization 
Added finer scope control for default clauses of local variable
  declarations.
 2005-11-01 14:58:52 +01: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)
b98c93e0a8 Fix for bug #14445 (analyse.test fails) 2005-11-01 13:08:14 +04:00
sergefp@mysql.com
145b7e8a6a BUG#13126: Post-review fixes: better comments, some function renaming. 2005-11-01 08:36:49 +03: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
bell@sanja.is.com.ua
c54d129224 postreview fixes 2005-10-31 22:14:27 +02:00
andrey@lmy004.
153d4c400e fix for bug #14381 (Key length is limited to 255 bytes on BDB) 2005-10-31 14:13:51 +01: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
hf@deer.(none)
16c66d49ca Additional fix for #12839 2005-10-31 12:05:27 +04:00
sergefp@mysql.com
3612707c71 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-oct25-test
 2005-10-31 09:23:13 +03:00
sergefp@mysql.com
4ad3313cd7 BUG#14139 - Merge to 5.0 2005-10-31 09:22:33 +03:00
konstantin@mysql.com
fd3a3c2224 Minor comments. 2005-10-29 13:11:34 +04:00
jimw@mysql.com
e55f906130 Fix bug in handling of decimal fields in UNION statements that could 
cause a crash or write to an incorrect memory location. (Bug #14216)
 2005-10-28 18:12:57 -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
evgen@moonbone.local
b5d5e9a546 sql_select.cc: 
After merge fix
 2005-10-29 02:07:57 +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
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
1111b5cd02 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14233/mysql-5.0
 2005-10-28 16:58:41 +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
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)
68fa03258a Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
b1189769c9 Merge neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:09:10 +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
hf@deer.(none)
fda75b1519 Fix for bug #9551 (Show commands fail) 2005-10-28 12:15:46 +05: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
c399932a72 fixe of typos, comments & layout 2005-10-28 00:56:44 +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
monty@mysql.com
faba744caf Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-27 21:11:41 +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
71b731e92e Manually merged 2005-10-27 17:44:28 +04:00
SergeyV@selena.
2025b35544 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#13377-mysql-5.0a
 2005-10-27 17:08:45 +04:00
SergeyV@selena.
77dc254958 Fix for the patch #13377. Avoids race condition for relay logs close. 
Code that closes current relay log is moved to purge_relay_logs().
 2005-10-27 17:04:01 +04:00
monty@mysql.com
7ea49858b4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-27 15:16:12 +03:00
monty@mysql.com
1b3ed12017 Fixes during review of pushed code 
Added back missing return in mysql_delete()
 2005-10-27 15:15:01 +03:00
ramil@mysql.com
ca31cf8dd3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b14290
 2005-10-27 13:08:58 +05:00