1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Commit Graph

22098 Commits

Author SHA1 Message Date
unknown
b5fa754f7b Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2001-04-11 19:39:04 -06:00
unknown
3d4c5e9474 BitKeeper/triggers/post-commit
use REAL_EMAIL
myisam/mi_search.c
    merged the dropped lines
ignore junk in libmysqld directory


BitKeeper/triggers/post-commit:
  use REAL_EMAIL
myisam/mi_search.c:
  merged the dropped lines
BitKeeper/etc/ignore:
  Added libmysqld/convert.cc libmysqld/derror.cc libmysqld/errmsg.c libmysqld/field.cc libmysqld/field_conv.cc libmysqld/filesort.cc libmysqld/get_password.c libmysqld/ha_berkeley.cc libmysqld/ha_heap.cc libmysqld/ha_isam.cc libmysqld/ha_isammrg.cc libmysqld/ha_myisam.cc libmysqld/ha_myisammrg.cc libmysqld/handler.cc libmysqld/hostname.cc libmysqld/init.cc libmysqld/item.cc libmysqld/item_buff.cc libmysqld/item_cmpfunc.cc libmysqld/item_create.cc libmysqld/item_func.cc libmysqld/item_strfunc.cc libmysqld/item_sum.cc libmysqld/item_timefunc.cc libmysqld/item_uniq.cc libmysqld/key.cc libmysqld/lock.cc libmysqld/log.cc libmysqld/log_event.cc libmysqld/md5.c libmysqld/mini_client.cc libmysqld/net_pkg.cc libmysqld/net_serv.cc libmysqld/opt_ft.cc libmysqld/opt_range.cc libmysqld/opt_sum.cc libmysqld/password.c libmysqld/procedure.cc libmysqld/records.cc libmysqld/slave.cc libmysqld/sql_acl.cc libmysqld/sql_analyse.cc libmysqld/sql_base.cc libmysqld/sql_cache.cc libmysqld/sql_class.cc libmysqld/sql_crypt.cc libmy
2001-04-11 19:38:02 -06:00
unknown
71af8ca9bf Ugly merge of 3.23 changes into 4.0 - fix up needed
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
myisam/mi_search.c:
  the ugliest merge I've ever done! And I already see this has introduced a bug - will have to do a fix-up afterwards
2001-04-11 19:09:00 -06:00
unknown
658ba944f5 re-added line that was resolved out during merge 2001-04-11 17:50:23 -06:00
unknown
d6ca0213b0 merge
BitKeeper/etc/logging_ok:
  auto-union
2001-04-11 16:49:40 -06:00
unknown
46e73b40a8 mysql-test/t/rpl000015.test
reversed incorrect temporary change


mysql-test/t/rpl000015.test:
  reversed incorrect temporary change
2001-04-11 16:36:07 -06:00
unknown
72ccee9d37 fixed bugs in the new stuff in rpl000001 test
start slave thread if master.info is present and server_id is set
updates for rpl000015 and rpl000016 to remove master.info to make sure
master info struct does not get auto-initialized


Docs/manual.texi:
  updates for recent changes
mysql-test/r/rpl000001.result:
  update for test case change
mysql-test/t/rpl000001.test:
  fixed bugs in the test case
mysql-test/t/rpl000015.test:
  wrong change - to be reversed
sql/mysqld.cc:
  start slave thread if master.info is present and server_id is set
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-11 16:29:15 -06:00
unknown
e9d687674b Fixed bug when using a key on a CHAR(255) NULL column
Docs/manual.texi:
  New links
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-12 00:56:55 +03:00
unknown
65575f94d1 Added SQL_CALC_FOUND_ROWS and FOUND_ROWS()
myisam/ft_boolean_search.c:
  Cleanup
myisam/ft_parser.c:
  Cleanup
myisam/ft_update.c:
  Cleanup
myisam/sort.c:
  Cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-12 00:54:35 +03:00
unknown
f21a521981 os0file.c Change pwrite to os_file_pwrite to allow compilation if no pwrite
innobase/os/os0file.c:
  Change pwrite to os_file_pwrite to allow compilation if no pwrite
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-11 21:47:51 +03:00
unknown
c164b35345 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
sql/slave.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-11 20:23:31 +03:00
unknown
9bf58f4fac Fixed bug in REGEXP for Linux Alpha
Docs/manual.texi:
  Updated MyODBC section
