Commit graph

9554 commits

Author SHA1 Message Date
unknown
e381dc98ba Merge jcole@bk-internal.mysql.com:/home/bk/mysql-4.0
into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0
2003-08-28 16:06:43 -04:00
unknown
a41f8bc204 opt_range.cc: Fixes for out of memory conditions.
sql/opt_range.cc:
  Fixes for out of memory conditions.
2003-08-28 16:06:13 -04:00
unknown
2db7d27f0e Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


myisam/mi_dynrec.c:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
2003-08-28 22:30:11 +03:00
unknown
6fd5403d31 Portability fixes
client/mysqltest.c:
  Removed not used functions
myisam/mi_dynrec.c:
  Added assert to avoid compilation errors
mysql-test/r/isam.result:
  Updated results after merge
sql/log_event.cc:
  Cleanup
sql/mysql_priv.h:
  Cleanup
sql/sql_class.cc:
  Moved Table_ident functions to .cc file to allow them to use table_case_convert()
sql/sql_class.h:
  Moved Table_ident functions to .cc file to allow them to use table_case_convert()
2003-08-28 22:18:02 +03:00
unknown
62c85c8951 Removed restriction not to be able use non regular files. 2003-08-28 21:27:25 +03:00
unknown
82ace8f820 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1


sql/sql_select.cc:
  Auto merged
2003-08-28 20:38:08 +03:00
unknown
0f57bb2eda fixed typo 2003-08-28 18:31:38 +03:00
unknown
914bc8686e Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-08-28 17:27:47 +03:00
unknown
38a65b4d4e Fix for the bug mysqldump -X creates invalid XML 2003-08-28 19:27:46 +05:00
unknown
86feb16bad Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1
2003-08-28 17:27:46 +03:00
unknown
c326e59635 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-08-28 19:27:46 +05:00
unknown
d1d9281769 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
2003-08-28 10:27:45 -04:00
unknown
f8e5581131 fixed merge mistake 2003-08-28 10:26:56 -04:00
unknown
241ed6b81c Fix for bug FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
Note about COMMIT&ROLLBACK:
  Only 'COMMIT' statement updates the binary log. 
  'ROLLBACK' statement doesn't update the binlog.


mysql-test/r/drop.result:
  Fix for bug  FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
mysql-test/r/innodb.result:
  Fix for bug  FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
mysql-test/t/drop.test:
  Fix for bug  FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
mysql-test/t/innodb.test:
  Fix for bug  FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
sql/handler.cc:
  Fix for bug  FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
sql/sql_table.cc:
  Fix for bug  FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
2003-08-28 18:09:00 +05:00
unknown
b6d2a6ee09 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-28 13:15:55 +02:00
unknown
f505877c2b post-merge fixes
myisam/mi_dynrec.c:
  included assert.h
mysql-test/r/isam.result:
  results updated
2003-08-28 13:14:54 +02:00
unknown
f9aa71db91 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-28 12:39:25 +02:00
unknown
cdfd728201 oom protection 2003-08-28 12:37:50 +02:00
unknown
834cfbd190 enum renamed (asked for compilation under windows) 2003-08-28 13:21:30 +03:00
unknown
6d2644492e Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-08-28 11:45:49 +02:00
unknown
6866b92331 merge with 3.23 to get for overrun in ISAM tables with man fields and a blob.
isam/open.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_dynrec.c:
  merge
mysql-test/r/isam.result:
  merge
mysql-test/t/isam.test:
  merge
2003-08-28 12:35:36 +03:00
unknown
16969a4880 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-08-28 12:29:32 +03:00
unknown
bda8edf1a2 Updated test for ISAM overflow bug
mysql-test/r/isam.result:
  Updated test for overflow bug
mysql-test/t/isam.test:
  Updated test for overflow bug
2003-08-28 12:28:51 +03:00
unknown
5df8c7b0e2 ixed overflow bug in MyISAM and ISAM when using packed tables with a lot of fields and blobs
isam/open.c:
  Fixed overflow bug when using packed tables and blobs
isam/test_all.res:
  updated test results
myisam/mi_dynrec.c:
  pack_bits not needed here as we do it on open
myisam/mi_open.c:
  Fixed overflow bug when using packed tables and blobs
2003-08-28 12:27:35 +03:00
unknown
36636e8278 SCRUM:
Fixed some mess with STDCALL in function's declarations


include/mysql.h:
  That definitions are more correct
libmysqld/lib_sql.cc:
  should be declared as STDCALL
libmysqld/libmysqld.c:
  should be declared as STDCALL
