Commit graph

308 commits

Author SHA1 Message Date
unknown
3eb5fd0f24 Fix to be able to cross-compile for modesto
scripts/make_win_src_distribution.sh:
  Change mode to -rw-rw-r--
2004-06-27 18:20:06 +03:00
unknown
72093a6d14 Add missing .cnf files to windows installation (Bug #4216)
scripts/make_win_binary_distribution.sh:
  Add missing .cnf files (Bug #4216)
scripts/make_win_src_distribution.sh:
  Add missing .cnf files (Bug #4216)
  Align code with MySQL 4.1
2004-06-25 18:54:43 +03:00
unknown
3db93f8086 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)


include/mysql.h:
  Make net_buffer_length visible for mysql clients
libmysql/libmysql.c:
  Make net_buffer_length visible for mysql clients
mysql-test/mysql-test-run.sh:
  Don't give warning for some common 'safe' warnings
mysql-test/r/lowercase_table2.result:
  Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)
mysql-test/t/lowercase_table2.test:
  Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)
scripts/mysql_install_db.sh:
  Removed not used variable
sql/sql_table.cc:
  lower_case_table_names=2 (Keep case for table names) was not honored
  with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
2004-06-23 16:44:34 +03:00
unknown
5fa063ba7e ke it possible to use mysys functions in netware/mysql_test_run.c
Don't pass --user to mysqld if --user is not used


netware/Makefile.am:
  Make it possible to use mysys functions in mysql_test_run.c
netware/mysql_test_run.c:
  Make it possible to use mysys functions in mysql_test_run.c
scripts/mysql_install_db.sh:
  Don't pass --user to mysqld if --user is not used
2004-06-18 04:22:43 +03:00
unknown
eefb240b6d 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
unknown
43f0418d33 After merge fix
scripts/mysql_install_db.sh:
  Cleanup
2004-06-10 16:44:39 +03:00
unknown
64bbd52a5d 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
unknown
93290dad1f warn about multiple mysqld --user parameters only if their arguments differ
scripts/mysqld_safe.sh:
  don't protect mysqld from multiple --user commands - mysqld can take care of itself
sql/mysqld.cc:
  warn about multiple --user parameters only if their arguments differ
2004-06-10 13:56:58 +02:00
unknown
7a00d199a4 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.


scripts/mysql_install_db.sh:
  Pass --user to mysqld
support-files/mysql.spec.sh:
  in postinstall, call mysql_install_db with --user=mysql, so that mysqld (which installs the grant tables)
  is started with --user=mysql.
2004-06-09 17:07:11 +02:00
unknown
b287ca53d0 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/tmp/skr99/mysql-4.0


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2004-05-25 22:01:50 +03:00
unknown
b3851363ba Added patches from Novell
Build-tools/Do-compile:
  Fixed indentation
configure.in:
  Added patches from Novell
  Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
extra/perror.c:
  Fixed error number reporting to not report 'Unknown error'
include/my_global.h:
  Defines to make NETWARE patches cleaner
include/thr_alarm.h:
  Fixed wrong macro
netware/mysql_install_db.c:
  Indentation fix
2004-05-25 22:00:14 +03:00
unknown
2d67f1e0cf 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.


VC++Files/bdb/bdb.dsp:
  Small, automatic changes
VC++Files/client/mysql.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqladmin.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlclient.dsp:
  Removed files that should only be used with mysql command line client
VC++Files/client/mysqldump.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlimport.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlshow.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/comp_err/comp_err.dsp:
  Automatic changes
VC++Files/dbug/dbug.dsp:
  Automatic changes
VC++Files/heap/heap.dsp:
  automatic changes
VC++Files/innobase/innobase.dsp:
  Automatic changes
VC++Files/isam/isam.dsp:
  Automatic changes
VC++Files/isamchk/isamchk.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysql/libmysql.dsp:
  Automatic changes
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Add missing files
VC++Files/libmysqld/libmysqld.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysqltest/myTest.dsp:
  Automatic changes
VC++Files/merge/merge.dsp:
  Automatic changes
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisam/myisam.dsp:
  automatic changes
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  automatic changes
VC++Files/myisamchk/myisamchk.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisamlog/myisamlog.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisammrg/myisammrg.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisampack/myisampack.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysql.dsw:
  Automatic changes
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqldemb/mysqldemb.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlserver/mysqlserver.dsp:
  Automatic changes
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Automatic changes
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Automatic changes
VC++Files/mysys/mysys.dsp:
  Automatic changes
