Commit graph

3128 commits

Author SHA1 Message Date
unknown
741b75b1c7 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-01-27 22:08:28 +02:00
unknown
83666b3e54 misc replication bugfixes including some needed modifications in IO_CACHE
likely() and unlikely() branch prediction compiler hint macros
clean-up of comments


include/my_global.h:
  added likely() and unlikely() macros to help some compilers optimize
  the code for architecture-specific branch prediction policies
include/my_sys.h:
  coverted my_b_append_tell() from macro to a function as it needed to be more
  complex to avoid a potential race condition
mysql-test/mysql-test-run.sh:
  hostname-independent relay log name to have consistent SHOW SLAVE STATUS
  output
mysql-test/r/rpl000014.result:
  result update
mysql-test/r/rpl000015.result:
  result update
mysql-test/r/rpl000016.result:
  result update
mysql-test/r/rpl_log.result:
  result update
mysql-test/t/rpl000017-slave.sh:
  proper cleanup of old logs
mysys/mf_iocache.c:
  cosmetic changes + more debugging asserts
mysys/mf_iocache2.c:
  my_b_append_tell()
  cleanup of comments
sql/log.cc:
  fix potential bug - do not rotate log in the middle of event
sql/slave.cc:
  do not write stop events when the server does not actually stop but just 
  rotates the log
  fixed race between queue_event() and show_slave_status()
  clean-up of comments
sql/slave.h:
  added ignore_stop_event flag to SLAVE_LOG_INFO
2002-01-26 22:26:24 -07:00
unknown
2e0096454b merge 2002-01-26 01:24:38 +02:00
unknown
48ff048f8f Update needed for SuSE 7.3
Update for autoconf 2.52


BitKeeper/deleted/.del-compile-pentium-symbols~b1b0f0b465eb15b8:
  Delete: BUILD/compile-pentium-symbols
BUILD/Makefile.am:
  Remove not used scripts
BUILD/SETUP.sh:
  Update needed for SuSE 7.3
BUILD/compile-alpha:
  Update needed for SuSE 7.3
BUILD/compile-pentium-debug-no-bdb:
  Update needed for SuSE 7.3
BUILD/compile-pentium-gcov:
  Update needed for SuSE 7.3
BUILD/compile-pentium-gprof:
  Update needed for SuSE 7.3
BUILD/compile-pentium-mysqlfs-debug:
  Update needed for SuSE 7.3
BUILD/compile-pentium:
  Update needed for SuSE 7.3
Docs/manual.texi:
  changelog
Docs/mysqld_error.txt:
  New error messages.
acconfig.h:
  Update to autoconf 2.52
acinclude.m4:
  Update to autoconf 2.52
bdb/dist/configure.in:
  Update to autoconf 2.52
configure.in:
  Update to autoconf 2.52
myisam/mi_check.c:
  Fix for myisamchk bug when reparing table with many keys.
myisam/mi_key.c:
  Fix problem with NAN in key's
scripts/Makefile.am:
  Fix for autoconf 2.52
scripts/mysql_new_fix_privilege_tables.sh:
  cleanup
2002-01-26 01:19:47 +02:00
unknown
845db7c20b Added my_getopt struct and modified myisamchk to the bk tree.
include/Makefile.am:
  Added my_getopt.h
myisam/myisamchk.c:
  myisamcheck is using my_getopt struct now. Old code left:
  changeable_var[], will be changed later.
mysys/Makefile.am:
  added my_getopt.c
mysys/getvar.c:
  Added my_set_changeable_var. This is not being used yet, and
  is mostly a copy of set_changeable_var still.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-01-25 23:34:37 +02:00
unknown
aa166cbd98 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-01-24 22:51:09 -07:00
unknown
de172721ed more predicatable slave behaviour with wait_for_slave_stop in mysqltest
fixed a couple of bugs with SEQ_READ_APPEND cache
rpl000016 still has non-deterministic result, but I am going to commit and
push since what I have is now better than what is in the main repository


client/mysqltest.c:
  added wait_for_slave_to_stop
  cleaned up TODO and comments
include/my_sys.h:
  fixed race in flush_io_cache in SEQ_READ_APPEND cache
mysql-test/r/rpl000016.result:
  updated result
