Commit graph

610 commits

Author SHA1 Message Date
serg@serg.mylan
1d33747d3a Symlink vulnerability fixed.
reported by Javier Fernandez-Sanguino Pena
and Debian Security Audit Team (http://www.debian.org/security/audit)
2005-01-12 23:30:54 +01:00
joreland@mysql.com
953df8f48d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-12 11:24:46 +01:00
jimw@mysql.com
39d90b710f Replace ZLIB_LIBS in mysql_config. (Bug #6418) 2005-01-11 21:50:30 +01:00
jimw@mysql.com
804a952f9b Create columns_priv with correct column lengths (the alter table
that used to fix it was removed in a merge, and now the alter table
that fixes the length comes before the create table so it fixes
pre-existing tables but not the newly-created one).
2005-01-07 19:50:41 +01:00
serg@sergbook.mysql.com
a609bc45f2 merge 2005-01-07 15:02:25 +02:00
jimw@mysql.com
5010be1d8b Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-06 21:39:57 +01:00
jimw@mysql.com
b1eab7097c Make sure all char columns in the mysql.* tables have the proper width in
mysql_fix_privilege_tables.sql, or they may get truncated during conversion
to utf8. (Bug #7539)
2005-01-06 20:42:06 +01:00
jimw@mysql.com
488170d38c Merge mysql.com:/home/jwinstead2/mysql-4.1-7021
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 20:03:06 +01:00
jimw@mysql.com
4149e1116a Merge mysql.com:/home/jwinstead2/mysql-4.1-6964
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 20:01:18 +01:00
jimw@mysql.com
2acb738784 Add comment to make code for option-stripping in mysql_config more clear 2005-01-06 19:57:02 +01:00
serg@sergbook.mysql.com
f472cec178 merged 2005-01-06 19:32:16 +02:00
jimw@mysql.com
d14f3d7675 Protect flags like -Wl,-O2 from being mangled by mysql_config (Bug #6964)
(Second commit of this patch -- first included wrong changes.)
2005-01-05 03:43:37 +01:00
jimw@mysql.com
30808e9ab9 Make sure to include ZLIB_LIBS in mysql_config --libs_r (Bug #7021) 2005-01-05 02:04:12 +01:00
jimw@mysql.com
0ed892f197 Change mysqld_safe search for mysqld relative to the current working directory
to only look for the mysqld binary (and english error strings) and assume the
datadir from that. Then, if that datadir turns out to not exist, startup will
fail. This avoids the behavior where mysqld_safe would go off and run a totally
different binary because the data directory had been moved (even when --datadir
was specified on the command line). (Bug #7249)
2005-01-05 01:08:45 +01:00
jani@ua141d10.elisa.omakaista.fi
81d99da104 Added checking for my.cnf file from environment variable MYSQL_HOME
instead of DATADIR.
2005-01-04 20:13:47 +02:00
jimw@mysql.com
663396653a Use 'ps xaww' in mysqld_safe (on Linux) so whole command-line is searched
for port and/or pid-file parameters. (Bug #5878)
2005-01-04 01:49:29 +01:00
kent@mysql.com
bb806c1e98 make_win_src_distribution.sh, make_binary_distribution.sh, mysql-test-run.sh:
Removed references to ISAM and MERGE
2005-01-01 21:13:09 +01:00
dlenev@mysql.com
536cb92195 Manual merge. 2004-12-31 12:48:27 +03:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00
dlenev@mysql.com
a8deefa3dd Manual merge of patch implementing WL#1339 with main tree. 2004-12-29 22:35:16 +03:00
dlenev@brandersnatch.localdomain
ffa7393330 WL#1339 "Add per account max_user_connections limit (maximum number
of concurrent connections for the same account)"

Added support of account specific max_user_connections limit. Made all
user limits to be counted per account instead of the old behavior,
which was per user/host accounting. Added option which enables the old
behavior. Added testing of these to the test suite.

(After review version).
2004-12-29 20:30:37 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
b1e30904d5 WL#925 - Privileges for stored routines
Implement fine-grained control over access to stored procedures
  Privileges are cached (same way as existing table/column privs)
2004-12-23 10:46:24 +00:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
paul@frost.snake.net
adfb20f64a fill_help_tables.sh:
Convert @samp{c} to 'c', not c.
2004-12-18 14:22:20 -06:00
joreland@mysql.com
cfa20fbaa6 merge 2004-12-17 10:36:14 +01:00
wax@kishkin.ru
e81d48fdd9 corrected mysqltest.dsp
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script
2004-12-14 18:46:55 +05:00
anjuta@arthur.local
a045161e5b Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; 2004-12-14 01:54:16 +02:00
monty@mysql.com
b68f2307e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-12-09 12:50:37 +02:00
monty@mysql.com
01e4740f4c Ensure that we free memory used with --order-by-primary (in mysqldump)
Simple, non critical, fix to mysql_fix_privilege_tables
2004-12-09 12:47:20 +02:00
monty@mysql.com
77207d19f2 Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
ram@gw.mysql.r18.ru
bd247e3d56 A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet). 2004-12-06 18:45:41 +04:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
tsmith@build.mysql.com
075a887995 mysqld_safe.sh:
Fix calls to my_print_defaults.  Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option.  
  NOTE: this may make some installations behave differently, if they depend on this broken behavior.
2004-11-30 22:17:43 +01:00
serg@serg.mylan
b460059988 merged 2004-11-28 20:42:04 +01:00
serg@serg.mylan
96729c62be merged 2004-11-28 18:19:01 +01:00
monty@mysql.com
eb304bd49f Fixes while reviewing code
(Cleanups and better bug fixes)
2004-11-26 02:31:22 +02:00
joreland@mysql.com
f63b126f7e Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-15 10:50:58 +01:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
monty@mysql.com
b56851fd7a Merge on pull 2004-11-12 17:48:01 +02:00
paul@ice.snake.net
1288f453cc fill_help_tables.sh:
Recognize another Texinfo tag.
2004-11-12 08:45:58 -06:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
brian@avenger.(none)
f05daf02ba Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
joreland@mysql.com
37e92ab27a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-11 22:02:17 +01:00
paul@ice.snake.net
9ee3bf9efa fill_help_tables.sh:
Handle some additional Texinfo tags that were being missed.
2004-11-10 22:43:09 -06:00
joreland@mysql.com
5172eace09 wl1744 - nbd windoze port 2004-11-10 14:18:49 +01:00
joreland@mysql.com
32796b4860 wl1744 - ndb on windows
Add rules for creating dsp-files
2004-11-10 00:03:01 +01:00
monty@mysql.com
47bbf768d4 Fixes after merge with 4.1
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
2004-11-03 12:39:38 +02:00
tim@siva.hindu.god
b0510c7fd4 Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROC
for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself.
2004-11-02 17:53:25 -07:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
joerg@mysql.com
5163c03bad Fix for bug#5385 ("Text files have unix line break"):
Windows style line end \r\n on README, license, and similar essential plaintext files.
2004-10-27 21:59:34 +02:00
tomas@poseidon.ndb.mysql.com
009bf31915 use the right make in make_binary_distribution 2004-10-22 08:57:52 +00:00
monty@mysql.com
f9cd4a60e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-10-20 15:14:06 +03:00
pem@mysql.comhem.se
4043c0f3db Implemented the stored procedure data access characteristics:
NO SQL
CONTAINS SQL (default)
READS SQL DATA
MODIFIES SQL DATA

These are needed as hints for the replication.
(Before this, we did have the default in the mysql.proc table, but no support in the parser.)
2004-10-14 18:07:09 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9001573040 Added documentation. 2004-10-11 23:59:37 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
4d55c4a321 Improved mysqld_multi documentation, especially the --example
section, which had gotten somewhat out-dated.
2004-10-11 20:54:48 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
26e34093c3 Added some extra information to output in case --verbose
was given.
2004-10-09 13:23:00 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
2450f4afa2 - Added --verbose
- Made some of the warnings under --verbose only
- Added possibility to add mysqladmin= under groups [mysqldN]
  mysqladmin=... is no longer mandatory under [mysqld_multi]
- Made 'start', 'stop' and 'report' commands truly case-insensitive
- Some other common places code merge and cleanup
2004-10-09 12:33:24 +03:00
mwagner@here.mwagner.org
edc4b65d5c mysql-test-run.sh:
Look for 'client_test' in tests/ not bin/
make_binary_distribution.sh:
  Copy 'client_test' into the dist
2004-10-08 13:38:35 -05:00
jani@a193-229-222-2.elisa-laajakaista.fi
951e54df74 Changed a fatal error to a warning in case the default mysqld
binary for mysqld_multi was not found. This is because it is
possible to define one under each mysqldN group separately.
Bailing out if mysqld binary is not found at all.

Added option --silent to turn off warnings.
2004-10-08 20:18:25 +03:00
monty@mysql.com
73e4a41103 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-10-08 16:40:00 +03:00
monty@mysql.com
8d73628d88 Merge 2004-10-08 15:43:27 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
4ec44183e2 Fixed a bug in --log option. 2004-10-07 23:51:47 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
c73cd9ff8a Fixed Bug#5575, mysqlhotcopy is broken when using --noindices 2004-10-07 20:30:30 +03: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
lenz@mysql.com
5037b95f81 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-10-07 14:43:09 +02:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
lenz@mysql.com
5db0d20b88 - Rename the *.cnf files to *.ini for the Windows source distribution 2004-10-05 14:42:15 +02:00
monty@mishka.local
be4ca46fbe More fixes for strict mode:
More tests.
Better error messages.
Fixed bug when checking if we updated all needed columns for INSERT.
Give an error if we encounter a wrong float value during parsing.
Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS.
Fixed UPDATE IGNORE when using STRICT mode.
2004-10-02 22:20:08 +03:00
tomas@poseidon.(none)
5488f207db mysql_install_db should do skip-ndbcluster
set a printout in SocketClient only for debug
2004-09-16 08:22:22 +00:00
patg@krsna.patg.net
78fa3aeff4 another small change for bug 5531 2004-09-14 14:10:29 -07:00
patg@krsna.patg.net
484d54b231 fixed bug 5531 2004-09-14 12:23:18 -07:00
bell@sanja.is.com.ua
3c239d0bec fixed privilege system upgrade script, to allow VIEW privileges for used who have CREATE privilege (BUG#5329) 2004-09-11 18:46:06 +03:00
hf@deer.(none)
2eec5d460d Fix for bug #5396(libmysql depends on SSL)
Since libmysqld has libmysql's capabilities it needs lssl to compile
2004-09-10 19:55:43 +05:00
serg@serg.mylan
413a8753e2 merged 2004-09-07 15:18:53 +02:00
serg@serg.mylan
707def6fd0 better fix for bug#5001 2004-09-07 13:48:38 +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
monty@mysql.com
9d8555c0f0 Merge with 4.0 to get latest bug fixes 2004-09-04 15:59:49 +03:00
serg@serg.mylan
9153fd2ae4 merged 2004-09-03 22:12:27 +02:00
serg@serg.mylan
e66d0fa7d8 add engine=MyISAM to all create table statements in
mysql_create_system_tables, just in case
2004-09-03 17:20:00 +02:00
bar@mysql.com
f37df2fdcc Bug#4338 mysql-test-run fails if compiled with non-latin1 character set 2004-09-02 12:34:27 +05:00
patg@krsna.patg.net
54eac3b8d4 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0
into krsna.patg.net:/home/patg/mysql-4.0
2004-08-31 19:04:07 -07:00
patg@krsna.patg.net
e277145911 mysqld_safe.sh:
bug #5001, added conditional if to test if port set, then only kill the processes
  for this port, not all processes (in the case of this bug where multiple servers 
  are killed.)
  The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's
  discovery that mysqld_safe would get killed. 
  In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file"
  was the case that evaluated as true, so in order to test, I had to comment that block
  out.
2004-08-31 18:59:41 -07:00
bar@mysql.com
521643c85a Bu#4526 building with utf8_bin collation causes help to be case sensitive 2004-08-27 21:12:53 +05:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
serg@serg.mylan
3c963455c1 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-10 16:36:11 +02:00
serg@serg.mylan
b49b5e9c68 disable safe-updates for mysql_fix_privilege_tables 2004-08-10 16:34:29 +02:00
dlenev@brandersnatch.localdomain
f49d4f5350 Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server".
Instead of trying to open time zone tables during calculation of CONVERT_TZ() function
or setting of @@time_zone variable we should open and lock them with the rest of 
statement's table (so we should add them to global table list) and after that use such 
pre-opened tables for loading info about time zones.
2004-08-10 12:42:31 +04: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
serg@serg.mylan
0d0a50ce6a language fix 2004-07-29 23:33:23 +02:00
lenz@mysql.com
0b8fd9d66d - match shared library file name suffixes on Mac OS X (.dylib)
and HP-UX (.sl) for creating "mysql-shared" packages there
2004-07-23 12:44:09 +02:00
serg@serg.mylan
8d080cbcfa manual merge 2004-07-20 15:34:57 +02:00
paul@ice.snake.net
849de1e629 mysql_fix_privilege_tables.sql:
Fix the other typo, too. :-)
2004-07-18 22:16:42 -05:00
paul@ice.snake.net
d74b122fd9 mysql_fix_privilege_tables.sql:
Fix typo in comments.
2004-07-18 22:11:47 -05:00
bell@sanja.is.com.ua
166a9ab465 changes in system db creation procedure for view privileges 2004-07-16 12:25:26 +03:00
bell@sanja.is.com.ua
9336d36cf8 VIEW
two TABLE_LIST copy eliminated
2004-07-16 01:15:55 +03:00
lenz@mysql.com
20389c1e9a Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-07-15 21:19:16 +02:00
lenz@mysql.com
fe2425b725 - Avoid the error message "Can't read index header from..."
when copying a small index file because the value returned
   for $length is < 1024. This can happen if the filehandle
   was open()ed as an UTF-8 encoded file with Unicode characters
   (In this case read() returns characters not bytes)
   (Thanks to Mike Bethune) for this hint)
2004-07-15 21:18:31 +02:00