Commit graph

2327 commits

Author SHA1 Message Date
unknown
f7ff692468 Merge jcole@work.mysql.com:/home/bk/mysql-4.0
into tetra.spaceapes.com:/home/jcole/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
2001-09-27 13:27:30 -05:00
unknown
1216cfdf65 Fixes to manual.texi to make XML happy.
Docs/manual.texi:
  Fixes to make XML happy.
2001-09-27 13:24:19 -05:00
unknown
a353f6249c manual.texi typo fixes.
Docs/manual.texi:
  typo fixes.
2001-09-27 12:36:28 -05:00
unknown
91db1a8c99 manual.texi correct date error in tutorial.
Docs/manual.texi:
  correct date error in tutorial.
2001-09-27 12:31:40 -05:00
unknown
5e0851e1b3 Portability fix
sql/gen_lex_hash.cc:
  Smaller array
2001-09-22 17:40:59 +03:00
unknown
d037709b17 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-09-22 17:40:58 +03:00
unknown
e7b9eabeca Added support of INSERT to MERGE tables
Fixes for embedded libary and openssl


BUILD/compile-pentium-debug-max:
  Added --with-openssl
acinclude.m4:
  Cleanup
client/client_priv.h:
  Include mysql_embed.h to remove not used functions in embedded server
client/mysql.cc:
  Don't use openssl with embedded server
include/Makefile.am:
  Move mysql_embed.h to 'include' directory
include/myisammrg.h:
  Added support of INSERT to MERGE tables
include/mysql.h:
  Fixes for embedded libary and openssl
include/mysql_com.h:
  Fixes for embedded libary and openssl
include/mysql_embed.h:
  Fixes for embedded libary and openssl
include/violite.h:
  Cleanup
libmysql/libmysql.c:
  Safety
libmysqld/examples/Makefile.am:
  Fixes for embedded libary and openssl
libmysqld/lib_sql.cc:
  Fixes for embedded libary and openssl
libmysqld/lib_vio.c:
  Fixes for embedded libary and openssl
libmysqld/libmysqld.c:
  Fixes for embedded libary and openssl
myisammrg/Makefile.am:
  Added support of INSERT to MERGE tables
myisammrg/myrg_create.c:
  Added support of INSERT to MERGE tables
myisammrg/myrg_open.c:
  Added support of INSERT to MERGE tables
myisammrg/myrg_static.c:
  Added support of INSERT to MERGE tables
mysql-test/t/union.test:
  Portability fix
sql/Makefile.am:
  Fixes for embedded libary and openssl
sql/gen_lex_hash.cc:
  Added support of INSERT to MERGE tables
sql/ha_myisammrg.cc:
  Added support of INSERT to MERGE tables
sql/handler.h:
  Added support of INSERT to MERGE tables
sql/mini_client.cc:
  Fixes for embedded libary and openssl
sql/net_serv.cc:
  Fixes for embedded libary and openssl
sql/sql_show.cc:
  Cleanup
Build-tools/Do-all-build-steps:
  Don't build openssl (Need to add proper configure test when to build ssl)
sql/lex.h:
  Added support of INSERT to MERGE tables
sql/sql_yacc.yy:
  Fixes for embedded libary and openssl
2001-09-22 17:40:57 +03:00
unknown
bb98bbd836 Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0


innobase/include/univ.i:
  Auto merged
2001-09-22 16:40:57 +02:00
unknown
2504336b41 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2001-09-22 17:40:56 +03:00
unknown
d0f64e9d82 Merge tfr@work.mysql.com:/home/bk/mysql-4.0
into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0
2001-09-22 16:40:55 +02:00
unknown
f60d2fed06 Typo fixes on SSL
sql/lex.h:
  Typo fix
sql/sql_yacc.yy:
  Typo fix
2001-09-22 22:40:54 +08:00
unknown
a6397f17f7 SSL parser changes to allow SSL specific GRANT commands
Build-tools/Do-all-build-steps:
  We need to test SSL stuff. Now we do it.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-09-22 22:32:43 +08:00
