jimw@mysql.com
de46ae18c2
Merge mysql.com:/home/jimw/my/mysql-5.0-11602
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:12 -07:00
jimw@mysql.com
0536bd6679
Increase allowed size of stored procedure bodies to 4GB, and
...
produce a sensible error when that limit is exceeded. (Bug #11602 )
2005-07-26 18:08:49 -07:00
lenz@mysql.com
bbd06a333a
Merge mysql.com:/space/my/mysql-4.1-merge
...
into mysql.com:/space/my/mysql-5.0-build
2005-07-25 15:04:28 +02:00
lenz@mysql.com
0c30acae32
- merge from 4.0: updated scripts/Makefile.am to properly create but not install
...
make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh
2005-07-25 14:39:23 +02:00
lenz@mysql.com
d9bacfa236
- Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
...
make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated
2005-07-25 14:14:24 +02:00
joerg@mysql.com
16bfcd3c75
File / directory structure change from 5.0 to 5.1:
...
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.
2005-07-21 21:47:46 +02:00
lenz@mysql.com
ca9087a82c
- don't install the Mac OS X support files when running "make install" -
...
they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way
2005-07-20 19:15:48 +02:00
tulin@dl145b.mysql.com
bf6e3f9aa8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-20 07:53:10 +02:00
jimw@mysql.com
80c1c6b33f
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 11:05:49 -07:00
jimw@mysql.com
bb6918e312
Merge mysql.com:/home/jimw/my/mysql-4.1-7249
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-19 10:35:15 -07:00
tomas@poseidon.ndb.mysql.com
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
lenz@mysql.com
611ae59245
- reverted adding mysql-test/t/*.def to the distribution (it is not supported in 4.1
...
at all)
2005-07-08 21:04:54 +02:00
pem@mysql.com
5ce9198f20
Fixed BUG#11365: Stored Procedure: Crash on Procedure operation
...
Two separate problems. A key buffer was too small in sp.cc for multi-byte
fields, and the creation and fixing of mysql.proc in the scripts hadn't been
updated with the correct character sets and collations (like the other
system tables had).
Note: No special test case, as the use of utf8 for mysql.proc will make
any existing crash (if the buffer overrrun wasn't fixed).
2005-07-08 16:33:15 +02:00
lenz@mysql.com
79f43c864a
- manual merge of the addition of including mysqlt-test/t/*.def
2005-07-08 11:27:08 +02:00
lenz@mysql.com
780d699b86
- added mysql-test/t/*.def to the source and binary distributions
2005-07-08 11:07:05 +02:00
lenz@mysql.com
a9e1b8756d
- manual merge of the make_binary_distribution.sh ChangeSet propagation
2005-07-06 14:30:51 +02:00
lenz@mysql.com
68e5693096
Merge mysql.com:/space/my/mysql-4.0-build
...
into mysql.com:/space/my/mysql-4.1-build
2005-07-06 14:00:24 +02:00
lenz@mysql.com
49986c7e05
- backported a change for make_binary_distribution.sh from 5.0 for easier building of
...
all versions: added an option "--machine" that allows to override the autodetected
architecture string (e.g. "i386") that becomes part of the binary package name with
a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
script
2005-07-06 13:58:29 +02:00
jimw@mysql.com
2669b86612
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 15:23:13 -07:00
jimw@mysql.com
c45f86a265
Merge mysql.com:/home/jimw/my/mysql-4.1-10986
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:56:47 -07:00
bell@sanja.is.com.ua
4bc6bd38ec
Merge
2005-07-05 13:42:19 +03:00
bell@sanja.is.com.ua
bfbd0e241b
added processing of view grants to table grants (BUG#9795)
2005-07-05 13:36:36 +03:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
kent@mysql.com
d16e1cafa7
make_win_src_distribution.sh:
...
Bug#11009, some more cleanup of unneded files from bootstrap
2005-06-28 05:25:29 +02:00
jimw@mysql.com
13773acc1b
If mysql_config is a symlink, resolve it before trying to find the lib and
...
include directories relative to where it is located. (Bug #10986 )
2005-06-24 17:59:19 -07:00
jimw@mysql.com
9f4c796922
Fix handling of datadir by mysqld_safe to support specifying a
...
different DATADIR via the command line or during ./configure and
still starting up mysqld_safe via a relative path. (Bug #7249 )
2005-06-24 17:14:16 -07:00
tulin@dl145b.mysql.com
6a0a577335
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-08 17:12:09 +02:00
lenz@mysql.com
024010e562
- make sure to include mysql-test/t/*.sql files in the binary distributions and when
...
"make install" is called (mysql_delimiter.sql was missing)
2005-06-08 11:49:24 +02:00
tulin@dl145b.mysql.com
b1a3d74f20
merge
2005-06-07 19:38:28 +02:00
igor@rurik.mysql.com
c963b12fd3
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 06:38:05 -07:00
ndbdev@dl145b.mysql.com
723173c0f3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 12:50:45 +02:00
lenz@mysql.com
a411763dae
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-06-07 11:41:55 +02:00
lenz@mysql.com
6e5818e977
- manual merge of mysql.spec.sh
2005-06-07 11:40:56 +02:00
lenz@mysql.com
1c21f84afb
- BUG#10676: don't install "make_win_src_distribution" and "make_win_binary_distribution"
...
when doing "make install" (they are not needed/useful) outside the build tree. Added
"mysql_client_test" to the "MySQL-bench" RPM.
- some small RPM spec file improvements (more variables than hard-coded values, cleanups)
2005-06-07 10:25:51 +02:00
elliot@mysql.com
b906f31388
BUG#7967 Fix mysqlhotcopy --record-log-position
2005-06-06 22:17:16 -04:00
tomas@poseidon.ndb.mysql.com
925548d349
Merge
2005-06-02 00:51:30 +02:00
lenz@mysql.com
9afd2563e9
Merge of 4.1 -> 5.0
2005-06-01 15:11:14 +02:00
lenz@mysql.com
e877e71b17
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
2005-06-01 13:06:15 +02:00
lenz@mysql.com
7bd3dd7cb3
- removed references to some obsolete files (BUG#10824)
...
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
spec file)
2005-06-01 12:59:10 +02:00
tomas@poseidon.ndb.mysql.com
a8bad15b64
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-01 07:13:01 +02:00
tim@siva.hindu.god
8a77c6f741
scripts/mysqld_safe.sh
...
Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable.
2005-05-27 12:44:06 +12:00
tulin@dl145c.mysql.com
be861a7ccf
merge
2005-05-19 09:04:24 +02:00
jimw@mysql.com
6757a04e4c
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-18 17:13:31 -07:00
tulin@dl145c.mysql.com
03590c20bd
merge
2005-05-18 22:26:23 +02:00
kent@mysql.com
2b5f9fad81
make_win_src_distribution.sh:
...
Add YASSL to Windows source distribution
Skip .deps, and remove .o files from source dist
2005-05-18 16:04:44 +02:00
ramil@mysql.com
8add105ff5
Merge mysql.com:/usr/home/ram/work/mysql-5.0-build
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-05-18 18:15:14 +05:00
kent@mysql.com
f81e6248d2
make_binary_distribution.sh:
...
To be safe, put "..." around variables to the test command
2005-05-18 12:49:43 +02:00
matt@mysql.com
4dca62401c
make_binary_distribution.sh:
...
Use portable check for empty string.
2005-05-18 03:45:01 +02:00
tulin@dl145c.mysql.com
4a1d6f6a18
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-17 23:25:13 +02:00
acurtis@xiphis.org
8df5887ad5
Bug#10246 - Parser: bad syntax for GRANT EXECUTE
...
Rename some functions
more fine-grained sp privileges
make grant/revoke sp grammar less ambigious
2005-05-17 19:54:20 +01:00
gbichot@quadita2.mysql.com
43d9b1d8c9
mysql_tableinfo removed (replaced by information schema; put a warning in the 5.0 version of the script about removal in 5.1).
...
Sad to say good bye to my contribution - this is hara-kiri, but that's for the sake of not confusing our users with a now useless script.
2005-05-12 22:28:26 +02:00
ndbdev@dl145b.mysql.com
58aa78e32d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-09 20:28:54 +02:00
dlenev@mysql.com
fa8bf7bc09
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-05-09 17:26:59 +04:00
mwagner@ultrafly.mysql.com
58409db4c9
make_binary_distribution.sh:
...
- Add --machine override
2005-05-09 14:57:45 +02:00
dlenev@mysql.com
e7f29e1904
Manual merge of fix for bug #9913 into 5.0 tree.
2005-05-09 16:21:57 +04:00
mwagner@ultrafly.mysql.com
f5ba5ab024
make_binary_distribution.sh:
...
- Print the platform name for the build logs.
2005-05-09 12:05:13 +02:00
lars@mysql.com
e76c641190
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
2005-05-09 11:45:59 +02:00
serg@sergbook.mylan
b1edf49952
don't use tmp file for such a triviality
2005-05-09 09:24:05 +02:00
mwagner@ultrafly.mysql.com
c5cb8a2bfa
make_binary_distribution.sh:
...
- Remove vendor tag from package names.
- Map standard OS names to user-friendly versions.
2005-05-08 23:02:50 +02:00
tomas@poseidon.ndb.mysql.com
4f1e27ed00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-03 00:10:52 +02:00
jimw@mysql.com
36869043ec
Resolve merge of fix for #8166 .
2005-05-02 10:25:47 -07:00
tomas@poseidon.ndb.mysql.com
145ae3c6f5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-02 13:18:26 +02: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
tomas@poseidon.ndb.mysql.com
033988f014
Merge
2005-04-25 22:21:25 +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
lars@mysql.com
1bd55e471e
Merging 5.0->5.1
2005-04-19 11:09:54 +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
patg@patrick.local
8e0eb65f9a
5.0 to 5.1 merge
2005-04-01 12:32:17 -08: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
lars@mysql.com
f1ce374acc
Correction of a bad manual merge
2005-03-21 17:53:48 +01:00
brian@zim.(none)
499f12faf2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/mysql-5.1
2005-03-17 17:16:31 -08:00
tomas@poseidon.ndb.mysql.com
1d1be36d87
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-03-16 02:50:02 +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