Commit graph

5986 commits

Author SHA1 Message Date
unknown
953f6c51fe upgrade readline to version 4.3
client/completion_hash.cc:
  correct headers of functions for readline 4.3 (add const modifier to char*)
client/completion_hash.h:
  correct headers of functions for readline 4.3 (add const modifier to char*)
client/mysql.cc:
  correct functions for readline 4.3
2002-11-19 18:26:53 +04:00
unknown
8e9a5a4f10 - applied patch for AMD x86-64
(thanks to Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>


bdb/dist/aclocal/mutex.m4:
   - applied patch for AMD x86-64
2002-11-19 13:45:51 +01:00
unknown
2f639e57a4 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1
2002-11-19 16:03:59 +04:00
unknown
56b6433e66 fix for BDB 2002-11-19 16:02:19 +04: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
10de2720aa Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-18 23:14:58 +02:00
unknown
fb23575c7a small revert
sql/sql_base.cc:
  one more change reverted
2002-11-18 23:11:45 +02:00
unknown
1556ea9ae7 small change
sql/sql_class.cc:
  reverting some changes and fixig C style of Sanja ... ;o)
2002-11-18 22:41:57 +02:00
unknown
3a21e244a0 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-explain-4.1


sql/sql_select.cc:
  Auto merged
2002-11-18 22:20:28 +02:00
unknown
2eb4a1ea38 Fixed explain error handling
mysql-test/r/subselect.result:
  test of subselect explain
mysql-test/t/subselect.test:
  test of subselect explain
2002-11-18 22:19:15 +02:00
unknown
f22010c835 fix for message being sent in EXPLAIN ...
sql/sql_base.cc:
  temporary removal ...
2002-11-18 20:58:04 +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
8e2346e884 lot's of fixes with test cases
mysql-test/r/create.result:
  A test case for foreign key bug that is resolved
mysql-test/r/select_found.result:
  test case for new select ... limit 0 behaviour
mysql-test/t/create.test:
  test case for foreign key bug that is fixed
mysql-test/t/select_found.test:
  test case for new behaviour of SELECT ... LIMIT 0
sql/sql_select.cc:
  SELECT ... LIMIT 0
sql/sql_union.cc:
  replacing my dirty hack with Sanja's "proper" fix
2002-11-18 18:28:51 +02: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
4e864685b3 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_select.cc:
  Auto merged
2002-11-18 14:24:56 +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
0fb3b8d9ab fixed subselect explain bug
mysql-test/r/subselect.result:
  test of subselect explain bug
mysql-test/t/subselect.test:
  test of subselect explain bug
sql/sql_select.cc:
  remuved difference between optimization for execution and optimization for description
2002-11-17 22:23:57 +02: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
849b9ed913 typelib.h is required by mysql.h and should be installed
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Delete: include/.my_sys.h.swp
2002-11-17 00:31:57 +01:00
unknown
7ddbc9e298 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


sql/item_cmpfunc.cc:
  Auto merged
2002-11-16 23:30:14 +02: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
e79eb98ba0 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-16 20:17:11 +01: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
a40a9d5916 Some new tests...................
mysql-test/r/derived.result:
  A test for derived table which requires creation on temporary MyISAM
  table ...
mysql-test/r/select_found.result:
  A test for LIMIT )
mysql-test/t/derived.test:
  A test for derived table which requires creation on temporary MyISAM
  table ...
mysql-test/t/select_found.test:
  A test for LIMIT 0
2002-11-16 16:41:29 +02:00
unknown
9c28568dc2 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_derived.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
2002-11-16 14:31:48 +02:00
unknown
1ce56c2ad8 Merge abelkin@work.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-16 14:13:23 +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
49aefe3fb7 Fixed bugs pointed by "Crash with 'big' derivated table in MySQL-4.1" bugreport
- fixed switching from heap to MyISAM table
 - fixed error handler


sql/sql_derived.cc:
  A fix for the bug when MyISAM tmp table has to be created in order to resolve derived table.
  fixed error handler
sql/sql_parse.cc:
  fixed error handler
sql/sql_union.cc:
  fixed switching from heap to MyISAM table
2002-11-16 00:01:48 +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
3f74283121 basic row Items (SCRUM)
include/mysql_com.h:
  basic row Items
include/mysqld_error.h:
  more wide error mening
libmysqld/Makefile.am:
  basic row Items
mysql-test/r/subselect.result:
  more wide error mening
sql/Makefile.am:
  basic row Items
sql/filesort.cc:
  basic row Items
sql/item.cc:
  basic row Items
sql/item.h:
  basic row Items
sql/item_cmpfunc.cc:
  basic row Items
sql/item_cmpfunc.h:
  basic row Items
sql/item_func.cc:
  basic row Items
sql/item_func.h:
  basic row Items
sql/item_strfunc.cc:
  basic row Items
sql/item_strfunc.h:
  basic row Items
sql/item_subselect.cc:
  basic row Items
sql/item_sum.cc:
  basic row Items
sql/share/czech/errmsg.txt:
  more wide error mening
sql/share/danish/errmsg.txt:
  more wide error mening
sql/share/dutch/errmsg.txt:
  more wide error mening
sql/share/english/errmsg.txt:
  more wide error mening
sql/share/estonian/errmsg.txt:
  more wide error mening
sql/share/french/errmsg.txt:
  more wide error mening
sql/share/german/errmsg.txt:
  more wide error mening
sql/share/greek/errmsg.txt:
  more wide error mening
sql/share/hungarian/errmsg.txt:
  more wide error mening
sql/share/italian/errmsg.txt:
  more wide error mening
sql/share/japanese/errmsg.txt:
  more wide error mening
sql/share/korean/errmsg.txt:
  more wide error mening
sql/share/norwegian-ny/errmsg.txt:
  more wide error mening
sql/share/norwegian/errmsg.txt:
  more wide error mening
sql/share/polish/errmsg.txt:
  more wide error mening
sql/share/portuguese/errmsg.txt:
  more wide error mening
sql/share/romanian/errmsg.txt:
  more wide error mening
sql/share/russian/errmsg.txt:
  more wide error mening
sql/share/serbian/errmsg.txt:
  more wide error mening
sql/share/slovak/errmsg.txt:
  more wide error mening
sql/share/spanish/errmsg.txt:
  more wide error mening
sql/share/swedish/errmsg.txt:
  more wide error mening
sql/share/ukrainian/errmsg.txt:
  more wide error mening
sql/sql_base.cc:
  fix_fields error handling
sql/sql_lex.cc:
  basic row Items
sql/sql_select.cc:
  basic row Items
sql/sql_yacc.yy:
  basic row Items
2002-11-15 20:32:09 +02:00
unknown
342dafb033 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-15 19:59:12 +02:00