Commit graph

5309 commits

Author SHA1 Message Date
unknown
9a2ac08bac configure.in:
- fix MYSQL_NO_DASH_VERSION if version number ends on one digit only
   ("comment" test failed when MySQL version was changed from 4.0.5
   to 4.0.5a)


configure.in:
   - fix MYSQL_NO_DASH_VERSION if version number ends on one digit only
     ("comment" test failed when MySQL version was changed from 4.0.5
     to 4.0.5a)
2002-11-21 21:42:44 +01:00
unknown
910849ccd1 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-20 22:57:42 +02:00
unknown
9b9546edbc Try to optimize the cache buffer size needed for bulk_insert
Fix for shutdown on Mac OS X


include/my_tree.h:
  Try to optimize the cache buffer size needed for bulk_insert
myisam/mi_write.c:
  Try to optimize the cache buffer size needed for bulk_insert
mysql-test/r/bdb.result:
  Make test repeatable
mysql-test/t/bdb.test:
  Make test repeatable
mysys/tree.c:
  Try to optimize the cache buffer size needed for bulk_insert
sql/mysql_priv.h:
  Small optimization
sql/mysqld.cc:
  Fix for shutdown on Mac OS X
sql/sql_insert.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/sql_yacc.yy:
  Call thd->strmake() instead of sql_strmake()
sql/table.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/table.h:
  Try to optimize the cache buffer size needed for bulk_insert
2002-11-20 22:56:57 +02:00
unknown
0c3106f964 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-20 15:17:57 +01:00
unknown
da6fc28210 bug in _ftb_strstr fixed :) 2002-11-20 15:17:17 +01:00
unknown
4813f04990 set_var.cc:
Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them


sql/set_var.cc:
  Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them
2002-11-19 22:59:01 +02:00
unknown
d050750f1f row0mysql.c, row0mysql.h, ha_innodb.cc, sql_table.cc, handler.h:
Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp


sql/handler.h:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
sql/sql_table.cc:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
sql/ha_innodb.cc:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
innobase/include/row0mysql.h:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
innobase/row/row0mysql.c:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
2002-11-19 16:27:26 +02:00
unknown
33d678fcdc merge with 3.23
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-depcomp:
  Delete: depcomp
config.guess:
  Auto merged
config.sub:
  Auto merged
configure.in:
  Auto merged
dbug/Makefile.am:
  Auto merged
heap/Makefile.am:
  Auto merged
install-sh:
  Auto merged
isam/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
ltconfig:
  Auto merged
ltmain.sh:
  Auto merged
missing:
  Auto merged
myisam/Makefile.am:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
regex/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
strings/Makefile.am:
  Auto merged
2002-11-19 12:35:17 +02:00
unknown
7bc917e9e1 Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2002-11-19 10:41:03 +02:00
unknown
54c03ff736 Merge vvagin@work.mysql.com:/home/bk/mysql-4.0
into genie.(none):/home/vva/work/mysqldump_xml/4.0
2002-11-18 20:53:07 +04:00
unknown
db7357a9e7 fix xml-output of mysqldump
client/mysqldump.c:
  fix xml-output
2002-11-18 20:50:42 +04:00
unknown
6600e656b1 add -DHAVE_BROKEN_REALPATH to CFLAGS on FreeBSD (previous patch touched only CXXFLAGS) 2002-11-18 16:50:37 +01:00
unknown
8c71ab8415 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
configure.in:
  Auto merged
2002-11-18 16:31:03 +01:00
unknown
4cdf5497a9 added -DHAVE_BROKEN_REALPATH for FreeBSD builds 2002-11-18 16:30:19 +01:00
unknown
b34d11f891 Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2002-11-18 16:21:53 +02:00
unknown
e41123b89f Small change to make key cache code cleaer 2002-11-18 14:59:45 +02:00
unknown
a9c044ac87 Merge akeremidarski@work.mysql.com:/home/bk/mysql-4.0
into geopard.(none):/storage/bk/my-new-4.0
2002-11-18 13:45:04 +02:00
unknown
925cd76bc9 Added tests for boolean operators in select part
Redo of changeset I commited, but failed to push


mysql-test/r/bool.result:
  Added tests for boolean operators in select part
mysql-test/t/bool.test:
  Added tests for boolean operators in select part
2002-11-18 13:41:07 +02:00
unknown
31de3a3a57 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build


BitKeeper/etc/ignore:
  auto-union
sql-bench/test-create.sh:
  Auto merged
2002-11-18 11:41:29 +01:00
unknown
f5ddbac858 - Tagged ChangeSet 1.1400.1.3 as "mysql-4.0.5"
- bumped up version number in configure.in
 - fixed a typo in test-create.sh