sql-common/client.c:
  should be declared as STDCALL
2003-08-28 13:39:46 +05:00
unknown
673922d365 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-08-28 09:28:27 +02:00
unknown
572f2a0e20 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-28 06:13:44 +03:00
unknown
26bb50a19b Add detection of in_addr_t
Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
(This will probably solve bug )
Fix test for available file descriptors in mysqltest
Fixed core dump bug in replication tests when running without transactional table support


acconfig.h:
  Add detection of in_addr_t
acinclude.m4:
  Add detection of in_addr_t
configure.in:
  Add detection of in_addr_t
extra/my_print_defaults.c:
  Cleanup
extra/resolveip.c:
  Add detection of in_addr_t
libmysql/dll.c:
  Fixed C++ commments
myisam/mi_dynrec.c:
  Add ASSERT if allocated record length is to small
myisam/mi_open.c:
  Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
myisam/mi_test_all.sh:
  Added valgrind option to make it easier to verify tests
mysql-test/include/check_var_limit.inc:
  Fix test for available file descriptors
mysql-test/r/myisam.result:
  More tests
mysql-test/t/myisam.test:
  More tests
mysql-test/t/query_cache_merge.test:
  Fix test for available file descriptors
mysys/default.c:
  Cleanup
mysys/my_pthread.c:
  Remove C++ comments
sql/log.cc:
  Code cleanup
  Fixed core dump bug in replication tests when running without transactional table support.
2003-08-28 06:08:17 +03:00
unknown
94eb7e4145 Merge
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/create.result:
  merge
mysql-test/t/create.test:
  merge
sql/item_cmpfunc.h:
  SCCS merged
2003-08-27 21:26:00 -04:00
unknown
85f7a6978b reset() split in 2 function clear() & add()
aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860)


mysql-test/r/subselect.result:
  test for BUG#860
mysql-test/t/subselect.test:
  test for BUG#860
sql/item_sum.cc:
  reset() replaced with clear()
sql/item_sum.h:
  reset() replaced with clear()
  (reset now is just composition of clear() and add())
sql/item_uniq.h:
  reset() replaced with clear()
sql/sql_select.cc:
  removed NULL value assigment, now it will be done by clear() call
  function for clearing if there was not found any row in group
sql/sql_select.h:
  function for clearing if there was not found any row in group
2003-08-28 03:10:14 +03:00
unknown
aedee9d4b1 - replaced C++-style comments in .c file (Please try to avoid this, as
it breaks compilation on picky C compilers!)


fs/database.c:
   - replaced C++-style comments in .c file
2003-08-28 01:35:58 +02:00
unknown
f5d4eb89e2 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1


sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
2003-08-27 19:15:27 -04:00
unknown
a73058a77c fixed bug (right type of ifnull function)
mysql-test/r/create.result:
  added test for bug  (right type of ifnull function)
mysql-test/t/create.test:
  added test for bug  (right type of ifnull function)
sql/field.h:
  added new constructors of Field_decimal, Field_tiny, Field_short, Field_float,
  Field_null, Field_year
  for using in Item::tmp_table_field_from_field_type
sql/item.cc:
  added Item::tmp_table_field_from_field_type
sql/item.h:
  added Item::tmp_table_field_from_field_type
2003-08-27 19:11:54 -04:00
unknown
235cb5ba37 btr0btr.c:
Fix bug: if the user created a prefix column key on a fixed length char column, then InnoDB claimed in CHECK TABLE that the table is corrupt
dict0dict.c:
  Fix bug 1151: if the user created a prefix column primary key on a fixed length char column, then InnoDB crashed in a simple SELECT


innobase/dict/dict0dict.c:
  Fix bug 1151: if the user created a prefix column primary key on a fixed length char column, then InnoDB crashed in a simple SELECT
innobase/btr/btr0btr.c:
  Fix bug: if the user created a prefix column key on a fixed length char column, then InnoDB claimed in CHECK TABLE that the table is corrupt
2003-08-28 02:00:46 +03:00
unknown
c2d54add7e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-08-27 22:31:16 +03:00
unknown
0ee6f7fde0 hanged UDF interface to use clear() instead of reset()
BUILD/FINISH.sh:
  Add just_clean option (for cleanup script)
scripts/mysql_fix_privilege_tables.sql:
  Added 'USE mysql' for easer use on windows
sql/item_sum.cc:
  Changed UDF interface to use clear() instead of reset()
sql/item_sum.h:
  Changed UDF interface to use clear() instead of reset()
