Commit graph

600 commits

Author SHA1 Message Date
unknown
f015cbdc7e Add support for NULL=NULL in keys (Used in GROUP BY optimization)
Add ISAM to Windows version
Fix of test results
Fixes for NULL keys in HEAP tables.


Docs/manual.texi:
  Changelog
heap/hp_open.c:
  Add support for NULL=NULL in keys (for GROUP BY)
heap/hp_rkey.c:
  Cleanup
heap/hp_write.c:
  Cleanup
include/config-win.h:
  Add ISAM to Windows version
include/my_base.h:
  Add support for NULL=NULL in keys (for GROUP BY)
libmysqld/Makefile.am:
  Rename of innobase to innodb
myisam/mi_write.c:
  Add support for NULL=NULL in keys (for GROUP BY)
BitKeeper/etc/ignore:
  Added libmysqld/ha_innodb.cc to the ignore list
mysql-test/r/group_by.result:
  Test of NULL keys in HEAP tables
mysql-test/r/heap.result:
  Test of NULL keys in HEAP tables
mysql-test/r/null.result:
  Cleanup
mysql-test/r/order_by.result:
  Fix for result of new ORDER BY optimization
mysql-test/t/group_by.test:
  Test of NULL keys in HEAP tables
mysql-test/t/heap.test:
  Test of NULL keys in HEAP tables
mysql-test/t/null.test:
  Cleanup
sql/ha_heap.cc:
  Add support of NULL keys
sql/item_strfunc.h:
  Fix for BINARY and CAST functions
sql/item_timefunc.h:
  Fix for BINARY and CAST functions
sql/sql_parse.cc:
  Cleanup
sql/sql_select.cc:
  Add support for NULL=NULL in keys (for GROUP BY)
2002-01-16 00:42:52 +02:00
unknown
ececdf0908 Changes for the BitKeeper resolve.
One more notice:

limiting number of queries per hour for different users has been done
on 4.0.1 , but I can port it to 3.23.* 

This will require only certain changes, like number of columns in user
table.

I will also make a test case for it, after it is approved by Monty, 
as result file will depend on the error message text.


BitKeeper/etc/ignore:
  auto-union
libmysqld/lib_sql.cc:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/lex.h:
  Changes for BitKeeper resolve...
sql/sql_class.h:
  Changes for BitKeeper resolve...
sql/sql_lex.h:
  Changes for BitKeeper resolve...
sql/sql_parse.cc:
  Changes for BitKeeper resolve...
sql/sql_yacc.yy:
  Changes for BitKeeper resolve...
2001-12-26 17:42:06 +02:00
unknown
71ce58a3b1 This is a large push. Included are :
* multi-table updates
* new paid feature for limiting number of queries per hour for users
* optional syntax for multi-table deletes
* optimization for SQL_CALC_FOUND_ROWS
* a small addition for CREATE .. SELECT that will be of future use

I know that all this will require many additions to documentation, 
which I have not done, but I am at Arjen's disposal to help him document
all this.



libmysqld/lib_sql.cc:
  This is a small change required due to new paid feature of limiting 
  number of queries per hour for each user.
mysql-test/r/multi_update.result:
  Change of the result to accomodate multi-table updates
mysql-test/t/multi_update.test:
  Change in multi-table tests to accomodate multi-table updates
BitKeeper/etc/ignore:
  Added 50 sql/new.cc to the ignore list
scripts/mysql_install_db.sh:
  This is a small change required due to new paid feature of limiting 
  number of queries per hour for each user.
sql/item_timefunc.h:
  This is a small feature that will be of use later in the proper 
  creation of the tables out of CREATE ... SELECT...
  
  Further changes will come after this resolve/push/test passes ..
sql/lex.h:
  This is a small change required due to new paid feature of limiting 
  number of queries per hour for each user.
sql/mysql_priv.h:
  This is a small change required due to new paid feature of limiting 
  number of queries per hour for each user.
sql/mysqld.cc:
  This is a small change required due to new paid feature of limiting 
  number of queries per hour for each user.
sql/sql_acl.cc:
  This is a small change required due to new paid feature of limiting 
  number of queries per hour for each user.
sql/sql_acl.h:
  This is a small change required due to new paid feature of limiting 
  number of queries per hour for each user.
sql/sql_class.h:
  These are changes required for multi-table updates.
sql/sql_lex.h:
  Changes required for both multi-table updates and limiting number of 
  queries per hour (paid feature).
sql/sql_parse.cc:
  Ha ! So many changes. 
  
  * multi-table updates
  * limiting number of queries per hour for users
sql/sql_select.cc:
  Optimisation for SQL_CALC_FOUND_ROWS, when a query involves a single
  table, without WHERE or GROUP clause
sql/sql_update.cc:
  multi-table updates
sql/sql_yacc.yy:
  Many things :
  * multi-table updates
  * limiting number of queries per hour for users
  * new optional syntax for multi-table deletes. This one is different 
    from the one demanded by user. USING clause MUST include ALL tables, 
    not just the ones that are used and not deleted from.
2001-12-26 16:49:10 +02:00
unknown
20aa6caa56 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0-stable


BitKeeper/etc/ignore:
  auto-union
2001-12-25 10:44:31 -07:00
unknown
8a889d30c0 some work on mysql_install
BitKeeper/etc/ignore:
  Added extra/mysql_install to the ignore list
extra/Makefile.am:
  added mysql_install
extra/mysql_install.c:
  implemented ask_user()
2001-12-25 10:42:53 -07:00
unknown
54108b2fce Merge
BitKeeper/etc/ignore:
  auto-union
sql/sql_handler.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
2001-12-21 13:38:06 +00:00
unknown
6a39d321ed mysql_fix_extensions added
BitKeeper/etc/ignore:
  Added scripts/mysql_fix_extensions to the ignore list
scripts/mysql_fix_extensions.sh:
  typo fixed
2001-12-19 16:15:31 +00:00
unknown
e4921f2159 Fix after merge
BitKeeper/etc/ignore:
  Added libmysqld/sql_do.cc to the ignore list
include/m_string.h:
  Fix for purify
libmysql/Makefile.shared:
  Fix for purify
libmysqld/Makefile.am:
  Fix for purify
sql/sql_handler.cc:
  Cleanup
2001-12-17 23:24:51 +02:00
unknown
38357b30e6 Fixed fulltext after merge from 3.23.45
First (incomplete) version of transaction and as3ap tests.


BitKeeper/etc/ignore:
  Added sql-bench/test-transactions to the ignore list
mysql-test/r/fulltext.result:
  Update fulltext results after merge
sql-bench/Makefile.am:
  Added transaction test
sql-bench/run-all-tests.sh:
  Added transaction test
sql-bench/server-cfg.sh:
  Added transaction test
sql-bench/test-ATIS.sh:
  Cleanup
sql/item_func.cc:
  Fix bad merge
sql/mysqld.cc:
  Cleanup
sql/sql_base.cc:
  Fix bad merge
sql/sql_delete.cc:
  Cleanup
sql/sql_parse.cc:
  Fix bad merge
sql/sql_select.cc:
  Fix bad merge
sql/sql_union.cc:
  Fix bad merge
tools/mysqlmanager.c:
  C
2001-11-22 17:55:18 +02:00
unknown
91fb1d2377 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
2001-11-07 16:53:11 -07:00
unknown
906f94ba5f Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
BitKeeper/etc/ignore:
  auto-union
mysys/my_alloc.c:
  Auto merged
2001-11-05 01:42:47 +02:00
unknown
0d1ba873aa merge with 3.23.44
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
include/my_base.h:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/rpl000012.test:
  Auto merged
BUILD/FINISH.sh:
  Auto merged
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
  Auto merged
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
Build-tools/Do-all-build-steps:
  Auto merged
client/client_priv.h:
  Auto merged
client/mysqladmin.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/rpl000015-slave.sh:
  Auto merged
mysql-test/t/rpl000016-slave.sh:
  Auto merged
mysys/mf_cache.c:
  Auto merged
mysys/mf_casecnv.c:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
readline/vi_mode.c:
  Auto merged
strings/strto.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/time.cc:
  Auto merged
