Commit graph

610 commits

Author SHA1 Message Date
monty@mysql.com
5b3c418b48 After merge fixes
Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)

Sanja needs to check out the calling of close_thread_tables() in sp_head.cc
2004-07-15 04:19:07 +03:00
paul@kite-hub.kitebird.com
791bdf2c48 mysql_fix_privilege_tables.sh:
Language fixups.
2004-07-14 11:33:00 -05:00
monty@mysql.com
31fe2837f9 Merge with 4.1 2004-07-12 08:20:24 +03:00
monty@mysql.com
56d5e56cc6 Merge 2004-07-11 12:16:25 +03:00
serg@serg.mylan
8064f06562 mysqlhotcopy:
fix MYI copying with scp
  safer tempfile creation
2004-07-09 14:30:51 +02:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
serg@serg.mylan
021242bc6c mysql_fix_privilege_tables.sh:
various fixes (for mysql-test-run at least):
  * accept --no-defaults
  * 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --)
ps_3innodb.test:
  only run ps_3innodb.test if innodb is present
mysql-test-run.sh:
  it's --verbose, not --verbose=1
2004-07-06 16:29:26 +02:00
paul@kite-hub.kitebird.com
f1218f982a Message/comment touchup. 2004-06-28 11:26:54 -05:00
guilhem@mysql.com
00394f591e Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-28 15:39:04 +02:00
guilhem@mysql.com
ba22a7aaa9 Fix for BUG#4240 "mysql_fix_privilege_tables Does not use --password properly"
Pass password if it is NOT empty. Typo fixed.
2004-06-28 15:37:42 +02:00
monty@mysql.com
380ff9c228 Fix to be able to cross-compile for modesto 2004-06-27 18:20:06 +03:00
monty@mysql.com
137b8517c4 Cleanup for creating windows source distribution 2004-06-26 10:57:00 +03:00
patg@krsna.patg.net
6fa7e370f9 make_win_src_distribution.sh:
4.1 tree must use installshield project files due to new tables
2004-06-25 19:25:36 -07:00
patg@krsna.patg.net
a65f2afbae mysql_create_system_tables.sh:
fix to user table during make_win_src_distribution
2004-06-25 19:11:46 -07:00
monty@mysql.com
b1d08ba2b4 Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
monty@mysql.com
b878240940 Add missing .cnf files to windows installation (Bug #4216) 2004-06-25 18:54:43 +03:00
monty@mysql.com
f6765146c1 Added missing root user to mysql.user on windows. (Bug #4242)
Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938)
Don't use default arguments for ha_rnd_init()
Simple code cleanups since last pull
2004-06-25 18:49:36 +03:00
ram@gw.mysql.r18.ru
fe3bb82b2b Changed a comment. 2004-06-25 15:26:50 +05:00
ram@gw.mysql.r18.ru
65fe5e7289 a fix (bug #4241: system_mysql_db_fix.test fails) 2004-06-25 15:09:26 +05:00
lenz@mysql.com
edb9af25bc - added mysql_tzinfo_to_sql to binary distributions 2004-06-24 09:22:45 +02:00
monty@mysql.com
ad86016e2f lower_case_table_names=2 (Keep case for table names) was not honored
with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)
2004-06-23 16:44:34 +03:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
dlenev@brandersnatch.localdomain
09ba29e539 WL#1264 "Per-thread time zone support infrastructure".
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
  
WL#1266 "CONVERT_TZ() - basic time with time zone conversion 
function".
  
Fixed problems described in Bug #2336 (Different number of warnings 
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated 
at Field object level not in conversion functions).
  
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
2004-06-18 10:11:31 +04:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
monty@mysql.com
f56df164f0 ke it possible to use mysys functions in netware/mysql_test_run.c
Don't pass --user to mysqld if --user is not used
2004-06-18 04:22:43 +03:00
monty@mysql.com
30bed1bbf9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-10 16:44:55 +03:00
monty@mysql.com
d28895d042 After merge fix 2004-06-10 16:44:39 +03:00
serg@serg.mylan
3d36d97efb Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-06-10 13:58:32 +02:00
serg@serg.mylan
5647809350 warn about multiple mysqld --user parameters only if their arguments differ 2004-06-10 13:56:58 +02:00
guilhem@mysql.com
4bd441850c Fix for BUG#4038 "rpm postinstall script leaves files as owned by root":
the rpm postinstall script must call mysql_install_db with --user=mysql,
and mysql_install_db must then pass this to mysqld. Otherwise, mysqld
runs as root, and if you have --log-bin=somewhere_out_of_var_lib_mysql
it creates binlog files owned by root in this dir, and this dir is not
fixed by the 'chmod mysql', so files remain owned by root, and later mysqld
(running as 'mysql') can't read them.
I'm hardcoding 'mysql' in the postinstall script, but it's already hardcoded
there in many places (see the useradd and chown) so it's ok.
2004-06-09 17:07:11 +02:00
paul@ice.snake.net
fb15e3e73f mysql_install_db.sh:
Correct a grammar error.
2004-06-04 16:11:47 -05:00
paul@kite-hub.kitebird.com
2f0ca1ce42 Fix skipp -> skip once and for all.
(Note: This affects only comments, not variable names.)
2004-06-03 11:52:54 -05:00
tomas@poseidon.bredbandsbolaget.se
8d7d4c077b several ndb make changes, see respective file 2004-06-02 00:54:58 +00:00
monty@mysql.com
518019f511 Remove some code from sql_yacc.cc that doesn't do anything except produce warnings on VC++ 2004-05-28 00:03:19 +03:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable
Applied patches for Netware
2004-05-26 19:12:49 +03:00
pem@mysql.com
71eddc362e Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
monty@mysql.com
ca8dbc24ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
monty@mysql.com
a4b0ec1ede Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
monty@mysql.com
86a966256b Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
2004-05-19 16:38:12 +03:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
lenz@mysql.com
b1f2932fff - make sure the binaries are executable before calling them during
make_binary_distribution (bug#2857)
2004-05-13 18:50:09 +02:00
monty@mysql.com
894e8fca6e Portability fixes 2004-05-12 02:38:57 +03:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
monty@mysql.com
d21d49a32a Merge with 4.0.19 2004-05-05 17:05:24 +03:00
lenz@mysql.com
3856bdfb82 - reverted change to fill_help_tables.sh ("Added checking of maximum
length of line in output (Bug #2874)" from last ChangeSet (should not
   have been applied)
2004-04-30 14:31:52 +02:00
monty@mysql.com
6678ecf19a Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
Added checking of cut read lines in bootstrap thread (Bug #2874)
2004-04-30 14:02:17 +03:00
monty@mysql.com
7c742e5583 Portability fixes 2004-04-30 00:14:56 +03:00
monty@mysql.com
f10d098f7d Fixed http address in some scripts (Bug #3460)
Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix)
Fixed that INTERVAL can handle big integers. (Bug #3498)
Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473)
2004-04-28 17:45:08 +03:00
monty@mishka.local
ef18b13738 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
2004-04-27 15:48:48 +03:00
monty@mishka.local
21fd1d270e Merge with 4.0 2004-04-26 15:53:31 +03:00
tomas@mc05.(none)
8e381405eb make_binary_distribution.sh:
added --with-ndbcluster switch
2004-04-15 15:43:10 +02:00
jani@rhols221.adsl.netsonic.fi
96cb3ec0e9 - Merged in changes from mysqld_multi 2.6
- Changed reading of config file so that one can use a separate config
  file for [mysqld_multi] also. In other words --config-file=file will
  read group [mysqld_multi] from this file, earlier it wouldn't have.
2004-04-09 09:59:11 +03:00
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
jani@rhols221.adsl.netsonic.fi
0e5cdf319d Fixed previous security patch. mysqld_safe will use the given --log=file,
or if not given, it will try to use the one in datadir, if possible, otherwise
log file will be disabled.
2004-04-07 19:37:13 +03:00
jani@a80-186-24-72.elisa-laajakaista.fi
0f484ebae6 Fixed a problem with mysqld_multi log file. The default is now datadir/mysqld_multi.log,
if doesn't exists or is not writable, then /var/log/mysqld_multi.log, if does not exists
or is not writable, then /tmp/mysqld_multi.log, but only in case the file does not yet
exists in /tmp. Otherwise log will be disabled, unless user explicitely sets it with an
option.
2004-04-06 17:57:32 +03:00
paul@ice.snake.net
85fc077033 Minor tweaks to help message of obscure script. 2004-04-04 18:48:41 -05:00
lenz@kallisto.local
bbbb3f6540 - install all *.sql files into the "shared" directory for the binary tar.gz
distribution (this is more in line with how "make install" would install
   them) - this should also fix a test failure in the "system_mysql_db_fix"
   test.
2004-04-01 17:34:26 +02:00
monty@mysql.com
f602829c75 Fix to get correct metadata when using temporary tables to create result. (Bug #2654) 2004-03-30 19:24:28 +03:00
monty@mysql.com
e0e0314d60 Merge with 4.0 2004-03-25 23:29:45 +02:00
monty@mysql.com
ce79eb9ca7 merge with 3.23 2004-03-25 22:05:09 +02:00
serg@serg.mylan
5de17ec592 protection against "ln -s /etc/passwd /tmp/failed-mysql-bugreport" 2004-03-24 20:27:07 +01:00
pem@mysql.comhem.se
5954e94fa7 Fixed BUG#3259: Stored procedure names are case sensitive.
Procedure names were unintentionally case-sensitive when read from the database
(but case-insensitive when fetched from the cache).
Note that the DB-part of qualified names is still case-sensitive (for consistency
with other usage in mysql).
2004-03-23 12:04:40 +01:00
monty@mysql.com
59f9dcd51d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-03-20 12:49:17 +02:00
serg@serg.mylan
fe138bf639 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-19 18:09:32 +01:00
serg@serg.mylan
361579307e Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-19 17:37:36 +01:00
monty@mysql.com
b49b24d94a Added test to show bug in current union implementation
After merge fixes
Portability fixes
2004-03-19 18:33:38 +02:00
monty@mysql.com
9a1baf7d62 Portability fixes
Fixed some wrong column specifications in mysql_fix_privilege_tables
2004-03-19 18:26:02 +02:00
serg@serg.mylan
b4577bc43a typo in mysql_install_db fixed 2004-03-19 17:19:33 +01:00
monty@mysql.com
933278a52b merge with 4.0 (to get compiler error fixes for innodb) 2004-03-19 15:17:56 +02:00
monty@mysql.com
b7fc7188d0 Portability fixes
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work
2004-03-19 14:52:48 +02:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
vva@eagle.mysql.r18.ru
faa9c92765 fixed BUG #2874 "Grant table bug" and
added tests for testing structure of mysql db
2004-03-10 22:54:07 +04:00
jani@ua72d24.elisa.omakaista.fi
34a332c086 Added option chroot to mysqlhotcopy.
Useful in case mysqld was started with chroot.
2004-03-04 18:30:28 +00:00
monty@mashka.mysql.fi
3b83cce5eb merge with 4.0 2004-02-22 09:50:59 +02:00
greg@mysql.com
1b0d050aaf Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/bk/mysql-4.0
2004-02-20 14:42:42 -01:00
serg@serg.mylan
a35955d60f \| is sed is on-portable 2004-02-20 12:02:34 +01:00
greg@mysql.com
0786eb656c Major work on Windows build automation-- add binary packaging, suffixes 2004-02-19 19:04:47 -01:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
lenz@mysql.com
9736c9c457 - renamed myisam/ft_dump to myisam/mysam_ftdump and added it to the
binary distribution and Server RPM
2004-02-03 22:25:02 +01:00
lenz@mysql.com
5693662fc0 - fixed early removing of socket file when multiple instances of mysqld are
started via mysqld_safe (BUG#2114) Thanks to Rodrigo Marchant for the
   suggestion
2004-01-15 16:14:30 +01:00
lenz@mysql.com
20733eed52 - improved wording in mysql_install_db on what to do to set the password
for the MySQL root user (BUG#2375)
2004-01-13 19:33:01 +01:00
serg@serg.mylan
2cae5989e9 do not put --user into command line if the value comes from [mysqld] or [server] sections
Bug #2163
2003-12-19 23:08:20 +01:00
pem@mysql.comhem.se
7a1fddaa1f Renamed the "schema" column to "db" in mysql.proc to keep it in style with
all the other mysql.* tables.
2003-12-16 19:14:10 +01:00
pem@mysql.comhem.se
7a20e5282e In order to make ALTER PROCEDURE|FUNCTION work correctly, and in general to
make characteristics (and SHOW) work right, we had to separate the old
definition blob in the mysql.proc table into separate fields for parameters,
return type, and body, and handle the characteristics (like SQL SECURITY)
separately... and then reassemble the CREATE string for parsing, of course.
This is rather ugly, mostly the parser bit. (Hopefully that will be better
with the new parser.)
2003-12-12 14:05:29 +01:00
pem@mysql.comhem.se
b27e9d6052 WL#1363: Update the mysql.proc table and add new fields.
Also made the parsing and handling of SP characteristics
more general and extendable, and added a few ch:istics.
2003-12-10 19:05:37 +01:00
pem@mysql.com
24a2ae44a3 Merged 4.1 -> 5.0 2003-12-09 19:00:34 +01:00
monty@mysql.com
e8aef44349 Portability fixes for Windows 2003-12-08 12:25:37 +02:00
pem@mysql.com
6e717133c5 Merge 4.1 to 5.0 2003-12-01 16:14:40 +01:00
serg@serg.mylan
bff0bbeb1f merged 2003-11-25 18:26:53 +01:00
lenz@mysql.com
531eb44301 - Removed COPYING.LIB from all source and binary distributions
after it was removed from manual.texi (where it was automatically
   generated from).
2003-11-25 17:52:12 +01:00
serg@serg.mylan
f8d52f7cf1 a script that fixes anti-GRANT'ness of privilege tables.
It can appear as a result of manual modifications with INSERT/UPDATE/DELETE

This script converts privilege table to the state that could be created
with GRANT commands only (with the exception of the short password)

This is necessary for 5.0
2003-11-25 16:08:55 +01:00
lenz@mysql.com
12fb40460b - Rephrased two option help texts to not start with "use the ..." as this
confuses RPM's Perl module dependency checking (it adds a bogus
   requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)
2003-11-24 17:05:24 +01:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
greg@mysql.com
2a23f98521 Merge mysql.com:/bk/mysql-4.1 into mysql.com:/home/greg/bk/4.1 2003-11-18 15:18:02 -05:00
greg@mysql.com
119b689b3b Add Docs/internals.texi to Windows source packages. 2003-11-18 15:17:41 -05:00
monty@mashka.mysql.fi
a47d56088f Merge with 4.0 tree 2003-11-18 18:54:27 +02:00
vva@eagle.mysql.r18.ru
24413c7d8c fixed bug #1650 "mysql_config --libmysqd-libs misses libwrap" 2003-11-15 19:37:54 -04:00
salle@vafla.online.bg
e51d0ced61 Fix for Bug #1752 Wrong letter cases.
Thanks to Daniel Convissor
2003-11-05 14:35:08 +02:00
monty@narttu.mysql.fi
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02:00
vva@eagle.mysql.r18.ru
30cad8ec2f Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1228/mysql-4.0
2003-10-25 16:23:24 -04:00
vva@eagle.mysql.r18.ru
dcc36e671c added to mysql_secure_installation
changing root password on all hosts (bug 1228)
2003-10-24 15:20:46 -04:00
jani@rhols221.adsl.netsonic.fi
7b3c89f1f6 Reverted a wrong patch from mysqlhotcopy. This is a real bug
in MySQL server...
2003-10-22 19:24:19 +03:00
jani@rhols221.adsl.netsonic.fi
e69447933d Fixed a bug in mysqlhotcopy, which made special table names
to cause program to abort. Such table name could have been
one with a semicolon (:) in the middle.
2003-10-22 18:40:37 +03:00
jani@rhols221.adsl.netsonic.fi
94cce64416 Fixed bug #954 mysqlhotcopy permission problem. The database
directory owner ship was not honored.
2003-10-22 18:19:59 +03:00
pem@mysql.com
337238b78a Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
jani@rhols221.adsl.netsonic.fi
07c9d4575b Applied a patch from Travis Wheeler to mysqlhotcopy that allows
using regexp with tablenames together with databasenames.
2003-10-22 16:02:27 +03:00
vva@eagle.mysql.r18.ru
982e77be63 made more fine error message in scripts/fill_help_tables.sh 2003-10-19 16:57:17 -04:00
lenz@mysql.com
83f5c4dbf8 - fixed small typo to resolve "test: argument expected" error on Solaris
and Tru64 when running "mysql_install_db"
2003-10-16 22:15:36 +02:00
monty@mashka.mysql.fi
e87c9f5ff8 merge with 4.0 2003-10-16 03:08:40 +03:00
serg@serg.mylan
f3e7012d6e Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-14 00:27:04 +02:00
monty@mashka.mysql.fi
461d1627b3 merge with 4.0 for more memory allocation variables. 2003-10-13 15:50:30 +03:00
lenz@mysql.com
75e74c79ec Merge 2003-10-08 12:49:42 +02:00
lenz@mysql.com
4bc3f12caf - added make_sharedlib_distribution.sh to the source distribution 2003-10-08 12:35:24 +02:00
serg@serg.mylan
9d198d35bf merged 2003-10-07 20:41:07 +02:00
monty@narttu.mysql.fi
1f8e38d03a Merge with 4.0 to get fix for mysqlbinlog 2003-10-07 21:41:06 +03:00
monty@narttu.mysql.fi
b82b76f480 Simple cleanups 2003-10-07 15:44:31 +03:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
monty@mishka.mysql.fi
a5c83b05bd Move init_compiled_charsets to own file
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup
2003-10-06 22:56:34 +03:00
monty@narttu.mysql.fi
fa823857d3 Merge with 3.23.58 2003-10-06 21:21:04 +03:00
serg@serg.mylan
0ce865b6b4 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-06 09:24:12 +02:00
paul@ice.snake.net
62de13dca3 Ride hobby horse. 2003-10-04 17:41:17 -05:00
monty@mishka.mysql.fi
70da491d34 Add proc table if not exists 2003-10-01 16:50:50 +03:00
vva@eagle.mysql.r18.ru
d1cf77f4bf Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1
2003-09-29 12:06:23 -04:00
vva@eagle.mysql.r18.ru
e2fe872181 added fine error messages in scripts/fill_help_tables.sh 2003-09-29 11:39:00 -04:00
serg@serg.mylan
9e68df2333 typo fixed (bug #1390 - incorrect mysql_config output) 2003-09-28 21:35:47 +02:00
serg@serg.mylan
1394684e12 make mysqld to respect socket/port options of mysqld_safe command line
and [mysqld_safe] section in my.cnf, even if they are also specified
in [mysql] section.
2003-09-27 18:54:22 +02:00
lenz@kallisto.local
f950139321 - better test for a string to avoid "test: integer expression expected"
if a variable is not defined (empty).
2003-09-27 00:25:57 +02:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
monty@mishka.mysql.fi
b0ae222ea2 Merge script with 4.1 2003-09-24 09:08:33 +03:00
monty@narttu.mysql.fi
f05a1c8394 Block SIGPIPE also for not threaded client programs.
Added --include and --libs_r options to mysql_config.
Added mysql_get_client_version() to client library
Fixed some minor benchmark issues
2003-09-23 13:36:01 +03:00
lenz@mysql.com
74077c79fc - added make_win_src_distribution.sh to EXTRA_SCRIPTS 2003-09-17 22:01:08 +02:00
greg@mysql.com
c4fb6c74d7 Merge gweir@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/4.0
2003-09-15 17:40:13 -04:00
greg@mysql.com
564dad6c53 Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999 2003-09-15 17:39:50 -04:00
greg@mysql.com
cc6e3a2ec9 New Windows source package automation for 3.23 2003-09-12 19:58:22 -04:00
monty@mashka.mysql.fi
73f66f68fd merge with 4.0.15 2003-09-11 20:24:14 +03:00
lenz@mysql.com
541189e746 - Added option "--skip-name-resolve" to mysql_install_db to be able to
use the local machine's IP address instead of the host name when 
   building the initial grant tables if "skip-name-resolve" has been
   specified in my.cnf. This can be helpful on FreeBSD to avoid
   thread-safety problems with the FreeBSD resolver libraries.
   (Thanks to Jeremy Zawodny for the patch)
2003-09-10 17:48:43 +02:00
greg@mysql.com
b450f65490 Provide mysql_fix_privilege_tables.sql for Windows users to update grant tables (BUG #948)
Fix make_win_src_distribution
2003-09-04 12:56:02 -04:00
monty@narttu.mysql.fi
4b3b4b9250 merge 2003-09-03 19:53:08 +03:00
serg@serg.mylan
7d2b0a0ce7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-03 15:40:19 +02:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were
lost.
2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c merged 2003-09-03 12:07:18 +02:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
60dd8a2c4f hanged UDF interface to use clear() instead of reset() 2003-08-27 22:30:50 +03:00
jani@rhols221.adsl.netsonic.fi
5f8ef50b35 Added a warning to my_print_defaults if --verbose is given
and --defaults-file is a non-existing or non-regular file.
Bug#755
2003-08-27 19:22:14 +03:00
lenz@mysql.com
fea30410ed - Reverted a fix for bug#897, as it broke the installation on some
other operating systems - some implementations of "hostname" simply set
   the host name to "-f" instead of giving an error about an unkown option
2003-08-26 14:29:13 +02:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
serg@serg.mylan
8424aec8db added support for --libs_r 2003-08-22 23:41:56 +02:00
monty@mashka.mysql.fi
4f7512160b After merge fixes
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
gweir@build.mysql.com
fe511fc489 make_win_src_distribution.sh:
Add --zip option for finer grain control over what package formats are created
Bootstrap:
  Create both Windows source packages
2003-08-13 19:32:34 +02:00
gweir@build.mysql.com
225eda66ce make_win_src_distribution.sh:
'tools' contains intermediate files
2003-08-13 17:00:22 +02:00
gweir@build.mysql.com
c369236517 make_win_src_distribution.sh:
Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces
2003-08-13 16:45:28 +02:00
gweir@build.mysql.com
51008b109c make_win_src_distribution.sh:
Clean up script, add needed modifications to generate a complete 4.0 Windows source package
2003-08-13 16:36:01 +02:00
gweir@build.mysql.com
cde03a0183 make_win_src_distribution.sh:
Copy some previously missed files
2003-08-13 04:52:03 +02:00
lenz@mysql.com
94c7024eaa - enabled embedded server in the binary distributions by default
(Do-compile)
 - added mysql.info to the binary distribution files (BUG#1019)
 - heavily reworked the Do-rpm script to be more in line with Do-pkg
 - create a "docs" subdirectory in the binary distribution and moved the
   manual, ChangeLog and mysql.info file into it to unclutter the top
   directory
2003-08-12 23:21:21 +02:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
lenz@mysql.com
d5547ad13b - some fixed for make_win_src_distribution to work properly 2003-08-07 18:54:59 +02:00
greg@gcw.ath.cx
e177eba89b New option for Bootstrap: -w | --win-dist to create Windows source package 2003-08-07 01:14:45 -04:00
greg@gcw.ath.cx
d527253d04 Copied Venu's make_win_src_distribution script from 4.1 tree 2003-08-06 22:57:14 -04:00
lenz@mysql.com
3d5d56cea9 - try harder to obtain the FQDN with "hostname -f", if possible (BUG#897)
Unfortunately the returned value of "hostname" is inconsistent on
   various platforms - some return the host name only, others return the
   FQDN by default. On Linux, one can use option "-f" to enable the output
   of the FQDN. Use it, if available.
2003-08-06 12:13:08 +02:00
lenz@mysql.com
216ca1e15d - fixed BUG#968 ("test: argument expected" error) - thanks to Alex Kiernan
for the patch
2003-08-01 10:09:23 +02:00
kostja@oak.local
9f98b79e3a Merge oak.local:/home/kostja/mysql/mysql-4.1-root
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-18 11:53:50 +04:00
vva@eagle.mysql.r18.ru
e76d784864 fixed bug with location of mysql_create_sytem_tables 2003-07-17 12:15:41 -04:00
lenz@mysql.com
ca8831e1ad - removed options sort_buffer and key_buffer from calls to (my)isamchk
in mysqld_safe (commented out by default), to not override any options
   defined in my.cnf (thanks to Axel Schwenke from Jobpilot.de for the
   suggestion)
2003-07-15 12:50:17 +02:00
guilhem@mysql.com
2ca501f7ea Fix for BUG#812
"mysqlhotcopy fails to copy tables but does not indicate a failure"
("does not indicate a failure");
this is about "mysqlhotcopy fails to copy tables".
2003-07-10 16:03:29 +02:00
pem@mysql.telia.com
a8a29a39d2 Merging 4.1 into 5.0 (second pass; post-merge fixes).
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(
2003-07-09 17:07:12 +02:00
lenz@mysql.com
7326dcbf23 - Fixed mysqlhotcopy to actually abort if copying the tables failed.
(BUG#812)
2003-07-08 23:29:55 +02:00
paul@teton.kitebird.com
a5a3eb9439 mysqlhotcopy.sh:
Undo serg's patch that used my_print_defaults,
  and instead simply do not define $opt{user}.
  This allows the script to use option files properly.
2003-07-08 11:25:46 -05:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
serg@serg.mylan
dbf893fbd4 added missing ~/.my.cnf support to mysqlhotcopy (bug #808) 2003-07-08 17:27:22 +02:00
jani@rhols221.adsl.netsonic.fi
fe025d40c4 Fixed a compatibility bug in mysqlhotcopy between different
versions of DBD. New mysqlhotcopy version supports both old
and new DBD versions while versions elder than 1.19 support
only old DBD versions.
2003-07-04 23:06:21 +03:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1)
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
2003-07-01 23:40:59 +04:00
gluh@gluh.mysql.r18.ru
7455759f11 Bug fixed: mysql-test failure on rpl tests 2003-06-26 09:39:23 +05:00
bar@bar.mysql.r18.ru
63235ceeef mysql_create_system_tables.sh:
Type fix
2003-06-24 15:55:39 +05:00
monty@narttu.mysql.fi
1bd306ccd4 Fixed some new memory leaks
Updated VC++ files
2003-06-24 12:10:35 +03:00
lenz@kallisto.local
7a6059cc88 - make sure that scripts/*.sql files are being added to the source
distribution as well
2003-06-20 13:57:51 +02:00
lenz@mysql.com
e7e5ccb547 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-06-18 09:49:56 +02:00
venu@myvenu.com
75b8cb2036 Fix for --dirname and --suffix (missed ones) 2003-06-17 14:29:20 -07:00
venu@myvenu.com
b648691535 Added new HOWTO doc 'INSTALL-WIN-SOURCE' on building 'mysql clients and server' on WINDOWS from BitKeeper as well as from distributed source archive 2003-06-17 12:22:57 -07:00
lenz@mysql.com
3b7911d367 - changed "password" to "Password" as suggested by Paul DuBois to be
consistent with the other column names in the table.
2003-06-16 10:32:49 +02:00
monty@narttu.mysql.fi
e090f2d0cc Fixes for make_win_src_distributions
Removed compiler warnings
2003-06-15 23:24:37 +03:00
jani@rhols221.adsl.netsonic.fi
8a52c2d20b Added option --skip-kill-mysqld to mysqld_safe. This can be useful,
if one is running many mysqlds through mysqld_multi, for example.
Without this option, on Linux one mysqld_safe process may kill
other mysqlds as well, if started using the same binary and path.
2003-06-14 12:29:42 +03:00
lenz@mysql.com
63df5f7cb7 - applied patch for mysqld_safe from Christian Hammers to be able to
define a different niceness level in my.cnf (Bug #627)
2003-06-12 13:52:24 +02:00
lenz@mysql.com
2daa5643d3 - applied patch to mysql_explain_log.sh provided by Dennis Haney
to accept --socket option (Bug #592)
2003-06-11 13:40:20 +02:00
monty@narttu.mysql.fi
059b1e5612 After merge fixes 2003-06-05 23:19:56 +03:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
gluh@gluh.mysql.r18.ru
7c6522a74e 'Expand the mysql.proc table to include (almost) all fields' task(851)
Fix after review
2003-06-02 14:25:01 +05:00
vva@eagle.mysql.r18.ru
b4014b903b new version of help 2003-05-29 17:47:31 -04:00
greg@mysql.com[greg]
ea46c24279 rlyon-5.0.0-alpha.patch 2003-05-29 14:28:02 -04:00
vva@mysql.r18.ru
55d4e55f7c fixed small merge bug 2003-05-27 16:58:57 +05:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
venu@myvenu.com
39cbb547d4 Resolve merge colflict 2003-05-21 00:12:09 -07:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
monty@mashka.mysql.fi
4bde719df7 Safety fix to enable RAID in max binaries
Better fix for format('nan')
Fix for HAVING COUNT(DISTINCT...)
2003-05-13 10:54:07 +03:00
gluh@gluh.mysql.r18.ru
33cabdc3b1 Expand the mysql.proc table 2003-05-06 21:09:20 +05:00
monty@mashka.mysql.fi
1e2f2ae037 Varbinary should be string as default 2003-05-06 06:20:16 +03:00
lenz@mysql.com
7179284df9 - applied patch from Tim Bunce (new --addtodest option that adds copied
files into an already existing directory)
2003-05-03 16:16:52 +02:00
venu@myvenu.com
55f2e01879 make_win_src_distribution.sh:
Fix for bdb/cxx as they contain .cpp files directly ( for 4.0 to go )
2003-04-30 09:42:08 -07:00