mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24702 commits 2781 branches 343 tags 1.6 GiB
Commit graph

24702 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@mysql.com
6fd6fa517b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-14 17:49:19 +05:00
bar@mysql.com
c64128cc58 item.cc: 
After merge fix.
 2005-07-14 17:48:17 +05:00
reggie@linux.site
adfa1a2596 Bug #7403 error "Forcing close of thread 1 user: 'xxx'" 
The problem was that on Windows, the socket was in a blocking state 
trying to read.  Setting killed=1 is not enough to break the 
socket out of it's read loop.   You have to cancel the read request
or close the socket (which close_connection does).
 2005-07-14 06:04:29 -06:00
konstantin@mysql.com
b51edd3775 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new
 2005-07-14 15:33:41 +04:00
konstantin@mysql.com
509531421c Implement MarkM optimization request to avoid redundnat packet exchange 
in cursors.
 2005-07-14 15:27:24 +04:00
konstantin@mysql.com
d4df2660c6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2005-07-14 15:14:40 +04:00
konstantin@mysql.com
62b8e6fdd1 A fix and a test case for Bug#9735. 
No separate typecode for MEDIUMTEXT/LONGTEXT is added, as we
have no sound decision yet what typecodes and for what types are
sent by the server (aka what constitutes a distinct type in MySQL).
 2005-07-14 15:13:23 +04:00
bar@mysql.com
7d405e3c65 Merge mysql.com:/usr/home/bar/mysql-4.1.num-conv 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-14 16:11:55 +05:00
gluh@eagle.intranet.mysql.r18.ru
f302759522 valgrind error fix(uninitialiased variable) 
removed unnecessary operation
 2005-07-14 15:42:36 +05:00
reggie@linux.site
03a6d0c731 fixed function sig so it will compile with Visual C++ 8 2005-07-14 03:49:54 -06:00
bar@mysql.com
1b612b0006 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.num-conv
 2005-07-14 10:46:15 +05:00
konstantin@mysql.com
3cf9a4c4fc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 01:39:40 +04:00
konstantin@mysql.com
e0b9e35484 Post-merge fixes. 2005-07-14 01:19:52 +04:00
dlenev@mysql.com
f4d27c75e6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
 2005-07-14 01:02:34 +04:00
konstantin@mysql.com
7b507e8bb0 Merge mysql.com:/opt/local/work/mysql-4.1-9379 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 00:52:57 +04:00
joerg@mysql.com
aa2d5ee550 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-07-13 22:20:40 +02:00
konstantin@mysql.com
ef1e748ef1 A test case for Bug#9442 "Set parameter make query fail if column 
character set is UCS2".
The bug is no longer repeatable.
 2005-07-14 00:15:23 +04:00
joerg@mysql.com
557f0b74f4 Merging separate commits into 5.0.9-beta build clone and general BK tree. 
Tagging the 5.0.9-beta release.
 2005-07-13 22:15:05 +02:00
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
b6da7f6227 Merge mysql.com:/opt/local/work/mysql-4.1-9379 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-13 23:49:45 +04:00
konstantin@mysql.com
1755df7649 A fix and a test case for Bug#9379 (collation of a parameter marker is 
binary).
 2005-07-13 23:43:46 +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
bar@mysql.com
5150fdcc04 ctype_utf8.result: 
adding test case
sql_table.cc:
  sql_table.cc:
  - do not create a new item when charsets are the same
  - return ER_INVALID_DEFAULT if default value cannot
    be converted into the column character set.
item.cc:
  - Allow conversion not only to Unicode,
    but also to and from "binary".
  - Adding safe_charset_converter() for Item_num
    and Item_varbinary, returning a fixed const Item.
 2005-07-13 13:00:17 +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