libmysql/conf_to_src.c:
  Fixed wrong typecast
mysql-test/r/func_regexp.result:
  Added test case for REGEXP bug
mysql-test/t/func_regexp.test:
  Added test case for REGEXP bug
regex/engine.c:
  Fixed wrong type
regex/regexec.c:
  Fixed wrong type
sql/records.cc:
  Fixed test of READ lock
sql/slave.cc:
  Cleanup
2001-04-11 20:19:52 +03:00
unknown
8dd2e5b8d9 Added all changes from old 4.0 version:
PSTACK, libmysqld and MySQL filesystem
UPDATE ... ORDER BY
DELETE ... ORDER BY
New faster fulltext handling
Faster compressed keys



Makefile.am:
  Added support for pstack and libmysqld_dir
acconfig.h:
  MySQL filesystem and PSTACK
acinclude.m4:
  MySQL File system
client/mysql.cc:
  Support for --xml
configure.in:
  Pstack, MySQL FS and libmysqld_dir
include/ft_global.h:
  Faster fulltext
include/my_pthread.h:
  Made c++ safe
include/myisam.h:
  Update for faster fulltext
include/mysql_com.h:
  new my_net_read()
include/violite.h:
  libmysqld
libmysql/net.c:
  New protocol that supports big packets
myisam/Makefile.am:
  Faster fulltext
myisam/ft_parser.c:
  Faster fulltext
myisam/ft_search.c:
  Faster fulltext
myisam/ft_update.c:
  Faster fulltext
myisam/ftdefs.h:
  Faster fulltext
myisam/mi_check.c:
  Faster fulltext
myisam/mi_open.c:
  Faster compressed keys
myisam/mi_search.c:
  Faster compressed keys
myisam/mi_update.c:
  Faster compressed keys
myisam/myisamdef.h:
  Faster compressed keys
myisam/sort.c:
  Faster compressed keys
mysql-test/mysql-test-run.sh:
  --skip-innobase and --skip-bdb
sql/ChangeLog:
  Changelog
sql/Makefile.am:
  PSTACK
sql/mysql_priv.h:
  New ORDER BY options and libmysqld
sql/mysqld.cc:
  PSTACK
sql/net_serv.cc:
  New protocol that supports big packets
sql/share/estonian/errmsg.txt:
  New error messages
sql/sql_base.cc:
  Better list_open_tabels
sql/sql_delete.cc:
  ORDER BY for delete
sql/sql_lex.cc:
  Added language convertation of all strings
sql/sql_parse.cc:
  Changes for libmysqld
  Use new ORDER BY options
sql/sql_show.cc:
  Character set convertations
  Use new list_open_tables function.
sql/sql_update.cc:
  UPDATE ... ORDER BY
sql/sql_yacc.yy:
  Clean up symbol definitions
  DELETE .. ORDER BY
  UPDATE .. ORDER BY
sql/table.h:
  new OPEN_TABLE_LIST structure
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-11 13:04:03 +02:00
unknown
2adf9320a4 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-10 21:17:21 -06:00
unknown
a5052f001b Fixed a bug in pager, + added a feature to it.
client/mysql.cc:
  Fixed a bug in pager + added feature that the default
  pager will be the last one used. This is invoked in mysql
  client monitor with pager command without argument.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-11 06:17:20 +03:00
unknown
0969368d13 do not log the drop internal temporary tables into the binary log
mark killed partially completed updates with an error code in binlog
stop replication if the master reports a possible partial/killed update
test partially killed update


mysql-test/r/rpl000001.result:
  updated result
mysql-test/r/rpl000012.result:
  updated result
mysql-test/t/rpl000001.test:
  test handing a killed partial update
mysql-test/t/rpl000012.test:
  test temporary table replication more thoroughly
sql/log_event.h:
  mark killed partially completed updates with an error code
BitKeeper/etc/ignore:
  Added bdb/btree/btree_auto.c bdb/build_vxworks/db_int.h bdb/build_win32/db_int.h bdb/build_win32/include.tcl bdb/build_win32/libdb.rc bdb/db/crdel_auto.c bdb/db/db_auto.c bdb/dist/config.hin to the ignore list
