Commit graph

21923 commits

Author SHA1 Message Date
jimw@mysql.com
0f007e5c73 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 08:42:30 -07:00
msvensson@neptunus.(none)
71ccc569ae Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-04 17:09:53 +02:00
monty@mysql.com
04f8e164fb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-04 16:45:23 +03:00
monty@mysql.com
5ba3f707f7 Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
Fix that mysql.proc works with new VARCHAR fields
Give warnings for wrong zero dates
2005-04-04 16:43:25 +03:00
bar@mysql.com
856378bdda Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
2005-04-04 18:04:29 +05:00
bar@mysql.com
d9f8b501db ctype_uca.result:
fixing test results accordingly.
ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.
2005-04-04 17:55:12 +05:00
ramil@mysql.com
ac2efb1300 Fix for bit type:
we have to handle bit fields as well.
2005-04-04 16:33:23 +05:00
msvensson@neptunus.(none)
41c036a60b BUG#6762 ALTER TABLE gives weird results and error message
- Better error message when table definition has changed
2005-04-04 12:26:05 +02:00
gluh@eagle.intranet.mysql.r18.ru
f1773668a8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into eagle.intranet.mysql.r18.ru:/home/gluh/MySQL/Bugs/mysql-5.0.9344
2005-04-04 12:12:50 +05:00
petr@mysql.com
7730319738 Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
doesn't work out of the box)
2005-04-04 03:49:10 +04:00
serg@serg.mylan
52770e8682 XID SQL syntax
minor cleanups
XA tests
2005-04-04 00:50:05 +02:00
bell@sanja.is.com.ua
957c01ad14 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
2005-04-03 22:38:05 +03:00
dlenev@brandersnatch.localdomain
fc1e7b07d6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-trg3
2005-04-03 17:02:13 +04:00
bell@sanja.is.com.ua
51b17c974d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
2005-04-03 15:30:18 +03:00
dlenev@brandersnatch.localdomain
c67971af3c Bug #3891 - "DROP TABLE many-unexistent-tables, was printing an error with
%s instead of table names".

Propagating changes from old language-specific errmsg.txt files to new
global errmsg.txt.
2005-04-03 11:31:50 +04:00
dlenev@mysql.com
7b294bdc8d Merge of patch for bug #3891 into 5.0 tree. 2005-04-03 10:36:18 +04:00
dlenev@mysql.com
da53d7bc88 Manual merge of fix for bug #8894 "TIMESTAMP values scrambled/misaligned
when using --new" into 4.1 tree.
2005-04-03 10:05:01 +04:00
dlenev@mysql.com
a663889569 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg8894
2005-04-03 09:48:09 +04:00
bell@sanja.is.com.ua
e2a83fca56 - stackoverflow check added for view of view processing
- fixed bug in join view processing
- postreview fixes (BUG#9398 & BUG#8703)
2005-04-03 01:23:45 +03:00
serg@serg.mylan
ddee2fa7fb Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-02 21:45:02 +02:00
serg@serg.mylan
4a0e73c63a results updated 2005-04-02 21:36:50 +02:00
serg@serg.mylan
7ba99ee324 merged 2005-04-02 20:28:58 +02:00
serg@serg.mylan
3098b93ef8 bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)
2005-04-02 20:13:19 +02:00
bell@sanja.is.com.ua
4e916e251b postreview patch 2005-04-02 18:45:44 +03:00
bell@sanja.is.com.ua
3061a749e6 fix of required privileges for altering view VIEW (DELETE->DROP) (BUG#9260) 2005-04-02 18:05:00 +03:00
jimw@mysql.com
5865330a9e Merge embedded server testing changes from 4.1. 2005-04-01 19:17:15 -08:00
jimw@mysql.com
623a5d5a57 Clean up merge of fix for Bug #9468. 2005-04-01 19:00:14 -08:00
kent@mysql.com
2292480e79 mysqld.dsp:
Corrected wrong exe naming from bad merge
2005-04-02 03:35:28 +02:00
jimw@mysql.com
16efc3e333 Merge embedded-server testing changes. 2005-04-01 16:43:35 -08:00
jimw@mysql.com
9e16f12145 Fix handling of max_allowed_packet and net_buffer_length in
embedded server when a size suffix (K, M, G) is added. (Bug #9472)
2005-04-01 16:09:20 -08:00
mskold@mysql.com
9f7ad11e34 Added more types 2005-04-01 22:14:30 +02:00
mskold@mysql.com
e95f19afca Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-01 20:58:25 +02:00
mskold@mysql.com
f2deb39f06 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-01 20:52:55 +02:00
joerg@mysql.com
2bdabb1ebb Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-01 20:17:24 +02:00
jimw@mysql.com
1ebcd90364 Fix the new ps_grant test to clean itself up properly. 2005-04-01 09:13:20 -08:00
joerg@mysql.com
e2dbb850b8 Merge changesets constituting 4.1.10a back into main tree, including release label. 2005-04-01 18:56:45 +02:00
joerg@mysql.com
7f52a616f4 Last minor things to finish MySQL 4.1.10a:
- some wordings,
- RPM packaging improvements.
2005-04-01 18:38:19 +02:00
mskold@mysql.com
5adfa12df2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-01 18:02:51 +02:00
mskold@mysql.com
cf7c0e43cb Fix for bug#9435: TIMESTAMP columns don't update 2005-04-01 17:59:46 +02:00
reggie@mdk10.(none)
a722daa1e3 Merge 2005-04-01 08:35:33 -06:00
reggie@mdk10.(none)
0eaafddfdd Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-01 08:18:49 -06:00
monty@mysql.com
9616c9a80d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-01 15:06:35 +03:00
monty@mysql.com
201ee3eb78 Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902)
CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912)
ALTER TABLE now fails in STRICT mode if it generates warnings.
Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933)
2005-04-01 15:04:50 +03:00
msvensson@neptunus.(none)
1a147cd744 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-01 12:40:54 +02:00
msvensson@neptunus.(none)
09b3d3e224 Manual merge 2005-04-01 12:35:49 +02:00
msvensson@neptunus.(none)
fe5384dad8 BUG#6554 Problem Building MySql on Fedora Core 3
- Remove the local static var
2005-04-01 12:32:47 +02:00
bell@sanja.is.com.ua
05c9defefa Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
2005-04-01 13:02:29 +03:00
pekka@mysql.com
328b453c86 merge 2005-04-01 11:21:55 +02:00
pekka@mysql.com
57451feb1c Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/pekka/ndb/version/my50
2005-04-01 11:18:52 +02:00
msvensson@neptunus.(none)
6f9b118626 Merge 2005-04-01 11:15:11 +02:00