mysql-test/t/rpl000016.test:
  use wait_for_slave_to_stop to have deterministic slave behaviour for the test
mysys/mf_iocache.c:
  fixed race in flush_io_cache()
  fixed failure to unlock mutex in my_b_append()
sql/log.cc:
  be compatible with 3.23 master
sql/log_event.cc:
  3.23 master compat
sql/slave.cc:
  3.23 master compat
sql/sql_class.h:
  compat with 3.23 master
2002-01-24 22:49:47 -07:00
unknown
adb110bec2 manual.texi change notes cleanup
Docs/manual.texi:
  change notes cleanup
2002-01-24 09:15:07 -06:00
unknown
a1014a4f3a Merge
client/mysqldump.c:
  Auto merged
2002-01-24 13:47:17 +02:00
unknown
17ed74a9e6 Added SQL dump of our sample database 'world'. 2002-01-24 14:09:21 +10:00
unknown
26d9a40ecb ODBC compliance level updated 2 -> 3.51 2002-01-24 14:04:45 +10:00
unknown
caa2707234 Corrected typo: CALC_FOUND_ROWS should be SQL_CALC_FOUND_ROWS. 2002-01-24 09:28:38 +10:00
unknown
7b72c14bbb Increase max package length to 512M for mysql and mysqldump.
Faster 'read_first_row' (Fixes slow 'preparing' state)
Read constant tables earlier, which provides better optimzations when using tables with <=1 row.
This also fixes a complicated bug involving const tables.


Docs/manual.texi:
  Changelog
client/mysql.cc:
  Increase max package length to 512M
client/mysqldump.c:
  Increase max package length to 512M
dbug/dbug.c:
  Fixed wrong printf() format string.
mysql-test/t/innodb.test:
  Test for multi-table delete
sql/handler.cc:
  Faster 'read_first_row' (Fixes slow 'preparing' state)
sql/handler.h:
  Faster 'read_first_row' (Fixes slow 'preparing' state)
sql/opt_range.cc:
  More debug info.
sql/sql_select.cc:
  Read constant tables earlier, which provides better optimzations when using tables with <=1 row.
  This also fixes a complicated bug involving const tables.
sql/sql_select.h:
  Read const tables earlier
2002-01-23 02:52:26 +02:00
unknown
3b9e18d9a8 Merge jamppa@work:/home/bk/mysql-4.0/
into hynda.mysql.fi:/data/my/bk/mysql-4.0-quick-fixes
2002-01-23 00:08:25 +02:00
unknown
1c2802931e Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-01-22 15:08:22 -07:00
unknown
11f04648f2 post-merge fixes, including slave-skip-errors backport
fixed too quick timeout in mysql-test-run which caused a race with the
 new server getting started before the old one completely finished 
 shutdown. This should fix the pid warning we've been getting as well as
 inconsistent results when running tests with the manager


libmysqld/lib_sql.cc:
  post-merge fix
mysql-test/mysql-test-run.sh:
  fixed start/stop timeout and cleanup of log directory
mysql-test/r/rpl000014.result:
  post-merge fix
mysql-test/r/rpl000015.result:
  post-merge fix
mysql-test/r/rpl000016.result:
  post-merge fix
mysql-test/r/rpl_log.result:
  post-merge fix
sql/log_event.cc:
  post-merge fix
sql/slave.cc:
  post-merge fix
sql/slave.h:
  post-merge fix
sql/sql_class.h:
  post-merge fix
tools/mysqlmanager.c:
  added debug message
2002-01-22 15:05:11 -07:00
unknown
f7722d914b Fixed a bug in mysqldump.c 2002-01-23 00:04:43 +02:00
unknown
2778e53e51 manual.texi:
Added a comment for Tfr; Test for Tom


Docs/manual.texi:
  Added a comment for Tfr; Test for Tom
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-01-22 10:30:42 -05:00
unknown
15d6fd1df0 manual.texi:
Add nore info to make InnoDB installation easier


Docs/manual.texi:
  Add nore info to make InnoDB installation easier
2002-01-22 17:19:16 +02:00
unknown
29f14f065f mirrors.texi:
Update mirror listing


Docs/mirrors.texi:
  Update mirror listing
2002-01-21 18:44:21 +02:00
unknown
1e0f2b7a42 Ugly merge! But I am not done yet - there are a number of things I need to fix
before I can push


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mini_client.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/structs.h:
  Auto merged