sql/slave.cc:
  stop replication if the master reports a possible partial/killed update
sql/sql_base.cc:
  do not log the drop internal temporary tables into the binary log
2001-04-10 20:56:54 -06:00
unknown
0c97164177 srv0srv.h Merging work for 3.23.37
os0thread.c	Set created thread priority to QUERY_PRIOR if specified
row0mysql.c	Drop table removes locks on the table, error handling changed
row0ins.c	Insert now always sets a shared lock on a duplicate or suspected duplicate record
lock0lock.h	Can remove locks from a table to be dropped
lock0lock.c	Can remove locks from a table to be dropped
srv0srv.c	Try to do log flush every second
srv0start.c	No need for a slash at the end of dir
trx0trx.h	Added an IGNORE option field to trx handle
trx0trx.c	Added an IGNORE option field to trx handle
ha_innobase.h	Added last_query_id field to handle
ha_innobase.cc	Fix drop table hang, roll-forward etc.


sql/ha_innobase.cc:
  Fix drop table hang, roll-forward etc.
sql/ha_innobase.h:
  Added last_query_id field to handle
innobase/trx/trx0trx.c:
  Added an IGNORE option field to trx handle
innobase/include/trx0trx.h:
  Added an IGNORE option field to trx handle
innobase/srv/srv0start.c:
  No need for a slash at the end of dir
innobase/srv/srv0srv.c:
  Try to do log flush every second
innobase/lock/lock0lock.c:
  Can remove locks from a table to be dropped
innobase/include/lock0lock.h:
  Can remove locks from a table to be dropped
innobase/row/row0ins.c:
  Insert now always sets a shared lock on a duplicate or suspected duplicate record
innobase/row/row0mysql.c:
  Drop table removes locks on the table, error handling changed
innobase/os/os0thread.c:
  Set created thread priority to QUERY_PRIOR if specified
innobase/include/srv0srv.h:
  Merging work for 3.23.37
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-10 21:58:07 +03:00
unknown
6b464d84ce Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-04-10 10:21:27 -06:00
unknown
494a3a0fc7 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-10 11:33:37 +03:00
unknown
dd1723f1da updated ignore
BitKeeper/etc/ignore:
  added mysys/test_dir
2001-04-10 11:33:17 +03:00
unknown
92de72694b Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL
Docs/manual.texi:
  Updated replication section
mysql-test/r/null_key.result:
  Added test UPDATE/DELETE with IS NULL on unique key
mysql-test/t/null_key.test:
  Added test UPDATE/DELETE with IS NULL on unique key
mysys/Makefile.am:
  Removed -f from $CP as this is not portable
  Fixed rule for testhash
sql/field.cc:
  Safety fix
sql/opt_range.cc:
  Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL
sql/opt_range.h:
  Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL
2001-04-10 11:32:28 +03:00
unknown
9b55716a5b mysql-test/t/bench_count_distinct.test
make table delay key write to speed things up a bit


mysql-test/t/bench_count_distinct.test:
  make table delay key write to speed things up a bit
2001-04-09 18:31:00 -06:00
unknown
e19e69fbcb added gprof options
added a benchmark test for count(distinct)


mysql-test/mysql-test-run.sh:
  u
2001-04-09 18:25:06 -06:00
unknown
5102766f42 added compile-pentium-gprof
ignore generated files from bdb


BitKeeper/etc/ignore:
  Added bdb/dist/template/rec_btree bdb/dist/template/rec_crdel bdb/dist/template/rec_db bdb/dist/template/rec_hash bdb/dist/template/rec_log bdb/dist/template/rec_qam bdb/dist/template/rec_txn bdb/hash/hash_auto.c bdb/include/btree_auto.h bdb/include/crdel_auto.h bdb/include/db_auto.h bdb/include/db_server.h bdb/include/hash_auto.h bdb/include/log_auto.h bdb/include/qam_auto.h bdb/include/txn_auto.h bdb/java/src/com/sleepycat/db/DbConstants.java bdb/log/log_auto.c bdb/qam/qam_auto.c bdb/rpc_client/db_server_clnt.c bdb/rpc_client/gen_client.c bdb/rpc_server/db_server_svc.c bdb/rpc_server/db_server_xdr.c bdb/rpc_server/gen_db_server.c bdb/test/include.tcl bdb/txn/txn_auto.c gmon.out mysql-test/gmon.out sql/gmon.out sql/share/charsets/gmon.out sql/share/gmon.out to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-09 13:08:35 -06:00