BUILD/SETUP.sh:
  Use -mcpu as default (safe for all x86 cpu's)
client/mysqldump.c:
  Merge from 3.23.44
configure.in:
  Update version number
extra/resolveip.c:
  Portability fix
2001-11-04 16:14:09 +02:00
unknown
c76c0836e4 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
sql/mysqld.cc:
  Auto merged
2001-11-03 16:55:39 -07:00
unknown
cd825a1993 more work on IO_CACHE
portability fixes for systems with broken syscalls that do not interrupt on 
a signal
temporary commit - will not be pushed, need to sync up


include/my_sys.h:
  work on READ_APPEND cache
mysys/Makefile.am:
  change to test IO_CACHE
mysys/mf_iocache.c:
  work on READ_APPEND cache
BitKeeper/etc/ignore:
  Added mysys/#mf_iocache.c# mysys/test_io_cache to the ignore list
sql/mysqld.cc:
  make shutdown work on broken systems
sql/sql_repl.cc:
  make sure slave can be stopped on broken systems in all cases, clean-up
2001-11-03 16:54:00 -07:00
unknown
0176dacd54 Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column is declared as NOT NULL.
BUILD/SETUP.sh:
  Use -O1 to avoid problem with INLINE functions
Docs/manual.texi:
  Changelog
mysql-test/r/join.result:
  Test for bugfix
mysql-test/t/join.test:
  Test for bugfix
sql/sql_select.cc:
  Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column was declared as NOT NULL.
BitKeeper/etc/ignore:
  Added bdb/include/db_ext.h bdb/include/mutex_ext.h to the ignore list
2001-11-03 21:22:06 +02:00
unknown
50fdd2b371 Remove bdb/include/*_ext.h from revision control. They are
generated automatically.


BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
  Delete: bdb/include/db_ext.h
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
  Delete: bdb/include/mutex_ext.h
BitKeeper/deleted/.del-btree_ext.h~5d53d710f170c6b6:
  Delete: bdb/include/btree_ext.h
BitKeeper/deleted/.del-clib_ext.h~ed9d9f7965f0e1d3:
  Delete: bdb/include/clib_ext.h
BitKeeper/deleted/.del-common_ext.h~35c8aab64ee3b8fd:
  Delete: bdb/include/common_ext.h
BitKeeper/deleted/.del-env_ext.h~33a5fdef1aeecefd:
  Delete: bdb/include/env_ext.h
BitKeeper/deleted/.del-hash_ext.h~5b31ff8413481606:
  Delete: bdb/include/hash_ext.h
BitKeeper/deleted/.del-lock_ext.h~ccd0785bb206933f:
  Delete: bdb/include/lock_ext.h
BitKeeper/deleted/.del-log_ext.h~2988f11d4545c76b:
  Delete: bdb/include/log_ext.h
BitKeeper/deleted/.del-mp_ext.h~a528b772d42d6455:
  Delete: bdb/include/mp_ext.h
BitKeeper/deleted/.del-os_ext.h~a1771032b4d2d53b:
  Delete: bdb/include/os_ext.h
BitKeeper/deleted/.del-qam_ext.h~9993db1fb3428b6d:
  Delete: bdb/include/qam_ext.h
BitKeeper/deleted/.del-tcl_ext.h~6759d22aa2ff5f39:
  Delete: bdb/include/tcl_ext.h
BitKeeper/deleted/.del-txn_ext.h~9db24c14f204890c:
  Delete: bdb/include/txn_ext.h
BitKeeper/deleted/.del-xa_ext.h~50918e5ef9f095b6:
  Delete: bdb/include/xa_ext.h
BitKeeper/etc/ignore:
  Added bdb/include/btree_ext.h bdb/include/clib_ext.h bdb/include/common_ext.h bdb/include/db_ext.h bdb/include/env_ext.h bdb/include/hash_ext.h bdb/include/lock_ext.h bdb/include/log_ext.h bdb/include/mp_ext.h bdb/include/mutex_ext.h bdb/include/os_ext.h bdb/include/qam_ext.h bdb/include/tcl_ext.h bdb/include/txn_ext.h bdb/include/xa_ext.h to the ignore list
2001-11-01 20:47:31 -05:00
unknown
4a113420ee Improve libmsyql_r and libmysqld sections of manual.
Docs/manual.texi:
  Clean up libmysql_r and libmysqld sections.
BitKeeper/etc/ignore:
  Added libmysqld/mf_iocache.cc to the ignore list
2001-10-29 14:12:46 -05:00
unknown
f9b331ff8a Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
2001-10-19 17:46:51 +03:00
unknown
7b440a7326 Unchecked changes, so that I could run mysql-test.
If I ruined anything, write your complaints to sasha@mysql.com


sql/sql_delete.cc:
  Unchecked changes, so that I could run mysql-test
sql/sql_lex.h:
  Unchecked changes, so that I could run mysql-test
sql/sql_parse.cc:
  Unchecked changes, so that I could run mysql-test
sql/sql_union.cc:
  Unchecked changes, so that I could run mysql-test
sql/sql_yacc.yy:
  Unchecked changes, so that I could run mysql-test
BitKeeper/etc/ignore:
  Added libmysqld/examples/link_sources to the ignore list
2001-10-19 17:43:30 +03:00
unknown
8f8f6edd83 Another reserved words fixup.
BitKeeper/etc/ignore:
  Added Docs/tex.fmt to the ignore list
2001-10-19 11:40:51 +10:00
unknown
02cbb3fa80 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged
2001-10-17 19:40:52 +03:00
unknown
aeaf3fcf12 Don't do signal() on windows (Causes instability problems)
Safer, a bit faster filesort.
Code changes to avoid calls to current_thd() (faster code).
Removed all compiler warnings from readline.


BitKeeper/etc/ignore:
  Add my_global.h back.
Docs/manual.texi:
  4.0.1 Changelog
include/my_sys.h:
  Added strmake_root
libmysql/libmysql.c:
  Don't do signal() on windows (Causes instability problems)
mysys/my_alloc.c:
  Added strmake_root
readline/bind.c:
  Remove warnings
readline/complete.c:
  Remove warnings
readline/display.c:
  Remove warnings
readline/funmap.c:
  Remove warnings
readline/histexpand.c:
  Remove warnings
readline/histfile.c:
  Remove warnings
readline/history.h:
  Remove warnings
readline/histsearch.c:
  Remove warnings
readline/isearch.c:
  Remove warnings
readline/kill.c:
  Remove warnings
readline/macro.c:
  Remove warnings
readline/readline.c:
  Remove warnings
readline/readline.h:
  Remove warnings
readline/rltty.c:
  Remove warnings
readline/search.c:
  Remove warnings
readline/shell.c:
  Remove warnings
readline/terminal.c:
  Remove warnings
readline/tilde.c:
  Remove warnings
readline/tilde.h:
  Remove warnings
readline/undo.c:
  Remove warnings
readline/util.c:
  Remove warnings
readline/vi_mode.c:
  Remove warnings
sql-bench/server-cfg.sh:
  Added use of truncate table
sql-bench/test-insert.sh:
  Added use of truncate table
  Changed some tests to use keys instead of 'range'
sql-bench/test-wisconsin.sh:
  Cleanup
sql/field.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/field.h:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/filesort.cc:
  Safer memory allocation;  Don't allocate pointer to buffers directly, but use an IO_CACHE instead.
  This will allow us to use more memory for keys and will also work better if the number of rows that is to be sorted is much larger than expected.
sql/item.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item.h:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item_func.h:
  Cleanup
sql/opt_range.cc:
  Use mem_root instead of sql_alloc() to get more speed
sql/sql_class.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_class.h:
  Added strmake()
sql/sql_handler.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_lex.cc:
  Use mem_root instead of sql_alloc() to get more speed
sql/sql_select.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
tests/fork2_test.pl:
  Fixed typos
tests/fork_big.pl:
  Fixed typos
tests/insert_and_repair.pl:
  Fixed typos
tests/rename_test.pl:
  Fixed typos
tests/test_delayed_insert.pl:
  Fixed typos
2001-10-17 19:39:39 +03:00
unknown
6312ba60f2 Explanation of maximum index length changed to maximum index width.
BitKeeper/etc/ignore:
  Added Docs/texi2dvi.out to the ignore list
2001-10-17 10:54:54 +10:00
unknown
91de46f050 Removed old chapter about Unireg.
Inserted note about stable codebase and backwards compatibility in "How stable is MySQL" section.


BitKeeper/etc/ignore:
  Added Docs/#manual.texi# to the ignore list
2001-10-15 14:14:21 +10:00
unknown
6db2120514 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/fulltext_order_by.result:
  Auto merged
mysql-test/r/fulltext_multi.result:
  Auto merged
mysql-test/r/fulltext_cache.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/r/fulltext_left_join.result:
  Auto merged
sql/handler.h:
  Auto merged
2001-10-12 17:47:13 +02:00
unknown
35b11f8345 Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
BitKeeper/etc/ignore:
  auto-union
2001-10-11 19:55:38 +03:00
unknown
7b4549e6a0 Added missing files in libmysqld and the RPM spec file
Docs/manual.texi:
  Added info to foreign key section.
BitKeeper/etc/ignore:
  Added libmysqld/repl_failsafe.cc to the ignore list
libmysqld/Makefile.am:
  Added missing files
mysql-test/r/innodb.result:
  Fixed explain results after new innodb optimizations
support-files/mysql.spec.sh:
  Added missing files
2001-10-11 05:37:05 +03:00
unknown
a0ed9744f3 merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-ft_search.c~c011cb6e8041bb59:
  the file is deleted anyway
include/my_global.h:
  merder
myisam/ft_boolean_search.c:
  huh?
mysql-test/r/fulltext.result:
  use local
mysql-test/r/fulltext_cache.result:
  ur
mysql-test/r/fulltext_left_join.result:
  ur
mysql-test/r/fulltext_multi.result:
  ur
mysql-test/r/fulltext_order_by.result:
  ur
2001-10-09 16:01:06 +02:00
unknown
736e5b0de2 Boolean search passes _some_ tests
sql/ha_myisam.cc:
  One more abstraction layer added (C++ emulated in C :).
include/ft_global.h:
  boolean search code plugged in
mysql-test/r/fulltext_cache.result:
  boolean search code plugged in
mysql-test/r/fulltext_left_join.result:
  boolean search code plugged in
mysql-test/r/fulltext_multi.result:
  boolean search code plugged in
mysql-test/r/fulltext_order_by.result:
  boolean search code plugged in
sql/lex.h:
  IN BOOLEAN MODE syntax
myisam/ft_nlq_search.c:
  boolean search code plugged in
myisam/ftdefs.h:
  boolean search code plugged in
sql/ha_myisam.h:
  boolean search code plugged in
sql/handler.h:
  boolean search code plugged in
include/my_base.h:
  do_not_sort_keyseg feature for MyISAM
include/my_global.h:
  #define comp(a,b) (((a) < (b)) ? -1 : ((a) > (b)) ? 1 : 0)
myisam/ft_boolean_search.c:
  bugfixing
myisam/ft_parser.c:
  cleanup
myisam/ft_static.c:
  do_not_sort_keyseg feature for MyISAM
myisam/mi_search.c:
  do_not_sort_keyseg feature for MyISAM
myisam/mi_write.c:
  cleanup
mysql-test/t/fulltext.test:
  boolean search tests added
BitKeeper/etc/ignore:
  Added myisam/FT1.MYD myisam/FT1.MYI to the ignore list
sql/item_func.cc:
  boolean search
sql/item_func.h:
  boolean search
sql/sql_yacc.yy:
  boolean search
2001-10-09 14:53:54 +02:00
unknown
86dccb3895 Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
BitKeeper/etc/ignore:
  auto-union
2001-10-08 07:33:12 +03:00
unknown
515c747dcf merge
BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/count_distinct2.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
libmysqld/Makefile.am:
  Added back md5.c
2001-10-08 05:36:35 +03:00
unknown
cef1d75249 Updated manual about embedded version.
Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86


BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7:
  Delete: mysys/mf_pack2.c
Docs/manual.texi:
  Updated chapter about embedded version
acinclude.m4:
  Fix for using BDB and InnoDB with embedded
client/completion_hash.cc:
  Speed up memory allocation
client/completion_hash.h:
  Speed up memory allocation
client/mysql.cc:
  Speed up memory allocation
client/mysqldump.c:
  Fix to use now convert_dirname
client/mysqltest.c:
  Fixed memory allocation bugs.
  Added --basedir=#, --compress=#, --server-arg, --server-file.
  Fixes for embedded version
  Changed silent mode to -s instead of -q
include/my_global.h:
  Update to use HAVE_ISAM
include/my_sys.h:
  Cleanup of fn_format()
include/mysql.h:
  Prepare FIELD struct for 4.1
include/mysql_embed.h:
  Don't use ISAM in embedded version
innobase/include/srv0srv.h:
  Make InnoDB startup/shutdown silent in embedded version
innobase/log/log0log.c:
  Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0srv.c:
  Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0start.c:
  Make InnoDB startup/shutdown silent in embedded version
isam/isamlog.c:
  new convert_dirname
libmysql/libmysql.c:
  Prepare for 4.1
libmysqld/Makefile.am:
  Changed to create one libmysqld.a file that includes all other libraries.
libmysqld/examples/Makefile.am:
  Changed to use new libmysqld.a
libmysqld/examples/test-run:
  Lot's of fixes to get new mysqltest with embedded MySQL to work.
libmysqld/lib_sql.cc:
  Changed type of arguments for mysql_server_init() to make code more portable.
libmysqld/libmysqld.c:
  Cleanup
merge/Makefile.am:
  Rename to use common prefix.
merge/mrg_close.c:
  Rename to use common prefix.
merge/mrg_create.c:
  Rename to use common prefix.
merge/mrg_def.h:
  Rename to use common prefix.
merge/mrg_delete.c:
  Rename to use common prefix.
merge/mrg_extra.c:
  Rename to use common prefix.
merge/mrg_info.c:
  Rename to use common prefix.
merge/mrg_locking.c:
  Rename to use common prefix.
merge/mrg_open.c:
  Rename to use common prefix.
merge/mrg_panic.c:
  Rename to use common prefix.
merge/mrg_rrnd.c:
  Rename to use common prefix.
merge/mrg_rsame.c:
  Rename to use common prefix.
merge/mrg_static.c:
  Rename to use common prefix.
merge/mrg_update.c:
  Rename to use common prefix.
myisam/myisamlog.c:
  Use new convert_dirname
myisammrg/Makefile.am:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_close.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_create.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_def.h:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_delete.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_extra.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_info.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_locking.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_open.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_panic.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_queue.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rfirst.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rkey.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rlast.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rnext.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rprev.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rrnd.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rsame.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_static.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_update.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_write.c:
  Renamed mymrgdef.h -> myrg_def.h
mysql-test/include/master-slave.inc:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/mysql-test-run.sh:
  cleanup
mysql-test/r/auto_increment.result:
  Cleanup of tests for embedded version
mysql-test/r/func_system.result:
  Cleanup of tests for embedded version
mysql-test/r/isam.result:
  Cleanup of tests for embedded version
mysql-test/r/lock.result:
  Cleanup of tests for embedded version
mysql-test/r/show_check.result:
  Cleanup of tests for embedded version
mysql-test/t/auto_increment.test:
  Cleanup of tests for embedded version
mysql-test/t/backup.test:
  Cleanup of tests for embedded version
mysql-test/t/count_distinct2-master.opt:
  Cleanup of tests for embedded version
mysql-test/t/count_distinct2.test:
  Cleanup of tests for embedded version
mysql-test/t/create.test:
  Cleanup of tests for embedded version
mysql-test/t/flush.test:
  Cleanup of tests for embedded version
mysql-test/t/func_system.test:
  Cleanup of tests for embedded version
mysql-test/t/isam.test:
  Cleanup of tests for embedded version
mysql-test/t/kill.test:
  Cleanup of tests for embedded version
mysql-test/t/lock.test:
  Cleanup of tests for embedded version
mysql-test/t/order_fill_sortbuf-master.opt:
  Cleanup of tests for embedded version
mysql-test/t/rpl000015.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000016.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000017.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000018.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/show_check.test:
  Move ISAM specific tests to isam.test
mysql-test/t/status.test:
  Cleanup of tests for embedded version
mysql-test/t/tablelock.test:
  Cleanup
mysys/Makefile.am:
  Removed not used mf_pack2.c
mysys/charset.c:
  new convert_dirname
mysys/default.c:
  new convert_dirname
mysys/mf_dirname.c:
  Changed convert_dirname() to be more general
mysys/mf_format.c:
  Changed bit flags to fn_format() to defines.
  Added handling of relative filenames
BitKeeper/etc/ignore:
  Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list
mysys/mf_pack.c:
  new convert_dirname
mysys/mf_tempfile.c:
  new convert_dirname
scripts/Makefile.am:
  Adde mysql_explain_log
scripts/mysql_config.sh:
  Added support of --libmysqld-libs
sql/Makefile.am:
  Fix to use 'innodb_system_libs'
sql/ha_innobase.cc:
  Make InnoDB startup/shutdown silent in embedded version
sql/ha_isam.cc:
  Added handling of HAVE_ISAM
sql/ha_isammrg.cc:
  Added handling of HAVE_ISAM
sql/ha_myisam.cc:
  Handle relative paths;  Needed to support BACKUP TABLE in embedded version
sql/ha_myisammrg.cc:
  Rename of filenames
sql/handler.cc:
  Added handling of HAVE_ISAM
sql/item_func.cc:
  Fix for ecc (Intel Compiler)
sql/mysql_priv.h:
  Added global variable 'mysql_embedded'
sql/mysqld.cc:
  Use HAVE_ISAM
sql/sql_parse.cc:
  Use new convert_dirname
sql/sql_select.cc:
  Fix for ecc (Intel Compiler)
sql/sql_table.cc:
  Added handling of relative filenames
strings/Makefile.am:
  Don't compile both assembler and C functions on x86
strings/bchange.c:
  cleanup
2001-10-08 04:58:07 +03:00
unknown
29f148bd36 client/mysqlmanagerc.c
added support for quiet
    increased line buffer size
client/mysqltest.c
    fixed memory leak
    added query logging to result file
    added error message logging to result file
    added enable_query_log/disable_query_log
mysql-test/mysql-test-run.sh
    converted tests to use mysqlmanager

Updated test results


BitKeeper/etc/ignore:
  added *.reject
client/mysqlmanagerc.c:
  added support for quiet
  increased line buffer size
client/mysqltest.c:
  fixed memory leak
  added query logging to result file
  added error message logging to result file
  added enable_query_log/disable_query_log
mysql-test/mysql-test-run.sh:
  converted tests to use mysqlmanager
mysql-test/r/alias.result:
  log queries
mysql-test/r/alter_table.result:
  log queries
mysql-test/r/analyse.result:
  log queries
mysql-test/r/auto_increment.result:
  log queries
mysql-test/r/backup.result:
  log queries
mysql-test/r/bdb-crash.result:
  log queries
mysql-test/r/bench_count_distinct.result:
  log queries
mysql-test/r/bigint.result:
  log queries
mysql-test/r/binary.result:
  log queries
mysql-test/r/bulk_replace.result:
  log queries
mysql-test/r/case.result:
  log queries
mysql-test/r/check.result:
  log queries
mysql-test/r/comments.result:
  log queries
mysql-test/r/compare.result:
  log queries
mysql-test/r/count_distinct.result:
  log queries
mysql-test/r/count_distinct2.result:
  log queries
mysql-test/r/create.result:
  log queries
mysql-test/r/ctype_latin1_de.result:
  log queries
mysql-test/r/delayed.result:
  log queries
mysql-test/r/dirty-close.result:
  log queries
mysql-test/r/distinct.result:
  log queries
mysql-test/r/drop.result:
  log queries
mysql-test/r/empty_table.result:
  log queries
mysql-test/r/explain.result:
  log queries
mysql-test/r/flush.result:
  log queries
mysql-test/r/fulltext.result:
  log queries
mysql-test/r/fulltext_cache.result:
  log queries
mysql-test/r/fulltext_distinct.result:
  log queries
mysql-test/r/fulltext_left_join.result:
  log queries
mysql-test/r/fulltext_multi.result:
  log queries
mysql-test/r/fulltext_order_by.result:
  log queries
mysql-test/r/fulltext_update.result:
  log queries
mysql-test/r/fulltext_var.result:
  log queries
mysql-test/r/func_crypt.result:
  log queries
mysql-test/r/func_date_add.result:
  log queries
mysql-test/r/func_equal.result:
  log queries
mysql-test/r/func_group.result:
  log queries
mysql-test/r/func_in.result:
  log queries
mysql-test/r/func_like.result:
  log queries
mysql-test/r/func_math.result:
  log queries
mysql-test/r/func_misc.result:
  log queries
mysql-test/r/func_op.result:
  log queries
mysql-test/r/func_regexp.result:
  log queries
mysql-test/r/func_set.result:
  log queries
mysql-test/r/func_str.result:
  log queries
mysql-test/r/func_system.result:
  log queries
mysql-test/r/func_test.result:
  log queries
mysql-test/r/func_time.result:
  log queries
mysql-test/r/func_timestamp.result:
  log queries
mysql-test/r/group_by.result:
  log queries
mysql-test/r/handler.result:
  log queries
mysql-test/r/having.result:
  log queries
mysql-test/r/heap.result:
  log queries
mysql-test/r/identity.result:
  log queries
mysql-test/r/ins000001.result:
  log queries
mysql-test/r/insert.result:
  log queries
mysql-test/r/insert_select.result:
  log queries
mysql-test/r/isam.result:
  log queries
mysql-test/r/join.result:
  log queries
mysql-test/r/join_crash.result:
  log queries
mysql-test/r/join_outer.result:
  log queries
mysql-test/r/key.result:
  log queries
mysql-test/r/key_diff.result:
  log queries
mysql-test/r/key_primary.result:
  log queries
mysql-test/r/keywords.result:
  log queries
mysql-test/r/kill.result:
  log queries
mysql-test/r/limit.result:
  log queries
mysql-test/r/lock.result:
  log queries
mysql-test/r/merge.result:
  log queries
mysql-test/r/multi_update.result:
  log queries
mysql-test/r/myisam.result:
  log queries
mysql-test/r/null.result:
  log queries
mysql-test/r/null_key.result:
  log queries
mysql-test/r/odbc.result:
  log queries
mysql-test/r/openssl_1.result:
  log queries
mysql-test/r/openssl_2.result:
  log queries
mysql-test/r/order_by.result:
  log queries
mysql-test/r/order_fill_sortbuf.result:
  log queries
mysql-test/r/raid.result:
  log queries
mysql-test/r/range.result:
  log queries
mysql-test/r/rename.result:
  log queries
mysql-test/r/replace.result:
  log queries
mysql-test/r/rollback.result:
  log queries
mysql-test/r/rpl000001.result:
  log queries
mysql-test/r/rpl000002.result:
  log queries
mysql-test/r/rpl000003.result:
  log queries
mysql-test/r/rpl000004.result:
  log queries
mysql-test/r/rpl000005.result:
  log queries
mysql-test/r/rpl000006.result:
  log queries
mysql-test/r/rpl000007.result:
  log queries
mysql-test/r/rpl000008.result:
  log queries
mysql-test/r/rpl000009.result:
  log queries
mysql-test/r/rpl000010.result:
  log queries
mysql-test/r/rpl000011.result:
  log queries
mysql-test/r/rpl000012.result:
  log queries
mysql-test/r/rpl000013.result:
  log queries
mysql-test/r/rpl000014.result:
  log queries
mysql-test/r/rpl000015.result:
  log queries
mysql-test/r/rpl000016.result:
  log queries
mysql-test/r/rpl000017.result:
  log queries
mysql-test/r/rpl000018.result:
  log queries
mysql-test/r/rpl_get_lock.result:
  log queries
mysql-test/r/rpl_log.result:
  log queries
mysql-test/r/rpl_magic.result:
  log queries
mysql-test/r/rpl_mystery22.result:
  log queries
mysql-test/r/rpl_sporadic_master.result:
  log queries
mysql-test/r/sel000001.result:
  log queries
mysql-test/r/sel000002.result:
  log queries
mysql-test/r/sel000003.result:
  log queries
mysql-test/r/sel000031.result:
  log queries
mysql-test/r/sel000032.result:
  log queries
mysql-test/r/sel000033.result:
  log queries
mysql-test/r/sel000100.result:
  log queries
mysql-test/r/select.result:
  log queries
mysql-test/r/select_found.result:
  log queries
mysql-test/r/select_safe.result:
  log queries
mysql-test/r/show_check.result:
  log queries
mysql-test/r/slave-running.result:
  log queries
mysql-test/r/slave-stopped.result:
  log queries
mysql-test/r/status.result:
  log queries
mysql-test/r/symlink.result:
  log queries
mysql-test/r/tablelock.result:
  log queries
mysql-test/r/temp_table.result:
  log queries
mysql-test/r/truncate.result:
  log queries
mysql-test/r/type_blob.result:
  log queries
mysql-test/r/type_date.result:
  log queries
mysql-test/r/type_datetime.result:
  log queries
mysql-test/r/type_decimal.result:
  log queries
mysql-test/r/type_enum.result:
  log queries
mysql-test/r/type_float.result:
  log queries
mysql-test/r/type_ranges.result:
  log queries
mysql-test/r/type_time.result:
  log queries
mysql-test/r/type_timestamp.result:
  log queries
mysql-test/r/type_uint.result:
  log queries
mysql-test/r/type_year.result:
  log queries
mysql-test/r/union.result:
  log queries
mysql-test/r/update.result:
  log queries
mysql-test/r/user_var.result:
  log queries
mysql-test/r/varbinary.result:
  log queries
mysql-test/r/variables.result:
  log queries
mysql-test/t/bench_count_distinct.test:
  log queries
mysql-test/t/check.test:
  log queries
mysql-test/t/count_distinct2.test:
  log queries
mysql-test/t/flush.test:
  log queries
mysql-test/t/isam.test:
  log queries
mysql-test/t/multi_update.test:
  log queries
mysql-test/t/myisam.test:
  log queries
mysql-test/t/order_fill_sortbuf.test:
  log queries
mysql-test/t/rpl000016.test:
  log queries
tools/managertest1.nc:
  test for def_exec overwrite
tools/mysqlmanager.c:
  support def_exec overwrite and queries on running server
2001-09-27 23:05:54 -06:00
unknown
08b94f415b added mysqlmanager-pwgen
added set_exec_stdout and set_exec_stderr to mysqlmanager to be able 
to redirect stdout and stderr
added support for MY_FULL_IO to my_read, so we can tell it to read
a number of bytes in as many chunks as it takes instead of one try


BitKeeper/etc/ignore:
  Added client/mysqlmanager-pwgen to the ignore list
client/Makefile.am:
  mysqlmanager-pwgen
client/mysqlmanagerc.c:
  clean-up
include/my_sys.h:
  added MY_FULL_IO
mysql-test/mysql-test-run.sh:
  started on changes to use mysqlmanager
mysys/my_read.c:
  added support for MY_FULL_IO
tools/managertest1.nc:
  updated test case
tools/mysqlmanager.c:
  added set_exec_stdout and set_exec_stderr
2001-09-22 21:47:57 -06:00
unknown
30f4ea7044 merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
  Auto merged
include/Makefile.am:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/md5.c:
  Auto merged
sql/Makefile.am:
  Auto merged
2001-09-19 14:39:11 -06:00
unknown
ba2c3fcd6a fixes for MYSQL manager
mysys/md5.c:
  Rename: sql/md5.c -> mysys/md5.c
include/md5.h:
  Rename: mysys/md5.h -> include/md5.h
client/Makefile.am:
  added mysqlmanagerc
include/Makefile.am:
  moved md5.h to include
include/mysql.h:
  added mysqlmanager client code
include/mysql_com.h:
  renamed connect2 to my_connect() and made it extern
libmysql/Makefile.shared:
  added md5 to libmysqlclient
libmysql/libmysql.c:
  connect2->my_connect
mysys/Makefile.am:
  added md5 to client
sql/Makefile.am:
  md5 -> mysys
sql/handler.cc:
  fixed typo
tools/managertest1.nc:
  cleanup
tools/mysqlmanager.c:
  fixed bugs
  added md5 authentication
BitKeeper/etc/ignore:
  Added client/mysqlmanagerc to the ignore list
vio/test-ssl:
  no change
2001-09-19 14:30:43 -06:00
unknown
f350008707 Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
BitKeeper/etc/ignore:
  auto-union
2001-09-19 02:14:27 +03:00
unknown
1869975881 Better purify information
BitKeeper/etc/ignore:
  Added sql/mysqld-purecov sql/mysqld-purify sql/mysqld-quantify to the ignore list
2001-09-19 01:18:47 +03:00
unknown
8a787b37f7 Fix to get pstack included in distribution
Fix to get libmysqld examples to be included in distribution


BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
  Delete: vio/test-ssl
BitKeeper/etc/ignore:
  Added libmysqld/examples/mysql libmysqld/examples/mysqltest to the ignore list
configure.in:
  Fix to get pstack included in distribution
libmysqld/Makefile.am:
  Fix to get libmysqld examples to be included in distribution
libmysqld/examples/Makefile.am:
  Fix to get libmysqld examples to be included in distribution
sql/sql_parse.cc:
  Fixed bug in grant
2001-09-18 06:05:55 +03:00
unknown
28097f40d3 Fixed locking problem when using bulk insert
Fixed array overrun when using drop_db
Portability fixes


BitKeeper/etc/ignore:
  Added libmysqld/examples/completion_hash.cc libmysqld/examples/completion_hash.h libmysqld/examples/my_readline.h libmysqld/examples/mysql.cc libmysqld/examples/mysqltest.c libmysqld/examples/readline.cc libmysqld/examples/sql_string.cc libmysqld/examples/sql_string.h to the ignore list
acinclude.m4:
  Fixed reference to top_builddir
myisam/mi_write.c:
  Fixed locking problem when using bulk insert
sql/sql_db.cc:
  Fixed array overrun when using drop_db
2001-09-17 17:53:27 +03:00
unknown
dd02abb187 Merge
BitKeeper/etc/ignore:
  auto-union
configure.in:
  SCCS merged
client/mysql.cc:
  SCCS merged
client/mysqltest.c:
  SCCS merged
mysql-test/mysql-test-run.sh:
  Auto merged
libmysqld/libmysqld.c:
  SCCS merged
2001-09-16 22:10:50 -04:00
unknown
5fffbb1236 Add some examples for using libmysqld, including a hack for running the
mysql test suite.

A few minor libmysqld fixes.

Add mysql_server_init() and _end() to mysql.cc and mysqltest.c, so they
can be linked against libmysqlclient or libmysqld.


sql/mysqld.cc:
  have unireg_end() exit(), instead of pthread_exit()
  if inside the EMBEDDED_LIBRARY.  This is a hack
  which hopefully won't be needed.  But without it,
  the program hangs at end.
client/mysql.cc:
  Don't call mysql_ssl_clear() unless HAVE_OPENSSL.
client/mysqltest.c:
  Add mysql_server_init() and _end().
acinclude.m4:
  change .. to $(top_builddir) in innodb_libs
Makefile.am:
  Add libmysqld/examples to link_sources target
configure.in:
  output libmysqld/examples/Makefile
  Also, change .. to $(top_builddir) in readline_link
BitKeeper/etc/ignore:
  added linked_libmysqldex_sources
mysql-test/mysql-test-run.sh:
  use latin1, not latin1_de, in tests
libmysqld/libmysqld.c:
  Add replication functions.
2001-09-16 21:41:22 -04:00
unknown
b7ae610302 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
BitKeeper/etc/ignore:
  added vio/test-ssl
sql/net_serv.cc:
  Auto merged
2001-09-15 16:24:05 +03:00
unknown
ef2e750842 Added my_global.h
BitKeeper/etc/ignore:
  R
2001-09-15 05:12:46 +03:00
unknown
9f6d389470 Cleanups
BitKeeper/etc/ignore:
  added vio/test-ssl
Docs/manual.texi:
  Cleanup
isam/isamchk.c:
  Cleanup
myisam/mi_check.c:
  Cleanup
myisam/myisamchk.c:
  Cleanup
myisam/myisamdef.h:
  Cleanup
sql/log_event.cc:
  Cleanup
sql/mysqld.cc:
  Cleanup
2001-09-15 05:03:16 +03:00
unknown
7d6644ad6f fixed coredump, and changed mngd->manager
sql/sql_acl.cc:
  fixed coredump when running without SSL
tools/Makefile.am:
  mysqlmngd -> mysqlmanager
tools/mysqlmanager.c:
  mngd->manager
BitKeeper/etc/ignore:
  Added tools/mysqlmanager to the ignore list
2001-08-29 16:52:50 -06:00
unknown
7a17233bcf Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
2001-08-27 17:34:29 -06:00
unknown
5e878c0d9a work on MySQL server management daemon
BitKeeper/etc/ignore:
  Added linked_tools_sources tools/my_vsnprintf.c tools/mysqlmngd tools/mysys_priv.h to the ignore list
Makefile.am:
  fixes for tools directory
configure.in:
  fixes for tools directory
tools/mysqlmngd.c:
  some bare-bones server code
2001-08-27 17:33:11 -06:00
unknown
a1f5a1094a OpenSSL changes
BitKeeper/etc/ignore:
  Added vio/test-sslclient vio/test-sslserver to the ignore list
client/mysql.cc:
  Let make mysql client tell user about cipher in use
sql/mini_client.cc:
  Synced SSL stuff with libmysql code
sql/mysqld.cc:
  Preaparations to turn replication SSL on
  Stuff to output SSL variables with SHOW STATUS command
sql/sql_show.cc:
  Stuff to output SSL variables with SHOW STATUS command
sql/structs.h:
  Stuff to output SSL variables with SHOW STATUS command
vio/viossl.c:
  Major modifications
vio/viosslfactories.c:
  SSL fixes
2001-08-27 03:34:52 +08:00
unknown
003d978acd Fix some libmysqld problems.
BitKeeper/etc/ignore:
  Added libmysqld/ha_innobase.cc to the ignore list
libmysqld/Makefile.am:
  Add ha_innobase.cc to libmysqld.
libmysqld/lib_sql.cc:
  Hack to get shutdown working properly in libmysqld.  Probably
  this is not quite correct.
sql/mini_client.cc:
  Remove name collision in embedded libmysqld.
2001-08-21 19:04:31 -04:00
unknown
e3a9e7e40e New startup options and some cleanups
BitKeeper/etc/ignore:
  Added =6 to the ignore list
include/mysqld_error.h:
  Error message for no-mixing of table types..
sql/mysql_priv.h:
  New option
sql/mysqld.cc:
  New option
sql/share/english/errmsg.txt:
  Error message for no-mixing of table types..
sql/sql_base.cc:
  Checking of the mixing of table types
sql/sql_parse.cc:
  some fixes
2001-08-18 15:29:21 +03:00
unknown
89b28ebdeb Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2001-08-12 16:11:43 +03:00
unknown
02e0db5a51 Changes so that CREATE and INSERT work from UNION's
BitKeeper/etc/ignore:
  Added innobase/conftest.s1 innobase/conftest.subs sql/sql_select.cc.orig to the ignore list
2001-08-12 16:01:32 +03:00
unknown
c9dbb4b726 merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql-bench/Makefile.am:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
Docs/manual.texi:
  merge
include/mysql_com.h:
  merge
include/mysqld_error.h:
  merge
mysql-test/install_test_db.sh:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  merge
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/sql_base.cc:
  merge
sql/sql_table.cc:
  merge
2001-08-11 17:28:41 -06:00
unknown
23d5f3f965 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqlbinlog.cc:
  Auto merged
2001-08-11 15:27:10 -06:00
unknown
48d48eac0b Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql
BitKeeper/etc/ignore:
  auto-union
2001-08-11 11:54:23 +03:00
unknown
cc32440ce9 delete generated files
BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Delete: bdb/include/rpc_server_ext.h
BitKeeper/deleted/.del-rpc_client_ext.h~85436ca9b5691338:
  Delete: bdb/include/rpc_client_ext.h
BitKeeper/etc/ignore:
  added bdb/include/rpc_client_ext.h
2001-08-11 11:53:50 +03:00
unknown
1e5b7a20fe ignore generated include file
BitKeeper/etc/ignore:
  added include/widec.h
2001-08-11 11:43:45 +03:00
unknown
cb1c0b0818 Made SIGTERM safer for Solaris
BitKeeper/etc/ignore:
  added */*_pure_*warnings
BUILD/compile-solaris-sparc:
  Optimized build for ultrasparc
sql/mysqld.cc:
  Made SIGTERM safer for Solaris as it sometimes delivered a not catched
  signal during shutdown
2001-08-11 11:24:43 +03:00
unknown
9a6a7bf5f6 merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
ltmain.sh:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2001-08-09 19:16:15 -06:00
unknown
8ddf0c4414 mysqlbinlog->client
BitKeeper/etc/ignore:
  Added client/log_event.cc client/log_event.h client/mf_iocache.c client/mf_iocache.cc client/mysqlbinlog client/mysys_priv.h mysql.kdevprj to the ignore list
Makefile.am:
  do symlink hack in the client directory 
  ( originally needed to get log_event.cc for mysqlbinlog)
client/mysqlbinlog.cc:
  fixes to make it compile in the client directory
libmysql/Makefile.shared:
  link mysqlbinlog dependencies into libmysqlclient
libmysql/libmysql.c:
  make simple_command and net_safe_read extern ( for mysqlbinlog)
sql/log_event.cc:
  removed pthread dependency in mysqlbinlog
sql/log_event.h:
  removed pthread dependency in mysqlbinlog
2001-08-09 18:16:43 -06:00
unknown
4bb4018743 misc bug fixes
libmysqld/Makefile.am:
  sql_unions -> sql_union
BitKeeper/etc/ignore:
  Added libmysqld/sql_union.cc to the ignore list
mysql-test/mysql-test-run.sh:
  fix to get path-independent logging
mysql-test/r/rpl_log.result:
  fix for path-independent logging
sql/log.cc:
  fixed compile error with USING_TRANSACTIONS
sql/log_event.h:
  fixed compile error with USING_TRANSACTIONS
2001-08-06 16:47:48 -06:00
unknown
39045174a5 new file_id generation method
mysql-test/r/rpl_log.result:
  fixed result for new file_id generating method
BitKeeper/etc/ignore:
  Added vio/viotest-ssl to the ignore list
sql/log.cc:
  use a different method to generate unique file_id
sql/log_event.cc:
  new file_id generationg method
sql/sql_class.h:
  new file_id generationg method
2001-08-04 05:48:58 -06:00
unknown
22a5241f28 Add test case for update/replace bug in bdb.
Remove unused argument to ha_berkeley::remove_key().


mysql-test/r/bdb.result:
  Add test case for update/replace bug in bdb.
BitKeeper/etc/ignore:
  Added .gdbinit .vimrc to the ignore list
mysql-test/t/bdb.test:
  Add test case for update/replace bug in bdb.
sql/ha_berkeley.cc:
  The packed_record argument to ha_berkeley::remove_key() was never
  used; remove it.
sql/ha_berkeley.h:
  The packed_record argument to ha_berkeley::remove_key() was never
  used; remove it.
2001-07-24 12:23:17 -04: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
ac3219dc65 bug fixed (sometimes it broke filesort, due to too late maybe_null=1)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
BitKeeper/etc/ignore:
  Added myisam/test1.MYD myisam/test1.MYI to the ignore list
2001-07-03 17:58:47 +02:00
unknown
cdfc04fb08 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2001-07-01 13:27:09 +03:00
unknown
b291238171 Making multi-table delete BETA !!
mysql-test/t/multi_update.test:
  Making a test change the order of the tables, so that initalize_tables 
  would be tested properly
mysys/my_compress.c:
  Just changed my e-mail address .... ;o)
