Commit graph

2699 commits

Author SHA1 Message Date
unknown
3c4e170d80 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-11-07 16:27:30 -07:00
unknown
fa09f2cd7e manager clean-up ( added pid-file and kill in mysql-test-run when things go wrong)
fixes for IO_CACHE
need to pull Monty's fixes - this is not final, will not be pushed


include/my_sys.h:
   IO_CACHE fixes
mysql-test/mysql-test-run.sh:
  manager clean-up
mysys/mf_iocache.c:
  IO_CACHE fix
sql/mysqld.cc:
  more debug messages
tools/mysqlmanager.c:
  added pid-file
2001-11-07 16:17:40 -07:00
unknown
680646c2ae ft_boolean_search.c test
myisam/ft_boolean_search.c:
  test
2001-11-08 00:16:08 +01:00
unknown
b0d3a4779a POSIX.2 compatible fix 2001-11-08 00:14:16 +01:00
unknown
40cb728626 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-11-08 00:08:49 +01:00
unknown
7e6161287e bug in relevance calculation fixed 2001-11-08 00:06:07 +01:00
unknown
4b32cfb18b Fixups. 2001-11-08 08:21:05 +10:00
unknown
7a61edeeca Updated text on stored procedures and triggers. 2001-11-08 07:44:45 +10:00
unknown
b88341bb3b Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.bitbike.com:c:/home/mysql-4.0
2001-11-07 18:28:32 +10:00
unknown
2eb60a56b0 Move link titles to outside @uref{}. Fixup for printed edition. 2001-11-07 18:21:38 +10:00
unknown
1ef27cf04b post-commit Changed to docs-commit@
BitKeeper/triggers/post-commit:
  Changed to docs-commit@
2001-11-07 01:49:38 -06:00
unknown
a0ac4c6446 Fixups and consistency edits for printed edition. 2001-11-07 15:30:32 +10:00
unknown
57a21bea6a Some additional changes for manual copyright text (from Tim Smith). 2001-11-07 13:14:34 +10:00
unknown
177dca1a04 Added descriptive text about copyright of the manual. 2001-11-07 12:07:47 +10:00
unknown
e49cf66e07 Added internal command \! to mysql client which can be used
to execute system commands within the client in UNIX.


client/mysql.cc:
  Added option to run shell commands from the mysql client (\!)
2001-11-06 23:00:03 +02:00
unknown
caf8bee731 Merge stuff 2001-11-06 23:00:02 +02:00
unknown
b37c7d4a3d des_encrypt(), des_decrypt() functions added. Not finally ready yet, so I will clean it up later.
sql/item_strfunc.cc:
  des_encrypt(), des_decrypt() functions added
sql/item_strfunc.h:
  des_encrypt(), des_decrypt() functions added
sql/lex.h:
  des_encrypt(), des_decrypt() functions added
2001-11-06 22:57:14 +02:00
unknown
74e044c0db cleanup 2001-11-06 19:30:19 +01:00
unknown
30f8c66722 Merge
myisam/ft_boolean_search.c:
  SCCS merged
2001-11-06 16:43:47 +01:00
unknown
9e29bb4e01 ft boolean search by table scan; queue_fix()
include/queues.h:
  queue_fix() introduced
myisam/ft_boolean_search.c:
  ft boolean search by table scan
myisam/ft_parser.c:
  ft boolean search by table scan
myisam/ft_update.c:
  ft boolean search by table scan
myisam/ftdefs.h:
  ft boolean search by table scan
mysql-test/r/fulltext_cache.result:
  ft boolean search by table scan
mysql-test/t/fulltext_cache.test:
  ft boolean search by table scan
mysys/queues.c:
  queue_fix() introduced
2001-11-06 16:17:31 +01:00
unknown
cfd9bf3c3c Merge work.mysql.com:/home/bk/mysql-4.0 into black.box:/u/home/tim/my/4
Docs/manual.texi:
  Auto merged
2001-11-06 08:15:07 -05:00
unknown
ded5902f71 Merge
Docs/manual.texi:
  SCCS merged
libmysql/libmysql.c:
  SCCS merged
2001-11-06 07:50:58 -05:00
unknown
5f72364fd4 Oops, late catch of Monty-speak ;-). We're not working against ANSI 99 compliancy..... 2001-11-06 13:39:29 +10:00
unknown
9366590148 Merge jamppa@work:/home/bk/mysql-4.0/
into hynda.mysql.fi:/data/my/bk/mysql-4.0-quick-fixes
2001-11-06 02:56:53 +02:00
unknown
cc8d54fa71 Copyright fixups and typo. From Erik Grandstrom. 2001-11-06 10:56:52 +10:00
unknown
1e570d0a96 Fixed a bug in mysql.cc
client/mysql.cc:
  Fixed a bug with too early freeing for 'charsets_dir'.
