Commit graph

4100 commits

Author SHA1 Message Date
unknown
4da6a2c149 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-06-17 21:00:50 +03:00
unknown
4caf38387a My previous patch was not good at all.
This one is better, but should not be final.

Better fix is to make some changes in ha_myisammrg::index_read

This patch also reverts my previous one ...
2002-06-17 20:58:09 +03:00
unknown
32f658101b redo some changes lost after I messed up local repository 2002-06-17 11:37:31 -05:00
unknown
c99fd2caef Ensure that share->tot_locks s updated correctly
This fixes that mysamchk --sort-records works on windows.


myisam/mi_check.c:
  Ensure that share->tot_locks s updated correctly
myisam/mi_close.c:
  Ensure that share->tot_locks s updated correctly
myisam/mi_dynrec.c:
  Ensure that share->tot_locks s updated correctly
myisam/mi_open.c:
  Ensure that share->tot_locks s updated correctly
myisam/mi_statrec.c:
  Ensure that share->tot_locks s updated correctly
myisam/myisamchk.c:
  Ensure that share->tot_locks s updated correctly
2002-06-17 12:34:19 +03:00
unknown
c47044f0ae Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-06-17 09:46:38 +03:00
unknown
2fd3251541 Added MYSQL_PS1 to environment variables section. 2002-06-17 11:54:45 +10:00
unknown
9bcf5111d0 Typo fix and sentence cleanup in post-commit script. 2002-06-17 09:44:39 +10:00
unknown
2d6be1fff9 Changelog cleanup. 2002-06-17 08:15:05 +10:00
unknown
414b9af153 Merge work.mysql.com:/home/bk/mysql-4.0
into fred.bitbike.com:/home/arjen/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-06-17 08:00:47 +10:00
unknown
8a8e4be22f Cleanup of checking of user resources
Added missing checking of no_keyread


Docs/manual.texi:
  Fixed wrong example
myisam/myisamchk.c:
  Removed not needed include file
mysys/my_pthread.c:
  Fix for HPUX
mysys/my_thr_init.c:
  Removed not needed warning
scripts/mysql_fix_privilege_tables.sh:
  Cleanup
sql/sql_lex.cc:
  Removed not needed initialization
sql/sql_parse.cc:
  Cleanup of checking of user resources
sql/sql_select.cc:
  Added checking of no_keyread
2002-06-16 17:06:12 +03:00
unknown
e9c43803dd Fixed a bug in optimiser with MERGE tables with non-unique values
with aggregating functions.

This consistently crashed Mysql
2002-06-15 20:59:42 +03:00
unknown
451a5e510b A fix for a bug which hits the optimiser when trying to group keys
for a seemingly impoosbile conds in WHERE....

This crashed MySQL in 4.0.2


Docs/manual.texi:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
mysql-test/r/select.result:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
mysql-test/t/select.test:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
sql/opt_range.cc:
  A fix for a bug which hits the optimiser when trying to group keys
  for a seemingly impoosbile conds in WHERE....
2002-06-15 14:56:35 +03:00
unknown
52eab5dca2 Merge
Docs/manual.texi:
  SCCS merged
2002-06-14 15:15:24 +03:00
unknown
4a1b497899 Fixed a rare bug when fulltext index is present and no tables are used.
A better fix would be to have a map of tables that are not used at all, 
and to annul just fledls in that TABLE.
2002-06-14 15:06:01 +03:00
unknown
501839ae29 Merge
BitKeeper/etc/logging_ok:
  auto-union
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
client/mysqldump.c:
  SCCS merged
2002-06-14 15:24:22 +04:00
unknown
8451d47ac7 This is just code style/minor optimizations cleanup changeset
client/mysqldump.c:
  Changes adviced by Monty
include/my_aes.h:
  Changes adviced by Monty
include/rijndael.h:
  Changes adviced by Monty
include/sha1.h:
  Changes adviced by Monty
mysys/my_aes.c:
  Changes adviced by Monty
mysys/rijndael.c:
  Changes adviced by Monty
mysys/sha1.c:
  Changes adviced by Monty
sql/item_strfunc.cc:
  Changes adviced by Monty
2002-06-14 15:14:30 +04:00
unknown
66af829427 Some style and consistency cleanups.
Adjusting target versions for implementation of new features.
Removed already implemented features from todo.
2002-06-14 18:50:17 +10:00
unknown
9cac831800 Style change for grant access privileges.
Fixed typo ("create temporary table" privilege is really "create temporary tables" privilege).
2002-06-14 15:46:36 +10:00
unknown
c2577b4dbb Fixed one inconsistency in previous priv-names style edit.
Fix some grammatical errors using 's instead of s for plural.
2002-06-14 12:02:53 +10:00
unknown
22bb27ce11 Added bk marker date for 3.23.51 in manual. 2002-06-14 11:07:27 +10:00
unknown
151e415fad Update reserved word list.
Docs/Support/update-reserved-words.pl:
  Issue a bk edit before changing the manual file.
