mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37818 commits 2784 branches 343 tags 1.6 GiB
Commit graph

725 commits

Author SHA1 Message Date
pem@mysql.comhem.se
f769a7a8b0 Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW 
(Review on irc by monty)
 2005-04-27 16:35:49 +02:00
pem@mysql.comhem.se
281c0a8130 Fixed BUG#8408: Stored procedure crash if function contains SHOW 
We simply have to disallow any kind of result set being sent back
  from a function. Can't see any way to make that to work.
 2005-04-26 17:31:59 +02:00
monty@mysql.com
220a01a838 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-26 16:03:20 +03:00
lenz@mysql.com
918ce29557 - manual merge 2005-04-21 08:30:59 +02:00
pem@mysql.comhem.se
54dfe4a66a Fixed BUG#7047: Stored procedure crash if alter procedure 
by simply disallowing alter procedure/function in an SP (as for drop).
 2005-04-20 17:59:28 +02:00
lenz@mysql.com
814b4aa2eb - manual merge 2005-04-19 17:18:56 +02:00
lenz@mysql.com
a42c7d442e - added missing copyright headers to several Makefile.am's (noticed 
while testing changes to the mysql-copyright scripts
 2005-04-19 17:00:05 +02:00
pem@mysql.comhem.se
6aad6835c6 Fixed BUG#9598: stored procedure call within stored procedure 
overwrites IN variable
  and added error checking of variables for [IN]OUT parameters while
  rewriting the out parameter handling.
 2005-04-14 14:52:35 +02:00
gbichot@quadita2.mysql.com
2b7ec71836 all-local instead of all (to not have double "all:" in Makefile) 2005-04-11 17:44:28 +02:00
gbichot@quadita2.mysql.com
f356fb08d6 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) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).
 2005-04-11 17:37:49 +02:00
pem@mysql.comhem.se
2038ced40c Fixed BUG#9073: Able to declare two handlers for same condition in same scope 2005-04-08 19:58:04 +02:00
msvensson@neptunus.(none)
7a0e28feb5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-07 20:19:25 +02:00
msvensson@neptunus.(none)
12b6252145 BUG#6762 ALTER TABLE gives weird results and error message 
- Removed hardcoded error message from 4.1
 2005-04-07 20:17:37 +02:00
monty@mysql.com
a7c6348192 Fixed errors found during review 2005-04-06 19:43:35 +03:00
monty@mysql.com
174c15aee1 Small fixes done while reviewing pushed code 2005-04-06 16:52:41 +03:00
msvensson@neptunus.(none)
f22b8930c3 Fix swedish error message 2005-04-05 13:01:16 +02: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
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
pem@mysql.com
bb27307778 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/bk/mysql-5.0
 2005-03-31 10:54:15 +02:00
pem@mysql.comhem.se
8df8afc270 Fixed BUG#6600: Stored procedure crash after repeated calls with check table. 
Sedond attempt: Simply disallow CHECK in SPs, since it can't work.
 2005-03-30 17:43:52 +02:00
monty@mysql.com
fac67f091c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-30 16:01:30 +03:00
monty@mysql.com
332b7ed4a1 Give warnings if wrong date/time/datetime argument for STR_TO_DATE 
Small fixes while doing review of new pushed code
More test cases for decimal
 2005-03-30 16:00:31 +03:00
bar@mysql.com
7131f313be after merge fix 2005-03-29 17:37:10 +05:00
bar@mysql.com
ba115894c5 Better error message. 
Bugs#9057: Incorrect errormsg for too-large char field in table definition
 2005-03-29 15:43:00 +05:00
serg@serg.mylan
9a0dd5c7e4 sql/sql_acl.cc 
report correct errror in MODE_NO_AUTO_CREATE_USER
    cleanup
after merge fixes
 2005-03-23 19:18:25 +01:00
jani@ua141d10.elisa.omakaista.fi
01dddf095a - Added new error message. 
- Changed error message in sql_acl.cc
- Added some more tests for GRANT.
 2005-03-22 15:57:24 +02:00