unknown
71ae801325 Fix when compiling with mit-pthreads
Docs/manual.texi:
  Update
2001-09-22 01:56:25 +03:00
unknown
2bb1b6148d manual.texi:
Add a mirror in Mexico
mexico.txt, mexico.eps, mexico.gif:
  new file


Docs/manual.texi:
  Add a mirror in Mexico
2001-09-21 22:35:43 +02:00
unknown
ce7075e82c Fixes for distributed build
Changed --do-pstack to --enable-pstack
Removed pstack from default build


client/Makefile.am:
  Fixes for distributed build
configure.in:
  Removed pstack from default build
sql/Makefile.am:
  Fixes for distributed build
sql/mysqld.cc:
  Changed --do-pstack to --enable-pstack
2001-09-21 16:36:23 +03:00
unknown
3ebf3e425a Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-09-21 03:43:19 +03:00
unknown
c1a80bc061 Integrated table->ref_primary_key into table->part_of_key
Fixed bug in UNION


client/mysqlbinlog.cc:
  Added error message handling to read_log_event()
heap/hp_write.c:
  More debug info
myisam/myisampack.c:
  Cleanup
mysql-test/mysql-test-run.sh:
  Portability fixes.
mysql-test/r/union.result:
  More tests cases for UNION
mysql-test/t/union.test:
  More tests cases for UNION
sql/Makefile.am:
  Added mysql_embed.h
sql/item.cc:
  Fixed bug when using the same table multiple times in union.
sql/log_event.cc:
  Removed use of ## construct (Portability problem)
sql/log_event.h:
  Added error message handling to read_log_event()
sql/mysql_priv.h:
  Added mysql_embed.h
sql/opt_sum.cc:
  Cleanup
sql/slave.cc:
  cleanup
sql/sql_base.cc:
  Integrated table->ref_primary_key into table->part_of_key
sql/sql_union.cc:
  Cleanup
sql/table.cc:
  Integrated table->ref_primary_key into table->part_of_key
sql/table.h:
  Integrated table->ref_primary_key into table->part_of_key
2001-09-21 03:38:35 +03:00
unknown
53b3e373e0 os0sync.c Define os_fast_mutex functions also in Windows
innobase/os/os0sync.c:
  Define os_fast_mutex functions also in Windows
2001-09-20 21:43:58 +03:00
unknown
9402451031 os0sync.h Define os_fast_mutex functions also in Windows
os0sync.ic	Define os_fast_mutex functions also in Windows


innobase/include/os0sync.h:
  Define os_fast_mutex functions also in Windows
innobase/include/os0sync.ic:
  Define os_fast_mutex functions also in Windows
2001-09-20 21:38:46 +03:00
unknown
b596c41a87 univ.i Changes to eliminate unnecessary Purify warnings (documentation of flag UNIV_SET_MEM_TO_ZERO)
innobase/include/univ.i:
  Changes to eliminate unnecessary Purify warnings (documentation of flag UNIV_SET_MEM_TO_ZERO)
2001-09-20 21:14:49 +03:00
unknown
96bfd6e984 Merge heikki@work.mysql.com:/home/my/mysql
into donna.mysql.fi:/home/heikki/mysqlf
2001-09-20 21:05:21 +03:00
unknown
31fd0c63e0 mem0mem.ic Changes to eliminate unnecessary Purify warnings
ut0mem.h	Changes to eliminate unnecessary Purify warnings
ut0mem.ic	Changes to eliminate unnecessary Purify warnings
srv0start.c	Changes to eliminate unnecessary Purify warnings
mem0pool.c	Changes to eliminate unnecessary Purify warnings
ut0mem.c	Changes to eliminate unnecessary Purify warnings


innobase/ut/ut0mem.c:
  Changes to eliminate unnecessary Purify warnings
innobase/mem/mem0pool.c:
  Changes to eliminate unnecessary Purify warnings
innobase/srv/srv0start.c:
  Changes to eliminate unnecessary Purify warnings
innobase/include/ut0mem.h:
  Changes to eliminate unnecessary Purify warnings