unknown
c7105d8008 Fixed INSERT DELAYED with Innobase
Fix for shutdown on NT
Fixed bug when using wrong dates from blob field.


BitKeeper/deleted/.del-df_crash.result~4a3dbee64843953d:
  Delete: mysql-test/r/df_crash.result
BitKeeper/deleted/.del-df_crash.test~4c365178fe437f6:
  Delete: mysql-test/t/df_crash.test
Docs/manual.texi:
  Changelog
innobase/ib_config.h.in:
  automatic changed file
innobase/ib_config.h:
  automatic changed file
mysql-test/r/func_time.result:
  Test case for bug in time functions
mysql-test/r/innobase.result:
  Test for INSERT DELAYED
mysql-test/t/func_time.test:
  Test case for bug in time functions
mysql-test/t/innobase.test:
  Test for INSERT DELAYED
scripts/mysql_convert_table_format.sh:
  Added --socket and --port
sql/ha_innobase.cc:
  Fix bug when compiling with SAFE_MUTEX
  Cleaner comment when using SHOW TABLE STATUS
sql/mysqld.cc:
  Fix for shutdown on NT
sql/sql_insert.cc:
  Fixed problem with Innobase and INSERT DELAYED
sql/sql_udf.cc:
  Support for UDF on windows
sql/time.cc:
  Fixed bug when using wrong dates from blob field.
strings/ctype-tis620.c:
  Removed not used variable
support-files/mysql-max.spec.sh:
  Removed old not used section
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-09 21:08:56 +03:00
unknown
9ba069761a This won't be pushed either
mysql-test/t/handler.test:
  LIMIT tests
sql/mysql_priv.h:
  HANDLER ... LIMIT added
sql/sql_handler.cc:
  HANDLER ... LIMIT added
sql/sql_parse.cc:
  HANDLER ... LIMIT added
sql/sql_yacc.yy:
  HANDLER ... LIMIT added
2001-04-09 15:37:19 +02:00
unknown
5dfbb2ca7b Updated a link in the manual.
Docs/manual.texi:
  Updated a link.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-09 12:11:44 +03:00
unknown
cb2fe473f2 This wouldn't ever be pushed
mysql-test/t/handler.test:
  new tests
sql/sql_handler.cc:
  bugfix
2001-04-08 12:56:12 +02:00
unknown
9e82b5c854 fixed Do-rpm to not omit frame pointer
Build-tools/Do-rpm:
  will we ever get this -fno-omit-frame-pointer stuff right?
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-07 18:31:31 -06:00
unknown
7006b51823 Preliminary commit of HANDLER syntax (w/o LIMIT or column-list) 2001-04-07 00:18:33 +02:00
unknown
a9c3229340 univ.i Prevent inlining of functions on HP-UX because GCC is broken there
configure.in	Prevent inlining of functions on HP-UX because GCC is broken there
trx0trx.h	Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t
trx0trx.c	Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t
ha_innobase.cc	Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t


sql/ha_innobase.cc:
  Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t
innobase/trx/trx0trx.c:
  Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t
innobase/include/trx0trx.h:
  Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t
innobase/configure.in:
  Prevent inlining of functions on HP-UX because GCC is broken there
innobase/include/univ.i:
  Prevent inlining of functions on HP-UX because GCC is broken there
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-06 20:37:31 +03:00
unknown
efc74d1b22 Small fix to mail_to_db.pl
tests/mail_to_db.pl:
  Small fix.
2001-04-06 06:09:08 +03:00
unknown
4c7ed6cad0 Added --stdin option to mail_to_db.pl
tests/mail_to_db.pl:
  Added option for reading mails from stdin.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-06 05:26:36 +03:00
unknown
0b6b1b752b Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-04-05 19:10:58 -06:00
unknown
96c3bd9432 moved bdb/innobase to compile-pentium-debug-max
fixed bug in variable assignment in mysqltest
fixed coredump on conversion from empty blob/text to date
added test case for empty blob conversion to date


BUILD/compile-pentium-debug:
  move bdb/innobase to compile-pentium-debug-max
