Commit graph

1481 commits

Author SHA1 Message Date
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
f15a46eb33 Merge heikki@work.mysql.com:/home/my/mysql
into donna.mysql.fi:/home/heikki/mysqle
2001-05-09 23:09:17 +03:00
unknown
50d5bb5bbf row0sel.c Fix a bug in consistent read through secondary key
innobase/row/row0sel.c:
  Fix a bug in consistent read through secondary key
2001-05-09 23:06:52 +03:00
unknown
c6d9cbfa24 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
2001-05-09 23:02:58 +03: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
f1eb3ce33b Docs/manual.texi
removed porn site



Docs/manual.texi:
  removed porn site
2001-05-07 08:33:34 -06: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
f82415239e manual.texi Fixed a typo in InnoDB record size
Docs/manual.texi:
  Fixed a typo in InnoDB record size
2001-05-04 16:13:45 +03:00
unknown
4b9ade89b1 Docs/manual.texi
added reference to htCheck, and removed some broken links (incidentally, found by htCheck)


Docs/manual.texi:
  added reference to htCheck, and removed some broken links (incidentally, found by htCheck)
2001-05-03 18:18:35 -06: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
045de0a546 row0umod.c Partial fix to concurrent drop table and rollback by other user of rows in that table
row0uins.c	Partial fix to concurrent drop table and rollback by other user of rows in that table


innobase/row/row0uins.c:
  Partial fix to concurrent drop table and rollback by other user of rows in that table
innobase/row/row0umod.c:
  Partial fix to concurrent drop table and rollback by other user of rows in that table
2001-05-03 18:26:19 +03:00
unknown
eef01ff262 univ.i Do not inline on Unix if non-gcc compiler
innobase/include/univ.i:
  Do not inline on Unix if non-gcc compiler
2001-05-03 15:22:43 +03:00
unknown
1a40dcc8bb manual.texi Update MySQL manual about the syntax change to ...LOCK IN SHARE MODE
Docs/manual.texi:
  Update MySQL manual about the syntax change to ...LOCK IN SHARE MODE
2001-05-03 14:48:00 +03: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
491c2cbc50 os0file.c Removed extraneous undef and inclde of aio.h, fixed typecasts to off_t
os0file.c	Removed unnecessary code from os_file_read


innobase/os/os0file.c:
  Removed extraneous undef and inclde of aio.h, fixed typecasts to off_t
2001-05-03 14:16:11 +03:00
unknown
43ea79bde1 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2001-05-03 03:38:10 -05:00
unknown
876707b23b Fixed example that was wrong in manual.
Docs/manual.texi:
  Fixed example that was wrong.
2001-05-03 03:37:29 -05:00
unknown
203c3eeb4c Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
2001-05-03 08:47:34 +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
10f869455f row0sel.c Fixed a typo in the fix to consistent read through a secondary index
innobase/row/row0sel.c:
  Fixed a typo in the fix to consistent read through a secondary index
2001-05-02 18:05:15 +03:00
unknown
68edfdd667 Several minor fixes to manual per Tom.
Docs/manual.texi:
  Several minor fixes per Tom.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-02 05:49:59 -05:00
unknown
9afb49f53c Merge
Docs/manual.texi:
  SCCS merged
2001-05-02 12:18:05 +02:00
unknown
a9d2e5dd17 log0recv.c Add checksum to written pages to check that they are also read in unchanged
buf0buf.h	Add checksum to written pages to check that they are also read in unchanged
buf0flu.c	Add checksum to written pages to check that they are also read in unchanged
buf0buf.c	Add checksum to written pages to check that they are also read in unchanged


innobase/buf/buf0buf.c:
  Add checksum to written pages to check that they are also read in unchanged
innobase/buf/buf0flu.c:
  Add checksum to written pages to check that they are also read in unchanged
innobase/include/buf0buf.h:
  Add checksum to written pages to check that they are also read in unchanged
innobase/log/log0recv.c:
  Add checksum to written pages to check that they are also read in unchanged
2001-05-01 20:57:49 +03:00
unknown
449c819b44 manual.texi fixed paragraph
Docs/manual.texi:
  fixed paragraph
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-01 04:12:23 -04:00
unknown
64dcaea405 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
sql/log_event.cc:
  Auto merged
2001-04-29 16:07:58 +03:00
unknown
eaa2350748 Cleanup
sql/log_event.cc:
  cleanup
sql/mysqld.cc:
  Portability fix for AIX 4.2
  Fix for services on Windows
2001-04-29 16:07:40 +03:00
unknown
d067af6a16 row0sel.c Fix a bug in multiversioned reads through a secondary index
row0uins.c	Partial fix to the DROP TABLE + another user rolls back in that table problem
row0umod.c	Partial fix to the DROP TABLE + another user rolls back in that table problem
os0file.c	Reduce probability of deadlock bugs in connection with ibuf: do not let the ibuf i/o handler sleep


innobase/os/os0file.c:
  Reduce probability of deadlock bugs in connection with ibuf: do not let the ibuf i/o handler sleep
innobase/row/row0uins.c:
  Partial fix to the DROP TABLE + another user rolls back in that table problem
