Commit graph

4364 commits

Author SHA1 Message Date
unknown
6ba1aefe90 Merge with 3.23.51
Fixed wrong usage of sprintf() in ha_innodb.cc


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.ja.texi:
  Auto merged
include/config-os2.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/ibuf/ibuf0ibuf.c:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/page/page0cur.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0purge.c:
  Auto merged
innobase/row/row0umod.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/key.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
support-files/my-medium.cnf.sh:
  Auto merged
support-files/my-small.cnf.sh:
  Auto merged
Docs/manual.texi:
  Merge with 3.23.51
configure.in:
  Merge with 3.23.51
include/Makefile.am:
  Merge with 3.23.51
innobase/dict/dict0load.c:
  Merge with 3.23.51
innobase/include/univ.i:
  Merge with 3.23.51
innobase/row/row0mysql.c:
  Merge with 3.23.51
innobase/srv/srv0srv.c:
  Merge with 3.23.51
innobase/srv/srv0start.c:
  Merge with 3.23.51
myisam/mi_cache.c:
  Merge with 3.23.51
myisammrg/myrg_rnext.c:
  Merge with 3.23.51
myisammrg/myrg_rprev.c:
  Merge with 3.23.51
sql/ha_innodb.cc:
  Merge with 3.23.51
  Changed used of sprintf() to make code portable.
sql/handler.cc:
  Indentation change
sql/lex.h:
  Comment cleanup
sql/log.cc:
  Merge with 3.23.51
sql/log_event.h:
  Merge with 3.23.51
sql/mysql_priv.h:
  Merge with 3.23.51
sql/mysqld.cc:
  Merge with 3.23.51
  Cleaned up handling of innodb_flush_log_at_trx_commit
sql/share/portuguese/errmsg.txt:
  Merge with 3.23.51
sql/slave.cc:
  Not merged as this affects many files; Will be fixed in next changeset
sql/slave.h:
  Merge with 3.23.51
sql/sql_acl.cc:
  Merge with 3.23.51 (no changes)
sql/sql_db.cc:
  Merge with 3.23.51
sql/sql_parse.cc:
  Merge with 3.23.51
sql/sql_yacc.yy:
  Merge with 3.23.51
  (Renamed NO_FOREIGN_KEY_CHECKS and RELAXED_UNIQUE_CHECKS)
support-files/mysql.spec.sh:
  Merge with 3.23.51
2002-07-25 22:46:28 +03:00
unknown
29cec51551 Merge work:/home/bk/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-07-25 01:06:04 +03:00
unknown
296adfbebf INSERT ... VALUES(DEFAULT)
BitKeeper/deleted/.del-insert_set.test~35be5a761a410ac1:
  Delete: mysql-test/t/insert_set.test
BitKeeper/deleted/.del-insert_set.result~fca5025db098c892:
  Delete: mysql-test/r/insert_set.result
Docs/manual.texi:
  Changelog
mysql-test/r/insert.result:
  Test new insert ... (DEFAULT)
mysql-test/t/insert.test:
  Test new insert ... (DEFAULT)
sql/item.cc:
  Indentation cleanup
2002-07-25 01:00:56 +03:00
unknown
65366ce789 Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-07-24 21:57:37 +02:00
unknown
2b5dc846b9 bugfix: uniques did not contributed to MYI tot_length estimation, which resulted in "Index file full" error on huge SELECT DISTINCT's 2002-07-24 21:56:33 +02:00
unknown
cbef80af1d manual.texi fix typo
Docs/manual.texi:
  fix typo
2002-07-24 12:12:34 -05:00
unknown
8e28d2adef manual.texi fix typo
Docs/manual.texi:
  fix typo
2002-07-24 12:09:46 -05:00
unknown
05a0ec9aae Merge work:/home/bk/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-07-24 19:58:16 +03:00
unknown
72dec69046 Removed wrong implementation of CUBE/ROLLUP
Fixed bugfix of INSERT ... SET db_name.table_name.column_name
Changed locking to external-locking
Fix client hangup for some invalid SQL queries.


Docs/manual.texi:
  Changelog & recent incompatible changes to 4.0.3
include/mysqld_error.h:
  New error messages
myisam/ft_boolean_search.c:
  Removed compiler warning
