Commit graph

2394 commits

Author SHA1 Message Date
igor@rurik.mysql.com
db4ca33f52 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-03-09 16:53:20 -08:00
igor@rurik.mysql.com
af5d21357e Manual merge 2005-03-09 10:58:52 -08:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
paul@kite-hub.kitebird.com
d6b9e709bf changelog-5.0.xml:
Add dummy changelog file. It should merge upward without conflict.
2005-03-08 13:15:36 -06:00
paul@kite-hub.kitebird.com
3a81683c05 changelog-4.1.xml:
Add dummy changelog file. It should merge upward without conflict.
2005-03-08 13:13:15 -06:00
paul@kite-hub.kitebird.com
323d135684 changelog-4.0.xml:
Fix bad root element name in DOCTYPE.  Sheesh.
2005-03-08 11:49:56 -06:00
paul@kite-hub.kitebird.com
e3d32c9e2d Add dummy changelog file. It should merge upward without conflict. 2005-03-08 10:43:44 -06: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
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
paul@kite-hub.kitebird.com
31493800d5 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2004-11-12 14:44:14 -06:00
paul@kite-hub.kitebird.com
a6b6352d95 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-4.1
2004-11-12 14:15:51 -06:00
paul@kite-hub.kitebird.com
79d8bde11e Makefile.am:
Add -acc flag for texi2html to handle accented characters.
2004-11-12 14:15:06 -06:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
joerg@mysql.com
f7553251dc The new "Bootstrap" pushed in 4.0 with changeset "joerg:1.2057" is used for building
_all_ versions. It tries to remove "Docs/Images/Makefile*" as part of the actions to
correct bug number 6350. If the source tree does not contain a dummy file matching
that pattern, this "rm" will fail, and so "Bootstrap" will fail.
The "Makefile.am" introduced with this changeset is identical to the one that will
arrive here when "joerg:1.2057" is propagated from 4.0,
so this separate introduction here is just to allow "Bootstraps" in the meantime.
2004-11-05 10:42:37 +01:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
joerg@mysql.com
cb0bd6f57d The files stored in "Docs/Images" within the "mysqldocs" BK tree must be included
in the source tar-ball for distribution. This is done by using the "DISTFILES" macro
in a new "Docs/Images/Makefile". As the source BK tree does not contain these files,
they are copied from the "mysqldocs" tree at release build time.
This changeset relies on "bk commit - mysqldoc tree (joerg:1.2276)" of today.
2004-11-04 11:18:12 +01:00
monty@mysql.com
9972d68078 merge with 4.0 2004-11-02 08:58:45 +02:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
paul@kite-hub.kitebird.com
8e53b2d602 texi2html:
Updated version of texi2html so that 4.0.22 HTML manual doesn't turn out all goofy.
2004-10-27 13:44:31 -05:00
paul@ice.snake.net
f3409efc0d texi2html:
Change parsing of @image argument.
2004-10-15 23:22:11 -05:00
paul@ice.snake.net
1524f2d89d texi2html:
Change parsing of @image argument.
2004-10-15 23:16:02 -05:00
paul@kite-hub.kitebird.com
e5be18725f texi2html:
Change @image argument parsing.
2004-10-15 10:28:39 -05:00
lenz@mysql.com
7c18f064e6 - removed the Docs/Flags and Docs/RawFlags directories
- Updated Docs/Makefile.am and scripts/make_win_src_distribution.sh
   accordingly
2004-10-07 18:30:56 +02: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
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
lenz@mysql.com
1097805cf2 - rename: EXCEPTIONS->EXCEPTIONS-CLIENT 2004-08-05 17:05:11 +02:00
lenz@mysql.com
26f0fdd5e8 - More changes to include the FLOSS License Exception in the
various distributions
2004-08-05 11:22:02 +02:00
lenz@mysql.com
e5cb60dcaa - applied the required changes to create the FOSS License exception
file "EXCEPTIONS" and include it in the source and binary 
   distributions
2004-08-05 01:54:04 +02:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
monty@mysql.com
272c3a2669 After merge fixes 2004-05-27 02:50:42 +03:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
monty@mysql.com
59ddd8c738 Fix to handle unsigned data in prepared statements (Bug #3447)
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.
2004-05-04 15:02:38 +03:00
paul@ice.snake.net
ddb5af729a Attempt to decrease non-English coefficient,
at least slightly.
2004-04-15 11:21:08 -05:00
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
serg@serg.mylan
8644896c33 remove obsolete (hopefully) files from Docs/ 2004-04-02 19:09:51 +02:00
serg@serg.mylan
34c28c6bd9 SHOW PRIVILEGES updated (Bug#3227) 2004-03-24 14:44:31 +01:00
pem@mysql.comhem.se
5954e94fa7 Fixed BUG#3259: Stored procedure names are case sensitive.
Procedure names were unintentionally case-sensitive when read from the database
(but case-insensitive when fetched from the cache).
Note that the DB-part of qualified names is still case-sensitive (for consistency
with other usage in mysql).
2004-03-23 12:04:40 +01:00
pem@mysql.comhem.se
ad960d8c12 More corrections of sp-impl-spec.txt and sp-implemented.txt. 2004-01-30 14:02:19 +01:00
pem@mysql.comhem.se
bf66108143 Some minor updates and corrections of sp-implemented.txt. 2004-01-29 13:03:56 +01:00
pem@mysql.comhem.se
7a1fddaa1f Renamed the "schema" column to "db" in mysql.proc to keep it in style with
all the other mysql.* tables.
2003-12-16 19:14:10 +01:00
pem@mysql.comhem.se
7a20e5282e In order to make ALTER PROCEDURE|FUNCTION work correctly, and in general to
make characteristics (and SHOW) work right, we had to separate the old
definition blob in the mysql.proc table into separate fields for parameters,
return type, and body, and handle the characteristics (like SQL SECURITY)
separately... and then reassemble the CREATE string for parsing, of course.
This is rather ugly, mostly the parser bit. (Hopefully that will be better
with the new parser.)
2003-12-12 14:05:29 +01:00
pem@mysql.comhem.se
b27e9d6052 WL#1363: Update the mysql.proc table and add new fields.
Also made the parsing and handling of SP characteristics
more general and extendable, and added a few ch:istics.
2003-12-10 19:05:37 +01:00
pem@mysql.com
63f4858030 Merged 4.1 -> 5.0 2003-12-05 13:11:50 +01:00
lenz@kallisto.local
80deee256c - removed INSTALL-WIN-SOURCE from the BK tree as its content has been
added to manual.texi - extract it from there instead.
2003-12-02 15:56:18 +01:00
pem@mysql.com
6e717133c5 Merge 4.1 to 5.0 2003-12-01 16:14:40 +01:00
monty@mysql.com
ede8169d24 Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
lenz@mysql.com
53bcfb07d3 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2003-11-25 19:20:07 +01:00
lenz@mysql.com
8ff4b768ed - Fixed missing node name 2003-11-25 19:19:20 +01:00