innobase/include/ut0mem.ic:
  Changes to eliminate unnecessary Purify warnings
innobase/include/mem0mem.ic:
  Changes to eliminate unnecessary Purify warnings
2001-09-20 21:04:48 +03:00
unknown
0ef8576a17 Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0


acinclude.m4:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
2001-09-20 19:51:48 +02:00
unknown
6ae952129f Some fixes for Gemini
acinclude.m4:
  Fix for Gemini
sql-bench/server-cfg.sh:
  Fix for Gemini
sql/field.cc:
  Fix for Gemini
2001-09-20 20:22:43 +03:00
unknown
5dbd7397bd Makefile.am Add @pstack_libs@
Makefile.am	SUBDIRS = aout
configure.in	Output pstack/aout/Makefile
Makefile.am	BitKeeper file /home/tim/my/4/pstack/aout/Makefile.am


configure.in:
  Output pstack/aout/Makefile
pstack/Makefile.am:
  SUBDIRS = aout
libmysqld/examples/Makefile.am:
  Add @pstack_libs@
2001-09-19 03:47:55 +02:00
unknown
b7b9e0d77c Merge work.mysql.com:/home/bk/mysql-4.0
into work.mysql.com:/home/tim/my/4
2001-09-18 22:46:00 +02:00
unknown
e8b81c882d New documentation about the embedded MySQL server library.
Docs/manual.texi:
  New information about the embedded MySQL server
  library.
2001-09-18 22:45:41 +02:00
unknown
a8b37644ec Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_select.cc:
  Auto merged
2001-09-18 22:46:39 +03:00
unknown
4d902c1ef6 Cleanup
myisam/mi_write.c:
  cleanup
pstack/Makefile.am:
  Fixed wrong variable
2001-09-18 22:46:08 +03:00
unknown
a5e44471ed merge
Docs/manual.texi:
  Auto merged
myisam/mi_check.c:
  Auto merged
2001-09-18 21:27:28 +02:00
unknown
c66208cfbf Fix bug in SELECT EXPLAIN ... ORDER BY
Docs/internals.texi:
  Added more code style suggestions.
Docs/manual.texi:
  Changelog
myisam/mi_check.c:
  Removed dbug info
2001-09-18 22:13:35 +03:00
unknown
e154b30a57 Another attempt to get pstack into the binary distribution
Fixed that --enable-assembler works on newer Linux system


Makefile.am:
  Another attempt to get pstack into the binary distribution
configure.in:
  Fixed that --enable-assembler works on newer Linux system
  Fixes for pstack
pstack/Makefile.am:
  Another attempt to get pstack into the binary distribution
2001-09-18 15:24:14 +03:00
unknown
be94b8d3c8 Remove pstack from default build (because conflict with mit-pthreads)
configure.in:
  Don't enable pstack if mit-pthreads
2001-09-18 12:48:27 +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
9c34eaafb1 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-09-18 05:17:53 +03:00
unknown
53e09c9838 Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
extra/perror.c:
  Auto merged
include/myisam.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/rpl000017-slave.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/slave.cc:
  Auto merged
2001-09-18 04:17:52 +02:00
unknown
01eab0ce84 Fix error messages
Configure fixes


configure.in:
  Fix for pstack
libmysqld/Makefile.am:
  Fix to create examples
mysql-test/t/drop.test:
  Fix error messages
mysql-test/t/isolation.test:
  Fix error messages
mysql-test/t/union.test:
  Fix error messages
2001-09-18 05:16:39 +03:00
unknown
c91a3df5c3 Fix for LOAD DATA FROM MASTER when using tables with checksum
Fixed some wrong test cases


Docs/manual.texi:
  Changelog
extra/perror.c:
  Added BDB table errors
include/myisam.h:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
myisam/mi_check.c:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
mysql-test/mysql-test-run.sh:
  Better logging
mysql-test/r/join.result:
  Fixed missing results
mysql-test/r/rpl000006.result:
  Updated result
mysql-test/t/join.test:
  Fixed wrong test
mysql-test/t/rpl000001.test:
  Fixed wrong test