mysql-test/r/rpl000014.result:
  merge
mysql-test/r/rpl000015.result:
  merge
mysql-test/r/rpl000016.result:
  merge
mysql-test/r/rpl_log.result:
  merge
sql/log.cc:
  merge
sql/log_event.cc:
  merge
sql/log_event.h:
  merge
sql/mysqld.cc:
  merge
sql/slave.cc:
  merge
sql/slave.h:
  merge
sql/sql_class.h:
  merge
sql/sql_parse.cc:
  merge
sql/sql_repl.cc:
  merge
sql/sql_yacc.yy:
  merge
2002-01-19 22:46:25 -07:00
unknown
5df61c3cdc Here comes a nasty patch, although I am not ready to push it yet. I will
first pull, merge,test, and get it to work.

The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to 
prepare for multi-master implementation. 

I also documented IO_CACHE quite extensively and to some extend, THD class.


Makefile.am:
  moved tags target script into a separate file
include/my_sys.h:
  fixes in IO_CACHE for SEQ_READ_APPEND + some documentation
libmysqld/lib_sql.cc:
  updated replication locks, but now I see I did it wrong and it won't compile. Will fix
  before the push.
mysql-test/r/rpl000014.result:
  test result update
mysql-test/r/rpl000015.result:
  test result update
mysql-test/r/rpl000016.result:
  test result update
mysql-test/r/rpl_log.result:
  test result update
mysql-test/t/rpl000016-slave.sh:
  remove relay logs
mysql-test/t/rpl000017-slave.sh:
  remove relay logs
mysql-test/t/rpl_log.test:
  updated test
mysys/mf_iocache.c:
  IO_CACHE updates to make replication work
mysys/mf_iocache2.c:
  IO_CACHE update to make replication work
mysys/thr_mutex.c:
  cosmetic change
sql/item_func.cc:
  new replication code
sql/lex.h:
  new replication
sql/log.cc:
  new replication
sql/log_event.cc:
  new replication
sql/log_event.h:
  new replication
sql/mini_client.cc:
  new replication
sql/mini_client.h:
  new replication
sql/mysql_priv.h:
  new replication
sql/mysqld.cc:
  new replication
sql/repl_failsafe.cc:
  new replication
sql/slave.cc:
  new replication
sql/slave.h:
  new replication
sql/sql_class.cc:
  new replication
sql/sql_class.h:
  new replication
sql/sql_lex.h:
  new replication
sql/sql_parse.cc:
  new replication
sql/sql_repl.cc:
  new replication
sql/sql_repl.h:
  new replication
sql/sql_show.cc:
  new replication
sql/sql_yacc.yy:
  new replication
sql/stacktrace.c:
  more robust stack tracing
sql/structs.h:
  new replication code
BitKeeper/etc/ignore:
  Added mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval mysql-test/r/rpl000015.eval mysql-test/r/rpl000016.eval mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval to the ignore list
2002-01-19 19:16:52 -07:00
unknown
add1f37e4b Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.bitbike.com:/home/arjen/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-01-18 09:24:25 +10:00
unknown
143b571a08 InnoDB stable version adjustment (from Heikki). 2002-01-18 09:20:49 +10:00
unknown
c20e45d622 manual.texi fix for colons in TIME being referred to as semicolons
Docs/manual.texi:
  fix for colons in TIME being referred to as semicolons
2002-01-17 16:22:54 -06:00
unknown
ca907d2099 normal maintenance. Nothing for Arjen ...
Docs/manual.texi:
  normal maintenance
sql/sql_update.cc:
  To reflect the changes Monty made with keyreads..
2002-01-17 18:56:02 +02:00
unknown
5985d50096 Training/Consulting/etc fixes from Bertrand.
MySQL trademark fixups in chapter 1.
Portals info updated.
InnoDB stability info clarified.
Copyright year updated (2002).
2002-01-17 11:27:13 +10:00
unknown
879e892d66 Merge
sql/sql_update.cc:
  SCCS merged
2002-01-16 23:47:50 +02:00
unknown
088582035e Move HA_EXTRA_NO_READCHECK to ha_open
Fixed bug in multi-table-delete


Docs/manual.texi:
  Changelog