2001-11-06 02:29:59 +02:00
unknown
e7014fa157 Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.bitbike.com:c:/home/mysql-4.0
2001-11-06 10:29:58 +10:00
unknown
8d7f3781f8 Rewrite/re-arrange of "How stable is MySQL?" section, as per Monty/Kaj request. 2001-11-06 10:20:16 +10:00
unknown
0c1ce1c33f Do not print a warning message when the server's character set is
not found by the client.  This is especially important for PHP, which
only includes the latin1 character set in the bundled libmysql.


libmysql/libmysql.c:
  Do not print a warning message when the server's character set is
  not found by the client.  (In this case, the client has always fallen
  back on the default character set - this change just turns off the
  warning.)
mysys/charset.c:
  Pass flags in from the outside, instead of hard coding MY_WME, in
  add_charset().
2001-11-05 19:15:45 -05:00
unknown
b109a77331 manual.texi Remove upper-case emphasis (e.g., NOT -> @strong{not})
Docs/manual.texi:
  Remove upper-case emphasis (e.g., NOT -> @strong{not})
2001-11-05 19:08:45 -05:00
unknown
0493640c3d Updated reserved words list (get rid of EVENTS). 2001-11-06 08:53:18 +10:00
unknown
adb703943d Added xml patch to mysqldump.
Made innodb to compile more cleanly with debugging options
enabled. Fixed a few bugs and found a few possible bugs, which
I hope Heikki will check. Comments needs to be fixed too. Some
while() functions should be changed to do ... until for documenting
purposes, because some of them must and will be processed at least
once, or a variable would be used uninitialized.

Regards,
Jani


client/mysqldump.c:
  Added xml output. Patch originally from Gary Huntress, but needed
  a some clean up.
innobase/btr/btr0btr.c:
  cleaner compiling
innobase/btr/btr0cur.c:
  cleaner compiling
innobase/btr/btr0sea.c:
  cleaner compiling / found a bug ??
innobase/buf/buf0buf.c:
  Fixed a bug.
innobase/buf/buf0lru.c:
  Fixed a bug.
innobase/data/data0data.c:
  cleaner compiling
innobase/dict/dict0boot.c:
  cleaner compiling
innobase/dict/dict0crea.c:
  cleaner compiling
innobase/dict/dict0dict.c:
  cleaner compiling
innobase/dict/dict0load.c:
  cleaner compiling
innobase/eval/eval0eval.c:
  cleaner compiling / found a bug ??
innobase/fil/fil0fil.c:
  cleaner compiling
innobase/fsp/fsp0fsp.c:
  cleaner compiling
innobase/ibuf/ibuf0ibuf.c:
  cleaner compiling
innobase/include/btr0btr.ic:
  cleaner compiling
innobase/include/buf0buf.ic:
  cleaner compiling
innobase/include/dict0dict.ic:
  cleaner compiling
innobase/include/ha0ha.ic:
  cleaner compiling
innobase/include/row0mysql.ic:
  cleaner compiling
innobase/include/row0vers.ic:
  cleaner compiling
innobase/include/sync0rw.ic:
  cleaner compiling
innobase/lock/lock0lock.c:
  cleaner compiling
innobase/mem/mem0dbg.c:
  cleaner compiling
innobase/mtr/mtr0mtr.c:
  cleaner compiling
innobase/odbc/odbc0odbc.c:
  cleaner compiling
innobase/os/os0thread.c:
  cleaner compiling
innobase/page/page0cur.c:
  cleaner compiling. while() should be changed to do ... until
  for documenting purposes.
innobase/page/page0page.c:
  cleaner compiling
innobase/pars/pars0opt.c:
  cleaner compiling. while() should be changed to do ... until,
  because it will and must be processed at least once (for documenting
  purposes)
innobase/pars/pars0pars.c:
  cleaner compiling
innobase/que/que0que.c:
  cleaner compiling
innobase/rem/rem0cmp.c:
  cleaner compiling
innobase/rem/rem0rec.c:
  cleaner compiling
innobase/row/row0ins.c:
  cleaner compiling
innobase/row/row0mysql.c:
  cleaner compiling
innobase/row/row0purge.c:
  cleaner compiling
innobase/row/row0sel.c:
  cleaner compiling
innobase/row/row0uins.c:
  cleaner compiling
innobase/row/row0umod.c:
  cleaner compiling
innobase/row/row0upd.c:
  cleaner compiling
innobase/srv/srv0srv.c:
  cleaner compiling
innobase/srv/srv0start.c:
  cleaner compiling
innobase/sync/sync0arr.c:
  cleaner compiling
innobase/sync/sync0rw.c:
  cleaner compiling
innobase/sync/sync0sync.c:
  cleaner compiling