myisam/mi_check.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_dynrec.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_extra.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_key.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_open.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/mi_packrec.c:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/myisamdef.h:
  Change mi_fix_rec_buff_for_blob to mi_alloc_rec_buff
myisam/sort.c:
  Fixed uninitialized variable
mysql-test/r/insert_set.result:
  Change test case to use database foo
mysql-test/r/union.result:
  Test wrong usage of union
mysql-test/t/insert_set.test:
  Test bug in insert
mysql-test/t/union.test:
  Test wrong usage of union
sql/item.h:
  Indentation cleanup
sql/item_cmpfunc.h:
  Indentation cleanup
sql/item_func.h:
  Indentation cleanup
sql/item_strfunc.h:
  Indentation cleanup
sql/item_sum.h:
  Indentation cleanup
sql/item_timefunc.h:
  Indentation cleanup
sql/item_uniq.h:
  Indentation cleanup
sql/mysql_priv.h:
  Fix that we always generate an error message when calling YYABORT
sql/mysqld.cc:
  Changed command line arguments regarding locking to always use --external-locking
  Disable external locking by default
sql/procedure.h:
  Cleanup
sql/set_var.cc:
  change locking -> external_locking
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
mysql-test/r/olap.result:
  Removed CUBE/ROLLUP
mysql-test/t/olap.test:
  Removed CUBE/ROLLUP
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/share/ukrainian/errmsg.txt:
  New error messages
sql/sql_base.cc:
  Removed wrong patch for INSERT...
sql/sql_insert.cc:
  Fix bug in INSERT ... SET db_name.table_name.column_name
sql/sql_lex.h:
  Changed NON_EXISTIONG_ONE -> UNSPECIFIED_OLAP_TYPE
sql/sql_olap.cc:
  Removed wrong implementation of CUBE/ROLLUP
sql/sql_parse.cc:
  Removed wrong implementation of CUBE/ROLLUP
  Added function to give better error messages
sql/sql_select.cc:
  Removed wrong implementation of CUBE/ROLLUP
sql/sql_union.cc:
  Added comment
sql/sql_yacc.yy:
  Fix that we always generate an error message when calling YYABORT
2002-07-24 19:55:08 +03:00
unknown
8becb4cd11 Added sql/set_var.h to distribution
sql/Makefile.am:
   - Added missing file "set_var.h" to distribution
   - Fixed indendation
2002-07-24 13:48:27 +02:00
unknown
c911e9d721 Merge work:/home/bk/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
Docs/manual.texi:
  Auto merged
sql/sql_base.cc:
  Auto merged
2002-07-23 22:09:54 +03:00
unknown
80db4ec734 Small fixes after merge
BitKeeper/deleted/.del-net.c~ef21d6402bb882f9:
  This file is not auto-created
BitKeeper/etc/ignore:
  Added libmysqld/sql_olap.cc myisam/myisam.log to the ignore list
Docs/manual.texi:
  Small fixes
sql/sql_lex.h:
  Fixed typo
2002-07-23 22:08:37 +03:00
unknown
c70e7593c1 Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0
2002-07-23 13:33:31 -05:00
unknown
771a649a51 manual.texi change note mods, 4.0.x.
Docs/manual.texi:
  change note mods, 4.0.x.
2002-07-23 13:31:38 -05:00
unknown
32aac8dcee Fixed bug with INSERT .. SET db_name.tbl_name.col_name='' 2002-07-23 20:42:08 +03:00
unknown
10bd14dee8 merge
include/my_sys.h:
  Auto merged
include/myisam.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
2002-07-23 20:39:36 +03:00
unknown
a8caad316a New SET syntax & system variables.
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups


BitKeeper/deleted/.del-net.c~ef21d6402bb882f9:
  Delete: libmysql/net.c
BitKeeper/etc/ignore:
  added libmysql/net.c
Docs/manual.texi:
  New SET syntax & system variables.
client/client_priv.h:
  moved order of include files
client/mysql.cc:
  Removed compiler warning
client/mysqladmin.c:
  Use new SHOW GLOBAL syntax (if server supports it)
configure.in:
  version change
include/Makefile.am:
  indentation cleanup
include/my_getopt.h:
  Made some helper functions global
include/my_sys.h:
  Removed not used code
include/myisam.h:
  Added extra argument to ..._extra()
include/myisammrg.h:
  Added extra argument to ..._extra()
