Commit graph

2309 commits

Author SHA1 Message Date
unknown
634378a5ac Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
configure.in:
  Auto merged
2001-08-30 20:39:18 +03:00
unknown
18cd5fe5e0 Increase version number
sql/ha_myisam.cc:
  Added comments
2001-08-30 20:38:46 +03:00
unknown
e6a8e97c48 Merge work.mysql.com:/home/bk/mysql into white.box:/home/tim/my/3 2001-08-30 13:18:06 -04:00
unknown
16a2502047 Fixed problem in myisampack with blobs
myisam/myisamchk.c:
  Fixes bug when not using --set-character-set
myisam/myisampack.c:
  Fixed problem with blobs
2001-08-30 14:24:15 +03:00
unknown
a054969476 Portability fix 2001-08-30 12:51:58 +03:00
unknown
0fbb50b597 Fix problem with comments/blank lines in MERGE files.
Docs/manual.texi:
  Changelog
2001-08-30 11:20:28 +03:00
unknown
9001f3515b Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-08-30 11:02:28 +03:00
unknown
d66c098762 Portability fixes
dbug/dbug.c:
  Portability fix
include/heap.h:
  Portability fix
strings/conf_to_src.c:
  Portability fix
2001-08-30 10:51:36 +03:00
unknown
2fb1523917 manual.texi minor change log fixes
manual.texi	fix age calculations in the tutorial section to
manual.texi	determine age in integer years and to account for
manual.texi	relative order of dates within calendar year.


Docs/manual.texi:
  minor change log fixes
2001-08-29 21:56:18 -05: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
9a4aac7e23 Fix for OS2
Docs/manual.texi:
  Cleanup
2001-08-30 01:22:02 +03:00
unknown
cda4e4d23c Makefile.am Didn´ t compile after clone
tools/Makefile.am:
  Didn´ t compile after clone
2001-08-30 04:46:25 +08:00
unknown
6b6483ef6f OpenSSL work
readline/callback.c:
  warning removed
sql/mysqld.cc:
  Warning removed abut freeing zero pointer
2001-08-30 04:28:55 +08:00
unknown
a221315fa9 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-08-29 22:25:06 +03:00
unknown
79a356b087 buf0flu.c Testing if the file is ok in Bitkeeper
innobase/buf/buf0flu.c:
  Testing if the file is ok in Bitkeeper
2001-08-29 19:59:01 +03:00
unknown
dd9fa926b3 trx0roll.c Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
trx0sys.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
trx0trx.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0mysql.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0purge.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0sel.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0uins.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0umod.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0upd.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
srv0srv.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
srv0start.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
sync0arr.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
fil0fil.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
ibuf0ibuf.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
lock0lock.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
os0file.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0btr.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0cur.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0sea.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
buf0buf.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
data0data.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
srv0srv.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
trx0sys.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
trx0trx.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0cur.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
buf0buf.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
data0data.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
ha_innobase.cc	Fix the auto-inc+REPLACE+replication bug, improve InnoDB Monitor prints


sql/ha_innobase.cc:
  Fix the auto-inc+REPLACE+replication bug, improve InnoDB Monitor prints
innobase/include/btr0cur.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/buf0buf.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/data0data.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/srv0srv.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/trx0sys.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/trx0trx.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/btr/btr0btr.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/btr/btr0cur.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/btr/btr0sea.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/buf/buf0buf.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/data/data0data.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/fil/fil0fil.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/ibuf/ibuf0ibuf.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/lock/lock0lock.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/os/os0file.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0mysql.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0purge.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0sel.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0uins.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0umod.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0upd.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/srv/srv0srv.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/srv/srv0start.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/sync/sync0arr.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/trx/trx0roll.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/trx/trx0sys.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/trx/trx0trx.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
2001-08-29 19:42:23 +03:00
unknown
f78df02a72 Merge
Docs/manual.texi:
  SCCS merged