include/mysql_com.h:
  Define MAX_CHAR_WIDTH
myisam/mi_extra.c:
  Cleanup
mysql-test/r/bdb.result:
  Bug test
mysql-test/r/group_by.result:
  Bug test
mysql-test/t/bdb.test:
  Bug test
mysql-test/t/group_by.test:
  Bug test
sql/ha_berkeley.cc:
  More debug statements
sql/handler.cc:
  Move HA_EXTRA_NO_READCHECK to ha_open
sql/records.cc:
  More DBUG statements
sql/sql_analyse.cc:
  Cleanup
sql/sql_base.cc:
  Move HA_EXTRA_NO_READCHECK to ha_open
sql/sql_delete.cc:
  Fixed bug in multi-table-delete
  Cleanup
sql/sql_select.cc:
  Move HA_EXTRA_NO_READCHECK to ha_open
sql/sql_update.cc:
  Move HA_EXTRA_NO_READCHECK to ha_open
2002-01-16 23:02:26 +02:00
unknown
4d638f1e35 some small changes for MULTI-TABLE updates and other little fixes
sql/sql_class.h:
  small optimisations for MULTI-TABLE UPDATE's
sql/sql_parse.cc:
  Could not look at that if () at the start of execute_command, and as 
  Monty evidently did not have time, so I optimised it away in the best 
  fashion I know of.
sql/sql_update.cc:
  Some optimisations  for MULTI-TABLE UPDATE's
2002-01-16 22:45:47 +02:00
unknown
84d3da1df8 mirrors.texi:
Update French mirror


Docs/mirrors.texi:
  Update French mirror
2002-01-16 04:34:00 +02:00
unknown
40c146f6a2 merge
sql/mysqld.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-01-16 01:08:29 +02:00
unknown
f015cbdc7e Add support for NULL=NULL in keys (Used in GROUP BY optimization)
Add ISAM to Windows version
Fix of test results
Fixes for NULL keys in HEAP tables.


Docs/manual.texi:
  Changelog
heap/hp_open.c:
  Add support for NULL=NULL in keys (for GROUP BY)
heap/hp_rkey.c:
  Cleanup
heap/hp_write.c:
  Cleanup
include/config-win.h:
  Add ISAM to Windows version
include/my_base.h:
  Add support for NULL=NULL in keys (for GROUP BY)
libmysqld/Makefile.am:
  Rename of innobase to innodb
myisam/mi_write.c:
  Add support for NULL=NULL in keys (for GROUP BY)
BitKeeper/etc/ignore:
  Added libmysqld/ha_innodb.cc to the ignore list
mysql-test/r/group_by.result:
  Test of NULL keys in HEAP tables
mysql-test/r/heap.result:
  Test of NULL keys in HEAP tables
mysql-test/r/null.result:
  Cleanup
mysql-test/r/order_by.result:
  Fix for result of new ORDER BY optimization
mysql-test/t/group_by.test:
  Test of NULL keys in HEAP tables
mysql-test/t/heap.test:
  Test of NULL keys in HEAP tables
mysql-test/t/null.test:
  Cleanup
sql/ha_heap.cc:
  Add support of NULL keys
sql/item_strfunc.h:
  Fix for BINARY and CAST functions
sql/item_timefunc.h:
  Fix for BINARY and CAST functions
sql/sql_parse.cc:
  Cleanup
sql/sql_select.cc:
  Add support for NULL=NULL in keys (for GROUP BY)
2002-01-16 00:42:52 +02:00
unknown
62f9d3c201 manual.texi:
Added the MyCC list


Docs/manual.texi:
  Added the MyCC list
2002-01-14 21:52:35 -06:00
unknown
7e5b1ec5fa Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-01-14 15:42:38 +00:00
unknown
a5529dcd57 ftb-bugfix 2002-01-14 15:40:54 +00:00
unknown
9680f9682f Fix, myisampack does support TEXT/BLOB according to texts elsewhere (comment from antoine.pichot@int-evry.fr). 2002-01-14 09:59:29 +10:00
unknown
859db557a1 ft-bugfix (UPDATE something -> NULL) 2002-01-13 15:35:12 +00:00
unknown
a1cfdf4340 Merge
Docs/manual.texi:
  SCCS merged
