Commit graph

11 commits

Author SHA1 Message Date
unknown
a63ecdd3b1 Added FLUSH DES_KEY_FILE.
New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.


Docs/Makefile.am:
  Add missing files
Docs/manual.texi:
  Added information about HEX() and des_encrypt() / des_decrypt().
include/mysql_com.h:
  Added FLUSH DES_KEY_FILE
myisam/ft_update.c:
  Removed compiler warnings
mysql-test/mysql-test-run.sh:
  Fixes needed for des_key tests.
mysql-test/r/func_crypt.result:
  Moved crypt test from func_str to func_crypt
mysql-test/r/func_encrypt.result:
  Moved crypt test from func_str to func_crypt
mysql-test/r/func_str.result:
  Moved crypt test from func_str to func_crypt
mysql-test/t/func_crypt.test:
  Moved crypt test from func_str to func_crypt
mysql-test/t/func_encrypt.test:
  New tests
mysql-test/t/func_str.test:
  Moved crypt test from func_str to func_crypt
sql/des_key_file.cc:
  Changes needed for FLUSH DES_KEY_FILE
sql/item_create.cc:
  New HEX() function
sql/item_strfunc.cc:
  Changes needed for FLUSH DES_KEY_FILE
sql/item_strfunc.h:
  New HEX() function
sql/item_timefunc.cc:
  cleanup
sql/lex.h:
  FLUSH DES_KEY_FILE
sql/mysql_priv.h:
  FLUSH DES_KEY_FILE
sql/mysqld.cc:
  FLUSH DES_KEY_FILE
sql/sql_parse.cc:
  Cleanup sql_yacc.yy
sql/sql_yacc.yy:
  Cleanup sql_yacc.yy
2001-12-13 15:53:18 +02:00
unknown
8cbba4051f Remved Gemini code.
BitKeeper/deleted/.del-ha_gemini.cc~5d72172d33b00c6:
  Delete: sql/ha_gemini.cc
BitKeeper/deleted/.del-ha_gemini.h~4dfccf1929195747:
  Delete: sql/ha_gemini.h
BitKeeper/deleted/.del-gemini.result~89b4f9cced8dfc2f:
  Delete: mysql-test/r/gemini.result
BitKeeper/deleted/.del-gemini.test~51d0362310e55e17:
  Delete: mysql-test/t/gemini.test
BitKeeper/deleted/.del-have_gemini.inc~42f94f0dfd0f7b18:
  Delete: mysql-test/include/have_gemini.inc
BitKeeper/deleted/.del-have_gemini.require~206702c48b2e206b:
  Delete: mysql-test/r/have_gemini.require
BitKeeper/deleted/.del-gemini.dat~a73393a88b124b9f:
  Delete: mysql-test/std_data/gemini.dat
BitKeeper/deleted/.del-isolation.test~6a39e4138dd4a456:
  Delete: mysql-test/t/isolation.test
BitKeeper/deleted/.del-isolation.result~4da11e109a3d93a9:
  Delete: mysql-test/r/isolation.result
acinclude.m4:
  Remved gemini code.
configure.in:
  Remved gemini code.
libmysql/libmysql.c:
  Remved gemini code.
mysql-test/install_test_db.sh:
  Remved gemini code.
scripts/mysql_install_db.sh:
  Remved gemini code.
sql/Makefile.am:
  Remved gemini code.
sql/field.cc:
  Remved gemini code.
sql/field.h:
  Remved gemini code.
sql/handler.cc:
  Remved gemini code.
sql/handler.h:
  Remved gemini code.
sql/lex.h:
  Remved gemini code.
sql/mysqld.cc:
  Remved gemini code.
sql/sql_base.cc:
  Remved gemini code.
sql/sql_class.cc:
  Remved gemini code.
sql/sql_class.h:
  Remved gemini code.
sql/sql_lex.h:
  Remved gemini code.
sql/sql_parse.cc:
  Remved gemini code.
sql/sql_rename.cc:
  Remved gemini code.
sql/sql_table.cc:
  Remved gemini code.
sql/sql_yacc.yy:
  Remved gemini code.
2001-10-10 02:50:28 +03:00
unknown
ddee00a6ed merge with 3.23.42
config.guess:
  Auto merged
config.sub:
  Auto merged
ltconfig:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
include/errmsg.h:
  Auto merged
include/global.h:
  Auto merged
include/heap.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/isamlog.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
merge/open.c:
  Auto merged
myisam/ft_search.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_test_all.sh:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
myisam/sort.c:
  Auto merged
myisammrg/myrg_open.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_casecnv.c:
  Auto merged
mysys/mf_format.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/tree.c:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/err000001.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/overflow.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype.c:
  Auto merged
Docs/manual.texi:
  Change to 3.23 manual.
  (I will later add the changes for 4.0 to this copy)
client/mysql.cc:
  merge
client/mysqlbinlog.cc:
  merge
client/mysqldump.c:
  merge
client/mysqltest.c:
  merge
client/thread_test.c:
  merge
configure.in:
  merge
include/my_pthread.h:
  merge
include/mysqld_error.h:
  merge
libmysql/net.c:
  merge
myisam/mi_cache.c:
  merge
myisam/mi_check.c:
  merge
mysql-test/t/fulltext.test:
  merge