VC++Files/pack_isam/pack_isam.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/perror/perror.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/regex/regex.dsp:
  Automatic changes
VC++Files/replace/replace.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/sql/mysqld.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/strings/strings.dsp:
  Removed duplicate code for strnlen
VC++Files/test1/test1.dsp:
  Automatic changes
VC++Files/thr_test/thr_test.dsp:
  Automatic changes
VC++Files/vio/vio.dsp:
  Automatic changes
VC++Files/zlib/contrib/asm386/zlibvc.dsp:
  Automatic changes
VC++Files/zlib/zlib.dsp:
  Automatic changes
extra/my_print_defaults.c:
  Fixed bug in --verbose
include/m_string.h:
  Portability fix
include/mysql_embed.h:
  Better setting of server_version variable
include/mysql_version.h.in:
  Better license text handling
innobase/pars/pars0lex.l:
  Remove compiler warnings
innobase/trx/trx0sys.c:
  Remove compiler warnings
libmysqld/lib_sql.cc:
  Better setting of server_version variable
libmysqld/libmysqld.def:
  Add functions needed for mysql command line client
myisam/myisam_ftdump.c:
  Remove compiler warnings
mysys/sha1.c:
  Remove compiler warnings
scripts/make_win_src_distribution.sh:
  Safety fix
scripts/mysql_install_db.sh:
  Backport from 4.1 to allow make_win_src_distribution create the privilege tables
sql/Makefile.am:
  Add new file mysqld_suffix.h
  Remove not used file sql_olap.h
sql/ha_innodb.cc:
  Remove not used variable
sql/mysqld.cc:
  Better setting of server_version variable
sql/set_var.cc:
  Fixed bug when showing lower_case_file_system
strings/ctype-tis620.c:
  Remove compiler warnings
2004-05-19 16:38:12 +03:00
unknown
a6ff8d00e0 - make sure the binaries are executable before calling them during
make_binary_distribution (bug#2857)


scripts/make_binary_distribution.sh:
   - make sure the binaries are executable before calling them (bug#2857)
2004-05-13 18:50:09 +02:00
unknown
f4b02f9937 Portability fixes
mysql-test/mysql-test-run.sh:
  Avoid 'too many arguments' error
mysql-test/t/system_mysql_db_fix-master.opt:
  Add missing newline
scripts/mysql_fix_privilege_tables.sh:
  Portability fix
2004-04-30 00:14:56 +03:00
unknown
8b9ecce08c 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)


mysql-test/mysql-test-run.sh:
  Fixed wrong http address (Bug #3460)
mysql-test/r/func_time.result:
  Results for new test cases
mysql-test/t/func_time.test:
  Added test of INTERVAL with big integers
scripts/mysqld_safe.sh:
  Added html address to manual in case of error
sql/field.cc:
  Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19))
sql/item_timefunc.cc:
  Fixed that INTERVAL can handle big integers. (Bug #3498)
sql/mysql_priv.h:
  Removed not needed prototype
sql/sql_acl.cc:
  Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473)
  Moved GRANT_TABLE::GRANT_TABLE functions ou from class definition to make it possible to debug them
sql/structs.h:
  Fix for long values to INTERVAL
2004-04-28 17:45:08 +03:00
unknown
9afbd246ef - 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
unknown
7f0a632c19 merge with 3.23
BitKeeper/etc/logging_ok:
  auto-union
scripts/mysqlbug.sh:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/alter_table.test:
  Merge code with 3.23
sql/nt_servc.cc:
  use original code
2004-03-25 22:05:09 +02:00
unknown
7084ad6a73 protection against "ln -s /etc/passwd /tmp/failed-mysql-bugreport" 2004-03-24 20:27:07 +01:00
unknown
fd15d5ae1f 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
unknown
c56697f095 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
unknown
86ae07cd24 Portability fixes
Fixed some wrong column specifications in mysql_fix_privilege_tables


mysql-test/mysql-test-run.sh:
  Portability fix
mysql-test/r/func_math.result:
  portability fix
mysql-test/r/rpl_error_ignored_table.result:
  portability fix
mysql-test/t/func_math.test:
  portability fix
mysql-test/t/rpl_error_ignored_table.test:
  portability fix
scripts/mysql_fix_privilege_tables.sh:
  func.name was not generated correctly
scripts/mysql_fix_privilege_tables.sql:
  Fixed some wrong column specifications