2002-06-14 09:36:39 +10:00
unknown
d7690689d6 Merge work.mysql.com:/home/bk/mysql-4.0
into fred.bitbike.com:/home/arjen/mysql-4.0
2002-06-14 09:26:27 +10:00
unknown
0ea0993cfb Some small changes in multi-table update "ported" from mulit-table
delete.
2002-06-13 17:08:27 +03:00
unknown
664b219a72 Merge
Docs/mirrors.texi:
  SCCS merged
2002-06-13 12:15:06 +03:00
unknown
4a268d2051 mirrors.texi:
update mirrors


Docs/mirrors.texi:
  update mirrors
2002-06-13 12:01:51 +03:00
unknown
5822fbfc7e Style cleanups. 2002-06-13 15:20:59 +10:00
unknown
3300edcf24 Style/spelling fixups, mainly of new privileges. 2002-06-13 14:31:10 +10:00
unknown
1b1cfcb84e Translated new error message to Dutch. 2002-06-13 09:46:55 +10:00
unknown
c554eeec98 Remove remains of old getopt
sql/sql_delete.cc:
  Removed unnecessary code
2002-06-12 23:54:52 +03:00
unknown
33e636cbb4 Added missing include file to sql_acl.cc (bug in last changeset)
Docs/manual.texi:
  Updated Table is full section.
client/mysql.cc:
  Applied patch for fixing tee()
sql/sql_acl.cc:
  Added include file
2002-06-12 17:35:04 +03:00
unknown
e91d0d898b Merge work:/home/bk/mysql-4.0 into mashka.mysql.fi:/my/mysql-4.0
Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-06-12 15:08:22 +03:00
unknown
0724f98e67 Added the following new privleges:
SHOW DATABASES
CREATE TEMPORARY TABLE
LOCK TABLES
REPLICATION SLAVE & REPLICATION CLIENT
SUPER
EXECUTE

All scripts & documentation is updated for this change.
Added better error messages for global privileges 


BitKeeper/deleted/.del-mysql_new_fix_privilege_tables.sh~b1664b401375eece:
  Delete: scripts/mysql_new_fix_privilege_tables.sh
Docs/manual.texi:
  Updated manual for privilege changes.
include/mysqld_error.h:
  new error messages
mysql-test/install_test_db.sh:
  Updated to use new privileges
mysql-test/r/grant_cache.result:
  Updated to use new privileges
mysql-test/r/rpl000017.result:
  Updated to use new privileges
mysql-test/t/rpl000017.test:
  Updated to use new privileges
mysys/safemalloc.c:
  Cleanup
scripts/mysql_fix_privilege_tables.sh:
  Updated to use new privileges
scripts/mysql_install_db.sh:
  Updated to use new privileges
sql/field.h:
  Cleanup
sql/item_strfunc.cc:
  Updated to use new privileges
sql/lex.h:
  Updated to use new privileges
sql/log.cc:
  Updated to use new privileges
sql/mysql_priv.h:
  Updated to use new privileges
sql/mysqld.cc:
  Updated to use new privileges
sql/repl_failsafe.cc:
  Updated to use new privileges
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
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/slave.cc:
  Portability cleanup
sql/sql_acl.cc:
  Updated to use new privileges
sql/sql_acl.h:
  Updated to use new privileges
sql/sql_base.cc:
  Remove not used include file
sql/sql_class.cc:
  Comment cleanup
sql/sql_class.h:
  Updated to use new privileges
  Comment cleanups
sql/sql_insert.cc:
  Updated to use new privileges
sql/sql_lex.h:
  Indentation cleanup
sql/sql_parse.cc:
  Updated to use new privileges
sql/sql_repl.cc:
  Updated to use new privileges
  Comment cleanup
sql/sql_show.cc:
  Updated to use new privileges
sql/sql_yacc.yy:
  Updated to use new privileges
  Sorted some tockens for easer merge to 4.1 in the future.
sql/table.h:
  Updated to use new privileges
tests/grant.pl:
  Updated to use new privileges
tests/grant.res:
  Updated to use new privileges
2002-06-12 15:04:18 +03:00
unknown
70aedf591f Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-06-11 22:47:12 +03:00
unknown
bf95234b05 A fix for multi-table delete with tables optimised away.
Still not able to make a proper test case as this crashes on files 
where key and data pointers are 4 bytes each. Possibly a proper 
test case would require myisampack.


sql/sql_lex.cc:
  Just in case ...
2002-06-11 22:45:51 +03:00
unknown
ad8c639af8 manual.texi fix prefix/suffix mixup.
Docs/manual.texi:
  fix prefix/suffix mixup.
