Commit graph

1691 commits

Author SHA1 Message Date
unknown
1f41db2905 fixed race condition in automatic binlog rotation
remove extension from binary log if the user specifies one to avoid
    non-rotatable logs
fixed possible use of unitialized IO_CACHE in debug mode


sql/log.cc:
  fixed race condition in automatic binlog rotation
sql/mysqld.cc:
  remove extension from binary log if the user specifies one to avoid
  non-rotatable logs
sql/slave.cc:
  fixed race condition with slave thread during server shutdown
sql/sql_class.h:
  new_file() needed an argument to know if it was called withing the 
  log mutex or not
sql/sql_repl.cc:
  fixed possible use of unitialized IO_CACHE in debug mode
2001-07-11 19:29:23 -06:00
unknown
5d63584e60 merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/spanish/errmsg.txt:
  merged and translated the new 4.0 errors - had to type them in 
  anyway so figured I'd do it in Spanish - Jorge/Miguel - can you do QA
  on my translation?
2001-07-07 15:17:25 -06:00
unknown
502806cd50 HUP should not flush everything, just the logs 2001-07-06 15:30:52 -06:00
unknown
a1826b5519 merged
include/my_base.h:
  Auto merged
include/myisam.h:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysys/tree.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2001-07-02 21:52:22 +02:00
unknown
2d28c646cb memory-limited tree
bulk inserts optimization: caching keys in binary tree


include/my_base.h:
  bulk inserts optimization: caching keys in binary tree
include/my_tree.h:
  memory-limited tree
include/myisam.h:
  bulk inserts optimization: caching keys in binary tree
isam/isamlog.c:
  memory-limited tree
isam/pack_isam.c:
  memory-limited tree
myisam/ft_boolean_search.c:
  memory-limited tree
myisam/ft_nlq_search.c:
  memory-limited tree
myisam/ft_parser.c:
  memory-limited tree
myisam/ft_stopwords.c:
  memory-limited tree
myisam/mi_extra.c:
  bulk inserts optimization: caching keys in binary tree
myisam/mi_open.c:
  bulk inserts optimization: caching keys in binary tree
myisam/mi_static.c:
  bulk inserts optimization: caching keys in binary tree
myisam/mi_write.c:
  bulk inserts optimization: caching keys in binary tree
myisam/myisamdef.h:
  bulk inserts optimization: caching keys in binary tree
myisam/myisamlog.c:
  memory-limited tree
myisam/myisampack.c:
  memory-limited tree
mysql-test/mysql-test-run.sh:
  memory-limited tree
mysql-test/t/alter_table.test:
  make it faster
mysys/tree.c:
  memory-limited tree
sql/ha_myisam.cc:
  bulk inserts optimization: caching keys in binary tree
sql/item_sum.cc:
  memory-limited tree
sql/mysqld.cc:
  bulk inserts optimization: caching keys in binary tree
sql/sql_analyse.h:
  memory-limited tree
sql/uniques.cc:
  memory-limited tree
2001-07-02 21:18:57 +02:00
unknown
0a6cf93d23 post-merge fix
fixed bug in LOAD DATA FROM MASTER


BitKeeper/etc/ignore:
  Added scripts/mysqld_safe to the ignore list
sql/mysqld.cc:
  post-merge fix
2001-06-29 09:55:21 -06:00
unknown
1ed2bcc888 merged with 3.23 replication updates
mysql-test/r/type_float.result:
  Auto merged
sql/sql_repl.h:
  Auto merged
BitKeeper/triggers/post-commit:
  merged with 3.23 updates
sql/mysqld.cc:
  merged
sql/slave.cc:
  merged
sql/sql_repl.cc:
  merged
2001-06-28 19:48:49 -06:00
unknown
c7e200cdd8 fixed message in post-commit trigger
added debugging options to master to behave sporadically, and a 
test case to make sure the slave can deal with it


BitKeeper/triggers/post-commit:
  fixed message
sql/mysqld.cc:
  added debugging options to force the master to occasionally break
  replication
sql/slave.cc:
  cosmetic change to improve readability