2004-03-19 18:26:02 +02:00
unknown
88267ae534 typo in mysql_install_db fixed
scripts/mysql_install_db.sh:
  typo fixed
  (thanks Alex Dupre <ale@FreeBSD.org> for noticing this!)
2004-03-19 17:19:33 +01:00
unknown
9935110b30 Portability fixes
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work


client/mysqltest.c:
  More debug information
innobase/que/que0que.c:
  Fixed wrong usage of __attribute
mysql-test/mysql-test-run.sh:
  Portability fix; Added CLIENT_BINDIR
mysql-test/t/system_mysql_db_fix.test:
  Removed \r
mysql-test/t/system_mysql_db_refs.test:
  Removed \r
scripts/mysql_fix_privilege_tables.sh:
  Don't set root password from first option
  Added --bindir option
2004-03-19 14:52:48 +02:00
unknown
2053f8f850 fixed BUG #2874 "Grant table bug" and
added tests for testing structure of mysql db


client/mysqltest.c:
  extend "replace" to column names
  extend "disable_result_log" to output of --exec commad
mysql-test/install_test_db.sh:
  corrected wrong column definitions (as a result of tests)
mysql-test/mysql-test-run.sh:
  export MYSQL and MYSQL_FIX_SYSTEM_TABLES + 
  added option --result-file for *.opt files
scripts/mysql_fix_privilege_tables.sh:
  added new options to using in tests + 
  added new alters (as a result of new tests)
scripts/mysql_fix_privilege_tables.sql:
  added new alters (as a result of new tests)
scripts/mysql_install_db.sh:
  corrected definition of tables_priv.Table_name
2004-03-10 22:54:07 +04:00
unknown
21918cf763 Added option chroot to mysqlhotcopy.
Useful in case mysqld was started with chroot.
2004-03-04 18:30:28 +00:00
unknown
458c4d3119 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
unknown
2bd261a153 \| is sed is on-portable 2004-02-20 12:02:34 +01:00
unknown
ea9aa4d352 Major work on Windows build automation-- add binary packaging, suffixes
Build-tools/Do-win-build:
  Add suffix option, classic build, binary packaging
VC++Files/comp_err/comp_err.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/myisampack/myisampack.dsp:
  Update project file -- binary goes to ../client_release now
scripts/Makefile.am:
  Add make_win_binary_distribution to Makefile (for @VERSION@)
2004-02-19 19:04:47 -01:00
unknown
595e46704f - renamed myisam/ft_dump to myisam/mysam_ftdump and added it to the
binary distribution and Server RPM


myisam/myisam_ftdump.c:
  Rename: myisam/ft_dump.c -> myisam/myisam_ftdump.c
BitKeeper/etc/ignore:
  Added myisam/myisam_ftdump to the ignore list
myisam/Makefile.am:
   - renamed ft_dump to myisam_ftdump and added it to bin_PROGRAMS
scripts/make_binary_distribution.sh:
   - added myisam_ftdump to the binary distribution
support-files/mysql.spec.sh:
   - added myisam_ftdump to the Server package
2004-02-03 22:25:02 +01:00
unknown
81e869bcf2 - 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