innobase/trx/trx0purge.c:
  cleaner compiling. in theory this could also be a bug, although
  probably not. But the logic needs to be checked, it could be that
  these variables may be used uninitialized.
innobase/trx/trx0rec.c:
  cleaner compiling
innobase/trx/trx0roll.c:
  cleaner compiling
innobase/trx/trx0trx.c:
  cleaner compiling
innobase/trx/trx0undo.c:
  cleaner compiling
2001-11-05 23:48:03 +02:00
unknown
8cba75e56f Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0


sql/sql_yacc.yy:
  Auto merged
Docs/manual.texi:
  Auto merged
2001-11-05 11:11:26 +02:00
unknown
38cae4deb4 sql_yacc.yy des_encrpyt
sql/sql_yacc.yy:
  des_encrpyt
2001-11-05 11:05:15 +02:00
unknown
7fe5963c44 Copy info on WEEK() change in 4.0 from change log to appropriate section.
Typo fix.
2001-11-05 17:58:29 +10:00
unknown
379f5734b0 Another typo fix. Thanks to Bejamin Pflugmann 2001-11-05 09:33:05 +02:00
unknown
92f21400fb Heaps of fixups for MGM/Kaj. 2001-11-05 16:23:38 +10:00
unknown
bf37ac8134 Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.bitbike.com:c:/home/mysql-4.0
2001-11-05 12:48:01 +10:00
unknown
eab8a3a334 Removed UNION from 'things that must be done sometime' in 4.0. Is implemented in 4.0.0. 2001-11-05 12:35:14 +10:00
unknown
51113dc12a Fixup, paragraph lost since 3.23.41 (noted by Carsten Pederson). 2001-11-05 12:30:04 +10:00
unknown
28d20a1d2f Make ft_xxx variables ulong to not break mysqld.cc init of variables.
mysqltest: replace_result now also affects error messages


client/mysqltest.c:
  replace_result now also affects error messages
include/ft_global.h:
  Make variables ulong to not break mysqld.cc init of variables.
myisam/ft_static.c:
  Make variables ulong to not break mysqld.cc init of variables.
mysql-test/r/join.result:
  Fix for 64 bit systems
mysql-test/t/join.test:
  Fix for 64 bit systems
2001-11-05 03:43:00 +02:00
unknown
d18a6cc33a Fixes up things after merge from 3.23.44
Portability fixes.
Don't delete temporary tables on FLUSH tables.


client/client_priv.h:
  Fix after merge
client/mysqldump.c:
  Fix after merge
include/my_global.h:
  Change CMP -> CMP_NUM because CMP was used in other places
include/violite.h:
  Added missing prototype
myisam/ft_boolean_search.c:
  Removed warnings
myisam/ft_nlq_search.c:
  Removed warnings
myisam/mi_search.c:
  CMP -> CMP_NUM
mysql-test/mysql-test-run.sh:
  Write all logs to log directory
mysql-test/r/func_time.result:
  Fix test results after merge
mysql-test/r/having.result:
  Fix test results after merge
mysql-test/r/join.result:
  Fix test results after merge
mysql-test/r/rpl000012.result:
  Fix test results after merge
mysys/mf_iocache.c:
  Allow multiple call to end_iocache.
sql/ha_innobase.cc:
  Removed possible problem with using uninitialized variable
sql/log_event.cc:
  Don't delete temporary tables on FLUSH tables.
  (Needs to be fixed properly)
2001-11-05 01:04:08 +02:00
unknown
cec36f0f14 use local version when doing merge with 3.23.44 2001-11-04 16:14:57 +02:00
unknown
0d1ba873aa merge with 3.23.44
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
include/my_base.h:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/rpl000012.test:
  Auto merged
BUILD/FINISH.sh:
  Auto merged
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
  Auto merged
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
Build-tools/Do-all-build-steps:
  Auto merged
client/client_priv.h:
  Auto merged
client/mysqladmin.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/rpl000015-slave.sh:
  Auto merged
mysql-test/t/rpl000016-slave.sh:
  Auto merged
mysys/mf_cache.c:
  Auto merged
mysys/mf_casecnv.c:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
readline/vi_mode.c:
  Auto merged
strings/strto.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/time.cc:
  Auto merged
