Commit graph

641 commits

Author SHA1 Message Date
jimw@mysql.com
36869043ec Resolve merge of fix for #8166. 2005-05-02 10:25:47 -07:00
joerg@mysql.com
a0cac19e6e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-04-26 19:11:54 +02:00
jani@ua141d10.elisa.omakaista.fi
005c447183 Added a check for config-file. 2005-04-26 17:57:14 +03:00
jani@ua141d10.elisa.omakaista.fi
c98b90bbfb Fixed Bug#9834, "mysqld_multi --config-file parameter requires
absolute path".
2005-04-26 17:46:43 +03:00
jani@ua141d10.elisa.omakaista.fi
d4d0f9c126 Fixed Bug#6221, "mysqld_multi doesn't read the init_connect
option in my.cnf correctly"
2005-04-26 16:16:38 +03:00
jani@ua141d10.elisa.omakaista.fi
7810721f40 Fixed Bug#9835: mysqld_multi --help won't output help if there are
parameter problems.
2005-04-26 14:28:22 +03:00
joerg@mysql.com
49ac2dac3e Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
Post-merge fix will follow.
2005-04-26 12:03:37 +02:00
guilhem@mysql.com
3022cbc60c Informing of deprecation of mysql_tableinfo by INFORMATION_SCHEMA (and
I'm thinking of removing the script in 5.1).
2005-04-24 22:37:43 +02:00
joerg@mysql.com
48ba5e4956 Step 1 of the switch to support configuration with NPTL:
Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
2005-04-20 20:10:28 +02:00
acurtis@xiphis.org
1ef7bbc74b Update for VARCHAR and remove 4.1-specific actions.
by Philip Antoniades
2005-04-18 22:01:18 +01:00
monty@mishka.local
de1b1fe54d Added more rows to test to get predictable results 2005-04-16 10:53:30 +03:00
monty@mishka.local
c8170b349f Merge with 4.1 2005-04-16 04:35:54 +03:00
monty@mishka.local
2b322f36d8 Ensure that all privilege tables are created in MyISAM 2005-04-16 04:12:30 +03:00
lenz@mysql.com
a88acf4a9f Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-04-13 20:14:45 +02:00
lenz@mysql.com
1bd8c68f7f - After merge fixes 2005-04-13 19:46:26 +02:00
lenz@mysql.com
077368fc28 More changes to reflect the removal of manual.texi from the sources:
- Added a stub scripts/fill_help_tables.sql file to satisfy the build dependencies
- Removed scripts/fill_help_tables.sh and updated scripts/Makefile.am accordingly

The fill_help_tables.sql stub will be replaced with the approriate content when building the
official source distribution via Bootstrap - it's now autogenerated on the documentation server
and will be copied into place before packing up the source distribution.
2005-04-13 18:29:23 +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
jimw@mysql.com
3dcfc31e76 Remove references to result.es files 2005-04-12 18:04:32 -07:00
monty@mysql.com
beb28b27e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f Fixed errors descovered by valgrind 2.4
Added suppression file for some valgrind warnings that are not real errors
2005-04-06 17:22:21 +03:00
jimw@mysql.com
127afff8c8 Remove references to result.es files 2005-04-05 13:01:42 -07:00
petr@mysql.com
7730319738 Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
doesn't work out of the box)
2005-04-04 03:49:10 +04:00
pekka@mysql.com
5b9bd8c0c8 Merge 2005-04-01 10:13:37 +02:00
serg@serg.mylan
94ede0717a include sql/examples in the window source distribution 2005-03-31 20:27:29 +02:00
jimw@mysql.com
3ef3c59ed0 Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if
the row type is dynamic (For 4.1 tables old 'VARCHAR' fields are converted to
true VARCHAR in the next ALTER TABLE)
      
This ensures that one can use MySQL 5.0 privilege tables with MySQL 4.1.

(Fix imported from main 5.0 tree to 5.0.3 build tree.)
2005-03-22 21:52:01 +01:00
mysqldev@mysql.com
ad26a667e6 sql_acl.cc, sql_acl.h, sql_parse.cc
New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
  new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
  results updated
2005-03-22 15:54:18 +01:00
jimw@mysql.com
441f863f52 Merge mysql.com:/home/jimw/my/mysql-5.0-8902
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-11 12:46:11 -08:00
jimw@mysql.com
eaea82d3af Merge query_cache tests 2005-03-11 12:38:38 -08:00
jimw@mysql.com
d114066174 Merge mysql.com:/home/jimw/my/mysql-4.1-8513
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-11 11:08:04 -08:00
joerg@mysql.com
f610930224 Correct "make_win_src_distribution" to not introduce additional directory layers,
adapt the Windows build files accordingly.
2005-03-10 21:13:46 +01:00
lars@mysql.com
20318574d4 Merge 2005-03-09 21:41:09 +01:00
kent@mysql.com
3ce3295e3f mysqldumpslow.sh:
bug#4914 added --help and usage information
2005-03-09 15:00:40 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
jimw@mysql.com
2b2efa4208 Add all SQL_MODE settings to proc table. (Bug #8902) 2005-03-08 17:40:43 -08:00
kent@mysql.com
c6002966be mysql-test-run.pl:
Removed -c from /bin/sh call
make_win_src_distribution.sh:
  Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
2005-03-09 01:34:22 +01:00
jimw@mysql.com
f7c01cfb76 Merged from 4.1 2005-03-03 15:01:46 -08:00
jimw@mysql.com
fe065fe78c Merge mysql.com:/home/jimw/my/mysql-4.1-8136
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-03 10:47:49 -08:00
jimw@mysql.com
bb9d7bfc79 Create directory for UNIX socket in mysqld_safe if it doesn't already exist.
(Bug #8513)
2005-03-02 12:19:44 -08:00
jani@ua141d10.elisa.omakaista.fi
6e9b26e8b7 Fixed a compatibility problem.
1) If my.cnf is found in datadir and basedir, give a warning and use the
   one in basedir.
2) If my.cnf is found in datadir, use it, but give a warning.
3) No warning if my.cnf is in basedir.
2005-02-23 18:59:54 +02:00
tulin@mysql.com
9171ff17ca Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-21 10:54:23 +01:00
mysqldev@mysql.com
94fb790b18 Merge mysql.com:/home/mysqldev/tulin/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 10:53:01 +01:00
tulin@mysql.com
84f0f11fff bug #8611, ndb includes in lib dir instead of include dir 2005-02-21 10:52:29 +01:00
jimw@mysql.com
99bd939b3e Remove doubled quotes (used for escaping) in table names in mysqlhotcopy.
Part of fix for Bug #8136.
2005-02-18 12:37:18 -08:00
kent@mysql.com
d94b8662f4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-18 14:21:00 +01:00
jimw@mysql.com
e9a5b7d500 Clean up merge from 4.1, including making several enum fields
in the grant tables case-insensitive and updating test results.
2005-02-17 18:07:14 -08:00
jimw@mysql.com
7eb8c130f7 Merge 2005-02-17 16:16:58 -08:00
jimw@mysql.com
9de31feab9 Merge mysql.com:/home/jimw/my/mysql-4.1-7617
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:53:35 -08:00
kent@mysql.com
87d6da972f make_binary_distribution.sh, Makefile.am:
Make .disabled files part of distribution
2005-02-17 20:07:52 +01:00
monty@mysql.com
38d1a42481 Merge with 4.1 2005-02-15 17:12:13 +02:00