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

19809 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
a147766815 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-02-14 14:18:02 -08:00
sergefp@mysql.com
919f2f2364 Merge mysql.com:/home/psergey/mysql-4.1-bug8218 
into mysql.com:/home/psergey/mysql-5.0-bug8218
 2005-02-14 23:47:31 +03:00
sergefp@mysql.com
021f9849ef Remove redundant DROP TABLE from test case 2005-02-14 23:45:48 +03:00
matthias@three.local.lan
24bd4aea52 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
 2005-02-14 18:48:50 +01:00
tomas@poseidon.ndb.mysql.com
495cb18ac1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-02-14 18:48:49 +01:00
matthias@three.local.lan
d6c5089e92 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
 2005-02-14 16:34:36 +01:00
marko@hundin.mysql.fi
e0e87d0c92 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/k/mysql-5.0
 2005-02-14 17:23:12 +02:00
heikki@hundin.mysql.fi
01872c239d Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-02-14 17:23:11 +02:00
gluh@gluh.mysql.r18.ru
29510ce029 Fix for bug#8156:information_schema and lowercase_table3 fail on OSX 
Can't repeat information_schema test failure
Fix for lowercase_table3 only
 2005-02-14 18:23:10 +03:00
tomas@poseidon.ndb.mysql.com
35de04dfac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-02-14 16:22:00 +01:00
heikki@hundin.mysql.fi
67392525e8 ha_innodb.cc: 
Fix a glitch reported by Guilhem: release the memory allocated for innodb_internal_... if innobase_init() fails; cleanups: in ha_innodb, you should use the InnoDB formatting style for the source code
 2005-02-14 16:00:15 +02:00
marko@hundin.mysql.fi
e868711319 InnoDB: Small improvements to earlier patch (fix Bug #7350 better), 
suggested in review by Heikki.
 2005-02-14 15:54:08 +02:00
mleich@mysql.com
cb56fcaa94 Removal of a not needed statement 2005-02-14 14:20:43 +01:00
matthias@three.local.lan
e8bf23c16a Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
 2005-02-14 10:23:53 +01:00
heikki@hundin.mysql.fi
71174327df row0mysql.c: 
Fix memory corruption bug reported by Georg Richter: if one created a table whose primary key contained at least 2 column prefixes, that could corrupt the memory heap of prebuilt_t
 2005-02-13 20:48:02 +02:00
kent@mysql.com
ba3f9acff6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-02-13 18:22:38 +01:00
hf@deer.(none)
958456caa3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-02-13 01:54:24 +04:00
hf@deer.(none)
5b3ea1ab89 Fix for bug 8416 (bigint test fails on PPC) 2005-02-13 01:36:35 +04:00
sergefp@mysql.com
c0c50efdef Fix for BUG#8218: 
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List.
 2005-02-12 22:58:54 +03:00
matthias@three.local.lan
7e885e8bc1 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
 2005-02-11 22:03:55 +01:00
marko@hundin.mysql.fi
9d785cd513 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0
 2005-02-11 20:59:19 +02:00
jimw@mysql.com
8252360221 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-02-11 10:58:48 -08:00
matthias@three.local.lan
9c7d94d408 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
 2005-02-11 17:57:35 +01:00
joerg@mysql.com
5d026d49be Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 2005-02-11 13:00:17 +01:00
ingo@mysql.com
46e6b73bee After merge fix. 2005-02-11 12:53:43 +01:00
ingo@mysql.com
601a4fdfa2 Merge 2005-02-11 11:59:35 +01:00
ingo@mysql.com
987731d8b7 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug8306
 2005-02-11 10:51:17 +01:00
joerg@mysql.com
21e3ff0e8a Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1 2005-02-11 10:40:10 +01:00
igor@rurik.mysql.com
a697e5da15 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-10 23:48:35 -08:00
igor@rurik.mysql.com
4ef431ad55 select.result: 
Adjusted results of the test case for bug #7520 for 4.1.
 2005-02-10 23:47:57 -08:00
igor@rurik.mysql.com
06ff30f6c0 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-10 22:17:18 -08:00
igor@rurik.mysql.com
8b3d59ad42 select.result, select.test: 
Added a test case for bug #7520.
table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.
 2005-02-10 22:15:38 -08:00
brian@zim.(none)
29af4dffe6 Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks... 2005-02-10 19:04:38 -08:00
jimw@mysql.com
ae1aa19576 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-02-10 15:09:44 -08:00
jimw@mysql.com
3d265e9777 Merge commit trigger 2005-02-10 14:32:01 -08:00
jimw@mysql.com
b3d2e434ee Merge bk-internal:/home/bk/mysql-4.0 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-02-10 14:23:05 -08:00
lars@mysql.com
8b9679de0e Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6749-4.1 2005-02-10 21:55:36 +01:00
lars@mysql.com
bef05eda10 BUG#6749: If there is no current database, then nothing should be binlogged if 
binlog-do-db or binlog-ignore-db are in effect.   (In the future 5.1? 5.0? I think 
each statement should be verified against the filtering criteria based on the database
it *uses* and not the *current* one.  But, right now the *current* database is what 
counts according to the semantics of the manual.)
 2005-02-10 21:23:48 +01:00
matthias@three.local.lan
54684534fd Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
 2005-02-10 20:28:47 +01:00
mats@mysql.com
6611d3d2f8 Merge mysql.com:/home/bkroot/mysql-5.0 
into mysql.com:/home/bk/b7853-mysql-5.0
 2005-02-10 19:15:53 +01:00
ingo@mysql.com
35f65c5a06 Bug#8391 - "merge" fails on Linux/IA64 
It was a thread stack overrun.
IA64 had its own stack size section already.
Enlarged its default stack size from 192K to 256K.
 2005-02-10 16:56:57 +01:00
konstantin@mysql.com
957beb9794 Merge mysql.com:/home/kostja/work/mysql-4.1-root 
into mysql.com:/home/kostja/work/mysql-5.0-root
 2005-02-10 18:31:02 +03:00
konstantin@mysql.com
36c992b264 Follow-up for bug#7990 2005-02-10 18:24:26 +03:00
konstantin@mysql.com
6054f8140c Merge mysql.com:/home/kostja/work/mysql-4.1-root 
into mysql.com:/home/kostja/work/mysql-5.0-root
 2005-02-10 17:53:06 +03:00
konstantin@mysql.com
e9225b2588 Fix -ansi -pedantic compilation failure. 2005-02-10 17:46:27 +03:00
konstantin@mysql.com
4b2b327dcc A fix and test case for Bug#7990 "mysql_stmt_close doesn't 
reset mysql->net.last_error": the solution is to clear
MYSQL->net error before performing COM_CLOSE: if the call
succeeds, the connection is usable for other statements.
More comprehensive fix is to clear MYSQL->net for all
recoverable errors at the time they happen, it will be
implemented in 5.0 as it introduces incompatibility in behavior.
 2005-02-10 17:41:54 +03:00
konstantin@mysql.com
7d735c7207 manual merge 2005-02-10 16:58:02 +03:00
msvensson@neptunus.homeip.net
a172575854 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
 2005-02-10 14:41:52 +01:00
monty@mysql.com
ccb2f3381b Things missing in last changset 
After merge fixes
Don't give duplicate warnings for some ::store() functions
 2005-02-10 15:41:51 +02:00
joerg@mysql.com
12db4bf59e Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0 2005-02-10 14:34:36 +01:00