include/mysql_com.h:
  changed NET to be able to support changeable system variables
include/mysql_embed.h:
  Added MYSQL_SERVER_SUFFIX
include/mysql_version.h.in:
  Added check of multiple including (needed for embedded library)
include/mysqld_error.h:
  New error messages
innobase/dict/dict0dict.c:
  Remove compiler warnings
innobase/include/ut0mem.h:
  Remove compiler warnings
innobase/include/ut0mem.ic:
  Remove compiler warnings
isam/isamchk.c:
  new init_key_cache() arguments
isam/isamlog.c:
  new init_key_cache() arguments
isam/test2.c:
  new init_key_cache() arguments
isam/test3.c:
  new init_key_cache() arguments
libmysql/Makefile.am:
  Removed net.c (Automaticly make it from net_serv.cc)
libmysql/Makefile.shared:
  Removed net.c (Automaticly make it from net_serv.cc)
libmysql/libmysql.c:
  Changeable system variables
libmysqld/Makefile.am:
  Added set_var.cc file
libmysqld/embedded_priv.h:
  Changed order of include fiels
libmysqld/lib_sql.cc:
  merge with mysqld.cc (for changeable variables)
libmysqld/libmysqld.c:
  New changeable system variables
myisam/mi_check.c:
  Added extra argument to ..._extra()
myisam/mi_extra.c:
  Added extra argument to ..._extra()
myisam/mi_open.c:
  Removed not used variable
myisam/mi_test1.c:
  Changed call to init_key_cache
myisam/mi_test2.c:
  Added extra argument to ..._extra()
myisam/mi_test3.c:
  Added extra argument to ..._extra()
myisam/mi_write.c:
  Add cache size argument to bulk-insert-init
myisam/myisamchk.c:
  Use new key cache
myisam/myisamdef.h:
  new mi_init_bulk_insert() arguments
myisam/myisamlog.c:
  Added extra argument to ..._extra()
myisam/myisampack.c:
  Added extra argument to ..._extra()
myisammrg/myrg_extra.c:
  Added extra argument to ..._extra()
myisammrg/myrg_rrnd.c:
  Added extra argument to ..._extra()
mysql-test/r/insert_select.result:
  New changeable system variables
mysql-test/r/key.result:
  Test of bug in auto_increment
mysql-test/r/query_cache.result:
  New changeable system variables
mysql-test/r/rpl000001.result:
  New changeable system variables
mysql-test/r/rpl000016.result:
  New changeable system variables
mysql-test/r/union.result:
  New changeable system variables
mysql-test/r/user_var.result:
  New changeable system variables
mysql-test/r/variables.result:
  New changeable system variables
mysql-test/t/key.test:
  Test of bug in auto_increment
mysql-test/t/query_cache.test:
  New changeable system variables
mysql-test/t/rpl000001.test:
  New changeable system variables
mysql-test/t/rpl000009.test:
  New changeable system variables
mysql-test/t/rpl000016.test:
  New changeable system variables
mysql-test/t/rpl_compat.test:
  New changeable system variables
mysql-test/t/union.test:
  New changeable system variables
mysql-test/t/user_var.test:
  New changeable system variables
mysql-test/t/variables.test:
  New changeable system variables
mysys/default.c:
  Bigger default memory allocation
mysys/mf_iocache.c:
  Removed compiler warning
mysys/mf_keycache.c:
  Made key cache resizable on the fly
  Removed not needed extra argument to init_key_cache()
mysys/my_getopt.c:
  Made some helper functions global
sql/Makefile.am:
  Aded set_var.cc
sql/convert.cc:
  Comment cleanup
sql/field.cc:
  new changeable system variables
sql/filesort.cc:
  new changeable system variables
sql/ha_berkeley.cc:
  AUTO_COMMIT -> AUTOCOMMIT
sql/ha_innodb.cc:
  new changeable system variables
sql/ha_myisam.cc:
  Added extra argument to ..._extra()
sql/ha_myisam.h:
  Added extra argument to ..._extra()
sql/ha_myisammrg.cc:
  Added extra argument to ..._extra()
sql/ha_myisammrg.h:
  Added extra argument to ..._extra()
sql/handler.cc:
  Added extra argument to ..._extra()
  Added resize of key cache
  Change ha_table_typelib for use with new system variables
