sergefp@mysql.com
bd04f52552
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-03 20:54:46 +04:00
monty@mysql.com
53d05f4adb
Removed compiler warnings
2004-06-01 23:39:39 +03:00
monty@mysql.com
017096695a
Update version number
...
Fixed serbian error messages
Fix for windows regarding changed variable name
2004-06-01 22:29:46 +03:00
sergefp@mysql.com
dc38512390
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-01 17:29:13 +04:00
sergefp@mysql.com
fb17025b3e
WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2)
2004-05-21 04:27:50 +04:00
magnus@neptunus.(none)
97bf111f1d
WL #1729 Handler: error text for NDB errors
...
- New solution after discussions with Sergei, no handler specific code or error messages should be in sql layer.
next_result, only check for error if check is -1
Improved index_read
2004-05-13 11:56:45 +02:00
magnus@neptunus.(none)
02c9f8cfe0
WL# 1729 Handler: error text for NDB errors
...
- Close an open scan if index_read is called without closing the previous one.
- Removed some errors that occured during previous merge
2004-05-11 13:59:22 +02:00
bar@bar.intranet.mysql.r18.ru
df8e3eac45
ctype-win1250ch.c, ctype-czech.c:
...
Czech collations were renamed to _cs
Index.xml:
Czech collation were renamed to _cs
2004-05-07 10:24:12 +05:00
bell@sanja.is.com.ua
5e37c41fae
new error for unsupported command in PS
...
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
2004-04-08 00:16:17 +03:00
miguel@hegel.local
a149089abb
Spanish and Portuguese translation.
2004-04-03 19:33:55 -03:00
pem@mysql.comhem.se
fce57a1190
Added missing error message and corrected another one.
2004-04-02 10:27:01 +02:00
dlenev@jabberwock.localdomain
f6bff2e6c6
WL#1266 "Separate auto-set logic from TIMESTAMP type."
...
Final version of patch.
Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
clauses for TIMESTAMP field definition.
Current implementation allows only one such field per table and
uses several unireg types for storing info about this properties of
field. It should be replaced with better implementation when new
.frm format is introduced.
2004-04-02 10:12:53 +04:00
bar@bar.intranet.mysql.r18.ru
3827fa5589
Unicode Collation Algorithm subset implementation
2004-03-24 16:16:08 +04:00
paul@teton.kitebird.com
882fad2357
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-16 12:55:49 -06:00
gluh@gluh.mysql.r18.ru
df0ede69fc
Task #835 : additional changes fot str_to_date
2004-03-15 18:28:21 +04:00
vva@eagle.mysql.r18.ru
5bada5ee99
fixed bug #1427 "enum allows duplicate values in the list"
2004-03-13 23:13:31 +04:00
paul@teton.kitebird.com
d292e9bd1f
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-08 14:08:10 -06:00
paul@ice.local
09113817d2
SESSION instead of LOCAL in error messages.
2004-03-07 08:32:00 -06:00
paul@teton.kitebird.com
cf4707acfb
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-05 11:16:32 -06:00
serg@serg.mylan
f90555e0d5
"you need MySQL build with" may take an configure option as an argument not necessarily a define
2004-03-02 17:41:36 +01:00
paul@teton.kitebird.com
ab82779e89
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-01 14:35:52 -06:00
paul@ice.snake.net
6adf80ec40
Add word to error message.
2004-02-29 12:56:22 -06:00
guilhem@mysql.com
5137821cea
small after-merge fixes (error messages).
2004-02-28 23:36:41 +01:00
guilhem@mysql.com
6ebedbb6e3
temporary undo needed for merge
2004-02-28 22:33:47 +01:00
serg@serg.mylan
6f80635272
minor compress() cleanup
2004-02-28 18:45:27 +01:00
guilhem@mysql.com
b2e17ff2f3
found typo
2004-02-22 13:04:42 +01:00
guilhem@mysql.com
8bfb87ced5
Fix for BUG#2757
...
"--read-only gives weird error on update".
It is not fixable in 4.0 because it requires modifying
the sql/share/*/errmsg.txt files. So it is fixed in 4.1 like this:
the ER_SKIP_GRANT_TABLES is replaced by a more generic
ER_OPTION_PREVENTS_STATEMENT which can be used both for
"can't do this because of --skip-grant-tables" and
"can't do this because of --read-only" (for this we don't use
ER_CANT_UPDATE_WITH_READLOCK anymore).
So now the message for --read-only is:
"The MySQL server is running with the --read-only option so
cannot execute this statement".
2004-02-21 15:15:26 +01:00
paul@teton.kitebird.com
fbcb8b950b
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-02-20 12:18:13 -06:00
paul@teton.kitebird.com
9f1f82c42c
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-02-17 13:15:38 -06:00
serg@serg.mylan
6af8a93052
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-17 17:07:14 +01:00
serg@serg.mylan
b8e161be4b
if a key length exceeds the supported maximum and it is safe to auto-decrease it, do it.
2004-02-17 16:57:39 +01:00
paul@teton.kitebird.com
f33c6699fd
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-02-16 12:05:25 -06:00
monty@mysql.com
050af89dd8
Merge with public tree
2004-02-16 10:31:05 +02:00
serg@serg.mylan
03ffb63f08
no dots in the error messages!
...
--disable-warning in union.test
2004-02-15 19:16:38 +01:00
monty@mysql.com
ce14578909
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
paul@teton.kitebird.com
82430feae9
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-01-26 12:45:42 -06:00
gluh@gluh.mysql.r18.ru
fb6338d1a3
Fix for bug#2505: MySQL reports "out of memory"
...
when DROP USER if --skip-grant-tables
2004-01-26 20:31:38 +04:00
hf@deer.(none)
1562dafa5b
Error message added
2004-01-23 20:03:42 +04:00
hf@deer.(none)
52f2529536
Conflicts resolved
2004-01-23 20:00:10 +04:00
hf@deer.(none)
c13f757c43
SCRUM
...
WL#1163 (Make spatial code separable)
fixes before the push
2004-01-23 19:54:22 +04:00
paul@teton.kitebird.com
1b9c966fe7
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-01-20 14:55:48 -06:00
guilhem@mysql.com
b6fcdcffed
Completion of fix for BUG#2121 "Inadequate message "check permissions on master.info"":
...
I had not corrected these languages.
As it has been discussed with the docs team, the new messages will be merged
to 4.1, and then will be translated in 4.1 (they will remain in English
in 4.0).
2004-01-06 14:01:49 +01:00
bell@sanja.is.com.ua
501ae0bc52
allow UPDATE and DELETE stetements with tables derived from subquery if they are not updated (BUG#2117)
...
allow delete table by alias in multi-delete statement
2004-01-04 23:44:33 +02:00
paul@teton.kitebird.com
d4004ebb78
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2004-01-02 11:21:15 -06:00
bar@bar.intranet.mysql.r18.ru
210a87507c
latin1.xml, Index.xml:
...
Modern Spanish collation
2003-12-29 19:58:18 +04:00
bar@bar.intranet.mysql.r18.ru
08d8c0b9e4
languages.html:
...
new file
2003-12-25 17:46:30 +04:00
paul@teton.kitebird.com
2078190599
Avoid displaying account name in error messages
...
using syntax that is not actually legal in GRANT.
2003-12-23 13:37:10 -06:00
monty@mysql.com
d4c32db181
merge with 4.0.18
2003-12-19 16:42:17 +02:00
monty@mysql.com
031390a9a4
Fixes after merge with 4.0
...
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
2003-12-19 16:25:50 +02:00
vva@eagle.mysql.r18.ru
f70b3897c4
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0
2003-12-18 18:07:39 -04:00