lenz@mysql.com
36ddf47bed
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-07-06 08:50:22 +02:00
lenz@mysql.com
c505134699
- removed Docs/README.1st (it's obsolete)
2005-07-05 09:15:37 +02:00
lenz@mysql.com
a190236e0a
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0.8-clone
2005-06-23 11:41:01 +02:00
lenz@mysql.com
cacb7199d3
- manual merge of the new node names
2005-06-23 11:34:58 +02:00
lenz@mysql.com
03b128971e
- fixed text file generation - the node names in the info page had changed
2005-06-23 11:30:40 +02:00
lenz@mysql.com
918ce29557
- manual merge
2005-04-21 08:30:59 +02:00
lenz@mysql.com
814b4aa2eb
- manual merge
2005-04-19 17:18:56 +02:00
lenz@mysql.com
04a4680b8b
Updated Docs/Makefile.am:
...
- fixed copyright header and removed obsolete comments about how to
build the manual using texinfo
- added an "install-data-hook" to install the mysql.info info page.
This seems to be the only way to install info pages, if they are not
built from texinfo sources directly.
2005-04-19 13:33:38 +02:00
lenz@mysql.com
f8bf8697c1
- removed COPYING from txt_files of Docs/Makefile.am
...
(it's already in EXTRA_DIST of the toplevel Makefile.am)
2005-04-19 11:15:36 +02:00
lenz@mysql.com
1bd8c68f7f
- After merge fixes
2005-04-13 19:46:26 +02:00
lenz@mysql.com
ad75afe308
Manual merge of the ChangeSet to remove the dependency on manual.texi from the source tree (from 4.0)
2005-04-13 13:27:06 +02:00
lenz@mysql.com
11df4eec85
- manual.texi will be replaced with a manual written in DocBook/XML. This ChangeSet removes all
...
references to the .texi file and the build targets that depend on manual.texi as the input file.
- added COPYING as a regular file instead of creating it during the build. This ensures that it's part
of the sources when pulling from BK (it used to be extracted from the manual)
- Removed a lot of cruft and unused/obsolete stuff from the Docs directory (e.g. Flags, Images)
- added a dummy mysql.info placeholder file (the info file is still used as the source to extract
various text files during the build). It will be replaced with a "real" file during the Bootstrap
process to create the official source distribution - the placeholder just satisfies build dependencies.
2005-04-13 11:51:38 +02: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
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
