mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24680 commits 2790 branches 343 tags 1.7 GiB
Commit graph

24680 commits

This branch
This branch
All branches
Author SHA1 Message Date
konstantin@mysql.com
3274b050bc Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-15 00:31:09 +04:00
konstantin@mysql.com
7646850173 Hastily remove an occasionally checked in symlink :( 2005-07-15 00:26:19 +04:00
lenz@mysql.com
189d432d6a Merge mysql.com:/space/my/mysql-4.1.13-clone 
into mysql.com:/space/my/mysql-5.0-build
 2005-07-14 22:25:27 +02:00
konstantin@mysql.com
8375f76306 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2005-07-15 00:20:04 +04:00
lenz@mysql.com
c301935ed8 Merge mysql.com:/space/my/mysql-4.1.13-clone 
into mysql.com:/space/my/mysql-4.1-build
 2005-07-14 22:17:36 +02:00
konstantin@mysql.com
a2b11ff266 A fix and a test case for Bug#11299 "prepared statement makes wrong SQL 
syntax in binlog which stops replication":
disallow the use of parameter markers which can lead to generation
of malformed binlog queries.
 2005-07-15 00:01:49 +04:00
lenz@mysql.com
b5379c44a6 Merge mysqldev@production:my/mysql-4.1-release 
into mysql.com:/space/my/mysql-4.1.13-clone
 2005-07-14 18:13:14 +02:00
tomas@poseidon.ndb.mysql.com
ec52d680d2 misc (memleak) fixes: 
added using ndb_end and showing mem allocation stat at exit
    added init of variable
    added destruction of LocalConfig to still memleak
    added delete of theFacade on exit
    stopSessions(true) on socket server to ensure destuction of threads
    added destruction of arbit manager thread
    added true option to stopSessions in transporter facade to ensure destructions of threads
 2005-07-14 18:08:01 +02:00
tomas@poseidon.ndb.mysql.com
8afeb337f0 BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener 
+ added close of some fd's
    + debug prints
 2005-07-14 18:04:44 +02:00
konstantin@mysql.com
4ede973594 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new
 2005-07-14 20:02:38 +04:00
konstantin@mysql.com
36810d25f3 Post-merge fixes. 2005-07-14 20:02:37 +04:00
konstantin@mysql.com
1da2b9b4d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new
 2005-07-14 20:02:36 +04:00
konstantin@mysql.com
4099582be2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 20:02:35 +04:00
reggie@linux.site
342dc0c7b4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  linux.site:/home/reggie/bk/mysql-4.1
 2005-07-14 10:02:34 -06:00
konstantin@mysql.com
1c142ee631 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 20:02:34 +04:00
konstantin@mysql.com
a1270b65db A fix and a test case for Bug#11183 "mysql_stmt_reset() doesn't reset 
information about error".
 2005-07-14 20:02:33 +04:00
tomas@poseidon.ndb.mysql.com
9be420ee10 stilled mem leak in usage on getVersionString 
added __LINE__ so systemErrorLab for better error printout
 2005-07-14 18:02:33 +02:00
konstantin@mysql.com
3f28ad8eb7 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 20:02:32 +04:00
tomas@poseidon.ndb.mysql.com
96a80fd220 added debug prints 2005-07-14 18:02:32 +02:00
konstantin@mysql.com
3892f1d298 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2005-07-14 20:02:31 +04:00
sergefp@mysql.com
86d3c07836 Merge mysql.com:/home/psergey/mysql-4.1-build-tree 
into mysql.com:/home/psergey/mysql-4.1-merge-from-build
 2005-07-14 16:02:30 +00:00
lenz@mysql.com
63ffc74532 - suppress warning when running this test with a "classic" build (which does not 
include InnoDB)
 2005-07-14 17:50:33 +02:00
konstantin@mysql.com
9c6f14aa3d Get rid of checking for ETIME return value of pthread_cond_timedwait. 
ETIME was returned by cond_timedwait (sic, the pre-POSIX1001b function) on 
Solaris 2.6 and 2.7. pthread_cond_timedwait on Solaris returns ETIMEDOUT.
The standard requirement is that the only additional return value
of pthred_cond_timedwait compared to pthread_cond_wait is ETIMEDOUT.
Let us not bloat the application code with redundant checks,
and if we're ever to work on a platform that returns a non-standard 
value, we should write a wrapper for that platform (like we do, e.g., for
Windows).
 2005-07-14 19:42:56 +04:00
ramil@mysql.com
be233935cc fix for #11808 backported. 2005-07-14 20:19:27 +05:00
sergefp@mysql.com
0b3db181bf Fix for BUG#11869: In Item_func_match::fix_index() handle the case when there is no 
source table present (this happens for ORDER BY after UNION)
 2005-07-14 15:19:26 +00:00
sergefp@mysql.com
e1273aec6d Fix for BUG#11700: in add_not_null_conds(), call full fix_fields() for the created NOT NULL. 
This is needed because in some cases range optimization is performed twice and added 
  NOT NULL item must have correct const_table_map() value.
 2005-07-14 15:13:36 +00:00
hf@deer.(none)
8f9a268a1c Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-07-14 19:12:03 +05:00
hf@deer.(none)
1969a1622e Fix for bug #10929 (type_newdecimal.test requires InnoDB) 2005-07-14 18:51:05 +05:00
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