mysys/mf_qsort.c:
  merge
sql/lock.cc:
  merge
sql/md5.c:
  merge
sql/mini_client.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_load.cc:
  merge
sql/sql_repl.cc:
  merge
2001-09-02 18:38:33 +02:00
unknown
bfe2213bab Fixed that LOAD DATA INFILE works with transactions.
Fix for lower case filenames


BitKeeper/deleted/.del-select.tst~2e626fa07144d2c8:
  Delete: mysql-test/misc/select.tst
Docs/manual.texi:
  Better examples for sub selects
bdb/lock/lock_region.c:
  Fixed not critical error
mysql-test/r/gemini.result:
  Testcase for load data infile
mysql-test/t/gemini.test:
  Testcase for load data infile
sql/sql_load.cc:
  Fixed that LOAD DATA INFILE works with transactions
sql/sql_show.cc:
  Fix for lower case filenames
sql/sql_string.cc:
  cleanup
2001-08-28 06:43:55 +03:00
unknown
5e2639830e Added event sequence number and flags to binlog
Documented/cleaned up log event code
Updated tests


mysql-test/r/rpl000014.result:
  new binlog format
mysql-test/r/rpl000015.result:
  new binlog format
mysql-test/r/rpl000016.result:
  new binlog format
mysql-test/std_data/master-bin.001:
  new binlog format
mysql-test/t/rpl000014.test:
  new binlog format
sql/log.cc:
  new binlog format
sql/log_event.cc:
  new binlog format
sql/log_event.h:
  new binlog format
sql/sql_class.cc:
  new binlog format
sql/sql_class.h:
  new binlog format
sql/sql_repl.cc:
  new binlog format
2001-06-19 15:03:48 -06:00
unknown
dbe03fb0bc fixed up lock counting code - Monty's suggestions
updated manual about table lock counter
fixed coredump in DROP DATABASE with long bogus name by non-root user
fixed bug in handling STOP immediately after ROTATE
added test case for buffer overrun on DROP DATABASE by non-root user
added test case for the STOP bug in replication


Docs/manual.texi:
  updates for Table_locks_immediate and Table_locks_waited
include/thr_lock.h:
  fixes suggested by Monty to lock counts
mysql-test/r/status.result:
  clean up of result for changes in the test case
mysql-test/t/status.test:
  make it produce the same results if the had been some activity on the server already
mysys/thr_lock.c:
  fixes suggested by Monty
sql/mysqld.cc:
  fixes suggested by Monty
sql/slave.cc:
  fixed bug in processing STOP event after rotate
sql/sql_base.cc:
  fixes suggested by Monty
sql/sql_parse.cc:
  fixed coredump in drop database with long name by a non-root user
sql/sql_repl.cc:
  better status message
2001-01-27 15:33:31 -07:00
unknown
ab7afc8c36 Changes for --with-server-suffix
Fixed mutex bug in logging (crash on windows when doing SET PASSWORD=)
Changed MERGE  tables to not use FILE


BitKeeper/deleted/.del-m.MRG~3f5632c37af00f18:
  Delete: mysql-test/std_data/m.MRG
BitKeeper/deleted/.del-m.frm~e351dfe0b6824c0c:
  Delete: mysql-test/std_data/m.frm
Docs/manual.texi:
  Added DNS section
configure.in:
  Update to 3.23.32
include/Makefile.am:
  Added my_config.h
include/mysql_com.h:
  Changes for --with-server-suffix
include/mysql_version.h.in:
  cleanup
merge/open.c:
  Don't use FILE
mysql-test/Makefile.am:
  removed not needed data files
mysql-test/r/merge.result:
  generate merge file
mysql-test/t/merge.test:
  generate merge file
sql-bench/Results/ATIS-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/RUN-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/alter-table-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/big-tables-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/connect-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/create-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/insert-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/select-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/wisconsin-mysql-NT_4.0:
  New benchmark results
sql/log.cc:
  Ensure that mutex are initialized before used
sql/log_event.h:
  Changes for --with-server-suffix
sql/mysql_priv.h:
  Changes for --with-server-suffix
sql/mysqlbinlog.cc:
  Changes for --with-server-suffix
sql/mysqld.cc:
  changed strnmov -> strmake
sql/net_pkg.cc:
  Prepare for adding char-set conversion to SHOW commands
2001-01-21 16:30:16 +02:00
unknown
2ce474dc65 test case for a coredump on merge tables. Sergei or Monty, can you fix this?
mysql-test/mysql-test-run:
  added support for copying tables into datadir - now only MRG and FRM
  files are copied - will add others as we come up with samples
2000-12-12 08:24:50 -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
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
53ada89055 fixed bugs in delayed insert replication and when slave loses connection after Int_var but before Query
public test suite now tests replication code as well


mysql-test/mybin/mysql-test_install_db:
  fixes to test replication with two daemons on one machine
mysql-test/mysql-test-run:
  fixes for replication tests -- still need to test gcov, the rest works
mysql-test/t/include/master-slave.inc:
  include file for replication tests
sql/slave.cc:
  fixed bug for the case when the slave loses connection after it has read Int_var event but before Query
sql/sql_insert.cc:
  reset error in delayed thread
  slave converts delayed insert to regular
2000-11-17 23:35:40 -07:00