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

12868 commits

Author SHA1 Message Date
serg@serg.mylan
8c813c0a16 duplicate error message removed 2005-09-30 12:01:39 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
43b544a968 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
 2005-09-30 12:36:23 +03:00
serg@serg.mylan
69909c460a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-30 09:40:49 +02:00
timour@mysql.com
638198e17d Fix for BUG#13597 - columns in ON condition not resolved if references a table in a nested right join. 
The problem was in that when finding the last table reference in a nested join tree,
the procedure doing the iteration over the right-most branches of a join tree
was testing for RIGHT JOINs the table reference that represents the join, and not
the second operand of the JOIN. Currently the information whether a join is LEFT/RIGHT
is stored not on the join object itself, but on one of its operands.
 2005-09-30 10:39:17 +03:00
ramil@mysql.com
4dbe76d035 Comment adjusted (see fix for #13545) 2005-09-30 12:37:58 +05:00
ramil@mysql.com
63fa48c0f6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-09-30 12:30:32 +05:00
sergefp@mysql.com
7d383eecb5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13455
 2005-09-30 01:38:04 +04:00
sergefp@mysql.com
71d8990f8e Fix for BUG#13455: Make "ref" optimizer able to make this inference: 
"t.key BETWEEN c1 AND c2" and c1 = c2 -> can access table t using "t.key = c1".
 2005-09-30 01:34:19 +04:00
pem@mysql.com
44b4e9fc82 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 16:41:46 +02:00
ramil@mysql.com
920e456549 fix for bug #13545: Server crash caused by select query. 2005-09-29 19:34:21 +05:00
georg@lmy002.wdf.sap.corp
e445a3d8e3 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0
 2005-09-29 16:15:00 +02:00
pem@mysql.com
9f20feea5b Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 14:35:08 +02:00
gluh@mysql.com
b36f63e3ab 4.1 -> 5.0 merge 2005-09-29 16:35:50 +05:00
gluh@eagle.intranet.mysql.r18.ru
f9762c47d0 Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment 
"CHARACTER SET", "COLLATE", and "DEFAULT" are always
  printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
  "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
  if NO_FIELD_OPTIONS is not set.
 2005-09-29 16:17:45 +05:00
bar@mysql.com
7fe434098e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-09-29 16:07:33 +05:00
georg@lmy002.wdf.sap.corp
2e05b3b125 Fix for bug #13451 (memleak in rename view) after Dmitri's review: 
- call explicitly destructor for view's LEX
- cs fixes
 2005-09-29 12:29:58 +02:00
jan@hundin.mysql.fi
43b2dc617b Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/mysql-5.0
 2005-09-29 13:15:09 +03:00
pem@mysql.com
66fa4ffbdf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 11:37:28 +02:00
marko@hundin.mysql.fi
d426c109f4 Minor corrections to InnoDB function comments 2005-09-29 12:37:27 +03:00
msvensson@neptunus.(none)
9b7a3bec70 Bug #13231 mysqltest: fails to dectect when mysql_next_result fails 
- Packets out of order when reading cached data stored by a normal select from a ps or vice versa.
 - Add pkt_nr to query cache flags
 2005-09-29 10:25:44 +02:00
jan@hundin.mysql.fi
6734ca6cbe Fixed a bug checksum table locks the InnoDB table and does not use a 
consistent read (Bug #12669). This fixes InnoDB part of the bug.
 2005-09-29 08:34:38 +03:00
brian@zim.(none)
db486f4da1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/archive-move
 2005-09-28 19:07:43 -07:00
brian@zim.(none)
da101b3b5a Moving archive from example to sql. 2005-09-28 19:04:51 -07:00
kent@mysql.com
656b0cc15a Merge 2005-09-29 03:20:31 +02:00
kent@mysql.com
844d964f2d Many files: 
Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h
 2005-09-29 02:08:24 +02:00
evgen@moonbone.local
1bf2fbdb35 select.result, item.cc: 
After merge fix for bug#13356
 2005-09-28 21:30:10 +04:00
msvensson@neptunus.(none)
8ccd9e37ad Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 18:23:23 +02:00
dlenev@mysql.com
6f7928c293 Fix for bug #13546 "Build errors with --with-embedded-server 
--with-embedded-privilege-control options". One more (hopefully last) build
failure which was introduced during work on WL#2787 "Add view definer/owner
to the view definition..."
 2005-09-28 18:43:46 +04:00
msvensson@neptunus.(none)
13161c2a84 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 15:32:05 +02:00
msvensson@neptunus.(none)
60e5493d5d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 13:30:33 +02:00
osku@127.(none)
d440270dcd InnoDB: Remove compiler warnings. 2005-09-28 14:26:33 +03:00
jan@hundin.mysql.fi
dc80450410 Fixed a bug checksum table locks the InnoDB table and does not use a 
consistent read (Bug #12669).
 2005-09-28 14:14:49 +03:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 11:34:53 +02:00
bar@mysql.com
6e88f14eea Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-09-28 11:51:03 +05:00
evgen@moonbone.local
4f4711bd49 Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items. 
resolve_const_item() assumed to be not called for Item_row items. For
ensuring that DBUG_ASSERT(0) was set there.

This patch adds section for Item_row items. If it can it recursively calls
resolve_const_item() for each item the Item_row contains. If any of the
contained items is null then whole Item_row substitued by Item_null. Otherwise
it just returns.
 2005-09-28 00:58:12 +04:00
serg@serg.mylan
6716d16bc7 CHECKSUM TABLE now allows concurrent inserts 2005-09-27 20:11:09 +02:00
pem@mysql.com
2f3682db7e Fixed BUG#12589: Assert when creating temp. table from decimal stored 
procedure variable
  Second version, after review.
  Keep the unsigned_flag in Item_decimal updated. Note that this also changed
  the result of several old test results - creating tables from decimal
  templates now gives unsigned columns and different sizes. (Several tests
  had Length > Max_length before.)
 2005-09-27 17:07:28 +02:00
hf@deer.(none)
9b88d25247 additional fix to the bug #13372 (decimal union) 2005-09-27 15:31:38 +05:00
hf@deer.(none)
7f3e2dc48d Fix for bug #13372 (decimal union) 2005-09-27 15:11:39 +05:00
igor@rurik.mysql.com
6e2fb27af6 item.cc: 
Fixed bug #13410.
  Fixed name resolution for qualified reference to a view column
  in the HAVING clause.
view.result, view.test:
  Added a test case for bug #13410.
 2005-09-26 23:29:02 -07:00
igor@rurik.mysql.com
75c43f9663 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-09-26 20:28:49 -07:00
igor@rurik.mysql.com
a43b341c8a sql_base.cc, item.cc: 
Fixed bug #13411.
  Fixed name resolution for non-qualified reference to a view column
  in the HAVING clause.
view.result, view.test:
  Added a test case for bug #13411.
 2005-09-26 20:18:59 -07:00
pem@mysql.com
6ac4c47f7b Fixed BUG#6127: Stored procedure handlers within handlers don't work 
Replaced the dumb in-handler/not-in-handler check with a proper recursion
    check of handlers being executed.
    (Re-commit in a different tree, to make push possible.)
 2005-09-26 18:22:00 +02:00
evgen@moonbone.local
0032165acf Fix bug #13424 locking view with query cache enabled crashes server 
For LOCK view is opened but not prepared thus leaving 'table' field set to
NULL. invalidate_locked_for_write() wasn't checking that and call to 
invalidate_table(NULL) crashes server.

To invalidate_locked_for_write() added check that ensures that table is
completely opened.
 2005-09-26 19:08:26 +04:00
lars@mysql.com
9528d0aefd Fixed gcc error on AMD64: cast from 'char*' to 'unsigned int' loses precision 2005-09-26 16:49:18 +02:00
hf@deer.(none)
6890eae9e5 Merging 2005-09-26 13:15:01 +05:00
monty@mysql.com
ea6d5f9ec3 Fixed error found during review of new pushed code 2005-09-25 21:22:23 +03:00
serg@serg.mylan
4b24f83f8f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-25 16:07:13 +02:00
sergefp@mysql.com
2294c9b57a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13317
 2005-09-25 01:36:26 +04:00
serg@serg.mylan
e9d8f0940b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-24 21:45:30 +02:00
sergefp@mysql.com
061d660615 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-merge-sept24
 2005-09-24 03:33:26 +04:00
monty@mysql.com
6c6a25e9d7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2005-09-24 02:32:34 +03:00
sergefp@mysql.com
9a05a887de Manually merged 2005-09-24 02:39:52 +04:00
sergefp@mysql.com
d0a97917a2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug13419
 2005-09-24 01:55:09 +04:00
jimw@mysql.com
844d1244d7 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-23 14:44:41 -07:00
sergefp@mysql.com
d90b988da7 BUG#12232: Addressing docs team feedback: s/inequal/unequal/ 2005-09-24 01:39:50 +04:00
paul@kite-hub.kitebird.com
67a643f931 mysqld.cc: 
Fix out-of-order status variable.
 2005-09-23 15:59:32 -05:00
jimw@mysql.com
e80673d69d Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-23 13:59:14 -07:00
paul@kite-hub.kitebird.com
b83f29d56d mysqld.cc: 
Fix out-of-order status variable.
 2005-09-23 14:14:34 -05:00
jani@a193-229-222-105.elisa-laajakaista.fi
8d3036c35e Some minor fixes revealed as warnings by 
Intel compiler.
 2005-09-23 21:28:56 +03:00
dlenev@mysql.com
19b2cd58e8 Fix for yet another compilation failure on Windows which was introduced during 
work on WL#2787 "Add view definer/owner to the view definition (.frm) to check
privileges on used tables and stored routines when using a VIEW."
(aka bug #13402 "Windows VS 2003 Compiler error")
 2005-09-23 21:28:47 +04:00
jimw@mysql.com
3cd331c29f Merge mysql.com:/home/jimw/my/mysql-5.0-13361 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-23 10:03:29 -07:00
dlenev@mysql.com
d68f3ea17d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13407
 2005-09-23 18:30:08 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
acf218b708 Several fixes revelaled by Intel compiler. 2005-09-23 16:47:08 +03:00
osku@127.(none)
93671fb91e Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql/5.0/clean
 2005-09-23 16:46:59 +03:00
osku@127.(none)
d563a01afe Merge 127.(none):/home/osku/mysql/5.0/clean 
into  127.(none):/home/osku/mysql/5.0/3443
 2005-09-23 16:44:25 +03:00
osku@127.(none)
d61708d1c9 Fix bug #3443, better foreign key error messsages. 2005-09-23 16:22:27 +03:00
dlenev@mysql.com
77ac122350 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13407
 2005-09-23 17:10:05 +04:00
msvensson@neptunus.(none)
22c1bb4e6d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-23 14:38:26 +02:00
msvensson@neptunus.(none)
d55eeed8fd Merge from 4.1 to 5.0 2005-09-23 14:37:22 +02:00
serg@serg.mylan
d4eaa0ecc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-23 14:36:38 +02:00
osku@127.(none)
06077eb1eb InnoDB: Minor fixes. 2005-09-23 14:31:31 +03:00
sergefp@mysql.com
40ba88ca07 Fix for BUG#13419: In "ref" optimizer, take into account that item=Item_func_in(x,y) is 
not equivalent to "x=y" when item->negated == TRUE.
 2005-09-23 13:43:20 +04:00
osku@127.(none)
945ea8a98b Merge 127.(none):/home/osku/mysql/5.0/clean 
into  127.(none):/home/osku/mysql/5.0/13315
 2005-09-23 11:22:05 +03:00
osku@127.(none)
e6b3261556 InnoDB: Fix bug #13315, index columns having a maximum length of 767. 2005-09-23 11:20:34 +03:00
bar@mysql.com
1c38733f4a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-09-23 12:57:40 +05:00
msvensson@neptunus.(none)
02c7645cc1 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-23 09:18:56 +02:00
brian@zim.(none)
f5c00b0dbd Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/fix-5.0
 2005-09-22 19:46:16 -07:00
brian@zim.(none)
8eea3e5be0 This fixed bug 13369. Note, I dislike goto's as well. 
The alias structure now is a bit more simple and just uses a pointer to replace with the currect name. The giant case statement should go away in the next patch.
 2005-09-22 16:58:09 -07:00
konstantin@mysql.com
2d4c54ba1b Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-09-23 00:46:59 +04:00
dlenev@mysql.com
87dcb3c6f5 Fix for bug #13407 "Remote connecting crashes server" and couple of similar 
problems which were introduced during work on WL#2787 "Add view definer/owner
to the view definition (.frm) to check privileges on used tables and stored
routines when using a VIEW."

In some cases it is better to use value from Security_context::host_or_ip
instead of value from Security_context::host since the latter can be NULL
in certain situations (When we can't resolve hostname or we have not done
this yet).
 2005-09-22 23:03:53 +04:00
jimw@mysql.com
90d6195f04 Fix handling of NULL values in decimal fields in FORMAT(). (Bug #13361) 2005-09-22 11:40:22 -07:00
joerg@mysql.com
cb77a6accb Fixes needed to build 5.0.13 on Windows: 
- reflect two "Makefile.am" changes in the respective "VC project" files,
- correct a typo in a (normally) unused macro parameter.
 2005-09-22 18:57:07 +02:00
serg@serg.mylan
40c43365c5 fixed a memory leak in ha_tina.cc 2005-09-22 16:05:05 +02:00
marko@hundin.mysql.fi
ff8127ffaa InnoDB: correct two misleading comments 2005-09-22 13:09:14 +03:00
ramil@mysql.com
5cf4eb0e26 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b11553
 2005-09-22 13:05:48 +05:00
gluh@eagle.intranet.mysql.r18.ru
88ef33e542 Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting 
set auto_increment_field_not_null to true to preserve zero values
  for autoincrement fields during LOAD DATA execution if 
  NO_AUTO_VALUE_ON_ZERO sql mode is set
 2005-09-22 12:46:01 +05:00
ramil@mysql.com
92306dd089 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b11553
 2005-09-22 11:46:54 +05:00
ramil@mysql.com
66929c9540 a fix (#11553: gives error if aggregate user-defined function in HAVING clause). 2005-09-22 11:45:16 +05:00
ramil@mysql.com
d9eb8958a2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b11553
 2005-09-22 11:39:01 +05:00
monty@mysql.com
82fc54781b Fixed problems found by valgrind 
Fixed problems in test suite where some test failed
Fixed access to not initialized memory in federated
Fixed access to not initialized memory when using BIT fields in internal temporary tables
 2005-09-22 03:23:07 +03:00
evgen@moonbone.local
2ba1eb1486 Manual merge 2005-09-22 02:38:14 +04:00
konstantin@mysql.com
6f8d3c4844 A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and 
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
 2005-09-22 02:11:21 +04:00
evgen@moonbone.local
5065d73ebb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13180-bug-4.1-mysql
 2005-09-22 01:48:39 +04:00
evgen@moonbone.local
b7e8c8b112 Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing. 
thd->allow_sum_func was left 'true' after previous statement thus allowing
sum funcs to be present in conditions.

thd->allow_sum_func should be set to 0 for each query and each prepared
statement reinitialization. This is done in lex_start() and 
reset_stmt_for_execute().
 2005-09-22 01:38:39 +04:00
bar@mysql.com
d870612ac0 Bug#13046: LIKE pattern matching using prefix 
index doesn't return correct result
item_cmpfunc.cc:
  Use charset of LIKE to decide whether
  to use 8bit or Unicode "escape" value.
  But use charset of "escape" to scan escape character.
strings/ctype-xxx.c:
  We cannot reduce "end" pointer using charpos(),
  because of possible escape characters in the string.
  Limit the loop using count of written characters instead.
ctype_like_escape.inc:
  new file
mysql-test/t/ctype_xxx:
mysql-test/r/ctype_xxx:
  Adding test case.
 2005-09-21 23:10:51 +05:00
sergefp@mysql.com
7c590486d3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13317
 2005-09-21 21:39:45 +04:00
sergefp@mysql.com
7aca974fc8 Fix for BUG#13317: Make range optimizer able to produce ranges for "view.field IN (c1,c2)" 
and "view.field BETWEEN c1 AND c2"
 2005-09-21 21:36:15 +04:00
timour@mysql.com
ba9e3ca1a4 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into  mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-09-21 18:58:39 +03:00
serg@serg.mylan
306aa15391 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
 2005-09-21 17:42:44 +02:00
serg@serg.mylan
3b41e3362b aftermerge fix 2005-09-21 17:38:26 +02:00
monty@mysql.com
aaecf69525 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2005-09-21 17:28:51 +03:00
monty@mysql.com
1bd2beff5a Ensure that hex strings are used as integers in cast(... signed/unsigned) 
This fixes the new report for bug #7036
 2005-09-21 17:28:25 +03:00
msvensson@neptunus.(none)
0581a7f23c Bug #13231 mysqltest: fails to dectect when mysql_next_result fails 
- Added functionality to check errors returned from mysql_next_result
 - Exit from mysqltest when and unexpected error occurs.
 - The above fixes reveal problems with rpl000009, sp-error and query_cache-
 - Fix sp-error by adding an expected error
 - Fix rpl000009 by not sending "ok" from mysql_create_db when called with silent flag from load_master_data
 - Fix query_cache in separate patch
 2005-09-21 15:28:28 +02:00
jonas@perch.ndb.mysql.com
d1ee898d34 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-09-21 14:39:28 +02:00
jonas@perch.ndb.mysql.com
05d875f8c1 sql/item_func.cc 
remove extra ";" after function
 2005-09-21 14:36:55 +02:00
serg@serg.mylan
a083ff160e merged 2005-09-21 13:53:22 +02:00
jonas@perch.ndb.mysql.com
f35c49f748 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-21 13:22:59 +02:00
jonas@perch.ndb.mysql.com
6ed4539561 ndb post merge fixes (show engine ndb status) 2005-09-21 13:22:27 +02:00
serg@serg.mylan
23f35495ac merged 2005-09-21 12:37:51 +02:00
ramil@mysql.com
986a51e447 a fix (bug #7589: Decimal types are ignored when updating data from another column). 2005-09-21 14:32:19 +05:00
timour@mysql.com
6ae8a56f72 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into  mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-09-21 09:53:42 +03:00
timour@mysql.com
633d118d01 Fix for BUG#12882 - min/max inconsistent on empty table. 
The problem was in that the MIN/MAX optimization in opt_sum_query was
replacing MIN/MAX functions with their constant argument without
taking into account that a query has no result rows.
 2005-09-21 09:49:19 +03:00
bell@sanja.is.com.ua
e6cb720095 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
 2005-09-21 08:31:20 +03:00
bell@sanja.is.com.ua
506c6eb922 postmerge fixes 2005-09-21 08:29:47 +03:00
brian@zim.(none)
e3c87e16ae Fixed a typo in handler.cc if CSV was built. I also added CSV to the default MAX builds so that more people test it. 2005-09-20 15:26:10 -07:00
sergefp@mysql.com
a26e1b7280 Merge mysql.com:/home/psergey/bk-trees/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
 2005-09-21 02:20:55 +04:00
sergefp@mysql.com
f9475d1d15 BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index 
statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)
 2005-09-21 02:18:29 +04:00
bell@sanja.is.com.ua
3f66053a50 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
 2005-09-20 21:27:28 +03:00
bell@sanja.is.com.ua
c1b185f5ff WL#2787 (Add view definer/owner to the view definition (.frm) to check privileges on used tables and stored routines when using a VIEW.) 
Part 2 postreview fixes.
 2005-09-20 21:20:38 +03:00
evgen@moonbone.local
6383ab91db Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/12812-bug-5.0-mysql
 2005-09-20 21:36:43 +04:00
evgen@moonbone.local
b7c42a65d1 item_func.cc: 
Fixed mistake in fix for bug#12812
 2005-09-20 21:35:57 +04:00
guilhem@mysql.com
388cf622ee Fix fur BUG#13348: "multi-table updates and deletes are not logged if no rows were affected". 
Not fixed in 4.1 as not critical. Also I'm correcting error checking of multi-UPDATE/DELETE
when it comes to binlogging, to make it consistent with when we rollback the statement.
 2005-09-20 17:41:47 +02:00
tomas@poseidon.ndb.mysql.com
d0c578294e Bug #10694 LOAD DATA FROM INFILE fails with 'Out of operation records' 2005-09-20 14:20:02 +02:00
jonas@perch.ndb.mysql.com
34eba4b439 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-20 13:04:30 +02:00
timour@mysql.com
ad53c58eb5 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-13127
 2005-09-20 14:03:50 +03:00
timour@mysql.com
e609eac0d9 Fix for BUG#13127. 
The problem was in the way table references are pre-filtered when
resolving a qualified field. When resolving qualified table references
we search recursively in the operands of the join. If there is
natural/using join with a merge view, the first call to find_field_in_table_ref
makes a recursive call to itself with the view as the new table reference
to search for the column. However the view has both nested_join and
join_columns != NULL so it skipped the test whether the view name matches
the field qualifier. As a result the field was found in the view since the
view already has a field with the same name. Thus the field was incorrectly
resolved as the view field.
 2005-09-20 14:00:39 +03:00
jonas@perch.ndb.mysql.com
09c88914e2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-20 12:22:31 +02:00
jonas@perch.ndb.mysql.com
75cc4ef28a ndb - post merge fixes 2005-09-20 12:07:18 +02:00
ramil@mysql.com
6f64f66d8b a fix (bug #11553: gives error if aggregate user-defined function in HAVING clause). 2005-09-20 14:28:23 +05:00
jonas@perch.ndb.mysql.com
2119a88abe Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2005-09-20 10:46:33 +02:00
jonas@perch.ndb.mysql.com
8983e39070 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-09-20 09:50:10 +02:00
brian@zim.(none)
c10323fdf2 Cleanups for storage engine patch. Changed two test results to now reflect the changes in storage engines and a couple of comment changes in the code. 2005-09-19 22:08:22 -07:00
evgen@moonbone.local
e9c3396cd4 Manual merge 2005-09-20 03:31:00 +04:00
evgen@moonbone.local
de4e941e3f Fix bug #12812 create view calling a function works without execute right on function 
Execution rigths on function was checked just before function execution,
thus it was unknown on prepare stage whether user have right to execute 
particular function.

Added access rights checking function which is called right after fixing
Item_func_sp.
This have additional effect that if user don't have rights for execution
query will fail on earlier stage and will not waste resources on optimizing
with failing on execution stage.
 2005-09-20 03:05:35 +04:00
sasha@asksasha.com
c4f16269f3 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
 2005-09-19 15:45:01 -06:00
brian@zim.(none)
4dace2c4e0 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-09-19 12:12:41 -07:00
brian@zim.(none)
616c324436 Cleanup for handlerton structure to allow for loadable engine work. This is the first in a series of patches. 2005-09-19 12:06:23 -07:00
tulin@dl145b.mysql.com
c753d587ca Corrected last fix for 
Bug #13152 bit fields and fields that follow become corrupted when dumped from NDB tables
 2005-09-19 15:52:57 +02:00
jonas@perch.ndb.mysql.com
668a192ce5 ndb - imlp. show engine ndb status; 
that dump free list allocation per connection
 2005-09-19 15:35:07 +02:00
bar@mysql.com
6424e9cce1 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b10504
 2005-09-19 09:46:25 +05:00
georg@lmy002.wdf.sap.corp
541d3ae89b Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master
 2005-09-19 05:32:38 +02:00
evgen@moonbone.local
afa8187fb7 Fix bug #13218: InnoDB: using a partial-field key prefix in search 
This is backport from 5.0 of fix for bug #11039
 2005-09-19 04:39:49 +04:00
georg@lmy002.wdf.sap.corp
53a7bbf7ca Changes after discussion/review with Sanja 2005-09-18 21:43:28 +02:00
sasha@asksasha.com
c87bc3ef64 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
 2005-09-17 18:46:54 -06:00
georg@lmy002.wdf.sap.corp
afe8dcf2e7 Fix for bug#5508 after Sanja's review 2005-09-16 17:13:21 +02:00
evgen@moonbone.local
72f530ef3d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/12291-bug-5.0-mysql
 2005-09-16 16:08:11 +04:00
kent@mysql.com
19bae53ddc log.cc: 
Cast my_munmap() argument to be able to compile on Solaris
 2005-09-16 12:02:19 +02:00
bell@sanja.is.com.ua
c5ff0d6953 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-16 09:20:00 +03:00
bell@sanja.is.com.ua
27aa2ae30c fixed length detection 2005-09-16 09:15:45 +03:00