sql/sql_repl.cc:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
sql/sql_repl.h:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
2001-06-28 18:22:29 -06:00
unknown
4d5dcac35e Fixed bug when sorting big files (introduced with multi-table-delete)
Changed mysql-test to use --language
Cleaned up parameters to filesort()


configure.in:
  Fixed typo
mysql-test/install_test_db.sh:
  Changed test case to use --language
mysql-test/mysql-test-run.sh:
  Changed test case to use --language
  Fixed that test names are not 'cut'-ed.
mysql-test/r/select_found.result:
  Fixed test case to make it repeatable
mysql-test/t/insert.test:
  Added test of unique key handling
mysql-test/t/order_fill_sortbuf.test:
  Cleaned up test
mysql-test/t/select_found.test:
  Fixed test case to make it repeatable
sql/filesort.cc:
  Fixed bug when sorting big files (introduced with multi-table-delete)
  cleaned up parameters.
sql/mysql_priv.h:
  Cleaned up parameters to filesort()
sql/mysqld.cc:
  Fixed typo on enum
sql/sql_delete.cc:
  Cleanup
sql/sql_select.cc:
  Cleanup
sql/sql_table.cc:
  Cleanup
sql/sql_test.cc:
  Cleanup
sql/sql_update.cc:
  Cleanup
2001-06-25 11:35:22 +03:00
unknown
5b47d101e5 mysqld.cc Put OPT_INNODB_UNIX_FILE_FLUSH_METHOD to mysqld.cc enum type
sql/mysqld.cc:
  Put OPT_INNODB_UNIX_FILE_FLUSH_METHOD to mysqld.cc enum type
2001-06-24 20:45:57 +03:00
unknown
8f33f8d4d3 merge
Docs/manual.texi:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2001-06-21 11:03:54 +02:00
unknown
066eddd862 UNIQUE keys are not anymore shown as PRIMARY KEY
Docs/manual.texi:
  Changelog
mysql-test/r/show_check.result:
  Added test for SHOW CREATE
mysql-test/t/show_check.test:
  Added test for SHOW CREATE
sql/mysqld.cc:
  Fixed messages
2001-06-21 10:50:14 +03:00
unknown
b5f7e2408f Added --warnings to mysqld
Docs/manual.texi:
  Changelog
sql/mysql_priv.h:
  Added --warnings
sql/mysqld.cc:
  Added --warnings
sql/sql_parse.cc:
  Added --warnings
2001-06-21 01:12:29 +03:00
unknown
ce74f933c6 manual.texi Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39
mysqld.cc	Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39


sql/mysqld.cc:
  Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39
Docs/manual.texi:
  Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39
2001-06-13 19:27:51 +03:00
unknown
ad6ea3f3d4 merged
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
2001-06-12 15:08:58 -06:00
unknown
043c49aade Added --skip-stack to mysql-test-run
Docs/manual.texi:
  Changelog
mysql-test/mysql-test-run.sh:
  Added --skip-stack when using gdb
sql/mysqld.cc:
  Changed reference to bugs@lists.mysql.com to manual reference.
2001-06-12 18:00:36 +03:00
unknown
a9e6b975fc merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql-bench/server-cfg.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2001-06-12 14:12:35 +02:00
unknown
17bc31504d Removed --use-symbolic-links 2001-06-07 00:23:55 +03:00
unknown
14289d42ed Changed innodb_unix_file_flush_method -> innodb_flush_method
Cleaned up error messages.


mysql-test/mysql-test-run.sh:
  Added option --mysqld to send arguments to mysqld.
sql/ha_innobase.cc:
  Shortended messages a bit to correspond to the rest of MySQL.
sql/mysqld.cc:
  Changed innodb_unix_file_flush_method -> innodb_flush_method
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-07 00:10:59 +03:00
unknown
b1e00c9680 Updated benchmarks and crash-me for postgreSQL 7.1.1
Fixed option for symlinks


Docs/manual.texi:
  Updated symlink handling.
sql-bench/Comments/postgres.benchmark:
  Updated benchmark text
sql-bench/Makefile.am:
  Added graph-compare-results
sql-bench/compare-results.sh:
  Don't reset the cmp option.
sql-bench/crash-me.sh:
  Updated transaction testing.