BUILD/SETUP.sh:
  Use -mcpu as default (safe for all x86 cpu's)
client/mysqldump.c:
  Merge from 3.23.44
configure.in:
  Update version number
extra/resolveip.c:
  Portability fix
2001-11-04 16:14:09 +02:00
unknown
9f90ff3f12 Fix error messages
mysqltest now also writes failed error messages to log


Docs/manual.texi:
  Applied changes missed in last merge
client/mysqltest.c:
  Write failed error messages to log.
  Remove space from start of line when doing 'eval'
mysql-test/include/master-slave.inc:
  Fixed after adding output of error messages to mysqltest
mysql-test/r/alter_table.result:
  Removed wrong space
mysql-test/r/rpl000001.result:
  Removed wrong space
mysql-test/r/rpl000003.result:
  Fixed after adding output of error messages to mysqltest
mysql-test/r/rpl000015.result:
  Removed wrong space
mysql-test/r/rpl000016.result:
  Removed wrong space
mysql-test/t/drop.test:
  Change error numbers
mysql-test/t/union.test:
  Change error numbers
sql/share/czech/errmsg.txt:
  Fix error messages
sql/share/danish/errmsg.txt:
  Fix error messages
sql/share/english/errmsg.txt:
  Fix error messages
sql/share/french/errmsg.txt:
  Fix error messages
sql/share/german/errmsg.txt:
  Fix error messages
sql/share/greek/errmsg.txt:
  Fix error messages
sql/share/hungarian/errmsg.txt:
  Fix error messages
sql/share/italian/errmsg.txt:
  Fix error messages
sql/share/japanese/errmsg.txt:
  Fix error messages
sql/share/korean/errmsg.txt:
  Fix error messages
sql/share/norwegian-ny/errmsg.txt:
  Fix error messages
sql/share/norwegian/errmsg.txt:
  Fix error messages
sql/share/polish/errmsg.txt:
  Fix error messages
sql/share/portuguese/errmsg.txt:
  Fix error messages
sql/share/romanian/errmsg.txt:
  Fix error messages
sql/share/slovak/errmsg.txt:
  Fix error messages
sql/share/spanish/errmsg.txt:
  Fix error messages
sql/share/swedish/errmsg.txt:
  Fix error messages
sql/share/ukrainian/errmsg.txt:
  Fix error messages
2001-11-04 15:43:41 +02:00
unknown
c76c0836e4 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
sql/mysqld.cc:
  Auto merged
2001-11-03 16:55:39 -07:00
unknown
cd825a1993 more work on IO_CACHE
portability fixes for systems with broken syscalls that do not interrupt on 
a signal
temporary commit - will not be pushed, need to sync up


include/my_sys.h:
  work on READ_APPEND cache
mysys/Makefile.am:
  change to test IO_CACHE
mysys/mf_iocache.c:
  work on READ_APPEND cache
BitKeeper/etc/ignore:
  Added mysys/#mf_iocache.c# mysys/test_io_cache to the ignore list
sql/mysqld.cc:
  make shutdown work on broken systems
sql/sql_repl.cc:
  make sure slave can be stopped on broken systems in all cases, clean-up
2001-11-03 16:54:00 -07:00
unknown
29bae7b7b7 merge
BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
Docs/manual.texi:
  Bad merge.
include/mysqld_error.h:
  Merge with 3.23
2001-11-03 22:28:16 +02:00
unknown
8b91ed2c39 Added STDCALL to mysql_sever and mysql_thread variables
Merged error messages with 3.23.44
Fixed bug with DATA DIRECTORY on windows


Docs/internals.texi:
  Update coding policies
Docs/manual.texi:
  Minor general corrections
acinclude.m4:
  Fixed wrong cpu-test
configure.in:
  Remove CPU test, because this makes unportable binaries.
include/mysql.h:
  Added STDCALL to mysql_sever and mysql_thread variables
include/mysqld_error.h:
  Merged error messages with 3.23.44
libmysql/libmysql.c:
  Added STDCALL to mysql_sever and mysql_thread variables
libmysqld/lib_sql.cc:
  Added STDCALL to mysql_sever and mysql_thread variables
sql-bench/limits/db2.cfg:
  New limits file
sql-bench/test-select.sh:
  Fixed bug in cache test
sql/share/czech/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/danish/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/dutch/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/english/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/estonian/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/french/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/german/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/greek/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/hungarian/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/italian/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/japanese/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/korean/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/norwegian-ny/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/norwegian/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/polish/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/portuguese/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/romanian/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/russian/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/slovak/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/spanish/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/swedish/errmsg.txt:
  Merged error messages with 3.23.44
sql/share/ukrainian/errmsg.txt:
  Merged error messages with 3.23.44
sql/sql_parse.cc:
  Fix bug with DATA DIRECTORY on windows.
sql/sql_select.cc:
  Cleanup
2001-11-03 21:33:11 +02:00
unknown
0176dacd54 Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column is declared as NOT NULL.
BUILD/SETUP.sh:
  Use -O1 to avoid problem with INLINE functions
Docs/manual.texi:
  Changelog
mysql-test/r/join.result:
  Test for bugfix
mysql-test/t/join.test:
  Test for bugfix
sql/sql_select.cc:
  Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column was declared as NOT NULL.
BitKeeper/etc/ignore:
  Added bdb/include/db_ext.h bdb/include/mutex_ext.h to the ignore list
2001-11-03 21:22:06 +02:00