2002-01-13 12:56:34 +00:00
unknown
1c603ad1ef mysqldump.c:
Added missing 'Q' for -Q option


client/mysqldump.c:
  Added missing 'Q' for -Q option
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-01-13 01:32:05 -06:00
unknown
e9b8c183a2 Some changes in multi-table deletes, with some speed-ups and
incorporations of the new stuff.

When Monty approves / corrects it, I will "port" it to multi-table
updates.


sql/sql_insert.cc:
  A small bug fix
sql/sql_update.cc:
  query cache invalidation
2002-01-12 19:51:10 +02:00
unknown
71a5af5b52 Added support of null keys in HEAP tables
Added ORDER BY optimization


Docs/manual.texi:
  Added ORDER BY optimisation section
heap/_check.c:
  Cleanup
heap/heapdef.h:
  Added support of null keys in HEAP tables
heap/hp_hash.c:
  Added support of null keys in HEAP tables
heap/hp_open.c:
  Added support of null keys in HEAP tables
heap/hp_test2.c:
  Added support of null keys in HEAP tables
heap/hp_write.c:
  Added support of null keys in HEAP tables
include/heap.h:
  Added support of null keys in HEAP tables
include/my_base.h:
  Support for hash algoritm
isam/static.c:
  Cleanup
myisam/mi_static.c:
  Cleanup
sql/Makefile.am:
  Rename innobase -> innodb
sql/ha_berkeley.cc:
  Added ORDER BY optimization
sql/ha_berkeley.h:
  Added ORDER BY optimization
sql/ha_heap.cc:
  Added support for NULL keys
sql/ha_heap.h:
  Added support for NULL keys
sql/ha_isam.cc:
  Added ORDER BY optimization
sql/ha_isam.h:
  Added ORDER BY optimization
sql/ha_isammrg.h:
  Added ORDER BY optimization
sql/ha_myisam.cc:
  Added ORDER BY optimization
sql/ha_myisam.h:
  Added ORDER BY optimization
sql/ha_myisammrg.cc:
  Added ORDER BY optimization
sql/ha_myisammrg.h:
  Added ORDER BY optimization
sql/handler.cc:
  Rename innobase -> innodb
sql/handler.h:
  Rename innobase -> innodb
sql/ha_innodb.cc:
  Rename innobase -> innodb
sql/ha_innodb.h:
  Rename innobase -> innodb
sql/mysqld.cc:
  Rename innobase -> innodb
sql/sql_delete.cc:
  Rename innobase -> innodb
sql/sql_select.cc:
  Added ORDER BY optimization
sql/sql_select.h:
  Added ORDER BY optimization
2002-01-12 15:42:54 +02:00
unknown
9f0c13f394 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4
2002-01-12 15:42:29 +02:00
unknown
985763d649 New result block allocation strategy
mysql-test/r/query_cache.result:
  Test changed according with new block sizes
mysql-test/t/query_cache.test:
  Test changed according with new block sizes
2002-01-12 15:40:52 +02:00
unknown
2bf244d83f manual.texi Added CAST and CONVERT descriptions into the release notes
Docs/manual.texi:
  Added CAST and CONVERT descriptions into the release notes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-01-12 14:22:59 +01:00
unknown
87ec555947 Win32 Embedded Server Changes
libmysql/libmysql.def:
  For to have the same order of the 3.23.XX stuff
libmysqld/lib_load.cc:
  For to have the file extension for VC++
libmysqld/lib_sql.cc:
  The VC++ compiler returns duplication define from
  net_serv.cc. If the same happens with Unix then
  those lines should be removed.
  VC++ file extension.
sql/mysqld.cc:
  Changes for Win32 Embedded Server.
sql/net_serv.cc:
  Sanja Fixes.
sql/sql_cache.cc:
  To avoid the crash on Win9x
2002-01-09 05:38:48 -02:00
unknown
23a6f06885 Little fixups in change log. 2002-01-09 13:17:19 +10:00
unknown
5806807ce9 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-01-08 20:18:30 +02:00
unknown
ef6119f569 A small fix for a VERY small Monty's bug ... 2002-01-08 20:17:54 +02:00
unknown
106c0a8523 mirrors.texi:
Update mirror listing


Docs/mirrors.texi:
  Update mirror listing
2002-01-08 17:17:16 +02:00