Commit graph

2304 commits

Author SHA1 Message Date
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
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
unknown
0712369bd2 manual.texi:
Change a mirror contact e-mail


Docs/manual.texi:
  Change a mirror contact e-mail
2001-09-17 09:06:58 +02: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
5810866b69 Portability fixes
client/Makefile.am:
  Cleanup
sql/Makefile.am:
  Cleanup
sql/share/dutch/errmsg.txt:
  Added missing error messages
sql/share/ukrainian/errmsg.txt:
  Added missing error messages
sql/sql_handler.cc:
  Portability fix
tools/Makefile.am:
  Portability fix
2001-09-17 00:32:45 +03:00
unknown
482735b566 manual.texi:
Added a mirror in Finland


Docs/manual.texi:
  Added a mirror in Finland
2001-09-16 21:54:01 +02:00
unknown
32456b9e76 manual.texi:
Added a mirror in Turkey
turkey.eps, turkey.gif, turkey.txt:
  new file


Docs/manual.texi:
  Added a mirror in Turkey
2001-09-16 11:34:14 +02:00
unknown
3479f42807 fixed bug in mysqltest
updated mysql-test-run with features from 4.0
added a test case for broken load data from master for MyISAM tables
with checksum


client/mysqltest.c:
  fixed parser bug
mysql-test/mysql-test-run.sh:
  backported changes from 4.0 ( needed to be able to run client in gdb)
mysql-test/t/rpl000006.test:
  updated test case for a bug
2001-09-15 22:09:12 -06:00
unknown
e3dee590c1 flush bulk-insert tree on dup key 2001-09-15 17:04:04 +02: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
7dc2f1a69e Portability fixes
libmysql/libmysql.c:
  Cleanup & portability fixes
2001-09-15 16:22:34 +03:00
unknown
3c360e3ea5 Merge
Docs/manual.texi:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/mysqld.cc:
  merge
sql/net_serv.cc:
  SCCS merged
2001-09-15 15:19:47 +02:00
unknown
45ea63fec3 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
  Auto merged
2001-09-15 16:06:46 +03:00
unknown
1a9bf29e99 Fixed bug in --safe-create-user
Docs/manual.texi:
  Changelog
isam/_dbug.c:
  Cleanup
sql/mysqld.cc:
  Cleanup
sql/net_serv.cc:
  Cleanup
2001-09-15 15:24:56 +03:00
unknown
e0e42a7918 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


Docs/manual.texi:
  Auto merged
2001-09-15 13:15:55 +02:00
unknown
b0528fc428 manual.texi outdated line removed
Docs/manual.texi:
  outdated line removed
2001-09-15 13:14:56 +02:00
unknown
c1caa081ad manual.texi:
Add a mirror in Philippines
philippines.txt, philippines.gif, philippines.eps:
  new file


Docs/manual.texi:
  Add a mirror in Philippines
2001-09-15 09:53:47 +02:00
unknown
1efe6fe956 manual.texi fix example that uses INDEX() as function (there
manual.texi	is no such function)


Docs/manual.texi:
  fix example that uses INDEX() as function (there
  is no such function)
2001-09-14 21:41:10 -05: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
6612decff3 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2001-09-14 19:52:22 +03:00
unknown
af19fa4628 Fixed bug in UNION
Fixed replication bug in load_master_data


BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Delete: include/global.h
Docs/manual.texi:
  Cleaned up "Things to do in 4.0"
mysql-test/r/union.result:
  New test
mysql-test/t/union.test:
  New test
mysys/my_lib.c:
  Cleanup
sql/mysql_priv.h:
  Fixed replication bug load_master_data
sql/sql_base.cc:
  Fixed bug in UNION
sql/sql_db.cc:
  Fixed replication bug load_master_data
sql/sql_parse.cc:
  Fixed replication bug load_master_data
sql/sql_repl.cc:
  Fixed replication bug load_master_data
sql/sql_union.cc:
  Fixed bug in UNION
tools/mysqlmanager.c:
  Portability fix
2001-09-14 19:50:56 +03:00
unknown
cf45545f0e manual.texi typo fixes
Docs/manual.texi:
  typo fixes
2001-09-14 11:34:00 -05:00
unknown
687a1b0610 Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0


configure.in:
  Auto merged
2001-09-14 17:24:43 +02:00