Commit graph

26577 commits

Author SHA1 Message Date
SergeyV@selena.
988c8e92d8 Small update for lock functions used in my_cgets() 2005-09-20 20:03:51 +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
b49ec75b42 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:52:42 +02: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
jani@a193-229-222-105.elisa-laajakaista.fi
b942a98b76 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
2005-09-20 12:43:48 +03: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
mskold@mysql.com
f852307d8e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-09-20 10:35:47 +02:00
mskold@mysql.com
cb4745591f Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in this were not counted, giving incorrect memory consumption 2005-09-20 10:34:00 +02:00
jonas@perch.ndb.mysql.com
e813de6883 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 10:21:24 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f5f6045a3 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
2005-09-20 10:58:15 +03: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
jani@a193-229-222-105.elisa-laajakaista.fi
1a29e7b084 Fixed a missing cast. 2005-09-20 09:17:04 +03:00
brian@zim.(none)
6b32d44d31 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-09-19 22:09:42 -07: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
reggie@fedora.(none)
93e5a46c5d More fixes to the VC 7.1 solution and vcproj files 2005-09-19 23:23:23 -05:00
evgen@moonbone.local
e9c3396cd4 Manual merge 2005-09-20 03:31:00 +04:00
petr@mysql.com
914aa5d431 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-09-20 03:15:32 +04:00
petr@mysql.com
6168d0d52c fix warnings 2005-09-20 03:14:07 +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
jonas@perch.ndb.mysql.com
992620318c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-20 00:26:23 +02:00
jonas@perch.ndb.mysql.com
ad61da4fbe 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 00:26:12 +02:00
jonas@perch.ndb.mysql.com
3d520d22ce 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 00:25:33 +02: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
evgen@moonbone.local
9fe540fa13 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13218-bug-4.1-mysql
2005-09-19 23:46:39 +04: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
jani@a193-229-222-105.elisa-laajakaista.fi
468610635b Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-19 20:56:14 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
7c57c41a06 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-19 19:33:59 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
a8bdf632d3 Fixed Bug#13275 mysqltest empty file bug 2005-09-19 18:45:22 +03: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
kent@mysql.com
654277084c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-19 15:31:09 +02:00
jonas@perch.ndb.mysql.com
5c836e2ab7 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-19 15:00:13 +02:00
kent@mysql.com
76956fdf90 mysql-test-run.pl:
Added flag --valgrind-mysqltest
2005-09-19 14:58:06 +02:00
jonas@perch.ndb.mysql.com
e358a81710 bug#9282 - ndb
big delete from causing NdbObjectIdMap::expand at same time 
  as receiver thread perform getObjectId
2005-09-19 14:05:54 +02:00
kent@mysql.com
cfba073cc4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-19 12:31:22 +02:00
bar@mysql.com
d7f96c50ae ctype_utf8.result, ctype_utf8.test:
Bug#10504: additional test
2005-09-19 09:48:03 +05: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
paul@snake-hub.snake.net
15bf8f6ada Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
2005-09-18 13:24:27 -05:00
paul@snake-hub.snake.net
e54e17635d Merge snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2005-09-18 13:22:10 -05:00
paul@snake-hub.snake.net
1cac0cb6f1 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
2005-09-18 13:18:09 -05:00