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
18365 commits 2781 branches 343 tags 1.6 GiB
Commit graph

8587 commits

Author SHA1 Message Date
monty@mysql.com
6588997eb8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-05-14 16:28:52 +03:00
monty@mysql.com
beb5867dfb After merge fixes 2005-05-14 16:24:36 +03:00
konstantin@mysql.com
6adfd9436e Fix wrong format specifier in error messages. 
Not to be pushed into 5.0 as there it's fixed differently (in the new
format of error messages)
 2005-05-14 02:28:10 +04:00
monty@mysql.com
b4e92e6360 Merge with 4.0 2005-05-14 00:01:40 +03:00
serg@serg.mylan
c4c76c5fdb sql/ha_blackhole.cc 
bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks"
sql/sql_base.cc
    libmysqld/examples/mysql.cc linking problem
 2005-05-13 21:43:26 +02:00
monty@mysql.com
b54d7d04bd Fixes during review 2005-05-13 14:04:32 +03:00
monty@mysql.com
20f969b256 Change create_field->offset to store offset from start of fields, independent of null bits. 
Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236
 2005-05-13 11:11:50 +03:00
msvensson@neptunus.(none)
7133dc5a22 Remove testcode 2005-05-10 10:45:16 +02:00
bar@noter.(none)
c783cb3d7e SUBSTR with negative argument didn't work 
with multi-byte strings, length() instead
of numchars() where used in a mistake.
 2005-05-09 20:55:06 +05:00
antony@ltantony.mysql.com
ddf6225def Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733
 2005-05-09 14:50:56 +01:00
antony@ltantony.mysql.com
cc3bfc6ff1 Bug#8733 - server accepts malformed query (multiply mentioned distinct) 
Detect conflicting options in SELECT
 2005-05-09 14:31:46 +01:00
jimw@mysql.com
3591b93874 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-09 05:30:11 -07:00
msvensson@neptunus.(none)
891b64fd84 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-09 12:16:59 +02:00
jimw@mysql.com
59f5252dc9 Merge mysql.com:/home/jimw/my/mysql-4.1-10435 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-09 02:30:25 -07:00
msvensson@neptunus.(none)
670eef8756 Merge neptunus.(none):/home/msvensson/mysql/bug10241 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-09 11:23:12 +02:00
dlenev@mysql.com
12621f349b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg9913
 2005-05-09 12:18:19 +04:00
antony@ltantony.mysql.com
714994e3e6 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0
 2005-05-08 23:24:33 +01:00
antony@ltantony.mysql.com
10b460e780 Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug8191 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0
 2005-05-08 23:07:46 +01:00
antony@ltantony.mysql.com
b6609031fa Bug#8191 - SELECT INTO OUTFILE insists on FROM clause 
Fix bug + include test case.
  Enable outfile tests.
 2005-05-08 22:56:58 +01:00
mskold@mysql.com
6f38bd937e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-05-08 22:25:38 +02:00
antony@ltantony.mysql.com
d51308aec4 Bug#6236 
Incomplete ALTER TABLE breaks MERGE compatibility
  Fix implicit NOT NULL not set on ALTER of PK columns
 2005-05-08 21:03:50 +01:00
mwagner@ultrafly.mysql.com
8945bb5d1d Merge bk-internal:/home/bk/mysql-4.1 
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1
 2005-05-08 19:16:37 +02:00
mwagner@ultrafly.mysql.com
b0774772d9 errmsg.txt: 
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
 2005-05-08 19:14:28 +02:00
jimw@mysql.com
d1a745b0ba Add special error message for .frm files with an un-understood version, like 
those from 5.0 with new datatypes. (Bug #10435)
 2005-05-07 13:57:22 -07:00
mskold@mysql.com
89d8290eb3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-05-07 22:48:16 +02:00
mwagner@ultrafly.mysql.com
9f92bd5e25 Merge bk-internal:/home/bk/mysql-4.0 
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.0
 2005-05-07 22:08:05 +02:00
mskold@mysql.com
cb8d2905aa bug#9813: Post review fixes 2005-05-07 22:04:52 +02:00
lenz@mysql.com
f09fc52bc4 - Windows compile fix for ha_blackhole.cc - use #include "mysql_priv.h" instead of 
#include <mysql_priv.h>
 2005-05-07 22:04:10 +02:00
svoj@mysql.com
f0841a2771 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/svoj/devel/mysql/7709-mysql-4.0
 2005-05-07 21:39:29 +05:00
antony@ltantony.mysql.com
a5e9523364 Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
 2005-05-07 14:46:54 +01:00
antony@ltantony.mysql.com
687417be74 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
 2005-05-07 14:43:03 +01:00
mwagner@ultrafly.mysql.com
ded73eddf7 errmsg.txt: 
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
 2005-05-07 15:11:31 +02:00
antony@ltantony.mysql.com
1af671bf36 Bug#9666 - Can't use 'DEFAULT FALSE' for column of type bool 
Fix bug by moving TRUE/FALSE in with other literals.
 2005-05-07 13:51:29 +01:00
antony@ltantony.mysql.com
1ebc9e37ea Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update" 
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups.
 2005-05-07 13:31:37 +01:00
svoj@mysql.com
c7f0fcab23 BUG#7709 fix - Boolean fulltext query against unsupported engines does not 
fail.
 2005-05-07 15:48:56 +05:00
gbichot@production.mysql.com
a1948f769c [backport of 4.1, because 4.0 autobuild now hits the same problem; 
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
 2005-05-07 11:35:14 +02:00
jimw@mysql.com
ef183de687 Merge mysql.com:/home/jimw/my/mysql-4.1-8497 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-07 01:00:24 -07:00
ramil@mysql.com
7217b4e9a4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/ram/work/4.1
 2005-05-07 09:06:11 +05:00
antony@ltantony.mysql.com
91e04912cd Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
 2005-05-06 17:30:36 +01:00
antony@ltantony.mysql.com
67bcc9707f Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
 2005-05-06 16:16:05 +01:00
ramil@ram-book.(none)
bec93d485b fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB 2005-05-06 20:11:01 +05:00
bar@noter.(none)
6a47698468 Bug#6611: wrong sorting order. 
Adding cp1250_croatian_ci collation.
 2005-05-06 20:11:00 +05:00
antony@ltantony.mysql.com
bf17b75a28 Bug#6616 
MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
  Infinite loop caused by missing update to thd version.
 2005-05-06 14:42:28 +01:00
bar@noter.(none)
b20cac254c Bug#6505 Wrong sorting order: 
latin2_croatian_ci collation was fixed.
 2005-05-06 18:41:41 +05:00
rburnett@bk-internal.mysql.com
c95e33fadf Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/users/rburnett/bug9721
 2005-05-06 15:10:01 +02:00
jani@ibmlab.site
27ee605090 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ibmlab.site:/home/my/bk/mysql-4.1
 2005-05-06 13:22:56 +03:00
bar@noter.(none)
59129d9bbe bug#6504 Upper/Lower conversion bug: 
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
 2005-05-06 15:22:55 +05:00
jani@ibmlab.site
fa25b9b49d A fix for Bug#8467. 2005-05-06 12:18:37 +03:00
marko@hundin.mysql.fi
f9e7e2ee90 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/mysql-4.1
 2005-05-06 10:15:58 +03:00
lenz@mysql.com
22a8b93cc5 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-05-06 00:21:20 +02:00