Commit graph

14517 commits

Author SHA1 Message Date
unknown
a542f858bf Added Unique class to be used for duplicate removal in multi-table delete.
mysys/ptr_cmp.c:
  Removed old comments
pstack/bucomm.c:
  Change to use mkstemp.
sql/Makefile.am:
  Added Unique class
sql/filesort.cc:
  Changes to let the Unique class use the old filesort code.
sql/sql_class.h:
  Added Unique class
sql/sql_handler.cc:
  Removed warning.
sql/sql_select.cc:
  Cleaned up typo.
2001-05-23 23:47:08 +03:00
unknown
2f8dfb3f4a srv0srv.h One can now specify innodb_unix_file_flush_method in my.cnf
srv0srv.c	One can now specify innodb_unix_file_flush_method in my.cnf
srv0start.c	One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.cc	One can now specify innodb_unix_file_flush_method in my.cnf
ha_innobase.h	One can now specify innodb_unix_file_flush_method in my.cnf
mysqld.cc	One can now specify innodb_unix_file_flush_method in my.cnf


sql/ha_innobase.cc:
  One can now specify innodb_unix_file_flush_method in my.cnf
sql/ha_innobase.h:
  One can now specify innodb_unix_file_flush_method in my.cnf
sql/mysqld.cc:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0srv.c:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/srv/srv0start.c:
  One can now specify innodb_unix_file_flush_method in my.cnf
innobase/include/srv0srv.h:
  One can now specify innodb_unix_file_flush_method in my.cnf
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-23 18:04:49 +03:00
unknown
4b79972503 Don't write rows in MyISAM tables when using count(distinct)
Don't read MyISAM header when running without locking


include/myisam.h:
  Don't read header when running without locking.
myisam/mi_locking.c:
  Don't update changed flag for temporary files.
myisam/mi_open.c:
  Don't read header when running without locking.
myisam/mi_static.c:
  Don't read header when running without locking.
sql/item_sum.cc:
  Don't write rows in MyISAM tables when using count(distinct)
sql/mysqld.cc:
  Don't read MyISAM header when running without locking.
  Remove -Sg option.
sql/sql_analyse.h:
  Remove duplicate header.
sql/sql_select.cc:
  Cleaned up prototypes.
  Don't write rows to count(DISTINCT) MyISAM tables.
sql/sql_select.h:
  Cleaned up prototypes.
sql/table.h:
  A
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-23 02:40:46 +03:00
unknown
41dd2aa2b5 Remove wrong access check for locks.
Fixed problem with fuzzy dates.


mysql-test/r/func_time.result:
  Added test of fuzzy dates
mysql-test/t/func_time.test:
  Added test of fuzzy dates
sql/item.cc:
  Fixed bug with fuzzy dates