client/mysqltest.c:
  fixed bug in variable assignment
sql/time.cc:
  fixed coredump on conversion from empty blob/text to date
2001-04-05 19:04:34 -06:00
unknown
353d84d874 Remove generated files from bdb source code control.
BitKeeper/deleted/.del-btree_auto.c~a683156a176761f:
  Delete: bdb/btree/btree_auto.c
BitKeeper/deleted/.del-chk.define~aa9a626e58631003:
  Delete: bdb/dist/build/chk.define
BitKeeper/deleted/.del-chk.def~bb65b471d09f7c58:
  Delete: bdb/dist/build/chk.def
BitKeeper/deleted/.del-chk.offt~25759c9294db634e:
  Delete: bdb/dist/build/chk.offt
BitKeeper/deleted/.del-chk.srcfiles~ae884700cd110cbf:
  Delete: bdb/dist/build/chk.srcfiles
BitKeeper/deleted/.del-chk.tags~7a5b14d33d4078cc:
  Delete: bdb/dist/build/chk.tags
BitKeeper/deleted/.del-config.guess~ead1d91caeaa748c:
  Delete: bdb/dist/config.guess
BitKeeper/deleted/.del-config.hin~fdecb7a06fa137a7:
  Delete: bdb/dist/config.hin
BitKeeper/deleted/.del-config.sub~17e9990a298261a:
  Delete: bdb/dist/config.sub
BitKeeper/deleted/.del-crdel_auto.c~ee4146a08fd175c1:
  Delete: bdb/db/crdel_auto.c
BitKeeper/deleted/.del-db_auto.c~3186e950cc321ae7:
  Delete: bdb/db/db_auto.c
BitKeeper/deleted/.del-db_int.h~40ba51edce41403f:
  Delete: bdb/build_vxworks/db_int.h
BitKeeper/deleted/.del-db_int.h~9ee5645850a336a0:
  Delete: bdb/build_win32/db_int.h
BitKeeper/deleted/.del-include.tcl~f8bffb5e2510f229:
  Delete: bdb/build_win32/include.tcl
BitKeeper/deleted/.del-install-sh~1858c24340b72628:
  Delete: bdb/dist/install-sh
BitKeeper/deleted/.del-libdb.rc~906f4936ec6a8398:
  Delete: bdb/build_win32/libdb.rc
BitKeeper/deleted/.del-DbConstants.java~15fa87eda6b72302:
  Delete: bdb/java/src/com/sleepycat/db/DbConstants.java
BitKeeper/deleted/.del-btree_auto.h~84d4451c78faf67e:
  Delete: bdb/include/btree_auto.h
BitKeeper/deleted/.del-crdel_auto.h~1b8255da47550ece:
  Delete: bdb/include/crdel_auto.h
BitKeeper/deleted/.del-db_auto.h~994ddc84db334345:
  Delete: bdb/include/db_auto.h
BitKeeper/deleted/.del-db_server.h~61a33aa05bf368a7:
  Delete: bdb/include/db_server.h
BitKeeper/deleted/.del-db_server_clnt.c~b548b860f765c597:
  Delete: bdb/rpc_client/db_server_clnt.c
BitKeeper/deleted/.del-db_server_svc.c~35804eb82b953f49:
  Delete: bdb/rpc_server/db_server_svc.c
BitKeeper/deleted/.del-gen_client.c~ad86f092d0996a68:
  Delete: bdb/rpc_client/gen_client.c
BitKeeper/deleted/.del-hash_auto.c~d17c6a6ed4f181d1:
  Delete: bdb/hash/hash_auto.c
BitKeeper/deleted/.del-hash_auto.h~1b79cdd426d7ef25:
  Delete: bdb/include/hash_auto.h
BitKeeper/deleted/.del-log_auto.c~fe8c0369965f7151:
  Delete: bdb/log/log_auto.c
BitKeeper/deleted/.del-log_auto.h~8d52dd0884d03051:
  Delete: bdb/include/log_auto.h
BitKeeper/deleted/.del-qam_auto.c~361954d3f149feb0:
  Delete: bdb/qam/qam_auto.c
BitKeeper/deleted/.del-qam_auto.h~96f6c045fd0d6cab:
  Delete: bdb/include/qam_auto.h