sql-bench/limits/mysql-3.23.cfg:
  Updated benchmark run
sql-bench/limits/mysql.cfg:
  Updated benchmark run
sql-bench/limits/pg.cfg:
  Updated benchmark run
sql-bench/server-cfg.sh:
  Don't do vacuum too often.
sql-bench/test-insert.sh:
  Don't do vacuum too often.
sql/mysqld.cc:
  Changed skip-symlinks to skip-symlink
2001-06-05 04:05:33 +03:00
unknown
d82a86e61b merge
client/mysqltest.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-06-05 03:48:25 +03:00
unknown
fe1842d9ee Symlinking of tables should not work.
Fixed error number handling bug in mysqltest.
Fixed that error number from insert delayed is reported correctly.
merged new vio code with old violite code.


client/mysqltest.c:
  Fixed bug that error numbers wasn't tested properly.
myisam/mi_check.c:
  Moved initialization of variables to avoid a bug.
myisam/mi_create.c:
  Fixed bug in symlink handling.
myisam/mi_test_all.sh:
  Fixed script so that it works.
myisam/myisamchk.c:
  Removed --no-symlinks option
mysql-test/mysql-test-run.sh:
  Cleaned up error message
mysql-test/t/bdb.test:
  Fixed wrong error numbers
mysql-test/t/err000001.test:
  Fixed wrong error numbers
mysql-test/t/innodb.test:
  Fixed wrong error numbers
mysql-test/t/overflow.test:
  Fixed wrong error numbers
mysql-test/t/status.test:
  Ensure that we are using myisam tables for the lock test.
mysys/my_delete.c:
  cleanup
mysys/my_symlink2.c:
  Added option to not overwrite files when using symlinks.
sql/Makefile.am:
  Moved vio to avoid link error.
sql/ha_myisam.cc:
  Fixed symlink handling.
sql/mysqld.cc:
  Changed --skip-symlinks to --skip-symlink
sql/sql_insert.cc:
  Fixed that error number from insert delayed is reported correctly
sql/sql_parse.cc:
  Fixed symlink handling.
sql/sql_table.cc:
  Fixed symlink handling.
vio/vio.c:
  cleanup
vio/viosocket.c:
  c
2001-06-05 03:38:10 +03:00
unknown
fdff9c0a45 Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysys/tree.c:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-06-04 17:34:11 -06:00
unknown
83c9bb3b73 Fixed portability problem.
sql-bench/Comments/postgres.benchmark:
  Added warning about PostgreSQL 7.1.1
2001-06-04 04:08:30 +03:00
unknown
0105fae75f Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
2001-06-03 09:06:12 +02:00
unknown
b6cb800dbe misplaced #ifdef fixed
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-03 09:03:24 +02:00
unknown
2cf8889f57 do not show user/pass for slave unless running with show-slave-auth-info
cleanup of register_slave_on_master()


mysql-test/r/rpl000002.result:
  new output of show slave hosts
sql/mysqld.cc:
  user and password are shown in show slave hosts only if show-slave-auth-info option is on
sql/slave.cc:
  cleanup of register_slave_on_master()
sql/sql_repl.cc:
  do not show user/pass for slave unless running with show-slave-auth-info
sql/sql_repl.h:
  show-slave-auth-info
2001-06-01 21:15:15 -06:00
unknown
9f0b7b7cf7 merge
BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
2001-06-01 23:51:23 +02:00
unknown
455b6952d6 Added --skip-symlinks
Don't force repair of tables that are not closed properly.


Docs/manual.texi:
  Added information about symbolic links.
include/my_sys.h:
  symbolic link support
myisam/mi_check.c:
  Don't force repair of tables that are not closed properly.
myisam/myisamchk.c:
  Version number change.
mysys/my_static.c:
  symbolic link support
mysys/my_symlink2.c:
  Disabling of symbolic link support
sql/mysqld.cc:
  Disabling of symbolic link support
2001-06-01 19:38:47 +03:00
unknown
fb15124a94 Merge tonu@work.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/tonu/mysql-4.0


include/mysql_com.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2001-05-31 17:20:02 +03:00
unknown
20d04c924b Support for VIO library
Makefile.am:
  Added vio