sql/handler.h:
  Added extra argument to ..._extra()
sql/item.cc:
  new changeable system variables
sql/item.h:
  Added better support of Item_uint
sql/item_func.cc:
  Added support for SET @@[global | session] system_variable
sql/item_strfunc.cc:
  new changeable system variables
sql/key.cc:
  Fixed bug in auto_increment on second part keys
sql/lex.h:
  Removed not needed keywords
sql/log.cc:
  new changeable system variables
sql/log_event.cc:
  new changeable system variables
sql/log_event.h:
  Removed not needed var reference
sql/mini_client.cc:
  new changeable system variables
  code cleanup
sql/mini_client.h:
  Indentation cleanup
sql/mysql_priv.h:
  Changed order of include files & variables to make file more readable
sql/mysqld.cc:
  Changed order of variables to make file more readable.
  Support for changeable variables
  Rename of system variables
  Moved init_vars to set_var.cc
  Changed output of --help
sql/net_pkg.cc:
  Added my_net_local_init() to make it possible to set different defaults for network connection depending if you are a client, embedded library or server.
sql/net_serv.cc:
  new changeable system variables
  To support this, some global variables had to be move to the NET structure.
sql/records.cc:
  new changeable system variables
  use extra_opt()
sql/repl_failsafe.cc:
  new changeable system variables
  minior code cleanups
sql/repl_failsafe.h:
  removed not needed external var reference
sql/share/czech/errmsg.txt:
  new changeable system variables
sql/share/danish/errmsg.txt:
  new changeable system variables
sql/share/dutch/errmsg.txt:
  new changeable system variables
sql/share/english/errmsg.txt:
  new changeable system variables
sql/share/estonian/errmsg.txt:
  new changeable system variables
sql/share/french/errmsg.txt:
  new changeable system variables
sql/share/german/errmsg.txt:
  new changeable system variables
sql/share/greek/errmsg.txt:
  new changeable system variables
sql/share/hungarian/errmsg.txt:
  new changeable system variables
sql/share/italian/errmsg.txt:
  new changeable system variables
sql/share/japanese/errmsg.txt:
  new changeable system variables
sql/share/korean/errmsg.txt:
  new changeable system variables
sql/share/norwegian-ny/errmsg.txt:
  new changeable system variables
sql/share/norwegian/errmsg.txt:
  new changeable system variables
sql/share/polish/errmsg.txt:
  new changeable system variables
sql/share/portuguese/errmsg.txt:
  new changeable system variables
sql/share/romanian/errmsg.txt:
  new changeable system variables
sql/share/russian/errmsg.txt:
  new changeable system variables
sql/share/slovak/errmsg.txt:
  new changeable system variables
sql/share/spanish/errmsg.txt:
  new changeable system variables
sql/share/swedish/errmsg.txt:
  new changeable system variables
sql/share/ukrainian/errmsg.txt:
  new changeable system variables
sql/slave.cc:
  new changeable system variables
  Added some suppression of error messages
  Initialize current_thd for all slave threads.
sql/sql_acl.cc:
  Added checking of arguments for SET PASSWORD (for new SET defintion)
sql/sql_acl.h:
  new prototypes
sql/sql_base.cc:
  new changeable system variables
sql/sql_cache.cc:
  new changeable system variables
sql/sql_cache.h:
  Renamed some arguments to make code more readable
sql/sql_class.cc:
  new changeable system variables
sql/sql_class.h:
  New changeable system variables
  Code cleanup
sql/sql_db.cc:
  Fixed bug in DROP DATABASE
sql/sql_delete.cc:
  Usage of wrong define in test (possible speed problem)
sql/sql_insert.cc:
  use extra_opt()
  Code cleanup
sql/sql_lex.cc:
  Added support for SET @@[global | session] system_variable
sql/sql_lex.h:
  Added support for SET @@[global | session] system_variable
sql/sql_load.cc:
  Cleanup for embedded library
  Use extra_opt()
sql/sql_parse.cc:
  Cleanup for embedded library
  New changeable system variables
sql/sql_repl.cc:
  new changeable system variables
sql/sql_repl.h:
  Fixed variable definitions
sql/sql_select.cc:
  new changeable system variables
sql/sql_show.cc:
  New changeable system variables
sql/sql_table.cc:
  Fixed bug in DROP DATABASE