BitKeeper/deleted/.del-rec_btree~65d6b0b2f5b7a6d2:
  Delete: bdb/dist/template/rec_btree
BitKeeper/deleted/.del-rec_crdel~58795c0c5232f80d:
  Delete: bdb/dist/template/rec_crdel
BitKeeper/deleted/.del-rec_db~52c5797539878fca:
  Delete: bdb/dist/template/rec_db
BitKeeper/deleted/.del-rec_hash~dcbdd106ae17b865:
  Delete: bdb/dist/template/rec_hash
BitKeeper/deleted/.del-rec_log~3fe6d62c43bc553a:
  Delete: bdb/dist/template/rec_log
BitKeeper/deleted/.del-rec_qam~6eecf6833de0af98:
  Delete: bdb/dist/template/rec_qam
BitKeeper/deleted/.del-rec_txn~1ff22b797deb0e1b:
  Delete: bdb/dist/template/rec_txn
BitKeeper/deleted/.del-txn_auto.h~e3f49e94fd291c45:
  Delete: bdb/include/txn_auto.h
BitKeeper/deleted/.del-db_server_xdr.c~336ef020b4a22c05:
  Delete: bdb/rpc_server/db_server_xdr.c
BitKeeper/deleted/.del-gen_db_server.c~d5602f9bd5c930e:
  Delete: bdb/rpc_server/gen_db_server.c
BitKeeper/deleted/.del-include.tcl~20fc297b040cbe2:
  Delete: bdb/test/include.tcl
BitKeeper/deleted/.del-txn_auto.c~6eb282f016f606d9:
  Delete: bdb/txn/txn_auto.c
2001-04-05 15:33:16 -04:00
unknown
9d10389a12 Merge
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  SCCS merged
2001-04-05 15:25:39 -04:00
unknown
2a4e281c82 Clear up how ROUND() works (i.e., not the way you think).
Docs/manual.texi:
  Clear up how ROUND() works.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-05 15:21:19 -04:00
unknown
27d9f781f2 ut0dbg.h Print a better error message when an assertion fails
innobase/include/ut0dbg.h:
  Print a better error message when an assertion fails
2001-04-05 21:52:59 +03:00
unknown
9890ef99be accidentally merged a deleted piece of the manual back in 2001-04-04 23:19:28 -05:00
unknown
e97fae7e17 manual merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-04 23:19:27 -05:00
unknown
3b91fce6b8 Updates/cleanup for Linux notes
Docs/manual.texi:
  updates for Linux notes
2001-04-04 22:19:26 -06:00
unknown
759e0f931b Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-04 12:46:05 -06:00
unknown
92fcee847f separate compile-pentium and compile-pentium-max
BUILD/compile-pentium:
  do not build innobase and bdb, build it in max instead
2001-04-04 12:44:06 -06:00
unknown
f8d1b60744 os0thread.c Fix os_thread_sleep: did not work if over 1000000 microsecs; caused slowness at least on Solaris and FreeBSD
innobase/os/os0thread.c:
  Fix os_thread_sleep: did not work if over 1000000 microsecs; caused slowness at least on Solaris and FreeBSD
2001-04-04 20:34:54 +03:00
unknown
e3dee8e0f1 sync0sync.c Fix the infinite spin on FreeBSD
os0thread.c	Use pthread_yield instead of os_thread_sleep(0)


innobase/os/os0thread.c:
  Use pthread_yield instead of os_thread_sleep(0)
innobase/sync/sync0sync.c:
  Fix the infinite spin on FreeBSD
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-04 16:30:46 +03:00
unknown
2033edca12 Edits to first 10,000 lines from read-through of manual.texi.
Docs/manual.texi:
  Edits to first 10,000 lines from read-through.
2001-04-04 01:38:47 -05:00
unknown
7a60014eff Merge jcole@work.mysql.com:/home/bk/mysql
into abel.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2001-04-03 20:28:59 -05:00
unknown
dd081dabf8 manual.texi Update pubdate for PHP/MySQL book.
Docs/manual.texi:
  Update pubdate for PHP/MySQL book.
2001-04-03 20:28:58 -05:00
unknown
0b5e197bdb push so i can merge 2001-04-03 18:12:33 -05:00