Commit graph

2327 commits

Author SHA1 Message Date
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
d853390e56 -DCPU flag added
acinclude.m4:
  Added -DCPU flag to compile
2001-08-26 21:13:12 +08:00
unknown
f1f4a19503 Merge tonu@work.mysql.com:/home/bk/mysql-4.0
into x153.internalnet:/home/tonu/mysql-4.0
2001-08-26 00:19:17 +08:00
unknown
cc22852e2e Some warning fixes and some SSL testprograms check-in
extra/resolveip.c:
  Removed warnings about implicit declarations
myisam/mi_open.c:
  Removed warning about unused symbol
mysys/my_compress.c:
  Removed warnings about implicit declaration
mysys/string.c:
  Removed warning about uninitialized variable
strings/ctype.c:
  Removed warning about implicit declaration
vio/test-sslclient.c:
  Testprogram heavy modify
vio/test-sslserver.c:
  Testprogram heavy modify
2001-08-26 00:18:20 +08:00
unknown
0733b85d75 test case for InnoDB replace/auto_increment bug when insert_id is
forced by the user


mysql-test/r/innodb.result:
  updated result
mysql-test/t/innodb.test:
  added test case for bug in Innodb reported by Slashdot
2001-08-24 20:45:06 -06:00
unknown
5b95ffc52f EXPLAIN on UNION"s
mysql-test/r/union.result:
  New result for EXPLAIN UNION's
mysql-test/t/union.test:
  No error when EXPLAIN is done on UNION's
2001-08-24 13:18:06 +03:00
unknown
390eb478e9 Fixed oopsie, and fixed a typo. 2001-08-23 14:54:41 -05:00
unknown
eebaa4d645 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2001-08-23 14:50:57 -05:00
unknown
b5dfa5b7a7 Lots of cleanups. 2001-08-23 14:47:05 -05:00
unknown
44517da574 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-08-23 00:59:19 +03:00
unknown
29ebdeb11c Portability fixes
Docs/manual.texi:
  Small changes because of user request.
heap/heapdef.h:
  Portability fix
include/global.h:
  Portability fix
myisam/myisamlog.c:
  Portability fix
sql/mini_client.cc:
  Fix for windows
sql/sql_repl.cc:
  Fix for windows
sql/violite.c:
  Fix for windows
2001-08-23 00:55:48 +03:00
unknown
8396f4d8d7 Added target for mysql.xml to Docs/Makefile.am.
Docs/Makefile.am:
  Added target for mysql.xml.
2001-08-22 14:28:35 -05:00
unknown
ee5ba7642c Warning fixes
client/thread_test.c:
  Removed unused variables warnings
sql/mysqld.cc:
  Fixed freeing null ptr warnings
vio/Makefile.am:
  Make more test programs to compile
2001-08-23 03:05:56 +08:00
unknown
2707d6f271 Texinfo menus fixed. 2001-08-22 13:55:28 -05:00
unknown
4d08cfd750 Merge
client/mysqlbinlog.cc:
  Auto merged
