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
24526 commits 2793 branches 343 tags 1.7 GiB
Commit graph

24526 commits

This branch
This branch
All branches
Author SHA1 Message Date
dlenev@mysql.com
200c751df8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
 2005-07-14 00:11:15 +04:00
dlenev@mysql.com
14b93bf18a Now when we create or drop trigger we will open only subject table and not 
all tables suggested by prelocking algorithm.
Added test for bug #11889 "Server crashes when dropping trigger using stored
routine" (which was fixed by previous patch).
 2005-07-13 23:51:09 +04:00
konstantin@mysql.com
a25c4ead10 Merge mysql.com:/opt/local/work/mysql-4.1-11458 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-13 18:23:20 +04:00
konstantin@mysql.com
f913594343 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-13 18:15:29 +04:00
konstantin@mysql.com
2ba359147f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-11458
 2005-07-13 18:09:14 +04:00
konstantin@mysql.com
618f7d9449 Merge mysql.com:/opt/local/work/mysql-4.1-11458 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-13 18:05:57 +04:00
konstantin@mysql.com
2dc2ec3ef7 Cleanup after test for Bug#11458 2005-07-13 18:01:04 +04:00
joerg@mysql.com
ae949ccdd5 4.1.13 has been cloned off 2005-07-13 15:55:22 +02:00
konstantin@mysql.com
374b9182af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-11458
 2005-07-13 17:39:48 +04:00
konstantin@mysql.com
bef558b7ee - a fix for Bug#11458 "Prepared statement with subselects return random 
data": remove the fix for another bug (8807) that
added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
to prevent their evaluation at prepare. As this bit hanged in 
Item_subselect::used_tables_cache for ever, a constant subquery with
a placeholder was never evaluated as such, which caused wrong 
choice of the execution plan for the statement.
- to fix Bug#8807 backport a better fix from 5.0
- post-review fixes.
 2005-07-13 17:38:55 +04:00
marko@hundin.mysql.fi
bf7b47d92e sql_update.cc: 
mysql_update(): Call handler::unlock_row()
  also in the first while loop.
  This patch is from Heikki,
  and it was approved by Sergei Golubchik.
 2005-07-13 16:13:36 +03:00
dlenev@mysql.com
4a5c65e146 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
 2005-07-13 16:43:13 +04:00
dlenev@mysql.com
a37eea1993 Fixed trigger.test after fixing bug #11554 "Server crashes on statement 
indirectly using non-cached function".
 2005-07-13 16:22:36 +04:00
mats@mysql.com
2588b7e51d Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/bXXX-mysql-5.0
 2005-07-13 14:15:23 +02:00
mats@mysql.com
1826c39897 Bug#11905: Tables used in rpl_deadlock are not dropped at the 
end of the test, causing subsequent tests to fail.
 2005-07-13 13:49:35 +02:00
gluh@eagle.intranet.mysql.r18.ru
acf417a7e6 Post-merge fix 2005-07-13 16:08:14 +05:00
dlenev@mysql.com
8a28d604f5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
 2005-07-13 15:08:13 +04:00
gluh@mysql.com
b0ec1cd84e Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-07-13 16:08:13 +05:00
tomas@poseidon.ndb.mysql.com
738e0f15a4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-07-13 13:08:12 +02:00
tomas@poseidon.ndb.mysql.com
a2ffbb5515 Bug #11903, make perl test script run ndbcluster tests by default 2005-07-13 13:07:09 +02:00
dlenev@mysql.com
f334ea1fc6 Implementation of Monty's idea: Now we can open mysql.proc table for lookup 
of stored routines definitions even if we already have some tables open and
locked. To avoid deadlocks in this case we have to put certain restrictions
on locking of mysql.proc table.

This allows to use stored routines safely under LOCK TABLES without explicitly
mentioning mysql.proc in the list of locked tables. It also fixes bug #11554
"Server crashes on statement indirectly using non-cached function".
 2005-07-13 13:48:13 +04:00
gluh@eagle.intranet.mysql.r18.ru
672e1f20cb Bug #9854 hex() and out of range handling 
added out of range handling
 2005-07-13 14:23:09 +05:00