sql/sql_parse.cc:
  Remove wrong access check for locks.
  (This has to be delayed for 4.0 because there is currently now way
  to check for "any of the following privileges"
Docs/manual.texi:
  Changelog
2001-05-23 02:40:24 +03:00
unknown
52f473903a Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2001-05-22 22:29:30 +02:00
unknown
2cc87b411f Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/3
2001-05-22 16:22:12 -04:00
unknown
f58ae5e347 Security fix: LOCK TABLES must check for sufficient privileges.
sql/sql_parse.cc:
  Check table access for SQLCOM_LOCK_TABLES.
2001-05-22 16:21:07 -04:00
unknown
00c7a75380 dict0dict.h InnoDB now tries to provide autoinc column value from a counter table in data dict
dict0mem.h	InnoDB now tries to provide autoinc column value from a counter table in data dict
sync0sync.h	InnoDB now tries to provide autoinc column value from a counter table in data dict
univ.i  	InnoDB now tries to provide autoinc column value from a counter table in data dict
dict0dict.c	InnoDB now tries to provide autoinc column value from a counter table in data dict
dict0mem.c	InnoDB now tries to provide autoinc column value from a counter table in data dict
sync0sync.c	InnoDB now tries to provide autoinc column value from a counter table in data dict
ha_innobase.cc	InnoDB now tries to provide autoinc column value from a counter table in data dict


sql/ha_innobase.cc:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/sync/sync0sync.c:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/dict/dict0mem.c:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/dict/dict0dict.c:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/dict0dict.h:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/dict0mem.h:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/sync0sync.h:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/univ.i:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
2001-05-21 19:04:46 +03:00
unknown
a81daac3a6 .del-violite.c~afa871b4aab14371 Delete: client/violite.c
.del-violite.c~d7b85be615595ace	Delete: sql/violite.c


BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Delete: sql/violite.c
BitKeeper/deleted/.del-violite.c~afa871b4aab14371:
  Delete: client/violite.c
2001-05-20 23:34:36 +02:00
unknown
369401d172 Merge work.mysql.com:/home/bk/mysql-4.0
into x3.internalnet:/home/tonu/bk/mysql-4.0-modified


BitKeeper/etc/logging_ok:
  auto-union
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-05-20 20:41:49 +02:00
unknown
5bb27570d5 mysqld.cc openssl support
sql/mysqld.cc:
  openssl support
2001-05-20 20:36:59 +02:00
unknown
209e37a77f Makefile.am openssl support
missing:
  openssl support
sql/Makefile.am:
  openssl support
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-20 20:32:49 +02:00
unknown
8ec67661b4 Fixed that MySQL compiles again after last merge.
myisam/myisamdef.h:
  Added missing declaration
mysql-test/r/innodb.result:
  Changed test based on result from changed optimizer
sql/mysql_priv.h:
  Fixed wrong prototype
2001-05-20 16:08:09 +03:00
unknown
7abb78bcc6 new qsort
mysys/mf_qsort.c:
  New sort
2001-05-20 13:47:00 +03:00
unknown
4698fbee51 New qsort implementation
sql/sql_handler.cc:
  Fixed insert_fields usage
2001-05-20 13:44:10 +03:00
unknown
17fbf163c0 merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
myisam/mi_search.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
2001-05-20 12:38:19 +02:00
unknown
ee896803fe Force close of sockets on HPUX 10.20
Support option lines longer than 256 chars.
Close the slow log at shutdown.
Always allow debug options to mysqld.
Change some DBUG_PRINT tags.


Docs/manual.texi:
  Small cleanups
configure.in:
  Force close of sockets on HPUX 10.20
mysql-test/t/merge.test:
  Remove used tables
mysys/default.c:
  Support option lines longer than 256 chars.
mysys/mf_keycache.c:
  Split check_keycache tags
sql/mysqld.cc:
  Move things to 'cleanup'.
  Close the slow log at shutdown.
  Always allow debug options
sql/violite.c:
  Change the error tag to vio_error
2001-05-19 10:14:05 +03:00
unknown
ebe9b6071a Fixed bug when using MERGE on files > 4G
Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
Changed that tmp_table_size =4G-1 means unlimited.


Docs/manual.texi:
  Added new section about crashed MyISAM tables.
  Cleaned up subsections for InnoDB
client/mysql.cc:
  Cleanup
myisam/mi_rkey.c:
  Cleanup
myisam/mi_search.c:
  Fixed wrong casts in debug messages
myisammrg/myrg_rrnd.c:
  Fixed bug when using files > 4G
mysys/getvar.c:
  Changed to use longlong to support arguments up to 4G
mysys/thr_lock.c:
  Fix for delay insert
sql/mysqld.cc:
  Increased default size for temporary tables
sql/sql_base.cc:
  Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
sql/sql_insert.cc:
  Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
sql/sql_select.cc:
  Changed that tmp_table_size =4G-1 means unlimited.
2001-05-17 00:46:50 +03:00
unknown
83e3058c3e Merge
Docs/manual.texi:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  SCCS merged
2001-05-15 20:55:40 +02:00
unknown
fe983ca7b3 Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0 2001-05-15 21:24:07 +03:00
unknown
c23dbe674d Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/3
2001-05-14 20:42:20 -04:00
unknown
7665a6f137 sql/stacktrace.c
fixed frame depth since we now are a frame deeper 
    on Alpha, use SP instead of FP



sql/stacktrace.c:
  fixed frame depth since we now are a frame deeper 
  on Alpha, use SP instead of FP
2001-05-14 14:11:26 -06:00
unknown
aa07f65cae Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/3


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged
2001-05-14 14:23:45 -04:00
unknown
476625dd63 Cleanup up stacktrace code
Updated qsort source from glibc.
Add debugging of keycache when EXTRA_DEBUG is specified


Docs/manual.texi:
  Added new contrib stuff
bdb/dist/Makefile.in:
  Don't automaticly checkout things from bk
mysys/mf_keycache.c:
  Add debugging of keycache when EXTRA_DEBUG is specified.
mysys/mf_qsort.c:
  Updated qsort source from glibc.
sql/Makefile.am:
  Cleanup up stacktrace code
sql/mysqld.cc:
  Cleanup up stacktrace code
2001-05-14 01:12:40 +03:00
unknown
b7b7eb9c05 option to free_root() to not my_free() the blocks
fixed bug/updated count_distinct2 test
changed reset in count distinct to avoid calls to my_free()


include/my_sys.h:
  option to free_root() not to do my_free()
include/my_tree.h:
  reset_tree()
mysql-test/r/count_distinct2.result:
  added group by test
mysql-test/t/count_distinct2.test:
  group by test + fixed bug - need to drop table
mysys/my_alloc.c:
  mark_blocks_free()
mysys/tree.c:
  reset_tree()
sql/item_sum.cc:
  in count distinct reset_tree instead of delete_tree
2001-05-12 19:50:51 -06:00
unknown
6498429624 fixes/optimizations for count(distinct)
more extensive testing of count(distinct)


sql/item_sum.cc:
  fixes/optimizations for count(distinct)
2001-05-12 17:52:54 -06:00
unknown
a51554b922 Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0
sql/sql_select.cc:
  Auto merged
2001-05-12 14:05:24 +03:00
unknown
e5f9ca3d75 Only mark MERGE readonly if all tables are readonly
Optimize some queries when using LIMIT


merge/open.c:
  Only mark MERGE readonly if all tables are readonly
myisammrg/myrg_open.c:
  Only mark MERGE readonly if all tables are readonly
sql/sql_select.cc:
  Optimize some queries when using LIMIT
2001-05-12 14:03:53 +03:00
unknown
9c3297c9b2 Added information about using mysql-max
sql/mysqld.cc:
  Fixes for Alpha cc compiler
support-files/my-huge.cnf.sh:
  cleanup
support-files/my-large.cnf.sh:
  cleanup
support-files/my-medium.cnf.sh:
  cleanup
support-files/my-small.cnf.sh:
  cleanup
2001-05-12 09:24:35 +03:00
unknown
442e091f62 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-05-12 01:01:27 +03:00
unknown
6433cf75e7 cleanup
Docs/manual.texi:
  Updated gdb / trace information
innobase/pars/pars0grm.c:
  Removed warning on windows
mysys/mf_keycache.c:
  Changed "exec" to "check_keycache"
sql/mysqld.cc:
  Added suffix for windows binaries
2001-05-12 01:00:46 +03:00
unknown
1d56c0324e use tree for count(distinct) when possible
include/my_tree.h:
  fixed typo in comment
mysys/tree.c:
  fixed typo in comment
sql/item_sum.h:
  use tree for count distinct when possible
2001-05-11 15:07:34 -06:00
unknown
5e52875b8f ALTER TABLE ... DISABLE KEYS / ALTER TABLE ... ENABLE KEYS 2001-05-11 22:26:12 +02:00
unknown
89d6e639ae change tree to use qsort_cmp2 - compare function with 3 instead of 2 arguments
include/global.h:
  qsort_cmp2
include/my_tree.h:
  use qsort_cmp2
myisam/ft_boolean_search.c:
  use qsort_cmp2
myisam/ft_nlq_search.c:
  use qsort_cmp2
myisam/ft_parser.c:
  use qsort_cmp2
myisam/ft_stopwords.c:
  use qsort_cmp2
myisam/myisampack.c:
  use qsort_cmp2
mysys/tree.c:
  use qsort_cmp2
sql/sql_analyse.cc:
  use qsort_cmp2
sql/sql_analyse.h:
  use qsort_cmp2
2001-05-10 18:14:15 -06:00
unknown
174fdf05a1 fixes after merge. Now it compiles and passes the test suite
Docs/manual.texi:
  fixed bug from merge
sql/sql_delete.cc:
  examined rows fix
sql/sql_select.cc:
  fix bugs from merge
sql/sql_update.cc:
  examined rows merge completion
sql/sql_yacc.yy:
  fixed bugs from merge
2001-05-10 17:08:29 -06:00
unknown
9192600eb7 Merged with 3.23, needs further fix-up
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
include/myisam.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
  Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
Docs/manual.texi:
  merged
client/errmsg.c:
  merged
configure.in:
  merged
sql/mysqld.cc:
  merged
sql/sql_select.cc:
  merged, needs manual fixing
sql/sql_yacc.yy:
  merged, needs manual fixing
2001-05-10 15:06:35 -06:00
unknown
b59b5f4b6e sql/mysqld.cc
put back the things that the merge removed


sql/mysqld.cc:
  put back the things that the merge removed
2001-05-09 22:42:49 -06:00
unknown
a4a4a1c29e merged
sql/mysqld.cc:
  merged - need to fix
2001-05-09 22:29:21 -06:00
unknown
68ebea2d6f stack trace updates:
limited support on Alpha - in general case, even with frame pointer,
stack trace on alpha is impossible without looking at the symbol table
frame pointer does get saved on the stack, but you have no idea where
and where the return address is saved. So the best we can do without
the symbol table is look for magic opcodes and try to guess how big 
each frame is and where the return address was hidden from the 
instruction parameters. In practice, we can usually go up 3-4 frames 
before we hit some nasty frame that the current code cannot figure
out. This is actually not too bad, especially when we already have the query

Also cleaned up messages, print more variables, tell the user of
how much memory mysqld could potentially use, and warn of
what can happen with default STACK_SIZE and a lot of connections if
coredump happens when there are more than 200 connections. 


sql/mysqld.cc:
  stack trace updates
2001-05-09 22:22:04 -06:00
unknown
0fece375f2 Applied patches for BDB tables
Fixes to InnoDB to compile on Windows
Fix for temporary InnoDB tables
Fixed bug in REPLACE()
Fixed sub char keys for InnoDB


Docs/manual.texi:
  Changelog + update of table types
bdb/include/log.h:
  Patch from Sleepycat
bdb/log/log.c:
  Patch from Sleepycat
bdb/log/log_rec.c:
  Patch from Sleepycat
client/mysqladmin.c:
  Cleanup
innobase/include/univ.i:
  Fix for compilation on Windows
innobase/os/os0file.c:
  cleanup
innobase/pars/pars0grm.y:
  Fix for compilation on Windows
mysql-test/r/innodb.result:
  New test case
mysql-test/t/innodb.test:
  New test case
sql/ha_innobase.cc:
  cleanup
sql/ha_innobase.h:
  Fix for prefix keys
sql/handler.h:
  Fix for temporary Innodb tables
sql/item_strfunc.cc:
  Fixed bug in REPLACE()
sql/lock.cc:
  Fix for temporary Innodb tables
sql/mysqld.cc:
  Added --skip-stack-trace
sql/share/english/errmsg.txt:
  Better error messages
sql/sql_base.cc:
  Fix for temporary Innodb tables
sql/sql_select.cc:
  Fix for temporary Innodb tables
sql/sql_table.cc:
  Fixed sub char keys for InnoDB
sql/table.h:
  Fix for temporary Innodb tables
2001-05-09 23:02:36 +03:00
unknown
2321260ff0 Merge
sql/sql_yacc.yy:
  Auto merged
Docs/manual.texi:
  SCCS merged
2001-05-05 09:44:25 +03:00
unknown
62bff11cb4 Added LOAD DATA CONCURRENT
Docs/manual.texi:
  Update information about REPAIR and optimize
scripts/mysqlhotcopy.sh:
  Changed Alpha -> Beta
sql/sql_yacc.yy:
  A
2001-05-05 09:41:47 +03:00
unknown
d6ad4beed3 better error message in replication when packet is too large
sql/mini_client.cc:
  pass along ER_NET_PACKET_TOO_LARGE
sql/slave.cc:
  better error message when the packet is too large in slave thread
2001-05-03 17:27:35 -06:00
unknown
9167c80312 Docs/manual.texi
fixed bug
sql/sql_repl.cc
    undid virtual master change



Docs/manual.texi:
  fixed bug
sql/sql_repl.cc:
  undid virtual master change
2001-05-03 16:01:13 -06:00
unknown
a605a9f0b6 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-05-03 11:58:35 -06:00
unknown
70f585cbd6 reversed virtual master
BitKeeper/deleted/.del-binlog-backup-restore.test~d5b0b9bd83738a9f:
  Delete: mysql-test/t/binlog-backup-restore.test
BitKeeper/deleted/.del-binlog-backup-restore.result~605de78abda64d27:
  Delete: mysql-test/r/binlog-backup-restore.result
2001-05-03 11:46:49 -06:00
unknown
5461e6717c sql_yacc.yy changed ...IN SHARE MODE to ...LOCK IN SHARE MODE to resolve a parsing bug after a WHERE clause
sql/sql_yacc.yy:
  changed ...IN SHARE MODE to ...LOCK IN SHARE MODE to resolve a parsing bug after a WHERE clause
2001-05-03 14:41:03 +03:00
unknown
0f71614290 Fixed bug from last commit
Docs/manual.texi:
  Changelog
2001-05-03 08:46:58 +03:00
unknown
6c12715595 Fixed a bug with SELECT DISTINCT and HAVING
Docs/manual.texi:
  Update AIX information
support-files/Makefile.am:
  Removed mysql-max spec
2001-05-02 23:39:05 +03:00
unknown
9afb49f53c Merge
Docs/manual.texi:
  SCCS merged
2001-05-02 12:18:05 +02:00