sql/filesort.cc:
  Making sure that merge_buffers can not be killed
sql/sql_class.h:
  Added initialize_tables
sql/sql_delete.cc:
  Making final changes for multi table delete, beta version !!
sql/sql_select.cc:
  same as above
BitKeeper/etc/ignore:
  Added locked to the ignore list
2001-07-01 13:20:53 +03:00
unknown
bd286b23f9 support for eval_result and let $var = query syntax in mysql-test
fixes for rpl_log test to make it config-independent


BitKeeper/etc/ignore:
  Added mysql-test/r/rpl_log.eval to the ignore list
client/mysqltest.c:
  support for eval_result and let $var = `query` syntax
mysql-test/Makefile.am:
  import more variables into mysql-test-run
mysql-test/mysql-test-run.sh:
  if we got wrong result on eval_result test case, diff against the
  expanded result, not the template
mysql-test/r/rpl_log.result:
  change config-dependent parts of the result to dynamic variables
mysql-test/t/rpl_log.test:
  get server version from the server
  remove obsoleted replace hack to solve port problem - use eval_result
  instead
2001-06-30 13:08:35 -06: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
950a6871d9 Implement ORDER BY DESC optimization, which reads values in descending
order directly from the index instead of using a filesort.


mysql-test/mysql-test-run.sh:
  [ -n $SKIP_TEST ] --> [ -n "$SKIP_TEST" ]; portability fix