mysql-test/t/rpl000006.test:
  Cleanup
mysql-test/t/rpl000017-slave.sh:
  Fixed too long password
mysql-test/t/rpl000017.test:
  Fixed too long password
sql/ha_myisam.cc:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
sql/handler.cc:
  Unique error for DEADLOCK
sql/slave.cc:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
2001-09-18 04:58:15 +03:00
unknown
74bec0517b mysqld.cc cannot use unireg_abort before unireg_init
sql/mysqld.cc:
  cannot use unireg_abort before unireg_init
2001-09-18 01:26:50 +02:00
unknown
128d1bad54 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


myisam/mi_write.c:
  Auto merged
2001-09-18 00:46:16 +02:00
unknown
d8ae9669cd merge
Docs/manual.texi:
  Auto merged
extra/perror.c:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql.h:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
2001-09-17 23:26:00 +02:00
unknown
9d62e4a05b Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-09-17 23:44:19 +03:00
unknown
ffe994614f Added unique error for DEADLOCK
Include missing man pages into binary distribution


BitKeeper/deleted/.del-make_mysql_pkg.sh~c616a18bed4b9c2:
  Delete: support-files/make_mysql_pkg.sh
Docs/manual.texi:
  Changelog
extra/perror.c:
  Added missing error codes
include/my_base.h:
  Added unique error for DEADLOCK
include/mysql.h:
  Portability fix for the LCC windows compiler
include/mysqld_error.h:
  Added unique error for DEADLOCK
scripts/make_binary_distribution.sh:
  Include missing man pages into binary distribution
sql/ha_berkeley.cc:
  Added unique error for DEADLOCK
sql/ha_berkeley.h:
  Added unique error for DEADLOCK
sql/handler.h:
  Added unique error for DEADLOCK
sql/mysqld.cc:
  Portability fix
sql/share/czech/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/danish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/dutch/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/english/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/estonian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/french/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/german/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/greek/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/hungarian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/italian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/japanese/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/korean/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/norwegian-ny/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/norwegian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/polish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/portuguese/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/romanian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/russian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/slovak/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/spanish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/swedish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/ukrainian/errmsg.txt:
  Added unique error for DEADLOCK
2001-09-17 23:43:53 +03:00
unknown
9f939ecce6 Fix to get all files into the distribution 2001-09-17 23:38:31 +03:00
unknown
05821367d4 Fixed bug in UNION when doing UNION with the same tables
myisam/mi_extra.c:
  More debugging information
mysql-test/r/union.result:
  Added test for UNION bug
mysql-test/t/union.test:
  Added test for UNION bug
sql/sql_base.cc:
  Clear field->query_id when using UNION
sql/sql_parse.cc:
  Fix for UNION bug
sql/sql_union.cc:
  Cleanup
sql/table.h:
  Fix for UNION bug
tools/Makefile.am:
  Fix for compiling with MIT-threads
2001-09-17 22:44:51 +03:00
unknown
79ce69d7ea log0log.c Eliminate a Purify warning
buf0buf.c	Fix uninitilaized flush field noticed with Purify


innobase/buf/buf0buf.c:
  Fix uninitilaized flush field noticed with Purify
innobase/log/log0log.c:
  Eliminate a Purify warning
2001-09-17 18:17:38 +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
3324d0a7ff Fixed bug with SELECT * ... UNION
client/mysql.cc:
  Increased version number
client/mysqltest.c:
  Changed to use default path
include/mysql.h:
  Changed prototype of mysql_server_init
libmysql/libmysql.c:
  Changed prototype of mysql_server_init
libmysqld/lib_sql.cc:
  Changed prototype of mysql_server_init
mysql-test/r/union.result:
  Added test for UNION bug
mysql-test/t/union.test:
  Added test for UNION bug
2001-09-17 15:40:03 +03:00
unknown
b69a91cc3c Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-09-17 12:10:33 +03:00
unknown
7d1d29591a Fixed typo in makefile
tools/Makefile.am:
  Fixed typo
2001-09-17 12:09:44 +03:00