gluh@eagle.intranet.mysql.r18.ru
9c3349f5c6 Fix for bug#11685 SHOW TABLES; doesn't update Com_show_tables 2005-07-13 13:30:39 +05:00
ramil@mysql.com
6da9cf09c9 a fix (bug #11808: Test case 'mysql_client_test' fails in assert 'double_data == o_double_data') 2005-07-13 11:49:54 +05:00
lars@mysql.com
30b76e5d78 Manual merge 2005-07-13 04:00:55 +02:00
lars@mysql.com
ca2e52a34f Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-13 02:39:24 +02:00
kent@mysql.com
aab8220342 Merge 2005-07-13 02:39:23 +02:00
evgen@moonbone.local
693c7272f0 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-11709
 2005-07-13 04:39:22 +04:00
lars@mysql.com
6db2602ad0 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-13 02:13:04 +02:00
evgen@moonbone.local
d72f1c9b0c view.result, view.test: 
Fix for test case for bug#11709
 2005-07-13 04:10:19 +04:00
evgen@moonbone.local
bb1f81607c Merge 2005-07-12 23:24:35 +04:00
evgen@moonbone.local
de016ca78a Fix bug#11709 View was ordered by wrong column. 
When searching column to sort on, item was compared to field under view
column, but not the column itself. Because names of view column and underlaid
field may differ, it leads to possibly choosing wrong column for sorting on.

This patch makes Item_direct_view_ref::eq(Item *item,...) compare
item's name with it's own name proir to comparing to *ref item.
 2005-07-12 23:22:08 +04:00
lars@mysql.com
f19814bea6 Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-12 19:44:34 +02:00
igor@igor-inspiron.creware.com
4ffd18b4f2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/mysql-5.0
 2005-07-12 10:44:33 -07:00
joerg@mysql.com
e06e06ffeb Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-07-12 19:44:32 +02:00
igor@igor-inspiron.creware.com
db28fb113e view.test, view.result: 
Expanded the test case for bug #6120 to cover
  DROP VIEW / CREATE VIEW scenario.
sql_view.cc:
  Expanded the fix for bug #6120 to cover the case of
  DROP VIEW / CREATE_VIEW.
 2005-07-12 10:44:32 -07:00
igor@igor-inspiron.creware.com
7725eb3141 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/mysql-5.0
 2005-07-12 10:44:31 -07:00
joerg@mysql.com
58f12166e6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-07-12 19:44:31 +02:00
sergefp@mysql.com
83b84bc393 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug11821-merge
 2005-07-12 17:44:30 +00:00
sergefp@mysql.com
32a4e52d97 Fix for BUG#11821 manually merged 2005-07-12 17:11:24 +00:00
evgen@moonbone.local
7d20cad2db Merge 2005-07-12 20:49:43 +04:00
evgen@moonbone.local
dc5949b336 Fix bug #11399 Column alias was lost during view preraration. 
New item created in find_field_in_table() to fix view's item, was created 
without taking into account original item's alias. This patch checks if alias 
is set to the original item and if so sets it to newly created item.
 2005-07-12 20:45:34 +04:00
reggie@linux.site
c31d71c065 Fixed some vio code that was using ___WIN__ instead of __WIN__ 2005-07-12 10:31:09 -06:00
jimw@mysql.com
25deb84c0a Merge mysql.com:/home/jimw/my/mysql-4.1-11844 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-12 09:31:08 -07:00
jimw@mysql.com
60368919f9 Merge mysql.com:/home/jimw/my/mysql-4.1-11643 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-12 09:31:07 -07:00
lars@mysql.com
a2ed7cb257 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 18:31:06 +02:00
joerg@mysql.com
c208abe705 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-07-12 18:31:05 +02:00
lars@mysql.com
7d78f53e1c Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 18:31:05 +02:00
sergefp@mysql.com
670428f6e6 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug11821
 2005-07-12 16:31:04 +00:00
sergefp@mysql.com
55e70fd1f6 Fix for BUG#11821: Make Item_type_holder be able to work with MIN(field), 
MAX(field).
 2005-07-12 16:30:45 +00:00