sql/slave.cc:
  Fixed checking of eof for slave/master protocol. (Bug )
sql/sql_udf.cc:
  Changed UDF interface to use clear() instead of reset()
sql/sql_udf.h:
  Changed UDF interface to use clear() instead of reset()
sql/sql_yacc.yy:
  ERRORS and WARNINGS should not be reserved words
sql/udf_example.cc:
  Changed UDF interface to use clear() instead of reset()
2003-08-27 22:30:50 +03:00
unknown
ad4fdb79cd Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-27 22:13:26 +03:00
unknown
c637296cea Fixed unlikely stack bug when having a BIG expression of type 1+1-1+1-1... in certain combinations. Bug
sql-bench/limits/mysql.cfg:
  Updated limits
sql/item_cmpfunc.cc:
  Test for stack checking
sql/item_func.cc:
  Test for stack checking
2003-08-27 20:00:18 +03:00
unknown
9d64b924c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
2003-08-27 19:22:59 +03:00
unknown
d2f12f719f Updating translation for Spanish/Portuguese error messages files
sql/share/portuguese/errmsg.txt:
  Updating Translation
sql/share/spanish/errmsg.txt:
  Updating Translation
2003-08-27 12:22:42 -04:00
unknown
59de978b89 Added a warning to my_print_defaults if --verbose is given
and --defaults-file is a non-existing or non-regular file.
Bug#755


scripts/mysqld_safe.sh:
  Added a warning to my_print_defaults if --verbose is given
  and --defaults-file is a non-existing or non-regular file.
  
  Bug#755
2003-08-27 19:22:14 +03:00
unknown
5f8cc0998f Fix for bug FLUSH TABLES WITH READ LOCK does not block CREATE TABLE 2003-08-27 18:03:39 +05:00
unknown
cd822e347b Merge fixes
sql/sql_union.cc:
  Some further merge fixes
2003-08-27 15:32:52 +03:00
unknown
8a920b6133 sql_union.cc:
Post merge fixes


sql/sql_union.cc:
  Post merge fixes
2003-08-27 15:24:52 +03:00
unknown
8a6f8201be merge fixes
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-08-27 14:36:38 +03:00
unknown
9ed16ed13a - added missing file vio_priv.h to source distribution 2003-08-27 12:26:21 +02:00
unknown
b43a551e83 Add column names for metadata when running mysql with -T
Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug 


client/mysql.cc:
  Add column names for metadata when running with -T
mysql-test/r/show_check.result:
  test case for bug fix
mysql-test/t/show_check.test:
  test case for bug fix
sql/item_sum.cc:
  Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug 
sql/sql_load.cc:
  Removed not needed line
2003-08-27 10:26:03 +03:00
unknown
522a32203a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-27 02:52:27 +03:00
unknown
59806e1004 vio ssl structure renames (to get rid of ending _)
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port


BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f:
  Delete: mysql-test/include/have_openssl_2.inc
BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514:
  Delete: mysql-test/r/have_openssl_2.require
BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8:
  Delete: mysql-test/t/openssl_2.test
BitKeeper/etc/ignore:
  added libmysql/vio_priv.h libmysql_r/vio_priv.h
client/mysql.cc:
  vio ssl structure renames
include/violite.h:
  Cleanup violite.h interface (move things to vio_priv.h)
libmysql/Makefile.am:
  Use vio_priv.h
libmysql/Makefile.shared:
  Use vio_priv.h
libmysqld/lib_vio.c:
  Added timeout for windows
mysys/my_getopt.c:
  Indentaion cleanup
sql/item_cmpfunc.cc:
  Remove compiler warnings
sql/item_func.cc:
  Remove compiler warnings
sql/mini_client.cc:
  vio ssl structure renames
sql/mysqld.cc:
  Check on windows if second server is started with same TCP/IP port
sql/net_serv.cc:
  Add read/write timeouts for windows
sql/sql_acl.cc:
  vio ssl structure renames
sql/sql_show.cc:
  vio ssl structure renames
vio/vio.c:
  Added timeouts for windows
vio/viosocket.c:
  Added timeouts for windows
vio/viossl.c:
  Added timeouts for windows
  Cleaned up structure element names
vio/viosslfactories.c:
  Added timeouts for windows
  Cleaned up structure element names
2003-08-27 02:51:39 +03:00
unknown
d1be872edf do not try to "analyze" or "sort index" in the table that has no indexes or no records if --check-only-changed option is used.
It's because such a table is never marked as "analyzed" or "sorted", so --check-only-changed doesn't work
2003-08-27 00:58:42 +02:00