include/mysql_com.h:
  Removed ancient defines from Vio++ times
include/violite.h:
  Added vio
libmysql/Makefile.shared:
  Removed sqlobject line with violite.lo
libmysql/libmysql.c:
  Openssl stuff & sons
sql/Makefile.am:
  Added vio
sql/mini_client.cc:
  Added vio
sql/mysqld.cc:
  Added vio
sql/net_serv.cc:
  Added vio
sql/sql_parse.cc:
  Added vio
vio/Makefile.am:
  Removed C++ stuff
vio/vio.c:
  st_vio -> Vio
vio/viosocket.c:
  st_vio -> Vio
vio/viossl.c:
  st_vio -> Vio
vio/viosslfactories.c:
  vio.h-> violite.h
2001-05-31 17:18:25 +03:00
unknown
e6ecbfd629 merge
BitKeeper/triggers/post-commit:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-31 12:56:05 +02:00
unknown
ecba786861 A slave now can optionally register with the master providing the
info on how to connect to the slave for the clients that connect to
the master, but would like to know where the slaves are


include/mysql_com.h:
  register slaves
mysql-test/mysql-test-run.sh:
  parameters to test slave registration
mysql-test/r/rpl000002.result:
  test of slave registration
mysql-test/t/rpl000002.test:
  test slave registration
sql/mysql_priv.h:
  slave registration
sql/mysqld.cc:
  slave registration
sql/slave.cc:
  slave registration
sql/slave.h:
  slave registration
sql/sql_lex.h:
  slave registration
sql/sql_parse.cc:
  slave registration
sql/sql_repl.cc:
  slave registration
sql/sql_repl.h:
  slave registration
sql/sql_yacc.yy:
  slave registration
2001-05-30 18:50:56 -06:00
unknown
bd130011e1 Fixed portability bug in my_config.sh
Added print of --use-symbolic-links in mysqld


Docs/manual.texi:
  Added new links
configure.in:
  Fixes for gcc
scripts/mysql_config.sh:
  Fixed portability bug.
sql/mysqld.cc:
  Added print of --use-symbolic-links
2001-05-28 02:45:19 +03:00
unknown
f19c846325 Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
2001-05-23 23:54:18 +03:00
unknown
7927e83e4c Merge
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged
2001-05-23 22:52:21 +02:00
unknown
4d13177eb0 Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
  auto-union
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-05-23 23:49:06 +03:00
unknown
2f8dfb3f4a srv0srv.h One can now specify innodb_unix_file_flush_method in my.cnf
srv0srv.c	One can now specify innodb_unix_file_flush_method in my.cnf
srv0start.c	One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.cc	One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.h	One can now specify innodb_unix_file_flush_method in my.cnf
mysqld.cc	One can now specify innodb_unix_file_flush_method in my.cnf


sql/ha_innobase.cc:
  One can now specify innodb_unix_file_flush_method in my.cnf
sql/ha_innobase.h:
  One can now specify innodb_unix_file_flush_method in my.cnf
sql/mysqld.cc:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0srv.c:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0start.c:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/include/srv0srv.h:
  One can now specify innodb_unix_file_flush_method in my.cnf
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-23 18:04:49 +03:00
unknown
4b79972503 Don't write rows in MyISAM tables when using count(distinct)
Don't read MyISAM header when running without locking


include/myisam.h:
  Don't read header when running without locking.
myisam/mi_locking.c:
  Don't update changed flag for temporary files.
myisam/mi_open.c:
  Don't read header when running without locking.
myisam/mi_static.c:
  Don't read header when running without locking.
sql/item_sum.cc:
  Don't write rows in MyISAM tables when using count(distinct)
sql/mysqld.cc:
  Don't read MyISAM header when running without locking.
  Remove -Sg option.
sql/sql_analyse.h:
  Remove duplicate header.
sql/sql_select.cc:
  Cleaned up prototypes.
  Don't write rows to count(DISTINCT) MyISAM tables.
sql/sql_select.h:
  Cleaned up prototypes.
sql/table.h:
  A
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-23 02:40:46 +03:00
unknown
369401d172 Merge work.mysql.com:/home/bk/mysql-4.0
into x3.internalnet:/home/tonu/bk/mysql-4.0-modified