2001-08-29 17:34:46 +03:00
unknown
1241395fce Test that all MERGE tables comes from the same database
Docs/manual.texi:
  Changelog and more documentation about ALTER TABLE
include/mysqld_error.h:
  New error message
mysql-test/t/merge.test:
  Test of error conditions
sql/gen_lex_hash.cc:
  Smaller array
sql/ha_myisammrg.cc:
  Cleanup
sql/share/czech/errmsg.txt:
  New message
sql/share/danish/errmsg.txt:
  New message
sql/share/dutch/errmsg.txt:
  New message
sql/share/english/errmsg.txt:
  New message
sql/share/estonian/errmsg.txt:
  New message
sql/share/french/errmsg.txt:
  New message
sql/share/german/errmsg.txt:
  New message
sql/share/greek/errmsg.txt:
  New message
sql/share/hungarian/errmsg.txt:
  New message
sql/share/italian/errmsg.txt:
  New message
sql/share/japanese/errmsg.txt:
  New message
sql/share/korean/errmsg.txt:
  New message
sql/share/norwegian-ny/errmsg.txt:
  New message
sql/share/norwegian/errmsg.txt:
  New message
sql/share/polish/errmsg.txt:
  New message
sql/share/portuguese/errmsg.txt:
  New message
sql/share/romanian/errmsg.txt:
  New message
sql/share/russian/errmsg.txt:
  New message
sql/share/slovak/errmsg.txt:
  New message
sql/share/spanish/errmsg.txt:
  New message
sql/share/swedish/errmsg.txt:
  New message
2001-08-29 17:33:41 +03:00
unknown
fc6696de03 Merge
sql/ha_innobase.cc:
  SCCS merged
2001-08-29 16:43:01 +03:00
unknown
1143555835 ha_innobase.cc Fix a bug in connection with SET INSERT_ID:caused repliaction to fail
sql/ha_innobase.cc:
  Fix a bug in connection with SET INSERT_ID:caused repliaction to fail
2001-08-29 16:40:00 +03:00
unknown
d46365fb0f News-3.23.42 section updated 2001-08-29 14:03:02 +02:00
unknown
45c10a6b72 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2001-08-29 13:43:50 +02:00
unknown
9dffefc40e "freeing of unallocated pointer" bug fixed 2001-08-29 13:42:14 +02:00
unknown
9ec46a996c Typo fix 2001-08-29 15:37:29 +08:00
unknown
4f1aaf457a Fix to be able to configure without --with-tools 2001-08-29 09:13:29 +03:00
unknown
e39aaf8073 Update the SCO (now Caldera)/SysV tests. This should allow OpenUnix8
to work automatically.  Thanks to Boyd Lynn Gerber for the patch.
2001-08-28 18:48:13 -04: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
558ae81fb1 fixed compile error 2001-08-27 18:01:06 -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
a4c13122f5 Removed tens of annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables.
mysys/mf_casecnv.c:
  Removed annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables
mysys/mf_qsort.c:
  Removed annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables
readline/complete.c:
  Removed annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables
readline/readline.c:
  Removed annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables
readline/vi_mode.c:
  Removed annoying warnings about implicit declaration of memcpy(), strlen() and about unused variables
2001-08-27 16:30:13 +08:00
unknown
30774b3549 Fixed bug in auto-increment handling with InnoDB
Some small speedups


Docs/manual.texi:
  Changelog
client/mysqldump.c:
  Fixed quoting problem for table names when using --opt
mysys/mf_casecnv.c:
  Speed up some common string functions
sql-bench/test-insert.sh:
  Small changes that shouldn't affect results
sql-bench/test-select.sh:
  Small changes that shouldn't affect results
sql/field.h:
  Added reset() functions to speed up some common things
sql/gen_lex_hash.cc:
  Smaller hash table
sql/ha_innobase.cc:
  Fixed bug in auto-increment handling with InnoDB
2001-08-26 23:24:48 +03: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
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