BitKeeper/etc/ignore:
  Added autom4te.cache/output.0 autom4te.cache/requests autom4te.cache/traces.0 bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests bdb/dist/autom4te.cache/traces.0 innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests innobase/autom4te.cache/traces.0 to the ignore list
configure.in:
   - Bumped up version number to 4.0.6 now that 4.0.5 is tagged (4.0.6 is
     now labelled "gamma", according to conversation with Monty)
sql-bench/test-create.sh:
   - typo fixed
2002-11-18 11:40:55 +01:00
unknown
d8eda71337 better boundary behaviour 2002-11-17 20:08:42 +01:00
unknown
971db76533 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2002-11-17 20:44:16 +02:00
unknown
b463146ac6 new status variable (number of queries deleted because of low memory)
mysql-test/r/query_cache.result:
  test of new status variable
mysql-test/t/query_cache.test:
  test of new status variable
2002-11-17 20:41:25 +02:00
unknown
4589844513 merge::records_in_range and optimizer
sql/sql_select.cc:
  optimizer bug fixed. (what's the difference between s->records ans s->found_records ?)
2002-11-17 18:58:03 +01:00
unknown
564c7b241f myisammrg::records_in_range 2002-11-17 18:54:23 +01:00
unknown
2ef5ec316c - Applied required modifications for automake 1.5
- "make distcheck" needs to be fixed


BitKeeper/etc/ignore:
  Added autom4te.cache/output.0 autom4te.cache/requests autom4te.cache/traces.0 bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests bdb/dist/autom4te.cache/traces.0 innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests innobase/autom4te.cache/traces.0 to the ignore list
acinclude.m4:
   - removed libtool.m4 (is part of libtool 1.4)
config.guess:
   - applied diffs from config.guess of automake 1.5
config.sub:
   - applied diffs from config.sub of automake 1.5
configure.in:
   - renamed "AM_PROG_LIBTOOL" -> "AC_PROG_LIBTOOL"
   - added "AM_PROG_AS" for automake 1.5
dbug/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
extra/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
heap/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
install-sh:
   - applied diffs from install.sh of automake 1.5
isam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysql_r/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
ltconfig:
   - small correction for new libtool
ltmain.sh:
   - applied diffs from ltmain.sh of libtool 1.4.2
merge/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
missing:
   - applied diffs from missing of automake 1.5
myisam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
myisammrg/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
mysys/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
   - added $(EXEEXT) to test_charset
regex/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
sql/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
strings/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
   - removed @CHARSET_SRCS@
vio/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
2002-11-17 16:45:21 +01:00
unknown
4b9c5888e9 Merge serg.mysql.com:/usr/home/serg/Abk/mysql
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


scripts/mysqlhotcopy.sh:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
2002-11-17 00:36:28 +01:00
unknown
638d4619ad Delete: include/.my_sys.h.swp 2002-11-17 00:35:13 +01:00
unknown
c5dc4ab3cf Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2002-11-16 21:58:09 +02:00
unknown
bd1c2d65c4 Small improvement to alloc_root
Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE


BitKeeper/etc/ignore:
  added autom4te.cache/* bdb/dist/autom4te.cache/* innobase/autom4te.cache/*
include/my_alloc.h:
  Small improvement to alloc_root
libmysql/libmysql.c:
  Removed compiler warning
myisam/mi_page.c:
  Better DBUG message
mysql-test/r/multi_update.result:
  Added test with lock tables
mysql-test/r/rpl_replicate_do.result:
  Update results
mysql-test/r/rpl_rotate_logs.result:
  Make test independent of if t1 exists
mysql-test/t/multi_update.test:
  Added test with lock tables
mysql-test/t/rpl_rotate_logs.test:
  Make test independent of if t1 exists
mysys/my_alloc.c:
  Small imprevement to alloc_root
  (Don't free blocks less than ALLOC_MAX_BLOCK_ROOT (4K)
sql/ha_innodb.cc:
  More debug messages
sql/ha_myisam.cc:
  Safety change
sql/lex.h:
  Add support for LIMIT # OFFSET #
sql/lock.cc:
  Added assertion
sql/mysql_priv.h:
  Change of lock handling
sql/mysqld.cc:
  Added function clear_error_messages()
sql/sql_base.cc:
  Change lock handling by open_ltable() and open_and_lock_tables()
sql/sql_class.cc:
  Split THD::THD to two functions
  Move some code from cleanup() to ~THD:THD
  Add THD::change_user()
sql/sql_class.h:
  Prototype changes in class THD
sql/sql_delete.cc:
  Remove locking argument from mysql_delete()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
sql/sql_insert.cc:
  Remove locking argument from mysql_insert()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
  Don't use bulk insert if bulk_insert_buff_size is 0
sql/sql_parse.cc:
  Changes to make mysql_change_user() work as close+connect
  Changed command statistics to use statstics_increment to get more speed
  Update code to handle that locks is now stored in TABLE_LIST
sql/sql_update.cc:
  Remove locking argument from mysql_update()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
sql/sql_yacc.yy:
  Locking type is now stored in TABLE_LIST
  Added support for LIMIT # OFFSET # syntax
  Removed some wrong (never true) checks for SQLCOM_MULTI_UPDATE
mysql-test/t/rpl_replicate_do-slave.opt:
  Changed tables to use t1,t2,...
mysql-test/t/rpl_replicate_do.test:
  Changed tables to use t1,t2,...
2002-11-16 20:19:10 +02:00
unknown
2c349012b0 srv0start.c:
Print an error message if someone tries to call InnoDB startip more than once during process lifetime


innobase/srv/srv0start.c:
  Print an error message if someone tries to call InnoDB startip more than once during process lifetime
2002-11-16 01:59:04 +02:00
unknown
744000cd8e ha_innodb.cc:
Remove unintentionally pushed printf


sql/ha_innodb.cc:
  Remove unintentionally pushed printf
2002-11-15 23:10:51 +02:00
unknown
c17c9620ef ha_innodb.cc:
Fix another bug introduced in 4.0.4 in AUTO_INCREMENT and deadlock or lock wait timeout


sql/ha_innodb.cc:
  Fix another bug introduced in 4.0.4 in AUTO_INCREMENT and deadlock or lock wait timeout
2002-11-15 22:59:16 +02:00
unknown
1ed60c671a Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-11-15 22:02:19 +02:00
unknown
d798928d0e A fix for safe updates 2002-11-15 22:01:28 +02:00
unknown
6e289b7d06 ha_innodb.cc:
Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low


sql/ha_innodb.cc:
  Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low
2002-11-15 18:46:23 +02:00
unknown
fdabe22c3a - Fixed some minor bugs/typos
scripts/mysqlhotcopy.sh:
   - added missing "--host" option
sql-bench/test-create.sh:
   - fixed typo
support-files/mysql.server.sh:
   - fixed typo
2002-11-15 01:57:56 +01:00
unknown
c717613b8d Merge serg.mysql.com:/usr/home/serg/Abk/mysql
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/ha_myisam.cc:
  Auto merged
2002-11-14 22:42:19 +01:00
unknown
4ebb96c6b1 better fix for OPTIMIZE bug 2002-11-14 22:39:46 +01:00
unknown
ffd1d3df2a Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-14 12:35:33 +02:00
unknown
3648eb7da8 Portability fix when using -DBIG_TABLES
BitKeeper/etc/config:
  Changed Sasha to sys
client/mysqlbinlog.cc:
  Fixed that --position open works.
sql/item_timefunc.cc:
  Portability fix
sql/log_event.cc:
  Portability fix
sql/set_var.cc:
  Portability fix
2002-11-14 12:21:36 +02:00
unknown
20243b65d7 results updated
mysql-test/r/myisam.result:
  updated
2002-11-14 00:27:14 +01:00
unknown
9f8277f9a4 merged
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_myisam.cc:
  Auto merged
innobase/row/row0sel.c:
  merged (ul - as 3.23's fix was a backport from 4.0)
mysql-test/r/myisam.result:
  merged - ul
2002-11-13 23:38:19 +01:00
unknown
3a58dc5a4e Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2002-11-13 22:56:05 +01:00
unknown
ffb4dee5a5 optimize table corruption fixed, though more clean fix is desired.
Fix for another optimize bug is undone, as the new one handles both cases.
test added


mysql-test/r/myisam.result:
  updated
mysql-test/t/myisam.test:
  optimize table corruption test
sql/ha_myisam.cc:
  optimize table corruption fixed, though more clean fix is desired.
  Fix for another optimize bug is undone, as the new one handles both cases.
2002-11-13 22:55:32 +01:00
unknown
30fb37d53c Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-13 15:58:11 +01:00
unknown
ee23bc4d31 removed redundant line 2002-11-13 15:57:29 +01:00
unknown
f8680cf00c row0sel.c:
Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record


innobase/row/row0sel.c:
  Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record
2002-11-13 16:24:50 +02:00
unknown
5907ab4e04 row0sel.c:
Fix bug: if a unique search from a primary key matched to a delete-marked row, it could return the NEXT row


innobase/row/row0sel.c:
  Fix bug: if a unique search from a primary key matched to a delete-marked row, it could return the NEXT row
2002-11-13 15:45:05 +02:00
unknown
95ff7f77dd Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-11-13 14:48:28 +02:00