dlenev@brandersnatch.localdomain
f169114042 WL#874 "Extended LOAD DATA". 
Now one can use user variables as target for data loaded from file
(besides table's columns). Also LOAD DATA got new SET-clause in which
one can specify values for table columns as expressions.

For example the following is possible:
LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;

This patch also implements new way of replicating LOAD DATA.
Now we do it similarly to other queries.
We store LOAD DATA query in new Execute_load_query event
(which is last in the sequence of events representing LOAD DATA).
When we are executing this event we simply rewrite part of query which
holds name of file (we use name of temporary file) and then execute it
as usual query. In the beggining of this sequence we use Begin_load_query
event which is almost identical to Append_file event
 2005-03-16 04:32:47 +03:00
jimw@mysql.com
3c7c548b9a Fix change made to ER_READY by creating a new message, instead. 2005-03-09 08:56:50 -08:00
serg@serg.mylan
e47d0a0e2d merge 2005-03-03 23:07:20 +01:00
serg@serg.mylan
8d9a53a78c Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it) 2005-03-03 19:51:29 +01:00
jimw@mysql.com
2904f4d0a4 Merge mysql.com:/home/jimw/my/mysql-5.0-8444 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-01 15:25:17 -08:00
pem@mysql.comhem.se
54a2448bce Fixed BUG#8760: Stored Procedures: Invalid SQLSTATE is allowed in 
a DECLARE ? HANDLER FOR stmt.
 2005-02-28 18:07:06 +01:00
paul@snake-hub.snake.net
c2507d88f5 Fix badly spelled symbol. 2005-02-23 13:15:03 -06:00
jimw@mysql.com
7baab10ebb Include a timestamp on the 'ready for connections' message by printing it 
using sql_print_information() instead of directly to stdout. (Bug #8444)
 2005-02-22 18:09:35 -08:00
serg@serg.mylan
fd828e5b4d manually merged 2005-02-14 21:50:09 +01:00
pem@mysql.comhem.se
2c26ebe359 WL#2130: Table locking for stored FUNCTIONs 
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
 2005-02-08 20:52:50 +01:00
serg@serg.mylan
852f2e0aba small Makefile.am cleanup 
clean: targets removed
    generated *.h files moved to include/
 2005-01-28 17:14:03 +01:00
serg@serg.mylan
3c5060981f query_id and my_xid -> ulonglong 
fix for binlog+autocommit+tclog
comments, style fixes
 2005-01-27 22:38:56 +01:00
ram@gw.mysql.r18.ru
84f0b1eeee Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-21 12:10:19 +04:00
bar@mysql.com
5ed1b14464 errmsg.txt: 
Adding Shift-JIS error messages
  for Japanese Windows distributions.
  Thanks to Serg for help with a perl program 
  to merge 4.1 messages into 5.0 format :)
 2005-01-20 15:33:21 +04:00
bar@mysql.com
07be090e6e errmsg.txt: 
Minor fix after character set conversion.
 2005-01-20 13:08:16 +04:00
bar@mysql.com
1650728655 errmsg.txt: 
new file
 2005-01-20 12:37:02 +04:00