2002-06-11 11:02:50 -05:00
unknown
2325b78d12 Merge linux.local:/data/mysql-4.0-root into linux.local:/data/mysql-4.0 2002-06-11 13:56:58 +04:00
unknown
b6afdd09db This changeset is mostly new version of previous commit modified according
to Monty's code style and optimization comments 


client/client_priv.h:
  New value for --single-transaction option
client/mysqldump.c:
  Add --single-transaction option for consistent dumps
mysql-test/r/func_str.result:
  New functions test results
mysql-test/t/func_str.test:
  Tests for SHA/AES functions
mysys/Makefile.am:
  Extra files require compilation now
sql/item_create.cc:
  New functions
sql/item_create.h:
  New functions
sql/item_strfunc.cc:
  Implementation of SHA/AES_ENCRYPT/AES_DECRYPT
sql/item_strfunc.h:
  Required class definition
sql/lex.h:
  Add symbols for implemented functions
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-06-11 13:37:48 +04:00
unknown
70aa7424c4 Big code cleanup/review before 4.0.2 release.
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.


BUILD/SETUP.sh:
  Added -DPEDANTIC_SAFEMALLOC as standard debug option
Docs/manual.texi:
  Changes for new version.
client/mysql.cc:
  Fixed default value for rehash
  cleanup
client/mysqladmin.c:
  Cleanup
client/mysqlbinlog.cc:
  cleanup
client/mysqldump.c:
  Cleanup
client/mysqlmanager-pwgen.c:
  Cleanup
client/mysqlmanagerc.c:
  Cleanup
client/mysqltest.c:
  Cleanup
dbug/dbug.c:
  Cleanup
extra/resolve_stack_dump.c:
  Cleanup & Simple optimizations
include/ft_global.h:
  Cleanup
include/my_alloc.h:
  Cleanup
include/my_global.h:
  Cleanup
include/my_sys.h:
  Cleanup
include/myisam.h:
  Cleanup
libmysql/libmysql.c:
  Cleanup
libmysql/manager.c:
  Cleanup
myisam/ft_boolean_search.c:
  Cleanup
myisam/ft_dump.c:
  Change strcpy -> strmov
myisam/ft_eval.c:
  Cleanup
myisam/ft_nlq_search.c:
  Cleanup
myisam/ft_test1.c:
  strncpy -> strnmov
myisam/ft_update.c:
  Cleanup
myisam/mi_static.c:
  Cleanup
myisam/mi_test2.c:
  Cleanup
myisam/mi_write.c:
  Cleanup
mysys/mf_fn_ext.c:
  Cleanup
mysys/mf_iocache.c:
  Cleanup
mysys/mf_iocache2.c:
  Cleanup
mysys/my_getopt.c:
  Cleanup
mysys/my_read.c:
  Cleanup
mysys/my_thr_init.c:
  Cleanup
mysys/queues.c:
  Cleanup
mysys/safemalloc.c:
  Cleanup
sql/field.cc:
  Indentation cleanups
sql/ha_berkeley.cc:
  Indentation cleanups
sql/ha_myisam.cc:
  Cleanup
sql/item.h:
  Indentation cleanups
sql/item_cmpfunc.cc:
  Indentation cleanups
sql/item_create.cc:
  cleanup
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Indentation cleanups
sql/item_strfunc.cc:
  Indentation cleanups
sql/item_sum.cc:
  Indentation cleanups
sql/item_timefunc.cc:
  Indentation cleanups
sql/lock.cc:
  Indentation cleanups
sql/log.cc:
  Cleanup
  strnmov -> strmake
sql/log_event.cc:
  Cleanup + optimizations
  Fixed memory leak
  Added missing pthread_mutex_unlock()  (On error condition)
sql/log_event.h:
  Indentation and comment cleanup
  Merged #ifdef's into common blocks for better readability
sql/mini_client.cc:
  Indentation cleanup
sql/mysql_priv.h:
  Cleanup
  Changed int function to bool
sql/mysqld.cc:
  Indentation and comment cleanup
sql/net_pkg.cc:
  Indentation cleanup
sql/net_serv.cc:
  Changed int function -> bool
sql/nt_servc.cc:
  Cleanup
sql/opt_range.cc:
  Indentation cleanup
sql/repl_failsafe.cc:
  Cleanup + simple optimization
  strnmov -> strmake
sql/slave.cc:
  strnmov -> strmake
  Cleanups
sql/slave.h:
  Cleanup
sql/sql_acl.cc:
  Indentation and DBUG_PRINT cleanup
  Changed WITH MAX... to not use =
sql/sql_base.cc:
  Indentation cleanup
sql/sql_cache.cc:
  Indentation cleanup
