Commit graph

376 commits

Author SHA1 Message Date
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
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
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
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
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
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
vva@eagle.mysql.r18.ru
b4014b903b new version of help 2003-05-29 17:47:31 -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
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
lenz@mysql.com
093f661a80 - Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz>
(General code cleanup, use the GRANT statement instead of updating
   the privilege tables directly, added option to revoke privileges)
2003-04-25 21:58:25 +02:00
venu@myvenu.com
077d7e81c8 Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files
2003-04-16 11:49:52 -07:00
lenz@mysql.com
7fbc28c074 - added missing dashes to parameter "open-files-limit" in mysqld_safe
(bug #264)
2003-04-15 16:11:37 +02:00
lenz@mysql.com
ef39d2a669 - applied patch from provided by Christian Hammers from Debian to be able
to run the script even if mysqld is not up and running on upgrade
2003-04-09 21:19:53 +02:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
greg@mysql.com
080b73ee18 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches 2003-03-28 14:24:32 -05:00
greg@mysql.com
9aeb60210f Improve make_binary_distribution from Novell code at Monty's request 2003-03-27 18:13:37 -05:00
greg@mysql.com
67985efed5 Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC 2003-03-21 16:45:39 -05:00
monty@narttu.mysql.fi
112dfa5900 Fixes for fill_help_tables.sql 2003-03-21 18:53:55 +02:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
guilhem@mysql.com
7092bbe8a4 Small fixes in mysql_tableinfo. It's only code tiny changes, does not modify
the output of the script.
2003-03-14 16:07:15 +01:00
serg@serg.mysql.com
026ec1d37c merged 2003-03-13 13:44:03 +01:00
lenz@mysql.com
b69e0f48be - made test for multiple --user options more sh-compatible 2003-03-11 18:54:57 +01:00
monty@narttu.mysql.fi
fae2711297 merge 2003-03-10 14:13:46 +02:00
monty@narttu.mysql.fi
f1635f64f9 Merge with 3.23 to get fixes for --user and BACKUP TABLE 2003-03-10 12:48:43 +02:00
monty@narttu.mysql.fi
c231b747e3 Don't allow multiple --user options to mysqld
(First one is used)
2003-03-10 12:24:22 +02:00
venu@myvenu.com
dff8f63272 Change -IN_RPM -> --rpm and -WINDOWS -> --windows from mysql_install_db 2003-03-07 10:16:23 -08:00
venu@myvenu.com
582e8b929e Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-04 14:33:25 -08:00
lenz@mysql.com
26f9bee733 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 22:24:00 +01:00
lenz@mysql.com
905ce89dc5 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 18:18:05 +01:00
greg@mysql.com[greg]
137bdcec5a novell41.patch 2003-03-04 10:34:32 -05:00
venu@myvenu.com
64f0e4289d Fix for the windows src distribution script - SCRUM:
-- To take care of .zip and .tar
  -- Initialization of 'data' directory without any host dependancy data
  -- Incorporate all changes from Monty
2003-03-02 14:05:51 -08:00
monty@narttu.mysql.fi
9a46698e1e Merge with 4.0.11 2003-02-26 01:03:47 +02:00
monty@narttu.mysql.fi
326b8abc89 merge with 3.23 to get corrected error message files and rename of files in mysql-test 2003-02-26 00:22:35 +02:00
monty@narttu.mysql.fi
e6c575dacc change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS 2003-02-26 00:04:13 +02:00
jani@rhols221.adsl.netsonic.fi
7dc6d7bd19 Applied a patch which fixes a quoting problem with
mysql_hot_copy when --checkpoint or --record-log-pos was used.
2003-02-24 16:57:54 +02:00