mysql-test/r/order_by.result:
  Added test for ORDER BY DESC optimization
mysql-test/t/order_by.test:
  Added test for ORDER BY DESC optimization
sql/opt_range.cc:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/opt_range.h:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/sql_select.cc:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
BitKeeper/etc/ignore:
  Added .gdbinit .vimrc to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-28 03:06:23 -04:00
unknown
9227621cce Further work on UNIONS
BitKeeper/etc/ignore:
  Added libmysqld/hash_filo.cc libmysqld/sql_unions.cc libmysqld/stacktrace.c sql/share/mysql to the ignore list
sql/sql_parse.cc:
  Fixing some stuff for UNION's
2001-06-18 12:55:41 +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
8b76fb7f3e Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
Docs/manual.texi:
  Auto merged
2001-06-11 15:07:43 +03:00
unknown
765940cb3a Changed compare in MyISAM to use my_pread()
Fixed that @VAR shows all decimals
Fixed problem with FLUSH TABLES and LOCK TABLE
CREATE ... SELECT now creates keys later
Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key


Docs/manual.texi:
  Added MySQL/PostgreSQL comparison
isam/_dynrec.c:
  Fixed wrong compare (not used in MySQL)
myisam/mi_dynrec.c:
  Fixed wrong compare (not used in MySQL).
  Changed compare to use my_pread()
myisam/mi_packrec.c:
  cleanup
mysql-test/r/alter_table.result:
  Added test for ALTER TABLE
mysql-test/r/variables.result:
  Added test for variables with REAL values.
mysql-test/t/alter_table.test:
  Added test for ALTER TABLE
mysql-test/t/variables.test:
  Added test for variables with REAL values.
mysys/my_pread.c:
  Cleanup
sql-bench/Makefile.am:
  removed extra \
sql-bench/README:
  Fixed typo.
sql/item_func.cc:
  Fixed that @VAR shows all decimals
sql/share/swedish/errmsg.OLD:
  update
sql/sql_base.cc:
  Fixed problem with FLUSH TABLES and LOCK TABLE
sql/sql_insert.cc:
  CREATE ... SELECT now creates keys later
sql/sql_table.cc:
  Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key.
BitKeeper/etc/ignore:
  Added sql-bench/graph-compare-results to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-11 15:01:28 +03:00
unknown
44b670f650 Small fixes in the manual.
BitKeeper/etc/ignore:
  Added sql-bench/compare-results-all sql-bench/template.html to the ignore list
Docs/manual.texi:
  Changed innodb_unix_file_flush_method -> innodb_flush_method.