innobase/row/row0umod.c:
  Partial fix to the DROP TABLE + another user rolls back in that table problem
innobase/row/row0sel.c:
  Fix a bug in multiversioned reads through a secondary index
2001-04-27 21:12:15 +03:00
unknown
26f9b9af38 os0file.c Always do fsync after a file write to reduce possibility of a partially written page in an OS crash
buf0rea.c	Fixed a recovery hang associated with ibuf bitmap pages


innobase/buf/buf0rea.c:
  Fixed a recovery hang associated with ibuf bitmap pages
innobase/os/os0file.c:
  Always do fsync after a file write to reduce possibility of a partially written page in an OS crash
2001-04-26 16:36:59 +03:00
unknown
d3eb9d52b8 Merge jamppa@work:/home/bk/mysql into hynda.mysql.fi:/data/my/bk/mysql 2001-04-26 01:13:18 +03:00
unknown
b74fd76c27 Added a new option --result-file to mysqlbinlog.
sql/mysqlbinlog.cc:
  Added option -r.
2001-04-26 01:12:51 +03:00
unknown
3598b1ea76 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-04-25 15:21:47 -06:00
unknown
bc564fd0bc fixed bug in mysqlbinlog 2001-04-25 15:20:59 -06:00
unknown
6510309234 Fixed all mysqldump output to use 'result_file'
client/mysqldump.c:
  Fixed all output to use 'result_file'
mysys/my_error.c:
  cleanup
mysys/raid.cc:
  cleanup
2001-04-26 00:10:43 +03:00
unknown
6ca7bfb9e0 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqlbinlog.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2001-04-25 22:44:57 +03:00
unknown
97907ee8d7 Portability fixes for Ia64 and Sgi compiler
DROP DATABASE in mysqladmin asks for confirmation (again)
Added examined_rows to slow query log
SHOW CREATE for TEMPORARY table


BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5:
  Delete: mysql-test/r/shw000001.result
BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20:
  Delete: mysql-test/t/shw000001.test
Docs/manual.texi:
  Added information about InnoDB and TEMPORARY tables
acinclude.m4:
  Portability fixes
client/errmsg.c:
  merge with libmysqd/errmsg.c
client/mysqladmin.c:
  DROP DATABASE asks for confirmation (again)
client/mysqltest.c:
  Portability fixes
configure.in:
  Portability fixes for SGI compiler on Ia64
extra/resolve_stack_dump.c:
  Portability fixes
include/global.h:
  Portability fixes
isam/_dbug.c:
  Portability fixes
mysql-test/mysql-test-run.sh:
  Portability fixes
mysql-test/r/show_check.result:
  New test for SHOW CREATE
mysql-test/t/show_check.test:
  New test for SHOW CREATE
scripts/make_binary_distribution.sh:
  Added missing files
sql/filesort.cc:
  Added examined_rows to slow query log
sql/log.cc:
  Added examined_rows to slow query log
sql/mysql_priv.h:
  Added examined_rows to slow query log
sql/mysqlbinlog.cc:
  Fixed core dump when using wrong option
sql/mysqld.cc:
  Removed not used argument
sql/sql_base.cc:
  Fixed name problem with SHOW CREATE for TEMPORARY table
sql/sql_class.h:
  Added examined_rows to slow query log
sql/sql_parse.cc:
  Added examined_rows to slow query log
sql/sql_select.cc:
  Added examined_rows to slow query log
sql/sql_select.h:
  Added examined_rows to slow query log
sql/sql_show.cc:
  Fixed SHOW CREATE for TEMPORARY table
sql/sql_table.cc:
  Added examined_rows to slow query log
2001-04-25 22:44:27 +03:00
unknown
d909ccb6dc ha_innobase.cc Changed the error code HA_ERR_KEY_NOT_FOUND to HA_ERR_END_OF_INDEX in index_first to eliminate an error message
sql/ha_innobase.cc:
  Changed the error code HA_ERR_KEY_NOT_FOUND to HA_ERR_END_OF_INDEX in index_first to eliminate an error message
2001-04-25 14:44:35 +03:00
unknown
5744a6353c Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
Docs/manual.texi:
  Auto merged
2001-04-25 11:21:05 +02:00
unknown
87bddedf70 added to Fulltext todo 2001-04-25 11:19:54 +02:00
unknown
61a9643de6 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-04-24 17:40:25 -06:00
unknown
dc394cb9b5 fixed redundant repetition of use db in mysqlbinlog
added support for virtual master ( replicating from a directory with binlogs)
test case for backup/restore with virtual master


client/mysqltest.c:
  fix to accomodate for new test case
mysql-test/mysql-test-run.sh:
  do not automagically start slave
sql/log.cc:
  support for virtual master
sql/log_event.cc:
  fix for mysqlbinlog
sql/log_event.h:
  fix for mysqlbinlog
sql/mysqlbinlog.cc:
  fix for mysqlbinlog
sql/slave.cc:
  virtual master
sql/slave.h:
  virtual master
sql/sql_class.h:
  clean-up/fixes for virtual master
sql/sql_repl.cc:
  cleanup/fixes for virtual master
sql/sql_repl.h:
  virtual master
2001-04-24 17:39:26 -06:00