sql/sql_union.cc:
  New changeable system variables
sql/sql_update.cc:
  Usage of wrong define in test (possible speed problem)
sql/sql_yacc.yy:
  New changeable system variables
sql/structs.h:
  Added typedef for SHOW_VAR
sql/table.cc:
  Fixed bug in auto_increment on second part keys
sql/uniques.cc:
  Comment fix
sql/unireg.h:
  A
2002-07-23 18:31:22 +03:00
unknown
b42ca98d34 - Fixed build failure in mysql.spec.sh - linking against the special
patched glibc would force static linking, which does not work with
  OpenSSL (which is now part of the Max binary)
- RPM spec file cleanups
- Init script cosmetical fix


support-files/mysql.server.sh:
  - Fixed display output when waiting for mysqld process to shut down.
support-files/mysql.spec.sh:
  - Reworked the build steps a little bit: the Max binary is supposed
    to include OpenSSL, which cannot be linked statically, thus trying
    to statically link against a special glibc is futile anyway.
  - Because of this, it is not required to make yet another build run
    just to compile the shared libs (saves a lot of build time)
  - Updated the package descriptions to reflect new configuration of the Max
    binary
  Added a %clean macro to clean up the BuildRoot afterwards
2002-07-23 17:04:20 +02:00
unknown
714e9c881e Merge work:/my/mysql-3.23 into mashka.mysql.fi:/home/my/mysql-3.23 2002-07-23 02:16:29 +03:00
unknown
15013f97ca Fixed problem with auto_increment key as not first key part
Docs/manual.texi:
  Changelog
2002-07-23 02:08:48 +03:00
unknown
d190cae014 Fix old typo. 2002-07-23 08:32:16 +10:00
unknown
655bb9a39b - Removed MIRRORS from EXTRA_DIST files in Makefile.am to get
"make dist" succeed again.


Makefile.am:
  Removed MIRRORS from source distribution
2002-07-22 14:19:11 +02:00
unknown
398e924f67 Added missing file sql_olap.cc to libmysqld/Makefile.am to fix compile
failures when building the embedded server.


libmysqld/Makefile.am:
   - Added missing file sql_olap.cc to make building the embedded server
     possible again