BitKeeper/etc/logging_ok:
  auto-union
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-05-20 20:41:49 +02:00
unknown
5bb27570d5 mysqld.cc openssl support
sql/mysqld.cc:
  openssl support
2001-05-20 20:36:59 +02:00
unknown
17fbf163c0 merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
myisam/mi_search.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
2001-05-20 12:38:19 +02:00
unknown
ee896803fe Force close of sockets on HPUX 10.20
Support option lines longer than 256 chars.
Close the slow log at shutdown.
Always allow debug options to mysqld.
Change some DBUG_PRINT tags.


Docs/manual.texi:
  Small cleanups
configure.in:
  Force close of sockets on HPUX 10.20
mysql-test/t/merge.test:
  Remove used tables
mysys/default.c:
  Support option lines longer than 256 chars.
mysys/mf_keycache.c:
  Split check_keycache tags
sql/mysqld.cc:
  Move things to 'cleanup'.
  Close the slow log at shutdown.
  Always allow debug options
sql/violite.c:
  Change the error tag to vio_error
2001-05-19 10:14:05 +03:00
unknown
ebe9b6071a Fixed bug when using MERGE on files > 4G
Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
Changed that tmp_table_size =4G-1 means unlimited.


Docs/manual.texi:
  Added new section about crashed MyISAM tables.
  Cleaned up subsections for InnoDB
client/mysql.cc:
  Cleanup
myisam/mi_rkey.c:
  Cleanup
myisam/mi_search.c:
  Fixed wrong casts in debug messages
myisammrg/myrg_rrnd.c:
  Fixed bug when using files > 4G
mysys/getvar.c:
  Changed to use longlong to support arguments up to 4G
mysys/thr_lock.c:
  Fix for delay insert
sql/mysqld.cc:
  Increased default size for temporary tables
sql/sql_base.cc:
  Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
sql/sql_insert.cc:
  Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
sql/sql_select.cc:
  Changed that tmp_table_size =4G-1 means unlimited.
2001-05-17 00:46:50 +03:00
unknown
476625dd63 Cleanup up stacktrace code
Updated qsort source from glibc.
Add debugging of keycache when EXTRA_DEBUG is specified


Docs/manual.texi:
  Added new contrib stuff
bdb/dist/Makefile.in:
  Don't automaticly checkout things from bk
mysys/mf_keycache.c:
  Add debugging of keycache when EXTRA_DEBUG is specified.
mysys/mf_qsort.c:
  Updated qsort source from glibc.
sql/Makefile.am:
  Cleanup up stacktrace code
sql/mysqld.cc:
  Cleanup up stacktrace code
2001-05-14 01:12:40 +03:00
unknown
9c3297c9b2 Added information about using mysql-max
sql/mysqld.cc:
  Fixes for Alpha cc compiler
support-files/my-huge.cnf.sh:
  cleanup
support-files/my-large.cnf.sh:
  cleanup
support-files/my-medium.cnf.sh:
  cleanup
support-files/my-small.cnf.sh:
  cleanup
2001-05-12 09:24:35 +03:00
unknown
442e091f62 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-05-12 01:01:27 +03:00
unknown
6433cf75e7 cleanup
Docs/manual.texi:
  Updated gdb / trace information
innobase/pars/pars0grm.c:
  Removed warning on windows
mysys/mf_keycache.c:
  Changed "exec" to "check_keycache"
sql/mysqld.cc:
  Added suffix for windows binaries
2001-05-12 01:00:46 +03:00
unknown
9192600eb7 Merged with 3.23, needs further fix-up
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
include/myisam.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
  Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
Docs/manual.texi:
  merged
client/errmsg.c:
  merged
configure.in:
  merged
sql/mysqld.cc:
  merged
sql/sql_select.cc:
  merged, needs manual fixing
sql/sql_yacc.yy:
  merged, needs manual fixing
2001-05-10 15:06:35 -06:00
unknown
b59b5f4b6e sql/mysqld.cc
put back the things that the merge removed


sql/mysqld.cc:
  put back the things that the merge removed
2001-05-09 22:42:49 -06:00