Commit graph

2425 commits

Author SHA1 Message Date
joerg@trift2.
4525ea4bfb Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M51/push-5.1
2006-09-22 17:24:06 +02:00
joerg@trift2.
d1f0a57a6d Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work. 2006-09-21 17:38:42 +02:00
joerg@trift-lap.fambruehe
a33fdb44e5 Include "manual.chm" in the source distribution, because we now use it for Windows builds unchanged. 2006-09-14 16:34:35 +02:00
kroki@mysql.com
0acef25de8 Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-05-06 11:18:42 +04:00
paul@polar.kitebird.com
61632812e2 .del-changelog-5.0.xml~f4c50926ccdd7434:
Delete: Docs/changelog-5.0.xml
2006-05-04 16:21:10 -05:00
paul@polar.kitebird.com
a1e6218461 .del-changelog-4.1.xml~8aa496ebed09d868:
Delete: Docs/changelog-4.1.xml
2006-05-04 16:16:18 -05:00
paul@polar.kitebird.com
e67a5619f9 Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2006-05-04 16:15:31 -05:00
paul@polar.kitebird.com
2842d28d14 .del-changelog-4.0.xml~8f56ee8a913e848b:
Delete: Docs/changelog-4.0.xml
2006-05-04 16:14:19 -05:00
jimw@mysql.com
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
2006-04-11 18:54:24 -07:00
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
kent@mysql.com
0298bfaac6 Merge 2006-04-03 03:52:22 +02:00
kent@mysql.com
6ba1a85726 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-03 03:40:54 +02:00
kent@mysql.com
e1d6c31984 mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c:
Changed web address order.mysql.com to shop.mysql.com
2006-04-03 03:37:43 +02:00
knielsen@mysql.com
ce4463a139 Add some stuff to source package needed for CMake Windows packaging. 2006-03-30 11:02:52 +02:00
serg@serg.mylan
7d20407c9c BSD make compatibility 2006-01-06 17:32:25 +01:00
kent@mysql.com
b269caecb1 Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in:
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
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