ram@gw.mysql.r18.ru
92545cb3a9 ER_WARN_DATA_TRUNCATED replaced with WARN_DATA_TRUNCATED. 2005-01-19 16:24:06 +04:00
ram@gw.mysql.r18.ru
c24c023e8c A fix (bug #6999: Traditional: Wrong SQLSTATE returned for string truncation). 2005-01-19 12:04:35 +04:00
serg@serg.mylan
1034677f94 XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00
anjuta@arthur.local
224fcd4717 Merge 2005-01-13 19:14:10 +02:00
paul@kite-hub.kitebird.com
231632e34f user_limits.result: 
Fix test result affected by error message rewording.
errmsg.txt:
  Reword error messages.
set_var.cc:
  Reorder variables.
mysqld.cc:
  Reorder options.
 2005-01-12 20:38:05 -06:00
shuichi@mysql.com
852d74a68e renamed charset name 'eucjp_ms' to 'eucjpms' 2005-01-12 02:58:15 -08:00
shuichi@mysql.com
3126e82291 added new character set - cp932, eucjp_ms 2005-01-11 17:45:36 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
b1e30904d5 WL#925 - Privileges for stored routines 
Implement fine-grained control over access to stored procedures
  Privileges are cached (same way as existing table/column privs)
 2004-12-23 10:46:24 +00:00
anjuta@arthur.local
f56efde6a3 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into arthur.local:/my/mysql-5.0-clean
 2004-12-17 22:16:30 +02:00
lenz@mysql.com
750f3937d7 - typo fix 2004-12-17 18:00:05 +01:00
lenz@mysql.com
63534a3d98 - make sure to include sql/share/errmsg.txt into the source distribution 2004-12-17 17:46:46 +01:00
anjuta@arthur.local
31d51d04a9 Removed several erroneous error messages in different languages in errmsg.txt 2004-12-17 01:32:06 +02:00
anjuta@arthur.local
44cfef92d1 Removed incorrect messages; fixed serbian messages. 2004-12-16 21:21:13 +02:00
bar@mysql.com
f6b1f5dec1 errmsg.txt: 
My attempt N3
 2004-12-16 18:44:38 +04:00
gluh@gluh.mysql.r18.ru
6372efa7da Fix for bug#7212: information_schema: "Can't find file" errors if storage engine gone(after review) 2004-12-16 16:31:36 +03:00
anjuta@arthur.local
53db34f992 Added missing errmsg.txt 2004-12-13 23:28:24 +02:00
anjuta@arthur.local
f9451974be WL#1051, more maintanable error messages. 2004-12-13 22:51:54 +02:00
serg@serg.mylan
319546d5f0 create/drop/rename user cleanup 2004-11-27 23:07:30 +01:00
ingo@mysql.com
cb53411b47 WL#2050 - CREATE USER and DROP USER and RENAME USER 
Added new commands CREATE USER and RENAME USER.
Changed behaviour of DROP USER.
Changed an error messages for the new commands.
 2004-11-25 21:55:49 +01:00
bell@sanja.is.com.ua
072d38eb12 merge 2004-11-21 20:08:12 +02:00
bell@sanja.is.com.ua
8ded2093e6 postreview changes 2004-11-21 16:35:42 +02:00
bell@sanja.is.com.ua
d76db8b999 marge 2004-11-13 19:45:36 +02:00
bell@sanja.is.com.ua
7210195f1e now my_printf_error is not better then my_error, but my_error call is shorter 
used only one implementation of format parser of (printf)
fixed multistatement
 2004-11-13 19:35:51 +02:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
serg@serg.mylan
e20732b073 typos in error messages fixed 2004-11-12 16:41:53 +01:00
bell@sanja.is.com.ua
1555469b64 merge 2004-11-12 15:36:31 +02:00
bell@sanja.is.com.ua
0ef0b030a5 merge 2004-11-11 21:18:10 +02:00
guilhem@mysql.com
09da85338c no new message in 4.1 (causes merge issues with 5.0). Using ER_UNKNOW_ERROR and hardcoded message string instead. 2004-11-11 00:00:17 +01:00
guilhem@mysql.com
6cd218cc56 WL#1596 "make mysqldump --master-data --single-transaction able to do online dump of InnoDB AND report reliable 
binlog coordinates corresponding to the dump".
The good news is that now mysqldump can be used to get an online backup of InnoDB *which works for
point-in-time recovery and replication slave creation*. Formerly, mysqldump --master-data --single-transaction
used to call in fact mysqldump --master-data, so the dump was not an online dump (took big lock all time of dump).
The only lock which is now taken in this patch is at the beginning of the dump: mysqldump does:
FLUSH TABLES WITH READ LOCK; START TRANSACTION WITH CONSISTENT SNAPSHOT; SHOW MASTER STATUS; UNLOCK TABLES;
so the lock time is in fact the time FLUSH TABLES WITH READ LOCK takes to return (can be 0 or very long, if
a table is undergoing a huge update).
I have done some more minor changes listed in the paragraph of mysqldump.c.
WL#2237 "WITH CONSISTENT SNAPSHOT clause for START TRANSACTION":
it's a START TRANSACTION which additionally starts a consistent read on all
capable storage engine (i.e. InnoDB). So, can serve as a replacement for
BEGIN; SELECT * FROM some_innodb_table LIMIT 1; which starts a consistent read too.
 2004-11-10 17:56:45 +01:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
bell@sanja.is.com.ua
dff05eb951 merge 2004-10-28 11:02:48 +03:00
pem@mysql.comhem.se
2c428ca09d Fixed BUG#6030: Stored procedure has no appropriate DROP privilege. 
...and no ALTER privilege either.
  For now, only the definer and root can drop or alter an SP.
 2004-10-22 20:29:06 +02:00
bell@sanja.is.com.ua
4714a6e744 errors without code removed 
net_printf/send_error calls replaced by my_error family functions
-1/1 (sent/unsent) error reporting removed
(WL#2133)
 2004-10-20 04:04:37 +03:00
bell@sanja.is.com.ua
a78f817d20 merge 2004-10-05 13:41:51 +03:00
monty@mishka.local
5eca078b19 merge 2004-10-05 01:10:23 +03:00
bell@sanja.is.com.ua
9062e99ee6 merge 2004-10-04 13:56:48 +03:00
monty@mishka.local
be4ca46fbe More fixes for strict mode: 
More tests.
Better error messages.
Fixed bug when checking if we updated all needed columns for INSERT.
Give an error if we encounter a wrong float value during parsing.
Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS.
Fixed UPDATE IGNORE when using STRICT mode.
 2004-10-02 22:20:08 +03:00
bell@sanja.is.com.ua
013512abab merge 2004-09-29 17:10:17 +03:00
bell@sanja.is.com.ua
392292a46b post review changes: 
CHECK OPTION moved to one function
view name added to error messages
 2004-09-29 16:35:01 +03:00
monty@mishka.local
f2941380c4 Strict mode & better warnings 
Under strict mode MySQL will generate an error message if there was any conversion when assigning data to a field.
Added checking of date/datetime fields.
If strict mode, give error if we have not given value to field without a default value (for INSERT)
 2004-09-28 20:08:00 +03:00
bell@sanja.is.com.ua
67fcac7a87 support of join view updateability (WL#1809) 2004-09-15 23:42:56 +03:00
paul@kite-hub.kitebird.com
746e1876dc Add GPL notice to a bunch of files. 2004-09-10 14:53:06 -05:00
dlenev@mysql.com
c46e640009 Yet another manual merge with main tree for patch for WL#1218 "Triggers" 2004-09-09 19:52:10 +04:00
monty@mysql.com
49cd04b510 Merge on pull 2004-09-09 07:26:28 +03:00
dlenev@mysql.com
9b1bc6a4d5 Merge of changes from the main tree to tree for WL#1218 "Triggers". 2004-09-08 13:29:21 +04:00
dlenev@brandersnatch.localdomain
9ed038dd6f WL#1218 "Triggers". Some very preliminary version of patch. 
Mostly needed for Monty for him getting notion what needed for triggers 
from new .FRM format. 

Things to be done:
- Right placement of trigger's invocations
- Right handling of errors in triggers (including transaction rollback)
- Support for priviliges
- Right handling of DROP/RENAME table (hope that it will be handled automatically
  with merging of .TRG into .FRM file)
- Saving/restoring some information critical for trigger creation and replication
  with their definitions (e.g. sql_mode, creator, ...)
- Replication

Already has some known bugs so probably not for general review.
 2004-09-07 16:29:46 +04:00
bell@sanja.is.com.ua
ee03178f01 merge 2004-09-06 15:56:38 +03:00
monty@mysql.com
31122efde7 Merge with 4.1 
(Includes merge of arena code in 4.1 and 5.0)
 2004-09-06 15:14:10 +03:00
monty@mysql.com
9d8555c0f0 Merge with 4.0 to get latest bug fixes 2004-09-04 15:59:49 +03:00
bell@sanja.is.com.ua
bd2c119176 CHECK OPTIONs added (WL#1983) 2004-09-03 15:18:40 +03:00
paul@kite-hub.kitebird.com
f7bc60e0fc errmsg.txt: 
Add GPL comment
 2004-09-02 18:12:05 -05:00
bell@sanja.is.com.ua
f1bbfdf4a6 checked INTO clause during view creation (BUG#5332) 2004-09-02 12:09:26 +03:00
lenz@mysql.com
80879cffe6 - removed swedish errmsg.OLD 2004-09-01 16:04:01 +02:00
bar@mysql.com
34688d710c Better easier to call error message format. 2004-08-31 18:53:27 +05:00
bar@mysql.com
b604164599 Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict 2004-08-27 20:48:19 +05:00
bar@mysql.com
43b792d5cf win1251.conf: 
Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
  bug#5110
 2004-08-27 10:54:57 +05:00
pem@mysql.comhem.se
c81b848d20 Major rehacking and cleanup of sp_pcontext. 
This finishes (almost) WL#2002: Implement stored procedure GOTO.
Only the syntax issue for free labels remains ("label L;" vs "L:").
 2004-08-26 12:54:30 +02:00
monty@mysql.com
7ff0cef3f1 Fixed uninitialized variable 
Fixed error messages
 2004-08-24 01:08:48 +03:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
bar@mysql.com
0db8ff2eda Bug#5005 collation cp852_bin makes server crash 
ctype-simple.c:
  Check that unicode map was loaded
cp852.xml:
  Missing cp852_bin was added.
 2004-08-12 10:46:16 +05:00
paul@kite-hub.kitebird.com
8a95e5ed63 errmsg.txt: 
fix error message
 2004-08-10 14:23:19 -05:00
tim@sand.box
6ce0b07a99 Print MYSQL_COMPILATION_COMMENT after ER_READY on server startup 2004-08-04 10:12:57 -06:00
pem@mysql.comhem.se
7e6bade23b Fixed BUG#434: Stored procedure which drops itself causes crash. 
Simply disallow it, just as we disallow creation of routines from within
other SPs.
 2004-07-29 17:33:45 +02:00
pem@mysql.com
d1c454a6f4 Post-merge fix. 2004-07-23 18:54:01 +02:00
pem@mysql.comhem.se
e8b7c9cb1a Added missing error message to estonian/errmsg.txt. 2004-07-22 11:32:12 +02:00
serg@serg.mylan
c9fd775777 merged 2004-07-21 23:32:11 +02:00
hf@deer.(none)
cbff743b2d Final patch for WL#1600(warn if max_allowed_packet used) 2004-07-21 21:27:45 +05:00
hf@deer.(none)
5bff13bc72 Merging 2004-07-21 19:10:37 +05:00
bell@sanja.is.com.ua
ad9a6e0858 error message interception (Bug#4598) 
error handling of view initialization fixed (Bug#4599)
 2004-07-21 04:26:20 +03:00
bell@sanja.is.com.ua
9336d36cf8 VIEW 
two TABLE_LIST copy eliminated
 2004-07-16 01:15:55 +03:00
monty@mysql.com
31fe2837f9 Merge with 4.1 2004-07-12 08:20:24 +03:00
bar@mysql.com
6fdafa5635 Don't allow badly formed UTF8 identitiers 2004-07-07 16:39:43 +05:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
bar@mysql.com
b41e009b04 armscii8_bin was referenced to as armscii_bin in a mistake. 2004-07-02 13:27:46 +05:00
hf@deer.(none)
eb67909bf4 WL#1600 (Warn if result is truncatet due to max_allowed_packet) 2004-06-29 19:55:13 +05:00
dlenev@brandersnatch.localdomain
09ba29e539 WL#1264 "Per-thread time zone support infrastructure". 
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
  
WL#1266 "CONVERT_TZ() - basic time with time zone conversion 
function".
  
Fixed problems described in Bug #2336 (Different number of warnings 
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated 
at Field object level not in conversion functions).
  
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
 2004-06-18 10:11:31 +04:00
paul@kite-hub.kitebird.com
233ad19e01 Error message edits. 2004-06-16 11:59:35 -05:00
paul@kite-hub.kitebird.com
9db51b66f9 Error message edits. 2004-06-16 11:23:06 -05:00
paul@ice.snake.net
877d44dae9 Language/consistency edits to error messages. 2004-06-15 23:23:56 -05:00
paul@ice.snake.net
fd1d01e098 Language/consistency edits to error messages 
and affected test results.
 2004-06-15 22:18:20 -05:00
paul@kite-hub.kitebird.com
f4dbb250fd Language/consistency edits to error messages 
and affected test results.
 2004-06-15 15:38:36 -05:00
pem@mysql.comhem.se
f467e0b354 Removed extra error messages (that were replaced). 2004-06-10 12:17:13 +02:00
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
pem@mysql.com
df69f93ae9 Post-merge post-merge fix (new error codes for fparser). 2004-05-14 16:10:31 +02: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
bell@sanja.is.com.ua
3c5cec08c0 file parser for new .frm 2004-05-11 23:23:49 +03: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
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +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
pem@mysql.comhem.se
d42b145817 Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc 
merged manually by guilhem.
 2004-04-28 12:08:54 +02: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
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02: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
pem@mysql.comhem.se
329013f99e Fixed BUG#3287: Stored Procedure Case Statement Not SQL:2003 Compliant. 2004-03-29 12:29:06 +02:00
pem@mysql.comhem.se
52c820fbc5 Enforce standard declaration order in SPs. 
Added new test cases for this, and adjusted old tests accordingly,
and new error codes and messages.
Fixed bugs in some tests (bug2673 and use test).
Added debug printing of instructions in SPs.
 2004-03-29 11:16:45 +02: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
pem@mysql.comhem.se
6c6bbba007 WL#1366: Use the schema (db) associated with an SP. 
Phase 2: Make SPs belong to a DB, and use qualified names.
  As a side effect, using USE in an SP is no longer allowed.
  (It just doesn't work otherwise.)
 2004-03-11 17:18:59 +01: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
monty@mysql.com
4aafb1ef3d Cleanup + safety comment 2004-02-16 09:41:13 +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
pem@mysql.com
c8585f3283 Merge 4.1 into 5.0. 2004-02-10 18:44:02 +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
pem@mysql.com
99e0ae85c7 Merge 4.1 to 5.0. 2003-12-19 18:03:27 +01: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
vva@eagle.mysql.r18.ru
d49ff0fd62 added error message for receiving variable with wrong GLOBAL|LOCAL type 
(bug #2086)
 2003-12-17 16:37:47 -04:00
guilhem@mysql.com
b6e55207f5 Fix for BUG#2121 "Inadequate message "check permissions on master.info"": 
more general message when slave can't start because of incorrect
replication information, the previous one was sometimes a misleading
indication (i.e. sometimes the problem had nothing to do with
system permissions).
The perfect fix would be to report the exact error to the client
(instead of pointing the client to the error log); this is a bit
of work so it's more a development task:
WL#1088 "Move all hardcoded messages of replication to share/errmsg.txt".
I was not able to modify the errmsg.txt in these sql/ subdirectories:

danish
dutch
german
italian
portuguese
russian
spanish
swedish
ukrainian
 2003-12-16 21:52:11 +01:00
pem@mysql.com
975061bb5a Merge 4.1 to 5.0. 2003-12-16 16:12:28 +01:00
miguel@hegel.local
6e4329cbe6 Translation update 2003-12-13 18:00:15 -04:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
fcf96dbb18 WorkLog#1323 
Deprecate the use of TYPE=... Preferred syntax is ENGINE=
 2003-12-10 04:31:42 +00:00
pem@mysql.com
24a2ae44a3 Merged 4.1 -> 5.0 2003-12-09 19:00:34 +01:00
monty@mysql.com
e8aef44349 Portability fixes for Windows 2003-12-08 12:25:37 +02:00
pem@mysql.com
63f4858030 Merged 4.1 -> 5.0 2003-12-05 13:11:50 +01:00
pem@mysql.comhem.se
a5780a4815 Fixed BUG#336: Subselects with tables does not work as values for local SP variables 
and BUG#1654: Stored Procedure Crash if contains subquery and set function

Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
The latter should work, but turned out to be difficult to fix, so we just
disallow it for the time being.
 2003-12-04 15:17:55 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
55d4248dae Merge for update 2003-12-02 20:57:34 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
afc619f0a2 WorkLog#1280 - Remove fixed table handler from lex/yacc 2003-12-02 20:23:13 +00:00
pem@mysql.com
6e717133c5 Merge 4.1 to 5.0 2003-12-01 16:14:40 +01:00
hf@deer.(none)
611096a709 SCRUM 
WL#1284 (warnings about --skip-name-resolve)
Messages corrected
 2003-11-26 13:38:32 +04:00
pem@mysql.comhem.se
47f9c2946f Changed "query" into "statement", and corrected SQL state code (04000->0A000). 2003-11-24 18:24:14 +01:00