2002-07-22 14:07:04 +02:00
unknown
815f1c4112 merge.test:
merge.test - it was missed in the previous commit :(
manual.texi:
  fixed bad auto-merge of OLAP manual 
Docs/Makefile.am:
  removed ../MIRROR target (mirror list is no longer in the manual)


Docs/Makefile.am:
  removed ../MIRROR target (mirror list is no longer in the manual)
Docs/manual.texi:
  fixed bad auto-merge of OLAP manual
mysql-test/t/merge.test:
  merge.test - it was missed in the previous commit :(
2002-07-22 00:46:30 +02:00
unknown
caa45d7b85 Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-07-21 23:56:16 +02:00
unknown
4eff0593d6 AUTO_INCREMENT support for MERGE
HA_AUTO_PART_KEY support for handler parent class


Docs/manual.texi:
  AUTO_INCREMENT support for MERGE
mysql-test/r/merge.result:
  AUTO_INCREMENT support for MERGE
sql/ha_myisammrg.cc:
  AUTO_INCREMENT support for MERGE
sql/ha_myisammrg.h:
  AUTO_INCREMENT support for MERGE
sql/handler.cc:
  default handler::update_auto_increment now supports HA_AUTO_PART_KEY
2002-07-21 23:55:32 +02:00
unknown
13b326f105 parallel repair: style fixups 2002-07-21 21:01:05 +02:00
unknown
8f09b7053b row0ins.c:
Move the assertion in foreign keys to the right place


innobase/row/row0ins.c:
  Move the assertion in foreign keys to the right place
2002-07-21 13:17:49 +03:00
unknown
81a75051de dict0dict.c:
Revert the test changes to wait for a full push of new auto-inc algorithm


innobase/dict/dict0dict.c:
  Revert the test changes to wait for a full push of new auto-inc algorithm
2002-07-21 13:09:57 +03:00
unknown
b6b2546c18 row0ins.c:
Do not perform ON DELETE action for a FOREIGN KEY constraint if we are doing an UPDATE, not a DELETE
dict0dict.c:
  test


innobase/dict/dict0dict.c:
  test
innobase/row/row0ins.c:
  Do not perform ON DELETE action for a FOREIGN KEY constraint if we are doing an UPDATE, not a DELETE
2002-07-21 12:58:14 +03:00
unknown
792d3de24b Another item on TODO 2002-07-20 15:47:36 +03:00
unknown
6455b39f0e Some small changes 2002-07-20 15:40:02 +03:00
unknown
907c668729 OLAP functionality plus some small bug fixes 2002-07-20 14:51:52 +03:00
unknown
a9c52ff717 Fix wrong usage of constant which could cause mysqld to use index when doing an update/delete on small tables.
code cleanup


Docs/manual.texi:
  changelog
sql/ha_innobase.cc:
  Removed compiler warning
sql/slave.cc:
  Cleanup comments and indentation for suppressing connect warnings
sql/sql_db.cc:
  clean up comment
sql/sql_delete.cc:
  Fix wrong usage of constant which could cause mysqld to use index when doing an update/delete on small tables.
sql/sql_update.cc:
  Fix wrong usage of constant which could cause mysqld to use index when doing an update/delete on small tables.
2002-07-19 21:57:53 +03:00
unknown
887aaff939 fil0fil.c:
Align a buffer for i/o from a raw device


innobase/fil/fil0fil.c:
  Align a buffer for i/o from a raw device
2002-07-19 18:49:25 +03:00
unknown
dda85ba004 os0file.c:
Fix a bug in the previous commit change and align also the buffer in simulataled aio for possible use in i/o to raw devices


innobase/os/os0file.c:
  Fix a bug in the previous commit change and align also the buffer in simulataled aio for possible use in i/o to raw devices
2002-07-19 17:09:40 +03:00
unknown
4ce602e619 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-07-19 14:31:02 +03:00
unknown
dbdc7c65d4 Updated MySQL cert. information.
Removed certification@mysql.com address from manual. Just keep website ref.
2002-07-19 17:02:23 +10:00
unknown
f93fc9b202 Minor fix. 2002-07-19 16:24:17 +10:00
unknown
d0b58e3129 os0file.c:
Align the buffer used in initing a data file to zero; this may be needed if the data file is actually a raw device


innobase/os/os0file.c:
  Align the buffer used in initing a data file to zero; this may be needed if the data file is actually a raw device
2002-07-19 08:33:52 +03:00
unknown
a096aca323 Rearranged layout in section about the mysql cmdline client.
Noted version # for 'prompt' addition to cmdline client.
2002-07-19 15:30:43 +10:00
unknown
2a5894b709 Document LIMIT n,-1 possibility. 2002-07-19 15:01:03 +10:00
unknown
426f636aa3 Removed mirrors listing from manual. Refer to list on website, with info. 2002-07-19 10:16:20 +10:00
unknown
4de71a9565 Mirrors update (for Jim). 2002-07-19 08:30:52 +10:00
unknown
641d725dcb Reset previous width to maintain proper DocBook output. 2002-07-18 16:43:00 +10:00
unknown
33d2542804 Merge work.mysql.com:/home/bk/mysql-4.0
into fred.bitbike.com:/home/arjen/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-07-18 16:38:17 +10:00
unknown
a7c27de7c0 Little shuffle/improvement in 'building from dev.tree' instructions. 2002-07-18 16:11:02 +10:00
unknown
a3472583ea Clarification of replication master-slave compatibility between versions. 2002-07-18 16:06:36 +10:00
unknown
b105a7c905 manual.texi:
Added note about new version numbers.
configure.in:
  Updated version number.

Sorry, bitkeeper keeps messing up.


configure.in:
  Updated version number.
Docs/manual.texi:
  Added note about new version numbers.
2002-07-17 12:40:22 -05:00
unknown
18e0dd1f52 Some
C++ comments cleanup


sql/stacktrace.c:
  C++ comments cleanup
sql/structs.h:
  C++ comments cleanup
sql/ha_myisam.h:
  C++ comments cleanup
include/config-os2.h:
  C++ comments cleanup
include/sslopt-case.h:
  C++ comments cleanup
mysys/mf_tempfile.c:
  C++ comments cleanup
sql/mysql_priv.h:
  C++ comments cleanup
sql/slave.h:
  C++ comments cleanup
sql/time.cc:
  C++ comments cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-07-17 15:17:20 +03:00