scripts/mysqld_safe.sh:
   - fixed early removing of socket file when multiple instances of mysqld are
     started via the script (BUG#2114) Thanks to Rodrigo Marchant for the
     suggestion
2004-01-15 16:14:30 +01:00
unknown
54ee2705b0 - improved wording in mysql_install_db on what to do to set the password
for the MySQL root user (BUG#2375)


scripts/mysql_install_db.sh:
   - improved wording on what to do to set the password for the MySQL root
     user (BUG#2375)
2004-01-13 19:33:01 +01:00
unknown
cb12a8b827 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
unknown
ea280fd3ff - Removed COPYING.LIB from all source and binary distributions
after it was removed from manual.texi (where it was automatically
   generated from).


Docs/Makefile.am:
   - don't create COPYING.LIB anymore (was removed from manual.texi)
Makefile.am:
   - Removed COPYING.LIB from the source distribution
scripts/make_binary_distribution.sh:
   - Removed COPYING.LIB from the binary distribution
scripts/make_win_src_distribution.sh:
   - Removed COPYING.LIB from the windows source distribution
support-files/mysql.spec.sh:
   - Removed COPYING.LIB from the Server RPM
2003-11-25 17:52:12 +01:00
unknown
534ea9689f - 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)


scripts/mysqlaccess.sh:
   - Rephrased option help text so it does not start with "use" 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)
sql-bench/bench-init.pl.sh:
   - Rephrased option help text so it does not start with "use" 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
unknown
194dbe1a9a fixed bug #1650 "mysql_config --libmysqd-libs misses libwrap"
scripts/Makefile.am:
  added processing of @WRAPLIBS@ in scripts
scripts/mysql_config.sh:
  added @WRAPLIBS@ to embedded_libs option line
2003-11-15 19:37:54 -04:00
unknown
25f9971aaa Fix for Bug #1752 Wrong letter cases.
Thanks to Daniel Convissor


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-11-05 14:35:08 +02:00
unknown
977a1b8eee 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
unknown
ddd5eebd1e added to mysql_secure_installation
changing root password on all hosts (bug 1228)


scripts/mysql_secure_installation.sh:
  added changing root password on all hosts
2003-10-24 15:20:46 -04:00
unknown
a6aeb62749 Reverted a wrong patch from mysqlhotcopy. This is a real bug
in MySQL server...
2003-10-22 19:24:19 +03:00
unknown
3fdca01f24 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
unknown
cbc5304742 Fixed bug #954 mysqlhotcopy permission problem. The database
directory owner ship was not honored.
2003-10-22 18:19:59 +03:00
unknown
15988a374d 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
unknown
de01431b18 - 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
unknown
83f5a6a34f Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/slave.cc:
  Auto merged
2003-10-14 00:27:04 +02:00
unknown
5533f59aea Merge
scripts/Makefile.am:
  SCCS merged
2003-10-08 12:49:42 +02:00
unknown
743bc7cf35 - added make_sharedlib_distribution.sh to the source distribution 2003-10-08 12:35:24 +02:00
unknown
08bb033b53 merged
mysql-test/r/create.result:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2003-10-07 20:41:07 +02:00
unknown
c7fd510a41 Simple cleanups
client/mysqlbinlog.cc:
  Add default handling to mysqlbinlog
mysql-test/mysql-test-run.sh:
  Cleanup of mysqldump/mysqlbinlog argument handling
scripts/Makefile.am:
  Remove duplicate
scripts/mysql_install_db.sh:
  Change -eq to =
2003-10-07 15:44:31 +03:00
unknown
dfacd7c5fa Merge with 3.23.58
BitKeeper/etc/logging_ok:
  auto-union
mytest-old.c:
  Merge rename: VC++Files/libmysqltest/mytest.c -> mytest-old.c
BitKeeper/deleted/.del-mysqlshutdown.c:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.c
BitKeeper/deleted/.del-mysqlshutdown.rc:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc
BitKeeper/deleted/.del-mysqlwatch.c:
  Delete: VC++Files/mysqlwatch/mysqlwatch.c
BitKeeper/deleted/.del-thr_test.c:
  Delete: VC++Files/thr_test/thr_test.c
BitKeeper/deleted/.del-make_win_src_distribution.sh:
  Delete: scripts/make_win_src_distribution.sh
BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d:
  Auto merged
BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74:
  Auto merged
BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365:
  Auto merged
BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e:
  Auto merged
BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477:
  Auto merged
BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131:
  Auto merged
BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4:
  Auto merged
BitKeeper/deleted/.del-Default.rge~2218627c2a901409:
  Auto merged
BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9:
  Auto merged
BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28:
  Auto merged
BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81:
  Auto merged
BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90:
  Auto merged
BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e:
  Auto merged
BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903:
  Auto merged
BitKeeper/deleted/.del-Servers.fgl~36147accb82f759:
  Auto merged
BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34:
  Auto merged
BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722:
  Auto merged
BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e:
  Auto merged
BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6:
  Auto merged
BitKeeper/deleted/.del-Setup.rul~14510a994d515f19:
  Auto merged
BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a:
  Auto merged
BitKeeper/deleted/.del-infolist.txt~58b203247936d266:
  Auto merged
BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97:
  Auto merged
BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d:
  Auto merged
BitKeeper/deleted/.del-value.shl~98c2851db96b919e:
  Auto merged
BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d:
  Auto merged
configure.in:
  Merge with 3.23.58 (Keep old code)
sql/slave.cc:
  Merge with 3.23.58 (Keep old code)
sql/sql_parse.cc:
  Merge with 3.23.58 (Keep old code)
2003-10-06 21:21:04 +03:00
unknown
08504cfe27 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


scripts/mysql_config.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2003-10-06 09:24:12 +02:00