2001-08-22 10:02:48 -04:00
unknown
7374310f96 #include <my_pthread.h>
extern "C" {


client/mysqlbinlog.cc:
  #include <my_pthread.h>
include/my_pthread.h:
  #ifdef _cplusplus
  extern "C" {
  #endif
2001-08-22 14:15:01 +02:00
unknown
6bf6d4b8a5 Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql 2001-08-22 12:24:49 +03:00
unknown
2e6a193c0f Fix to get core files on Solaris
BUILD/compile-solaris-sparc-purify:
  Added -g
2001-08-22 12:22:46 +03:00
unknown
55e17c84b4 Some new files added for SSL stuff 2001-08-22 15:11:53 +08:00
unknown
57d9bc0434 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2001-08-22 02:07:53 -05:00
unknown
cca8953014 a few fixes per emails
clean up PostgreSQL section
2001-08-22 01:57:48 -05:00
unknown
269e914b3d Merge
client/mysqlbinlog.cc:
  SCCS merged
client/mysqltest.c:
  SCCS merged
include/my_pthread.h:
  SCCS merged
2001-08-21 19:24:35 -04:00
unknown
65bc433d81 Portability fix in mysqlbinlog.cc (include my_pthread.h)
Clean up 'unused argument' warnings

Add extern "C" { ... } in my_pthread.h




client/mysqlbinlog.cc:
  Include my_pthread.h before thr_alarm.h (otherwise pthread_t isn't
  declared yet).
client/mysqltest.c:
  Fix unused argument warnings.
client/thread_test.c:
  Fix unused argument warnings.
include/my_pthread.h:
  Put extern "C" { ... } wrappers, because this file is included from
  some C++ files.
2001-08-21 19:14:04 -04:00
unknown
3a6db1d65f myisamchk.c Make --set-character-set actually do something.
myisam/myisamchk.c:
  Make --set-character-set actually do something.
2001-08-21 19:07:28 -04:00
unknown
5a8177205c Merge work.mysql.com:/home/bk/mysql-4.0 into white.box:/home/tim/my/4 2001-08-21 19:05:22 -04: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
d85006f254 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
  Auto merged
2001-08-22 01:46:36 +03:00
unknown
31b9e6e03f Fixes for OS2.
Fix bug in isamlog
Add argument types to function declarations.


Docs/manual.texi:
  Updated credits
client/mysql.cc:
  Fixes for OS2
client/mysqladmin.c:
  Fixes for OS2
client/mysqldump.c:
  Fixes for OS2
client/mysqlimport.c:
  Fixes for OS2
client/mysqltest.c:
  Fixes for OS2
dbug/dbug.c:
  Fixes for OS2.
  Use new C calling convention.
dbug/factorial.c:
  Fixes for OS2.
  Use new C calling convention.
include/errmsg.h:
  Fix for OS2
include/global.h:
  Fixes for OS2.
include/my_pthread.h:
  Fixes for OS2.
include/my_sys.h:
  Fixes for OS2.
include/mysql_com.h:
  Move defines to global.h
include/thr_alarm.h:
  Fixes for OS2.
isam/isamchk.c:
  Fixes for OS2.
  Add arguments to function declarations.
isam/isamlog.c:
  Fixes for OS2.
  Fix bug in logfile handling.
isam/test1.c:
  Add arguments to function decl
isam/test2.c:
  Add arguments to function declarations.
isam/test_all.res:
  Update result
libmysql/get_password.c:
  Fixes for OS2.
libmysql/libmysql.c:
  Fixes for OS2.
libmysql/net.c:
  Fixes for OS2.
libmysql/violite.c:
  Add arguments to function declarations.
merge/_locking.c:
  Add argument types to function declarations.
merge/close.c:
  Add argument types to function declarations.
merge/create.c:
  Add argument types to function declarations.
merge/extra.c:
  Add argument types to function declarations.
merge/open.c:
  Add argument types to function declarations.
merge/panic.c:
  Add argument types to function declarations.
merge/rsame.c:
  Add argument types to function declarations.
merge/update.c:
  Add argument types to function declarations.
myisam/ft_eval.c:
  Portability fix
myisam/ft_search.c:
  Portability fix
myisam/ft_test1.c:
  Portability fix
myisam/ftdefs.h:
  Portability fix
myisam/mi_check.c:
  Portability fix
myisam/mi_test1.c:
  Portability fix
myisam/mi_test2.c:
  Portability fix
myisam/mi_test_all.sh:
  Update to test for MACH variable
myisam/myisamlog.c:
  Cleanup
myisam/myisampack.c:
  Don't use variable 'new'
myisam/sort.c:
  Portability fix
myisammrg/myrg_delete.c:
  Add argument types to function declarations.
myisammrg/myrg_locking.c:
  Add argument types to function declarations.
myisammrg/myrg_open.c:
  Add argument types to function declarations.
myisammrg/myrg_panic.c:
  Add argument types to function declarations.
mysql-test/t/backup.test:
  Fix for OS2
mysql-test/t/show_check.test:
  Fix for OS2
mysys/charset.c:
  Dont use variable 'new'
mysys/default.c:
  Fixes for OS2.
mysys/getopt.c:
  Fixes for OS2.
mysys/getopt1.c:
  Fixes for OS2.
mysys/list.c:
  Don't use variable 'new'
mysys/mf_dirname.c:
  Fixes for OS2.
mysys/mf_format.c:
  Fixes for OS2.
mysys/mf_path.c:
  Fixes for OS2.
mysys/mf_qsort.c:
  Portability fix
mysys/mf_tempfile.c:
  Fixes for OS2.
mysys/my_clock.c:
  Fixes for OS2.
mysys/my_copy.c:
  Fixes for OS2.
mysys/my_create.c:
  Fixes for OS2.
mysys/my_getwd.c:
  Fixes for OS2.
mysys/my_init.c:
  Fixes for OS2.
mysys/my_lib.c:
  Fixes for OS2.
mysys/my_lock.c:
  Fixes for OS2.
mysys/my_malloc.c:
  Portability fix
mysys/my_mkdir.c:
  Fixes for OS2.
mysys/my_open.c:
  Fixes for OS2.
mysys/my_pthread.c:
  Fixes for OS2.
mysys/my_realloc.c:
  Fixes for OS2.
mysys/my_redel.c:
  Fixes for OS2.
mysys/my_static.c:
  Fixes for OS2.
mysys/my_tempnam.c:
  Fixes for OS2.
mysys/my_thr_init.c:
  Fixes for OS2.
mysys/my_write.c:
  Fixes for OS2.
mysys/test_charset.c:
  Fixes for OS2.
mysys/thr_alarm.c:
  Fixes for OS2.
mysys/tree.c:
  Fixes for OS2.
sql/field.cc:
  Fixes for OS2.
sql/field.h:
  Fixes for OS2.
sql/gen_lex_hash.cc:
  Fixes for OS2.
sql/hostname.cc:
  Fixes for OS2.
sql/item_func.cc:
  Fixes for OS2.
sql/item_strfunc.cc:
  Fixes for OS2.
sql/log_event.cc:
  Fixes for OS2.
sql/md5.c:
  Fixes for OS2.
sql/mini_client.cc:
  Fixes for OS2.
sql/mysql_priv.h:
  Fixes for OS2.
sql/mysqld.cc:
  Fixes for OS2.
sql/net_serv.cc:
  Fixes for OS2.
sql/slave.cc:
  Fixes for OS2.
sql/sql_base.cc:
  Fixes for OS2.
sql/sql_db.cc:
  Portability fix
sql/sql_insert.cc:
  Fixes for OS2.
sql/sql_load.cc:
  Fixes for OS2.
sql/sql_parse.cc:
  Fixes for OS2.
sql/sql_table.cc:
  Fixes for OS2.
sql/sql_udf.cc:
  Fixes for OS2.
sql/violite.c:
  Fixes for OS2.
strings/ctype-big5.c:
  Fixes for OS2.
strings/ctype-gbk.c:
  Fixes for OS2.
strings/ctype-sjis.c:
  Fixes for OS2.
strings/ctype-tis620.c:
  Fixes for OS2.
strings/ctype.c:
  Fixes for OS2.
strings/strnlen.c:
  Fixes for OS2.
2001-08-22 01:45:07 +03:00
unknown
d61418b94f Portability fixes.
Patches required by Gemini
Fix to properly detect if there is an active transaction in InnoDB
Fix to not lock thread structure when doing automatic rollback when thread ends
Allow -O lower_case_names=0 on UNIX


Docs/manual.texi:
  Some updates from mailing list.
  Changelog
client/mysqlbinlog.cc:
  Removed variables declared in net.c
configure.in:
  Added test for strtoll and fixed test for gethostname_r for AIX
mysql-test/t/innodb.test:
  Added test of active transactions
sql/field.cc:
  Patch required by Gemini
sql/field.h:
  Patch required by Gemini
sql/filesort.cc:
  Patch required by Gemini
sql/gen_lex_hash.cc:
  Update to support new syntax
sql/ha_gemini.cc:
  Patch required by Gemini
sql/ha_gemini.h:
  Patch required by Gemini
sql/ha_innobase.cc:
  Fix to properly detect if there is an active transaction in InnoDB
sql/handler.cc:
  Fix to properly detect if there is an active transaction in InnoDB
sql/handler.h:
  Fix to properly detect if there is an active transaction in InnoDB.
  Fix for Gemini
sql/lex.h:
  SHOW LOCKS
sql/mysqld.cc:
  Fix to not lock thread structure when doing automatic rollback when thread ends.
sql/share/portuguese/errmsg.txt:
  Update
sql/sql_class.cc:
  Fix to not lock thread structure when doing automatic rollback when thread ends.
sql/sql_class.h:
  Fix to properly detect if there is an active transaction in InnoDB
sql/sql_delete.cc:
  Fix for Gemini
sql/sql_parse.cc:
  Allow -O lower_case_names=0 on UNIX
sql/sql_select.cc:
  Fix for Gemini
sql/sql_table.cc:
  Allow -O lower_case_names=0 on UNIX
sql/sql_update.cc:
  Fix for Gemini
sql/sql_yacc.yy:
  For SHOW LOCKS
strings/strto.c:
  Portability fix
2001-08-21 20:06:00 +03:00
unknown
f1f4bc465f Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-08-21 13:47:03 +03:00
unknown
023cbef04c Remove usage of my_dup(), as this casued error 127 when reading MyISAM tables
New definition of WEEK().


Docs/manual.texi:
  Changelog
myisam/mi_cache.c:
  Better logging on error
myisam/mi_open.c:
  Remove usage of my_dup(), as this casued error 127 when reading tables
mysql-test/r/func_time.result:
  More tests for the WEEK/YEARWEEK function
mysql-test/t/func_time.test:
  More tests for the WEEK/YEARWEEK function
sql/time.cc:
  New definition of WEEK
2001-08-21 13:44:01 +03:00
unknown
8d982e7690 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-08-20 11:21:40 -06:00
unknown
9326aa42ac fixes in mysqltest and mysqlbinlog
trying to understand why --bootstrap option does not create tables
on disk, hope the problem will be fixed when I pull, if not will
debug, but need to commit in order to pull


client/mysqltest.c:
  added safe_connect() and chaned all calls to mysql_real_connect() to
  safe_connect()
mysql-test/install_test_db.sh:
  more diagnostic
sql/log_event.cc:
  fixed compile error in mysqlbinlog
2001-08-20 11:20:47 -06:00
unknown
001f7fb5d3 manual.texi:
Fixed danish SunSite mirror


Docs/manual.texi:
  Fixed danish SunSite mirror
2001-08-20 16:02:11 +02:00
unknown
f3171b49b3 Add my_dup.c
sql/sql_parse.cc:
  cleanup
2001-08-19 15:16:52 +03:00
unknown
cfdf5fee20 Fix of UNION code
Added heap_delete_table
Added HA_EXTRA_PREPARE_FOR_DELETE
Added and use my_dup() for faster open of tables.
Removed not working no-mix-table-type


BitKeeper/deleted/.del-=6~33f33b0a159dc5d5:
  Delete: =6
heap/hp_clear.c:
  Cleanup
heap/hp_close.c:
  Added delayed delete
heap/hp_create.c:
  Added heap_delete_table
heap/hp_delete.c:
  cleanup
heap/hp_test2.c:
  Added heap_delete_table
include/heap.h:
  Added heap_delete_table
include/my_base.h:
  Added HA_EXTRA_PREPARE_FOR_DELETE
include/my_sys.h:
  Adde my_dup and set_prealloc_root
isam/extra.c:
  Added HA_EXTRA_PREPARE_FOR_DELETE
myisam/mi_check.c:
  use my_dup
myisam/mi_extra.c:
  use my_dup
myisam/mi_open.c:
  use my_dup
myisam/myisamchk.c:
  use my_dup
myisam/myisamdef.h:
  use my_dup
mysys/Makefile.am:
  my_dup
mysys/hash.c:
  Add hash_replace
mysys/mf_pack.c:
  cleanup
mysys/my_alloc.c:
  Add set_prealloc_root
mysys/my_fstream.c:
  cleanup
mysys/my_lib.c:
  cleanup
mysys/my_seek.c:
  cleanup
sql/ha_heap.cc:
  Uses heap_delete_table()
sql/mysqld.cc:
  Fix SIGHUP usage
  Remove no-mix-table-types
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/sql_base.cc:
  remove no-mix-table-type
sql/sql_parse.cc:
  Fix UNION code
2001-08-19 14:43:51 +03:00
unknown
e704dd7202 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-08-18 20:23:06 -06:00
unknown
87a85f7fe7 make LOAD DATA INFILE replication work with multi-character
delimiters/starters/terminators

started work on server management daemon


mysql-test/r/rpl_log.result:
  fixed result
sql/log_event.cc:
  make LOAD DATA INFILE replication
  work with multi-character delimiters/starters/terminators
sql/log_event.h:
  make LOAD DATA INFILE replication
  work with multi-character delimiters/starters/terminators
2001-08-18 20:22:20 -06: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
a14d63ba6e Fix for handling of floats inside val_int() of +, - * and /.
Build-tools/Do-compile:
  Make shutdown safer
Docs/manual.texi:
  Fix of bad merge
sql/log.cc:
  cleanup
sql/sql_acl.cc:
  cleanup
2001-08-18 14:24:01 +03:00
unknown
b82ec23adc Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql 2001-08-18 13:13:35 +03:00
unknown
e9ec978e2d Fix for bug in the Sun Workshop compiler
BUILD/compile-solaris-sparc-purify:
  Build for purify, quantify and purecoverage
2001-08-18 13:11:58 +03:00
unknown
b6151b42c4 merge
Docs/manual.texi:
  unedit old version;  Will reapply later
2001-08-18 12:17:56 +03:00
unknown
d01f2efebf Portability fixes.
Let myisamchk generate a new checksum for compressed data.
Don't unconditionally force filenames to lower case on windows.
Update mysqltest to match 4.0 source (to get some of the new bug fixes into 3.23)


Docs/manual.texi:
  Link changes, and new comments about IA64 and about Sun workshop
client/mysqltest.c:
  Updated this to match the 4.0 source
include/config-win.h:
  Don't unconditionally force filenames to lower case on windows.
innobase/include/ut0ut.h:
  Portability fix
myisam/mi_cache.c:
  Fix problem where reported error number was -1
myisam/mi_check.c:
  Let myisamchk generate a new checksum for compressed data.
myisam/mi_packrec.c:
  Cleanup
myisam/myisamchk.c:
  Report checksum for compressed tables
mysql-test/t/bdb.test:
  Fix to match new mysqltest
mysql-test/t/err000001.test:
  Fix to match new mysqltest
mysql-test/t/fulltext.test:
  Fix to match new mysqltest
mysql-test/t/innodb.test:
  Fix to match new mysqltest
mysql-test/t/overflow.test:
  Fix to match new mysqltest
sql/ha_gemini.cc:
  Fix false -> FALSE
sql/share/estonian/errmsg.txt:
  Updated of translation
sql/share/swedish/errmsg.txt:
  Updated of translation
sql/sql_parse.cc:
  Don't unconditionally force filenames to lower case on windows.
sql/sql_table.cc:
  Don't unconditionally force filenames to lower case on windows.
sql/sql_test.cc:
  Write current directory when using 'mysqladmin debug'
strings/strto.c:
  Portability fix
strings/strtoll.c:
  Portability fix
strings/strtoul.c:
  Portability fix
strings/strtoull.c:
  Portability fix
2001-08-18 10:49:00 +03:00
unknown
724d8e1dbc Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2001-08-17 14:19:50 -05:00
unknown
52391439cd various cleanups 2001-08-17 14:18:28 -05:00
unknown
857b5d4f43 manual.texi Fix typo
Docs/manual.texi:
  Fix typo
2001-08-17 22:05:53 +03:00
unknown
3fac95eea1 manual.texi Added a note that tablespace has to be >= 10 MB
Docs/manual.texi:
  Added a note that tablespace has to be >= 10 MB
2001-08-17 22:00:04 +03:00
unknown
57b1a50c81 ha_innobase.cc Impove ref length estimate in a handle to eliminate a warning in filesort
sql/ha_innobase.cc:
  Impove ref length estimate in a handle to eliminate a warning in filesort
2001-08-17 21:19:10 +03:00
unknown
0855ce419c manual.texi Re-added sunet.se mirror
Docs/manual.texi:
  Re-added sunet.se mirror
2001-08-17 06:14:56 -05:00