sql/sql_class.cc:
  Indentation cleanup
sql/sql_class.h:
  Renamed some struct slots
sql/sql_delete.cc:
  Indentation cleanup
sql/sql_handler.cc:
  Indentation cleanup
sql/sql_insert.cc:
  Use new slot names.
sql/sql_lex.cc:
  Indentation cleanup
sql/sql_lex.h:
  Indentation cleanup
sql/sql_load.cc:
  Indentation cleanup
sql/sql_parse.cc:
  Indentation cleanup
  Removed not used check from LOCK TABLES
sql/sql_repl.cc:
  strnmov -> strmake
sql/sql_repl.h:
  Removed test if file is included (We want to know if it's included twice to avoid this)
sql/sql_select.cc:
  Indentation cleanup
sql/sql_show.cc:
  Indentation cleanup
sql/sql_string.cc:
  Indentation cleanup
sql/sql_table.cc:
  Indentation cleanup
sql/sql_union.cc:
  Use renamed struct slot
sql/sql_update.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Removed = after GRANT ... MAX_  to make the syntax uniform
sql/table.cc:
  Indentation cleanup
sql/table.h:
  Indentation cleanup
sql/time.cc:
  Indentation cleanup
sql/udf_example.cc:
  Indentation cleanup
sql/unireg.cc:
  strnmov -> strmake
tests/grant.pl:
  Added test for LOCK TABLES
tools/mysqlmanager.c:
  Cleanup
  fopen() -> my_fopen()
vio/viosocket.c:
  DBUG_PRINT cleanups
vio/viosslfactories.c:
  Indentation cleanup
  Checking of results from malloc()
  Fixed possible memory leak
BitKeeper/etc/ignore:
  Added scripts/mysql_secure_installation to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-06-11 11:20:31 +03:00
unknown
30d5eb2287 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-06-10 13:34:41 +03:00
unknown
45e0cd6129 Fixed bug in SQL_CALC_FOUND_ROWS + LIMIT
Docs/manual.texi:
  Changelog
mysql-test/r/select_found.result:
  Test of FOUND_ROWS() bug fix
mysql-test/t/select_found.test:
  Test of FOUND_ROWS() bug fix
2002-06-10 13:33:25 +03:00
unknown
5de96e3bac Some enhancements in my_getopt. Made code more readable and better
optimized in some places.
2002-06-09 23:27:07 +03:00
unknown
3a395a994a Bug fix for complicated GROUP BY ... ORDER BY query.
Fixed problem in access rights testing (from last patch)


mysql-test/r/group_by.result:
  Condenced GROUP test case
mysql-test/t/group_by.test:
  Condenced GROUP test case
sql/sql_parse.cc:
  Fixed problem in access rights testing (from last patch)
sql/sql_select.cc:
  Rollback Sinisa's GROUP BY patch and make a better one.
2002-06-09 15:41:19 +03:00
unknown
a9a49dc380 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_parse.cc:
  Auto merged
2002-06-09 09:15:23 +03:00
unknown
7845e7f5c0 Fixed privilege check problem with SELECT ... INTO OUTFILE
sql/sql_parse.cc:
  Fixed privilege check problem with SELECT ... INTO OUTFILE
tests/grant.pl:
  Testing of grant problem with SELECT ... INTO OUTFILE
tests/grant.res:
  Testing of grant problem with SELECT ... INTO OUTFILE
2002-06-09 09:14:25 +03:00
unknown
7220f1682f Added changelog entry for mysql_secure_installation 2002-06-08 23:16:01 -05:00
unknown
9ce87cdee4 Oops, missed the actual file.
Added mysql_secure_installation
2002-06-08 23:12:39 -05:00
unknown
2d43d6848f Added mysql_secure_installation 2002-06-08 23:10:42 -05:00
unknown
168efb92ce Merge jcole@work.mysql.com:/home/bk/mysql-4.0
into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0


configure.in:
  Auto merged
2002-06-08 23:08:15 -05:00
unknown
a47f9028c0 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2002-06-09 00:59:31 +03:00
unknown
6a2eec80b0 removed unneeded table name pointer
transaction-live memory cleanup moved to ha_commit/ha_rollback
fixed query cache validator to work correctly on systems that allocate unaligned dat


sql/handler.cc:
  transaction-live memory cleanup moved to ha_commit/ha_rollback
sql/sql_cache.cc:
  removed unneeded table name pointer
  fixed debug enter message
  fixed query cache validator to work correctly on systems that allocate unaligned data
sql/sql_class.cc:
  removed unneeded table name pointer
sql/sql_parse.cc:
  transaction-live memory cleanup moved to ha_commit/ha_rollback
sql/table.h:
  removed unneeded table name pointer
2002-06-09 00:58:05 +03:00