2001-06-11 12:23:30 +03:00
unknown
30bd6b3bbc Updated manual about symlinks on window and adding users
BitKeeper/etc/ignore:
  added sql-bench/gif/*
2001-06-06 03:10:00 +03:00
unknown
1baef9839d Merge work:/home/bk/mysql-4.0
into threads.polyesthetic.msg:/home/tim/my/4


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-04 19:39:55 -04:00
unknown
bc0befda9c Various changes to get libmysqld in sync with latest sources.
BitKeeper/etc/ignore:
  Added libmysqld/uniques.cc
client/mysqltest.c:
  Don't core dump if --socket isn't specified.
  
  Add --test-file option, to facilitate running mysqltest under debugger.
libmysqld/Makefile.am:
  We need uniques.cc
libmysqld/lib_sql.cc:
  Tiny cleanup.
libmysqld/libmysqld.c:
  Split mysql_real_query() into mysql_send_query() and
  mysql_read_query_results().
2001-06-04 18:34:04 -04:00
unknown
7f4df54136 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
2001-06-01 11:06:28 -06:00
unknown
1a2b5bb025 fixed bug in count(distinct)
BitKeeper/etc/ignore:
  Added bdb/include/rpc_server_ext.h to the ignore list
2001-06-01 11:05:00 -06:00
unknown
d9a9f38e87 Removed compiler warnings.
Added preliminary handling of symlinks in MyISAM.
When using myisamchk to check tables with --force, don't repair
tables that are marked as 'not closed' if they are ok.
Change fn_format() to use my_real_path and my_symlink


include/myisam.h:
  Added handling of symlinks
myisam/ft_boolean_search.c:
  cleanup
myisam/ft_dump.c:
  cleanup
myisam/mi_check.c:
  Added handling of symlinks.
  When using check and --force, don't repair tables that are marked
  as 'not closed' if they are ok.
myisam/mi_create.c:
  Added handling of symlinks.
myisam/mi_dbug.c:
  Added handling of symlinks.
myisam/mi_info.c:
  Added handling of symlinks.
myisam/mi_open.c:
  Added handling of symlinks.
myisam/mi_search.c:
  cleanup
myisam/myisamchk.c:
  Added handling of symlinks.
myisam/myisamdef.h:
  Added handling of symlinks.
myisam/myisamlog.c:
  Fixed bug when using new trees
myisam/myisampack.c:
  cleanup
mysys/mf_cache.c:
  cleanup
mysys/mf_format.c:
  Change to use my_real_path and my_symlink
mysys/my_alloc.c:
  cleanup
BitKeeper/etc/ignore:
  Added libmysqld/sql_command libmysqld/backup_dir libmysqld/simple-test to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-31 14:07:17 +03: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
62198cbc79 Merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
2001-05-18 18:49:30 +02:00
unknown
ada14881c7 Do-patch-file Fix typo (extra 'mv')
ignore  	added Logs/* binary/*


BitKeeper/etc/ignore:
  added Logs/* binary/*
Build-tools/Do-patch-file:
  Fix typo (extra 'mv')
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-18 18:48:38 +02:00
unknown
d7eb456ad3 Clean out some more generated files from the bdb tree. Add a hack
to bdb/dist/s_rpc so that bk doesn't complain about the
rpc_server/db_server_proc.c file that gets overwritten (but needs to
be stored in BK).  Add a bdb/dist/template directory which is needed
by bdb/dist/s_recover.


BitKeeper/deleted/.del-gen_client_ext.h~5c621cacb18b38:
  Delete: bdb/include/gen_client_ext.h
BitKeeper/deleted/.del-gen_client_ret~786a5e65119b3991:
  Delete: bdb/dist/template/gen_client_ret
BitKeeper/deleted/.del-db_server.x~811aeb6b630fe7aa:
  Delete: bdb/rpc_server/db_server.x
BitKeeper/deleted/.del-db_server_proc.sed~1a9af8e5b051acbd:
  Delete: bdb/rpc_server/db_server_proc.sed
BitKeeper/deleted/.del-db_server_proc~2e8b49d42aefab55:
  Delete: bdb/dist/template/db_server_proc
BitKeeper/deleted/.del-gen_server_ext.h~fd7bcfe6bbca8bcb:
  Delete: bdb/include/gen_server_ext.h
BitKeeper/deleted/.del-db_archive.dsp~e3da826e91bb086:
  Delete: bdb/build_win32/db_archive.dsp
BitKeeper/deleted/.del-db_checkpoint.dsp~8071af22db95b1db:
  Delete: bdb/build_win32/db_checkpoint.dsp
BitKeeper/deleted/.del-db_deadlock.dsp~befd45d29eaeb672:
  Delete: bdb/build_win32/db_deadlock.dsp
BitKeeper/deleted/.del-db_dll.dsp~4e9dda53c84511b6:
  Delete: bdb/build_win32/db_dll.dsp
BitKeeper/deleted/.del-db_dump.dsp~e07d2a82708b61:
  Delete: bdb/build_win32/db_dump.dsp
BitKeeper/deleted/.del-db_java.dsp~e3941d5a9810b360:
  Delete: bdb/build_win32/db_java.dsp
BitKeeper/deleted/.del-db_load.dsp~e83a2af8e24a715d:
  Delete: bdb/build_win32/db_load.dsp
BitKeeper/deleted/.del-db_printlog.dsp~163f6e1073a5f396:
  Delete: bdb/build_win32/db_printlog.dsp
BitKeeper/deleted/.del-db_recover.dsp~835c32ab73359256:
  Delete: bdb/build_win32/db_recover.dsp
BitKeeper/deleted/.del-db_stat.dsp~f77417f5d9984986:
  Delete: bdb/build_win32/db_stat.dsp
BitKeeper/deleted/.del-db_static.dsp~78ea414467defc70:
  Delete: bdb/build_win32/db_static.dsp
BitKeeper/deleted/.del-db_tcl.dsp~5ad951d774e41520:
  Delete: bdb/build_win32/db_tcl.dsp
BitKeeper/deleted/.del-db_upgrade.dsp~90fd250190af4984:
  Delete: bdb/build_win32/db_upgrade.dsp
BitKeeper/deleted/.del-db_verify.dsp~e9a4938542f86cea:
  Delete: bdb/build_win32/db_verify.dsp
BitKeeper/deleted/.del-ex_access.dsp~8dd6017efffae14e:
  Delete: bdb/build_win32/ex_access.dsp
BitKeeper/deleted/.del-ex_btrec.dsp~c87137287d8d67dc:
  Delete: bdb/build_win32/ex_btrec.dsp
BitKeeper/deleted/.del-ex_env.dsp~1732d5e41efda77:
  Delete: bdb/build_win32/ex_env.dsp
BitKeeper/deleted/.del-ex_lock.dsp~286d2566e786dde:
  Delete: bdb/build_win32/ex_lock.dsp
BitKeeper/deleted/.del-ex_mpool.dsp~9eb937bc70c1573:
  Delete: bdb/build_win32/ex_mpool.dsp
BitKeeper/deleted/.del-ex_tpcb.dsp~644b38dae8b38152:
  Delete: bdb/build_win32/ex_tpcb.dsp
BitKeeper/deleted/.del-excxx_access.dsp~31e87b6228470681:
  Delete: bdb/build_win32/excxx_access.dsp
BitKeeper/deleted/.del-excxx_btrec.dsp~61b563f4ac1f73eb:
  Delete: bdb/build_win32/excxx_btrec.dsp
BitKeeper/deleted/.del-excxx_env.dsp~b0bf2649a4c797ac:
  Delete: bdb/build_win32/excxx_env.dsp
BitKeeper/deleted/.del-excxx_lock.dsp~257abf03544f6270:
  Delete: bdb/build_win32/excxx_lock.dsp
BitKeeper/deleted/.del-excxx_mpool.dsp~d17a5d09f09f5217:
  Delete: bdb/build_win32/excxx_mpool.dsp
BitKeeper/deleted/.del-excxx_tpcb.dsp~159c727e2c15105e:
  Delete: bdb/build_win32/excxx_tpcb.dsp
BitKeeper/deleted/.del-logtrack.list~7f4f1382b37d98e5:
  Delete: bdb/test/logtrack.list
BitKeeper/etc/ignore:
  added bdb/build_win32/db_archive.dsp bdb/build_win32/db_checkpoint.dsp bdb/build_win32/db_deadlock.dsp bdb/build_win32/db_dump.dsp bdb/build_win32/db_load.dsp bdb/build_win32/db_printlog.dsp bdb/build_win32/db_recover.dsp bdb/build_win32/db_stat.dsp bdb/build_win32/db_upgrade.dsp bdb/build_win32/db_verify.dsp bdb/build_win32/ex_access.dsp bdb/build_win32/ex_btrec.dsp bdb/build_win32/ex_env.dsp bdb/build_win32/ex_lock.dsp bdb/build_win32/ex_mpool.dsp bdb/build_win32/ex_tpcb.dsp bdb/build_win32/excxx_access.dsp bdb/build_win32/excxx_btrec.dsp bdb/build_win32/excxx_env.dsp bdb/build_win32/excxx_lock.dsp bdb/build_win32/excxx_mpool.dsp bdb/build_win32/excxx_tpcb.dsp bdb/build_win32/db_dll.dsp bdb/build_win32/db_java.dsp bdb/build_win32/db_static.dsp bdb/build_win32/db_tcl.dsp bdb/dist/template/gen_client_ret bdb/dist/template/db_server_proc bdb/include/gen_client_ext.h bdb/include/gen_server_ext.h bdb/rpc_server/db_server_proc.sed bdb/rpc_server/db_server.x bdb/test/logtrack.list
bdb/dist/s_rpc:
  This is a hack to handle the $proc_file special case.  Since it
  is both a source file and a generated file, we have to dance a
  bit to get it to work with 'bk get', not just with 'bk edit'.
  This still isn't perfect (I don't know what perfect would be in
  this case), but it seems to work for now.
2001-05-18 12:43:16 -04: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
dbd56fcdc5 Fixes for embedded MySQL
Some limit optimization


BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
  Delete: innobase/ib_config.h.in
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
  Delete: innobase/ib_config.h
client/errmsg.c:
  Moved error messages from libmysqld/
client/mysql.cc:
  Removed warnings
include/errmsg.h:
  New info for embedded versions
include/mysql_com.h:
  Fixes for embedded MySQL
libmysql/errmsg.c:
  Fixes for embedded MySQL
libmysqld/Makefile.am:
  Added HANDLER code
libmysqld/lib_sql.cc:
  Fixes for embedded MySQL
libmysqld/lib_vio.c:
  Fixes for embedded MySQL
BitKeeper/etc/ignore:
  Added libmysqld/sql_handler.cc to the ignore list
libmysqld/libmysqld.c:
  Fixes for embedded MySQL
mysql-test/r/null_key.result:
  Fixed result for 4.0
sql/net_serv.cc:
  Fixes for embedded MySQL
sql/sql_parse.cc:
  Fixes for embedded MySQL where the query could be a const char*
sql/sql_select.cc:
  Added limit optimization
sql/sql_select.h:
  Added limit optimization
2001-04-25 01:11:29 +03:00
unknown
4c5dd2f278 Fixed that database name is shown for CHECK TABLE
BitKeeper/etc/ignore:
  Added client/mysqlcheck to the ignore list
Docs/manual.texi:
  Changelog
2001-04-20 17:14:53 +03:00
unknown
b61b56b293 ignore some files
BitKeeper/etc/ignore:
  added mysql.proj
2001-04-19 20:41:47 +03:00
unknown
b33245671d mysql-test/mysql-test-run.sh
added --bench option
sql-bench/Makefile.am
    added bench-count-distinct.sh test
sql-bench/bench-init.pl.sh
    added --socket option


mysql-test/mysql-test-run.sh:
  added --bench option
sql-bench/Makefile.am:
  added bench-count-distinct.sh test
sql-bench/bench-init.pl.sh:
  added --socket option
sql-bench/server-cfg.sh:
  --socket
BitKeeper/etc/ignore:
  Added sql-bench/bench-count-distinct to the ignore list
2001-04-13 12:51:27 -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
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
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
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
33ec68e127 worked around gcc bug to make compile-pentium-gcov work
increase coverage for table.cc in mysql_rm_table()
ingore temporary gcov files
fixed bug in replication test case


BitKeeper/etc/ignore:
  added *.da
BUILD/compile-pentium-gcov:
  do not build shared libraries - combination of -fPIC and the coverage flags
  triggers a bug in gcc, apparently - problem went away after adding
  --disable-shared
mysql-test/t/flush.test:
  extra test to increase coverage of table.cc
mysql-test/t/rpl000016.test:
  fixed bug in test case - insert may be concurrent, so we may read the
  table on the slave before the last insert becomes visible even when the 
  master position is up to date if we do not
  lock it explicitly
2001-03-26 21:03:08 -07:00
unknown
fc9c0ad83e Changes to make it compile again
acinclude.m4:
  do not build Gemini by default
configure.in:
  do MYSQL_CHECK_GEMINI - otherwise it does not compile
BitKeeper/etc/ignore:
  Added BitKeeper/etc/level to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-03-22 11:31:43 -07:00
unknown
74ea733303 Fixed bug in MAX() optimizing for BDB tables
Docs/manual.texi:
  Updated changelog
mysql-test/README:
  Added reference to manual
mysql-test/r/bdb.result:
  Added test for MAX() bug
mysql-test/r/innobase.result:
  Added test for MAX() bug
mysql-test/t/bdb.test:
  Added test for MAX() bug
mysql-test/t/innobase.test:
  Added test for MAX() bug
sql-bench/server-cfg.sh:
  Don't create big blobs with innobase
sql/ha_berkeley.cc:
  Fixed bug in MAX() optimizing
BitKeeper/etc/ignore:
  Added sql/.gdbinit to the ignore list
sql/ha_innobase.h:
  Fixed bug in MAX() optimizing
sql/handler.h:
  Fixed bug in MAX() optimizing
sql/opt_sum.cc:
  Fixed bug in MAX() optimizing
2001-03-10 17:05:10 +02:00
unknown
ea7f14cf36 Small changes to make life with BDB in the tree easier.
BitKeeper/etc/ignore:
  added bdb/build_unix/*
BUILD/FINISH.sh:
  Run the s_all script in bdb/dist before running configure
2001-03-04 20:59:13 -05:00
unknown
1efcceba34 Ignore some files in bdb. 2001-03-04 20:07:36 -05:00
unknown
d169f8c838 Merge
BitKeeper/etc/ignore:
  added BitKeeper/tmp/*
Docs/manual.texi:
  SCCS merged
2001-01-29 13:59:26 +02:00
unknown
4ac091636b rpl000016.test sync
rpl000001.result	BitKeeper file /home/sasha/src/bk/mysql/mysql-test/r/rpl000001.result
ignore  	Added BitKeeper/tmp/bkr3sAHD to the ignore list
slave.h 	MASTER_POS_WAIT
lex.h   	MASTER_POS_WAIT
slave.cc	MASTER_POS_WAIT, do automagic restart on debugging abort, skip rotate events in 
slave.cc	debug abort count
sql_repl.cc	announce the log name at the start of the log with a fake rotate event
item_create.h	MASTER_POS_WAIT
item_func.cc	MASTER_POS_WAIT
item_func.h	MASTER_POS_WAIT
sql_class.h	enter_cond(), exit_cond() helper inliners
item_create.cc	added MASTER_POS_WAIT
mysql-test-run.sh	speed improvement fixes
rpl000007.test	sync
rpl000003.test	sleep -> sync
rpl000004.test	sleep -> sync, fixed clean up bug
rpl000014.test	sync
rpl000009.test	sync
rpl000013.test	sync
rpl000001.test	sleep -> sync
rpl000008.test	sync
rpl000006.test	sync on cleanup
rpl000011.test	sync
rpl000012.test	sync
rpl000005.test	sleep -> sync
rpl000010.test	sync
rpl000015.test	sync
rpl000002.test	sleep -> sync
rpl000014.result	we now know the master log name as soon as we connect
mysql.cc	added optional agrument to --wait
mysqltest.c	added save_master_pos and sync_with_master commands


client/mysql.cc:
  added optional agrument to --wait
client/mysqltest.c:
  added save_master_pos and sync_with_master commands
mysql-test/mysql-test-run.sh:
  speed improvement fixes
mysql-test/r/rpl000014.result:
  we now know the master log name as soon as we connect
mysql-test/t/rpl000001.test:
  sleep -> sync
mysql-test/t/rpl000002.test:
  sleep -> sync
mysql-test/t/rpl000003.test:
  sleep -> sync
mysql-test/t/rpl000004.test:
  sleep -> sync, fixed clean up bug
mysql-test/t/rpl000005.test:
  sleep -> sync
mysql-test/t/rpl000006.test:
  sync on cleanup
mysql-test/t/rpl000007.test:
  sync
mysql-test/t/rpl000008.test:
  sync
mysql-test/t/rpl000009.test:
  sync
mysql-test/t/rpl000010.test:
  sync
mysql-test/t/rpl000011.test:
  sync
mysql-test/t/rpl000012.test:
  sync
mysql-test/t/rpl000013.test:
  sync
mysql-test/t/rpl000014.test:
  sync
mysql-test/t/rpl000015.test:
  sync
BitKeeper/etc/ignore:
  Added BitKeeper/tmp/bkr3sAHD to the ignore list
mysql-test/t/rpl000016.test:
  sync
sql/item_create.cc:
  added MASTER_POS_WAIT
sql/item_create.h:
  MASTER_POS_WAIT
sql/item_func.cc:
  MASTER_POS_WAIT
sql/item_func.h:
  MASTER_POS_WAIT
sql/lex.h:
  MASTER_POS_WAIT
sql/slave.cc:
  MASTER_POS_WAIT, do automagic restart on debugging abort, skip rotate events in 
  debug abort count
sql/slave.h:
  MASTER_POS_WAIT
sql/sql_class.h:
  enter_cond(), exit_cond() helper inliners
sql/sql_repl.cc:
  announce the log name at the start of the log with a fake rotate event
2001-01-17 05:47:33 -07:00
unknown
72b3120dcc Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
BitKeeper/etc/ignore:
  added sql/share/*.sys
Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-01-12 13:56:46 +02:00
unknown
de51fa0c25 Added resovle_stack_dump
BitKeeper/etc/config:
  fixed up an option
BitKeeper/etc/ignore:
  Added extra/resolve_stack_dump to the ignore list
extra/Makefile.am:
  addition of resolve_stack_dump
2001-01-05 15:04:15 -07:00
unknown
7e687f893c Merge
BitKeeper/etc/ignore:
  added tmp/*
Docs/manual.texi:
  SCCS merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-01-01 14:21:12 +02:00
unknown
29fa72526a Fixed --no-defaults in mysqltest
BUILD/compile-pentium-debug:
  Use /usr/local/BerkeleyDB-dbug/ if available
BUILD/compile-pentium:
  Use /usr/local/BerkeleyDB-opt/ if available
Docs/internals.texi:
  Added 'unedited' documentation for mysys functions
Docs/manual.texi:
  Cleanups
client/mysql.cc:
  Added client language to status
client/mysqltest.c:
  Fixed bug with --no-defaults
heap/_check.c:
  Added option to print status.
heap/hp_close.c:
  Update to use new status interface
heap/hp_hash.c:
  Clean up hash function and add new experimental hash
heap/hp_test1.c:
  Update to use new status interface
heap/hp_test2.c:
  Update to use new status interface
include/heap.h:
  Update to use new status interface
mysql-test/r/key_diff.result:
  Cleanup tests that may give rows in random order
mysql-test/r/type_blob.result:
  Removed \r from output as this confused bk
mysql-test/t/key_diff.test:
  Cleanup tests that may give rows in random order
BitKeeper/etc/ignore:
  Added Docs/my_sys.doc to the ignore list
mysql-test/t/type_blob.test:
  Removed \r from output as this confused bk
mysys/hash.c:
  Add new experimental hash function
scripts/safe_mysqld.sh:
  Added --mysqld option
sql/ha_innobase.cc:
  Fixed store_locking
sql/mysqld.cc:
  Cleaned up warning messages
2000-12-29 16:06:10 +02:00
unknown
e56db85890 Extended mysqltest with --commands and 'require'
Fixed test results.
Added mysqld variable 'have_isam'


BitKeeper/deleted/.del-master-slave.inc~556fd038c3a3d54:
  Delete: mysql-test/t/include/master-slave.inc
BitKeeper/deleted/.del-README~f9fd36f3c3711305:
  Delete: mysql-test/r/3.23/README
Docs/manual.texi:
  Fixed typos
client/mysqltest.c:
  Changed internal commands to accept -- before them.
  Added command 'require' to make it possible to skip tests if the
  mysqld server lacks some capabilites.
  Removed extra \t at end of lines
configure.in:
  Update
myisam/myisamlog.c:
  cleanup
mysql-test/mysql-test-run.sh:
  Added support for 'not supported' tests
mysql-test/r/alt000001.result:
  Removed end tab
mysql-test/r/bdb.result:
  Removed end tab
mysql-test/r/crypt.result:
  Removed end tab
mysql-test/r/equal.result:
  Removed end tab
mysql-test/r/ft0000001.a.result:
  Removed end tab
mysql-test/r/ft0000001.b.result:
  Removed end tab
mysql-test/r/ft0000001.c.result:
  Removed end tab
mysql-test/r/ft0000001.d.result:
  Removed end tab
mysql-test/r/ft0000001.e.result:
  Removed end tab
mysql-test/r/ft0000002.a.result:
  Removed end tab
mysql-test/r/ft0000002.b.result:
  Removed end tab
mysql-test/r/ft0000002.c.result:
  Removed end tab
mysql-test/r/ins000001.result:
  Removed end tab
mysql-test/r/mrg000001.dummy.result:
  Removed end tab
mysql-test/r/mrg000001.result:
  Removed end tab
mysql-test/r/mrg000002.result:
  Removed end tab
mysql-test/r/rpl000001.a.result:
  Removed end tab
mysql-test/r/rpl000001.b.result:
  Removed end tab
mysql-test/r/rpl000002.result:
  Removed end tab
mysql-test/r/rpl000003.result:
  Removed end tab
mysql-test/r/rpl000004.a.result:
  Removed end tab
mysql-test/r/rpl000004.b.result:
  Removed end tab
mysql-test/r/rpl000005.result:
  Removed end tab
mysql-test/r/rpl000006.result:
  Removed end tab
mysql-test/r/rpl000007.result:
  Removed end tab
mysql-test/r/rpl000008.result:
  Removed end tab
mysql-test/r/rpl000009.result:
  Removed end tab
mysql-test/r/rpl000010.result:
  Removed end tab
mysql-test/r/rpl000011.result:
  Removed end tab
mysql-test/r/rpl000012.result:
  Removed end tab
mysql-test/r/rpl000012.status.result:
  Removed end tab
mysql-test/r/rpl000013.result:
  Removed end tab
mysql-test/r/rpl000013.status.result:
  Removed end tab
mysql-test/r/rpl000014.result:
  Removed end tab
mysql-test/r/rpl000015.result:
  Removed end tab
mysql-test/r/rpl000016.result:
  Removed end tab
mysql-test/r/sel000001.result:
  Removed end tab
mysql-test/r/sel000002.result:
  Removed end tab
mysql-test/r/sel000003.result:
  Removed end tab
mysql-test/r/sel000004.result:
  Removed end tab
mysql-test/r/sel000005.result:
  Removed end tab
mysql-test/r/sel000006.result:
  Removed end tab
mysql-test/r/sel000007.result:
  Removed end tab
mysql-test/r/sel000008.result:
  Removed end tab
mysql-test/r/sel000009.result:
  Removed end tab
mysql-test/r/sel000010.result:
  Removed end tab
mysql-test/r/sel000011.result:
  Removed end tab
mysql-test/r/sel000012.result:
  Removed end tab
mysql-test/r/sel000013.result:
  Removed end tab
mysql-test/r/sel000014.result:
  Removed end tab
mysql-test/r/sel000015.result:
  Removed end tab
mysql-test/r/sel000016.result:
  Removed end tab
mysql-test/r/sel000017.result:
  Removed end tab
mysql-test/r/sel000018.result:
  Removed end tab
mysql-test/r/sel000019.result:
  Removed end tab
mysql-test/r/sel000020.result:
  Removed end tab
mysql-test/r/sel000021.result:
  Removed end tab
mysql-test/r/sel000022.result:
  Removed end tab
mysql-test/r/sel000023.result:
  Removed end tab
mysql-test/r/sel000024.result:
  Removed end tab
mysql-test/r/sel000025.result:
  Removed end tab
mysql-test/r/sel000026.result:
  Removed end tab
mysql-test/r/sel000027.result:
  Removed end tab
mysql-test/r/sel000028.result:
  Removed end tab
mysql-test/r/sel000029.result:
  Removed end tab
mysql-test/r/sel000030.result:
  Removed end tab
mysql-test/r/sel000031.result:
  Removed end tab
mysql-test/r/sel000032.result:
  Removed end tab
mysql-test/r/sel000033.result:
  Removed end tab
mysql-test/r/sel000100.result:
  Removed end tab
mysql-test/r/shw000001.result:
  Removed end tab
mysql-test/r/slave-running.result:
  Removed end tab
mysql-test/r/slave-stopped.result:
  Removed end tab
mysql-test/t/bdb.test:
  Check that we have BDB support
mysql-test/t/replace.test:
  Check if we support ISAM tables
sql/gen_lex_hash.cc:
  Fixed bug in last output
sql/ha_berkeley.cc:
  Bug fix
sql/ha_berkeley.h:
  Initialize using_ignore
sql/handler.h:
  Fixed typo
sql/mysqld.cc:
  Fixed typos;  Added variable 'have_isam'
sql/sql_class.h:
  Fixed typo
BitKeeper/etc/ignore:
  Added sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686 to the ignore list
2000-12-27 03:31:06 +02:00
unknown
74bb64d304 Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
BitKeeper/etc/ignore:
  added sql-bench/output/*
Docs/manual.texi:
  Auto merged
2000-12-26 17:35:48 +02:00
unknown
33ae32174c acconfig.h
fix to make ENCRYPT work
BUILD/compile-pentium-debug
    debug has different warnings
BUILD/FINISH.sh
    save symbol table and dissassembled code with symobls available before strip
    use $do_make for make decision instead of $make to avoid conflict
BUILD/SETUP.sh
    export AM_MAKEFLAGS
    fast is now -fno-omit-frame-pointer, the opposite is now called 
    reckless
configure.in
    fixes to make CRYPT work again
Docs/Makefile.am
    hack to avoid rebuilding the manual on make clean -why does
    Makefile depend on $BUILD_SOURCES, and do we even need BUILD_SOURCES?


BUILD/FINISH.sh:
  save symbol table and dissassembled code with symobls available before strip
  use $do_make for make decision instead of $make to avoid conflict
BUILD/SETUP.sh:
  export AM_MAKEFLAGS
  fast is now -fno-omit-frame-pointer, the opposite is now called 
  reckless
BUILD/compile-pentium-debug:
  debug has different warnings
BitKeeper/etc/ignore:
  Added mysqld.S mysqld.sym to the ignore list
Docs/Makefile.am:
  hack to avoid rebuilding the manual on make clean -why does
  Makefile depend on $BUILD_SOURCES, and do we even need BUILD_SOURCES?
acconfig.h:
  fix to make ENCRYPT work
configure.in:
  fixes to make CRYPT work again
2000-12-20 00:11:49 -07:00
unknown
08d8d2adeb Ignore Berkeley DB directory.
BitKeeper/etc/ignore:
  - ignore Berkeley DB directory
2000-12-18 23:25:27 +02:00
unknown
123946665c fixed typo
BitKeeper/etc/ignore:
  Added BitKeeper/tmp/gone to the ignore list
2000-12-13 17:17:19 -07:00
unknown
91fa299ef2 MIT fix
BitKeeper/etc/ignore:
  Added mysql-test/install_test_db mysql-test/mysql-test-run to the ignore list
include/global.h:
  another fix for MIT-threads
2000-12-13 16:43:18 -07:00
unknown
011f8d0a7d Removed init that crashed BDB
Fixed newly introduced bug in update


BitKeeper/etc/ignore:
  Added libmysql_r/conf_to_src to the ignore list
sql/filesort.cc:
  Removed init that crashed BDB
sql/ha_berkeley.cc:
  Fixed bug in sub AUTO_INCREMENT keys in BDB tables
sql/opt_range.cc:
  Cleanup
sql/sql_update.cc:
  Fixed newly introduced bug in update
2000-12-11 02:31:09 +02:00
unknown
0b18dbf858 ignore cleaned up, AGAIN!
myrg_open.c	delayed queue allocation


myisammrg/myrg_open.c:
  delayed queue allocation
BitKeeper/etc/ignore:
  cleaned up, AGAIN!
2000-12-09 00:41:06 +01:00
unknown
56c1e86d2d Merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  SCCS merged
2000-12-08 18:39:37 +02:00
unknown
19d406d937 Lots of fixes for BDB tables
Change DROP TABLE to first drop the data, then the .frm file


Docs/manual.texi:
  Updated TODO and Changelog
include/Makefile.am:
  Portability fix
mysql-test/misc/select.res:
  ***MISSING WEAVE***
mysys/mf_iocache2.c:
  cleanup
scripts/mysqlhotcopy.sh:
  Fixed --noindices
sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/limits/pg.cfg:
  Updated to new crash-me
sql-bench/server-cfg.sh:
  Fixes for pg 7.0.2
sql/ha_berkeley.cc:
  Lots of BDB table fixes
sql/ha_berkeley.h:
  Lots of BDB table fixes
sql/handler.cc:
  Change DROP TABLE to first drop the data, then the .frm file
sql/hostname.cc:
  Fixes for empty hostnames
sql/log.cc:
  Fixed transaction logging
sql/share/swedish/errmsg.OLD:
  cleanup
sql/sql_delete.cc:
  Fixes for logging
sql/sql_insert.cc:
  Fixes for logging
sql/sql_select.cc:
  Fixes for BDB tables
sql/sql_table.cc:
  Change DROP TABLE to first drop the data, then the .frm file
sql/sql_update.cc:
  Fixes for logging
BitKeeper/etc/ignore:
  Added scripts/mysqld_multi to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-08 17:04:57 +02:00
unknown
5d3584a306 Merge
BitKeeper/etc/gone:
  auto-merge
BitKeeper/etc/ignore:
  merged, cleaned up
2000-12-08 14:00:48 +01:00
unknown
63c64ac950 sql_base.cc merge+insert (v.3)
myrg_info.c	merge+insert (v.3)
myrg_extra.c	merge+insert (v.3)
ignore  	cleanup


BitKeeper/etc/ignore:
  cleanup
myisammrg/myrg_extra.c:
  merge+insert (v.3)
myisammrg/myrg_info.c:
  merge+insert (v.3)
sql/sql_base.cc:
  merge+insert (v.3)
2000-12-08 13:53:24 +01:00
unknown
4d3f79265b more cleanup of slave load data infile - trying to track down bug,
BitKeeper/etc/ignore:
  Added BitKeeper/tmp/applied.list BitKeeper/tmp/backup.list BitKeeper/tmp/backup.sfio BitKeeper/tmp/sfile.list to the ignore list
sql/slave.cc:
  log warnings from replicated load data infile
sql/sql_load.cc:
  do not log load data infile from the master to update log on the slave
2000-12-07 21:51:29 -07:00
unknown
bbc25ae694 rpl000001 sporadic failure mystery solved - the table was being opened twice :-)
BitKeeper/etc/ignore:
  Added mysql-test/var/slave-data/mysql-bin.001 mysql-test/var/slave-data/mysql-bin.002 mysql-test/var/slave-data/mysql-bin.003 mysql-test/var/slave-data/mysql-bin.004 mysql-test/var/slave-data/mysql-bin.005 mysql-test/var/slave-data/mysql-bin.006 mysql-test/var/slave-data/mysql-bin.007 mysql-test/var/slave-data/mysql-bin.008 mysql-test/var/slave-data/mysql-bin.009 mysql-test/var/slave-data/mysql-bin.010 mysql-test/var/slave-data/mysql-bin.011 mysql-test/var/slave-data/mysql-bin.012 mysql-test/var/slave-data/mysql-bin.013 mysql-test/var/slave-data/mysql-bin.014 mysql-test/var/slave-data/mysql-bin.index to the ignore list
mysql-test/mysql-test-run:
  re-added --log-bin --log-slave updates to slave startup options
sql/slave.cc:
  fixed bug in LOAD DATA INFILE replication
2000-12-07 11:40:22 -07:00
unknown
4512b01c31 ok, here comes the push - prepare to resolve conflicts! And lets hope bk can gracefully handle all of my renames
BitKeeper/etc/ignore:
  Added mysql-test/var/lib/test/test3.frm mysql-test/var/lib/test/test3.MRG to the ignore list
mysql-test/t/mrg000001.test:
  fixed paths
sql/log.cc:
  fixed mutex problem
2000-12-07 10:14:28 -07:00
unknown
a768562aa3 Merge
BitKeeper/etc/logging_ok:
  Auto converge
configure.in:
  Auto merged
mysql-test/misc/select.res:
  ***MISSING WEAVE***
BitKeeper/etc/ignore:
  Added BitKeeper/etc/config BitKeeper/tmp/CONTENTS BitKeeper/tmp/patch BitKeeper/tmp/pid to the ignore list
mysql-test/mysql-test-run:
  merge
2000-12-07 08:10:30 -07:00
unknown
1a60318560 fixed up mysql-test - will not push this yet, as more clean up/testing is to follow
BitKeeper/deleted/.del-README~b8e00a1b57b91f69:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~2bddc2706d0834d0:
  ***MISSING WEAVE***
mysql-test/r/alt000001.result:
  mvdir
mysql-test/r/ins000001.result:
  mvdir
mysql-test/r/rpl000001.a.result:
  mvdir
mysql-test/r/rpl000001.b.result:
  mvdir
mysql-test/r/rpl000002.result:
  mvdir
mysql-test/r/rpl000003.result:
  mvdir
mysql-test/r/rpl000004.a.result:
  mvdir
mysql-test/r/rpl000004.b.result:
  mvdir
mysql-test/r/rpl000005.result:
  mvdir
mysql-test/r/rpl000006.result:
  mvdir
mysql-test/r/rpl000007.result:
  mvdir
mysql-test/r/rpl000008.result:
  mvdir
mysql-test/r/rpl000009.result:
  mvdir
mysql-test/r/rpl000010.result:
  mvdir
mysql-test/r/rpl000011.result:
  mvdir
mysql-test/r/rpl000012.result:
  mvdir
mysql-test/r/rpl000012.status.result:
  mvdir
mysql-test/r/rpl000013.result:
  mvdir
mysql-test/r/rpl000013.status.result:
  mvdir
mysql-test/r/sel000001.result:
  mvdir
mysql-test/r/sel000002.result:
  mvdir
mysql-test/r/sel000003.result:
  mvdir
mysql-test/r/sel000004.result:
  mvdir
mysql-test/r/sel000005.result:
  mvdir
mysql-test/r/sel000006.result:
  mvdir
mysql-test/r/sel000007.result:
  mvdir
mysql-test/r/sel000008.result:
  mvdir
mysql-test/r/sel000009.result:
  mvdir
mysql-test/r/sel000010.result:
  mvdir
mysql-test/r/sel000011.result:
  mvdir
mysql-test/r/sel000012.result:
  mvdir
mysql-test/r/sel000013.result:
  mvdir
mysql-test/r/sel000014.result:
  mvdir
mysql-test/r/sel000015.result:
  mvdir
mysql-test/r/sel000016.result:
  mvdir
mysql-test/r/sel000017.result:
  mvdir
mysql-test/r/sel000018.result:
  mvdir
mysql-test/r/sel000019.result:
  mvdir
mysql-test/r/sel000020.result:
  mvdir
mysql-test/r/sel000021.result:
  mvdir
mysql-test/r/sel000022.result:
  mvdir
mysql-test/r/sel000023.result:
  mvdir
mysql-test/r/sel000024.result:
  mvdir
mysql-test/r/sel000025.result:
  mvdir
mysql-test/r/sel000026.result:
  mvdir
mysql-test/r/sel000027.result:
  mvdir
mysql-test/r/sel000028.result:
  mvdir
mysql-test/r/sel000029.result:
  mvdir
mysql-test/r/sel000030.result:
  mvdir
mysql-test/r/sel000100.result:
  mvdir
mysql-test/r/shw000001.result:
  mvdir
mysql-test/t/README:
  mvdir
mysql-test/t/err000001.test:
  mvdir
mysql-test/t/rpl000007-slave.opt:
  mvdir
mysql-test/t/rpl000008-slave.opt:
  mvdir
mysql-test/t/rpl000009-slave.opt:
  mvdir
mysql-test/t/rpl000010-slave.opt:
  mvdir
mysql-test/t/rpl000013-slave.opt:
  mvdir
BitKeeper/deleted/.del-start-mysqld~9c8f21a7ab97793a:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-stop-mysqld~89a1194045f05d1c:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-translate-tests~3869c1fdf0a5ea1a:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~108667adaeabe3f5:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~c5aaceda4c2b1a8:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-key.master~e6b83af25df0ce5:
  ***MISSING WEAVE***
mysql-test/std_data/words.dat:
  Rename: mysql-test/std_data/words -> mysql-test/std_data/words.dat
BitKeeper/deleted/.del-simple-select.master~6f3eb98812926caf:
  ***MISSING WEAVE***
Makefile.am:
  add mysql-test to distribution
configure.in:
  added mysql-test
libmysql/Makefile.am:
  include hash.h
libmysql/Makefile.shared:
  add hash to libmysqlclient
mysql-test/Makefile.am:
  mysql-test is now in source dist also
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
mysql-test/install_test_db:
  renamed file, moved to different directory, and fixed up to work on binary dist
mysql-test/mysql-test-run:
  clean-up of test suite, make it work on binary dist
mysql-test/t/alt000001.test:
  moved directory
mysql-test/t/ins000001.test:
  moved directory
mysql-test/t/rpl000001.test:
  moved dir
mysql-test/t/rpl000002.test:
  moved dir
mysql-test/t/rpl000003.test:
  moved dir
mysql-test/t/rpl000004.test:
  moved dir
mysql-test/t/rpl000005.test:
  moved dir
mysql-test/t/rpl000006.test:
  moved dir
mysql-test/t/rpl000007.test:
  moved dir
mysql-test/t/rpl000008.test:
  moved dir
mysql-test/t/rpl000009.test:
  moved dir
mysql-test/t/rpl000010.test:
  moved dir
mysql-test/t/rpl000011.test:
  moved dir
mysql-test/t/rpl000012.test:
  moved dir
mysql-test/t/rpl000013.test:
  moved dir
mysql-test/t/sel000001.test:
  moved dir
mysql-test/t/sel000002.test:
  moved dir
BitKeeper/etc/ignore:
  Added libmysql_r/hash.c scripts/mysql-3.23.29-gamma-pc-linux-gnu-i686.tar.gz to the ignore list
mysql-test/t/sel000003.test:
  moved dir
mysql-test/t/sel000004.test:
  moved dir
mysql-test/t/sel000005.test:
  moved dir
mysql-test/t/sel000100.test:
  moved dir
mysql-test/t/shw000001.test:
  moved dir
scripts/make_binary_distribution.sh:
  fixes to include mysql-test
  added -debug option to exit after building temp dir before tar.gz 
  removed a bunch of SCCS files
2000-12-07 07:54:59 -07:00
unknown
0a1fcefba7 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged
2000-12-06 12:33:53 -06:00
unknown
553011afbd updated test case for SELECT DISTINCT coredump
BitKeeper/etc/ignore:
  Added mysql-test/var/lib/mysql-bin.008 to the ignore list
mysql-test/r/3.23/sel000100.result:
  coredump fixed, now it makes sense to have something in the result file
mysql-test/t/3.23/sel000100.test:
  renamed result file
2000-12-05 10:15:27 -07:00
unknown
cdcc130a3b Added a test case for a coredump bug in SELECT DISTINCT. Have not yet fixed the coredump itself
BitKeeper/etc/ignore:
  Added mysql-test/var/lib/test/test1.frm mysql-test/var/lib/test/test1.MYD mysql-test/var/lib/test/test1.MYI mysql-test/var/lib/test/test2.frm mysql-test/var/lib/test/test2.MYD mysql-test/var/lib/test/test2.MYI mysql-test/var/run/mysqld.pid mysql-test/var/tmp/mysql.sock to the ignore list
2000-12-05 06:12:19 -07:00
unknown
e2e18535ad New error messages
Fix for creating read-only files on windows
Manual updates


BitKeeper/deleted/.del-acconfig.h~65f1202b3b5c345f:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-acconfig.h~7b620dbd69ea6074:
  ***MISSING WEAVE***
Docs/manual.texi:
  Small clarifications
BitKeeper/etc/ignore:
  Added Docs/manual.aux Docs/manual.cp Docs/manual.cps Docs/manual.dvi Docs/manual.fn Docs/manual.fns Docs/manual.ky Docs/manual.pg Docs/manual.toc Docs/manual.tp Docs/manual.vr Docs/manual_a4.ps Docs/manual_letter.ps to the ignore list
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
mysys/my_open.c:
  Fix for windows where some files where created read only
sql/ha_myisam.cc:
  Added 'checking table' to process-list status
sql/opt_range.cc:
  Cleanup
sql/share/czech/errmsg.sys:
  New error messages
sql/share/czech/errmsg.txt:
  New error messages
sql/share/italian/errmsg.sys:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
2000-12-05 03:00:31 +02:00
unknown
17d0ffd966 Merge
BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged
sql/opt_range.cc:
  SCCS merged
2000-12-03 12:56:27 +02:00
unknown
aa442dfc5c ignored PENDING directory
BitKeeper/etc/ignore:
  added PENDING/*
2000-12-03 12:52:36 +02:00
unknown
202c9dd02b ignored some files
BitKeeper/etc/ignore:
  Added libmysql_r/ctype_extra_sources.c libmysql_r/conf_to_src libmysql_r/.libs/libmysqlclient_r.lai to the ignore list
2000-12-03 12:49:46 +02:00
unknown
4bad4939d3 Docs/manual.texi
updates for temporary table replication, and docs for replicate-do/ignore-table
    updated change history
    fixed errors/warnings from makeinfo


Docs/manual.texi:
  updates for temporary table replication, and docs for replicate-do/ignore-table
  updated change history
  fixed errors/warnings from makeinfo
BitKeeper/etc/ignore:
  Added Docs/manual.log to the ignore list
2000-12-02 14:00:57 -07:00
unknown
758567104c added loops and other cool stuff to mysqltest
fixed slave to preserve temp tables on slave stop; slave start
added abort-slave-event-count option to mysqld to test the above
added a test case for temp tables with a contantly aborting slave
removed warning in sql_parse.cc
fixed thimble.cc to compile


BitKeeper/etc/ignore:
  Added client/thimble support-files/mysql-3.23.29-gamma.spec to the ignore list
client/mysqltest.c:
  added while, let, and echo, added fractional sec sleep support
client/thimble.cc:
  fixes to make it compile
mysql-test/t/3.23/rpl000001.test:
  sleep less
mysql-test/t/3.23/rpl000002.test:
  sleep less
mysql-test/t/3.23/rpl000003.test:
  sleep less
mysql-test/t/3.23/rpl000005.test:
  sleep less
sql/mysqld.cc:
  --abort-slave-event count
sql/slave.cc:
  remember temp tables when slave thread termintates and restore them on
  slave start
sql/slave.h:
  --abort-slave-event-count
sql/sql_parse.cc:
  remove warning
2000-12-02 10:11:50 -07:00
unknown
c5a8038661 pointer casts -> int4store()
added error code to master failed connect message


BitKeeper/etc/ignore:
  Added libmysql_r/acconfig.h libmysql_r/array.c libmysql_r/bchange.c libmysql_r/bmove.c libmysql_r/bmove_upp.c libmysql_r/charset.c libmysql_r/conf_to_src.c libmysql_r/ctype_autoconf.c libmysql_r/ctype-big5.c libmysql_r/ctype.c libmysql_r/ctype-czech.c libmysql_r/ctype-euc_kr.c libmysql_r/ctype-gb2312.c libmysql_r/ctype-gbk.c libmysql_r/ctype-sjis.c libmysql_r/ctype-tis620.c libmysql_r/ctype-ujis.c libmysql_r/dbug.c libmysql_r/default.c libmysql_r/dll.c libmysql_r/errmsg.c libmysql_r/errors.c libmysql_r/getopt1.c libmysql_r/getopt.c libmysql_r/get_password.c libmysql_r/getvar.c libmysql_r/int2str.c libmysql_r/is_prefix.c libmysql_r/libmysql.c libmysql_r/list.c libmysql_r/llstr.c libmysql_r/longlong2str.c libmysql_r/mf_casecnv.c libmysql_r/mf_dirname.c libmysql_r/mf_fn_ext.c libmysql_r/mf_format.c libmysql_r/mf_loadpath.c libmysql_r/mf_pack.c libmysql_r/mf_path.c libmysql_r/mf_tempfile.c libmysql_r/mf_unixpath.c libmysql_r/mf_wcomp.c libmysql_r/mulalloc.c libmysql_r/my_alloc.c libmysql_r/my_compress.c libm
sql/share/romanian/errmsg.sys:
  touched again
sql/slave.cc:
  print error code on failed connects
sql/sql_base.cc:
  use int4store() instead of direct ponter casts
libmysql_r/acconfig.h:
  ***MISSING WEAVE***
2000-11-27 23:08:46 -07:00
unknown
c3cc5856a5 Fixed temp tables to work with replication. It will not work if you stop the slave
while slave thread has temp tables - not hard to fix though, but it is time to go to bed

added a new test case for temp table replication and Slave_open_temp_tables
status variable.

Misc fixes


client/mysqltest.c:
  added disconnect command
mysql-test/create-test-result:
  fixed bugs so it actually works
mysql-test/t/include/master-slave.inc:
  establish alternate connections to master and slave
sql/mysql_priv.h:
  Slave_open_temp_tables
sql/mysqlbinlog.cc:
  fixed a bug in reading local binlogs
sql/mysqld.cc:
  added Slave_open_temp_tables status variable
sql/slave.cc:
  fixed freed memory reference in the error message
sql/sql_class.cc:
  slave_proxy_id
sql/sql_class.h:
  slave_proxy_id
sql/sql_parse.cc:
  small optimization - reorder eval in &&
BitKeeper/etc/ignore:
  Added mysql-test/r/3.23/rpl000001.b.result.reject mysql-test/r/3.23/rpl000012.result.reject to the ignore list
sql/sql_table.cc:
  added THD arg to rename_temporary_table
sql/unireg.h:
  the table_cache_key is now 4 bytes longer
2000-11-25 23:29:01 -07:00
unknown
5bf6df6e5f Various fixups to manual.texi.
Added TAGS to ignore, for etags.


BitKeeper/etc/ignore:
  added TAGS
Docs/manual.texi:
  Various fixups.
2000-11-25 04:45:01 -06:00
unknown
1ef81b2165 slave master.info FILE -> IO_CACHE
send_file() is more stack-friendly - changed large static buffer to alloc_root()
fixed my_b_seek() to work with WRITE_CACHE
test case to make sure the slave starts correctly after being stopped
truncated words file so the replication tests will take less time


mysql-test/r/3.23/rpl000001.b.result:
  truncated words file
mysql-test/r/3.23/rpl000004.b.result:
  truncated words file
mysql-test/std_data/words:
  truncated words file
BitKeeper/etc/ignore:
  Added mysql-test/rpl000011.test mysql-test/var/lib/mysql-bin.007 sql/share/norwegian/errmsg.sys sql/share/norwegian-ny/errmsg.sys to the ignore list
mysys/mf_iocache2.c:
  got my_b_seek() to work with WRITE_CACHE, at least the one used by the slave
sql/share/romanian/errmsg.sys:
  accidently touched the file
sql/slave.cc:
  converted FILE to IO_CACHE for master.info
sql/slave.h:
  FILE -> IO_CACHE for master.info
sql/sql_repl.cc:
  be nice to the stack - change a large stack buffer to be alloced with
  alloc_root in send_file()
2000-11-24 19:49:13 -07:00
unknown
62c3b53667 client/mysqltest.c
generate a bigger reject file ( full in most cases) if the master result file is 0 length
sql/sql_show.cc
    fixed 3 bugs in SHOW CREATE TABLE

New test case shw000001 for SHOW CREATE TABLE bugs


BitKeeper/etc/ignore:
  Added BitKeeper/tmp/bkOF1wtJ scripts/mysqldumpslow to the ignore list
client/mysqltest.c:
  generate a bigger reject file ( full in most cases) if the master result file is 0 length
sql/sql_show.cc:
  fixed 3 bugs in SHOW CREATE TABLE
2000-11-21 16:41:29 -07:00
unknown
1100a260aa fixed warning in sql_class.cc
added gdb support, mysqld options per test, and other cool stuff to mysql-test-run
added --replicate-wild-do/ignore-table
more test cases


client/mysqltest.c:
  fixed a reject file bug
mysql-test/mysql-test-run:
  support for gdb and running only one test case
sql/mysql_priv.h:
  wild_compare needs to be global
sql/mysqld.cc:
  --replicate-wild-do/ignore-table
sql/slave.cc:
  wild,wild
sql/slave.h:
  wild fixes
sql/sql_class.cc:
  fixed compiler warning
sql/sql_string.cc:
  wild stuff needs to be global
BitKeeper/etc/ignore:
  Added BitKeeper/tmp/gone mysql-test/r/3.23/rpl mysql-test/r/3.23/rpl.reject mysql-test/var/lib/bar/bar.frm mysql-test/var/lib/bar/bar.MYD mysql-test/var/lib/bar/bar.MYI mysql-test/var/lib/foo/foo.frm mysql-test/var/lib/foo/foo.MYD mysql-test/var/lib/foo/foo.MYI mysql-test/var/lib/test/bar.frm mysql-test/var/lib/test/bar.MYD mysql-test/var/lib/test/bar.MYI mysql-test/var/lib/test/choo.frm mysql-test/var/lib/test/choo.MYD mysql-test/var/lib/test/choo.MYI mysql-test/var/slave-data/bar/bar.frm mysql-test/var/slave-data/bar/bar.MYD mysql-test/var/slave-data/bar/bar.MYI mysql-test/var/slave-data/foo/foo.frm mysql-test/var/slave-data/foo/foo.MYD mysql-test/var/slave-data/foo/foo.MYI mysql-test/var/slave-data/test/bar.frm mysql-test/var/slave-data/test/bar.MYD mysql-test/var/slave-data/test/bar.MYI mysql-test/var/slave-data/test/choo.frm mysql-test/var/slave-data/test/choo.MYD mysql-test/var/slave-data/test/choo.MYI mysql-test/var/tmp/README to the ignore list
2000-11-20 23:38:08 -07:00
unknown
55f76d4fd2 ignore files 2000-11-17 23:36:15 -07:00
unknown
6e8c7df035 sql/log.cc
fixed bug in find_first_log
sql/mysqlbinlog.cc
    flose file only if we opened it
sql/slave.cc
    changed spacing
sql/sql_repl.cc
    fixed error message


sql/log.cc:
  fixed bug in find_first_log
sql/mysqlbinlog.cc:
  flose file only if we opened it
sql/slave.cc:
  changed spacing
sql/sql_repl.cc:
  fixed error message
BitKeeper/etc/ignore:
  Added repl-tests/test-repl/foo-dump-slave.master. repl-tests/test-repl/sum-wlen-slave.master. repl-tests/test-repl/sum-wlen-slave.master.re to the ignore list
2000-11-16 17:48:13 -07:00
unknown
4ddac2140d BUILD/compile-pentium-debug
make -j 2
mysys/my_open.c
    my_umask is better than 0 - we do not want 0000 files when my_open() is called with O_CREAT
sql/log.cc
    fixed up IO_CACHE to make replication work, not fully yet
sql/log_event.cc
    fixed up IO_CACHE


BUILD/compile-pentium-debug:
  make -j 2
BitKeeper/etc/ignore:
  Added repl-tests/test-repl/sum-wlen-slave.master.reje support-files/mysql-3.23.28-gamma.spec to the ignore list
mysys/my_open.c:
  my_umask is better than 0 - we do not want 0000 files when my_open() is called with O_CREAT
sql/log.cc:
  fixed up IO_CACHE to make replication work, not fully yet
sql/log_event.cc:
  fixed up IO_CACHE
2000-11-16 10:37:30 -07:00
unknown
ae72872965 sql/item_strfunc.cc
fixed coredump in concat_ws
sql/item_strfunc.h
    fixed coredump in concat_ws
sql/mini_client.cc
    added mc_mysql_error()
sql/mini_client.h
    added mc_mysql_errno()
sql/mysqlbinlog.cc
    fixed bug in --postion for local files
sql/slave.cc
    more verbose message on bad net reads
sql/sql_repl.cc
    send errno on error in mysql_binlog_send


sql/item_strfunc.cc:
  fixed coredump in concat_ws
sql/item_strfunc.h:
  fixed coredump in concat_ws
sql/mini_client.cc:
  added mc_mysql_error()
sql/mini_client.h:
  added mc_mysql_errno()
sql/mysqlbinlog.cc:
  fixed bug in --postion for local files
BitKeeper/etc/ignore:
  Added client/.mysqladmin.c.swp to the ignore list
sql/slave.cc:
  more verbose message on bad net reads
sql/sql_repl.cc:
  send errno on error in mysql_binlog_send
2000-11-06 19:39:13 -07:00
unknown
745f1197f6 sql/slave.cc
mutex now initialized in the constructor
sql/sql_class.h
    intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc
    fixed typo in error message
    if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number
repl-tests/test-repl-ts/repl-timestamp.master.reject
    New BitKeeper file ``repl-tests/test-repl-ts/repl-timestamp.master.reject''


BitKeeper/etc/ignore:
  Added repl-tests/test-repl-ts/repl-timestamp.master.reject to the ignore list
sql/slave.cc:
  mutex now initialized in the constructor
sql/sql_class.h:
  intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc:
  fixed typo in error message
  if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number
2000-11-03 19:31:22 -07:00
unknown
a1b03526fc fixed bugs in elt() and make_set()
added two new test cases


BitKeeper/etc/ignore:
  Added mysql-test/r/3.23/sel000004.result.reject mysql-test/var/lib/mysql-bin.006 mysql-test/var/lib/test/elt_ck1.frm mysql-test/var/lib/test/elt_ck1.MYD mysql-test/var/lib/test/elt_ck1.MYI mysql-test/var/lib/test/elt_ck2.frm mysql-test/var/lib/test/elt_ck2.MYD mysql-test/var/lib/test/elt_ck2.MYI to the ignore list
mysql-test/r/3.23/sel000004.result:
  new result
mysql-test/r/3.23/sel000005.result:
  new result
sql/item_strfunc.cc:
  fixed bug in make_set() and elt()
2000-11-03 07:04:33 -07:00
unknown
3dfc0a825e libmysql/libmysql.c
keep vio from being freed twice when we are low on memory
mysys/safemalloc.c
    changes for --safemalloc-mem-limit
sql/mini_client.cc
    keep vio from being freed twice
sql/mysqld.cc
    changes for --safemalloc-mem-limit
sql/slave.cc
    prevent closing connection twice
sql/sql_string.h
    shrink() did not work right when my_realloc() failed


BitKeeper/etc/ignore:
  Added .gdb_history to the ignore list
libmysql/libmysql.c:
  keep vio from being freed twice when we are low on memory
mysys/safemalloc.c:
  changes for --safemalloc-mem-limit
sql/mini_client.cc:
  keep vio from being freed twice
sql/mysqld.cc:
  changes for --safemalloc-mem-limit
sql/slave.cc:
  prevent closing connection twice
sql/sql_string.h:
  shrink() did not work right when my_realloc() failed
2000-10-28 23:26:48 -06:00
unknown
add02ff882 fixed --skip-slave-thread bug
added PURGE MASTER LOGS TO and SHOW MASTER LOGS
fixed the output of SHOW MASTER STATUS
updated docs


Docs/manual.texi:
  Update for PURGE MASTER LOGS TO, SHOW MASTER LOGS
sql/lex.h:
  added PURGE
sql/log.cc:
  update for PURGE
BitKeeper/etc/ignore:
  Added include/.my_sys.h.swp PENDING/2000-10-25.01 PENDING/2000-10-25.02 support-files/mysql-3.23.27-beta.spec to the ignore list
sql/mysqld.cc:
  fixed bug in --skip-slave-start
sql/sql_class.cc:
  added linfo to THD
sql/sql_class.h:
  updates for PURGE
sql/sql_lex.h:
  updates for PURGE
sql/sql_parse.cc:
  updates for PURGE
sql/sql_repl.cc:
  updates for PURGE
sql/sql_repl.h:
  updates for PURGE
sql/sql_yacc.yy:
  updates for PURGE
2000-10-26 22:11:55 -06:00
unknown
bc7aaafc7e sql/slave.cc
buffer size fix + template instatiation


BitKeeper/etc/ignore:
  Added BitKeeper/etc/csets-in support-files/mysql-3.23.26-beta.spec to the ignore list
sql/slave.cc:
  buffer size fix + template instatiation
2000-10-21 12:17:08 -06:00
unknown
7a6f669d94 BitKeeper/etc/ignore@1.12
added BitKeeper/etc/csets-out


BitKeeper/etc/ignore:
  added BitKeeper/etc/csets-out
2000-10-18 19:10:24 -06:00
unknown
1161e8afd2 ignore stray files 2000-10-18 18:26:35 -06:00