Commit graph

12722 commits

Author SHA1 Message Date
unknown
be68220fbc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-06-10 12:02:29 +00:00
unknown
dd6023e729 removed myVector from ndb restore
BitKeeper/deleted/.del-myVector.hpp~4ecd4d6d4c8fa2f6:
  Delete: ndb/src/kernel/blocks/backup/restore/myVector.hpp
ndb/include/util/Parser.hpp:
  bug-fix missing delete
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  removed myVector
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  removed myVector
ndb/src/kernel/blocks/backup/restore/consumer_restore.cpp:
  removed myVector
ndb/src/kernel/blocks/backup/restore/main.cpp:
  removed myVector
2004-06-10 12:01:47 +00:00
unknown
d1cb8d6d2a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-10 08:30:43 +02:00
unknown
f1007e6018 more ndb restore cleanup 2004-06-10 01:38:38 +00:00
unknown
f468b91f37 Fix for Bug#3904 "COUNT DISTINCT performance anomaly in 4.1"
The bug was caused by error in hash calculation function: it
always returned hash value for last field in a composite key, so 
for keys like (a text, b char(1)) we were always
getting bad hash values.
 


myisam/mi_unique.c:
  Fix for bug #3904:
  We should take into account existing hash value when calculating hash for
  next key in a composite unique index.
2004-06-10 01:30:39 +04:00
unknown
a9c50d0573 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-09 19:29:49 +00:00
unknown
d089a424bd re-enginered ndb restore to remove new/deletes and data copy
BitKeeper/deleted/.del-Makefile_old~5e1138bd59f6b3aa:
  Delete: ndb/src/kernel/blocks/backup/restore/Makefile_old
2004-06-09 19:24:36 +00:00
unknown
350ad5003e Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-09 16:24:35 +02:00
unknown
43489240ad Making DROP TABLE IF EXISTS, DROP DATABASE IF EXISTS, DELETE FROM, UPDATE be logged to
binlog even if they changed nothing, and a test for this.
This is useful when users use these commands to clean up their master and slave by issuing
one command on master (assume master and slave have slightly different data for some
reason and you want to clean up both).
Note that I have not changed multi-table DELETE and multi-table UPDATE because their
error-reporting mechanism is more complicated.


mysql-test/r/mysqlbinlog.result:
  result update
mysql-test/r/rpl_charset.result:
  result update
mysql-test/r/rpl_flush_log_loop.result:
  result update
mysql-test/r/rpl_replicate_do.result:
  result update
mysql-test/r/rpl_temporary.result:
  result update
mysql-test/t/mysqlbinlog.test:
  moving SET TIMESTAMP up as DROP shows up in binlog
sql/sql_db.cc:
  DROP DATABASE IF EXISTS is now always logged to binlog, even if db did not exist
sql/sql_delete.cc:
  DELETE FROM t is now always logged to binlog even if no rows deleted (but in this case, only if really no error).
sql/sql_table.cc:
  DROP TABLE IF EXISTS is now always logged to binlog even if table did not exist
sql/sql_update.cc:
  UPDATE is now always logged to binlog even if no rows updated (but in this case, only if really no error).
2004-06-09 16:07:01 +02:00
unknown
5304a03e99 charset.c:
Fix to be ANSI C complient
  ,


mysys/charset.c:
  Fix to be ANSI C complient
  ,
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-09 12:33:30 +05:00
unknown
35602052fa 3 retries for wait started 2004-06-09 06:09:13 +02:00
unknown
19a5cf935a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4026


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2004-06-09 03:22:55 +04:00
unknown
27eda71204 Proposed fix for Bug#4026 "Microseconds part of TIME/DATETIME types
is broken (prepared statements)": fixed date handling in many places 
of prepared statements code.


libmysql/libmysql.c:
  Fix for Bug#4026:
  - now buffer_length is defined for any buffer type. Network buffer 
    preallocation cleaned up.
  - added constants for maximum buffer sizes necessary for MYSQL_TYPE_DATE,
    MYSQL_TYPE_TIME, MYSQL_TYPE_DATETIME types.
  - TIME/DATETIME packing/unpacking functions fixed 
  - now result set metadata is always updated from fields sent to COM_EXECUTE.
    This is necessary to make 'SELECT ?' queries work without conversions.
sql/item.cc:
  - added implementatoin of Item_param::get_date
sql/item.h:
  - added enum_field_types Item_param::param_type. First step for proper
    handling of placeholders.
  - added get_date() implementation to prevent date -> string -> date 
    conversions when MYSQL_TYPE_DATE/DATETIME parameter is used in temporal 
    context.
sql/protocol.cc:
  Fix for Bug#4026:
  - PACKET_BUFFET_EXTRA_ALLOC -> PACKET_BUFFER_EXTRA_ALLOC.
    The define itself was moved to .cc as it's used only in protocol.cc
  - fixed Protocol_prep::store_time() call.
sql/protocol.h:
  - PACKET_BUFFER_EXTRA_ALLOC moved to protocol.cc
sql/sql_prepare.cc:
  Fix for Bug#4026:
  - MYSQL_TYPE_TIME/DATETIME handling fixed.
  - added initialization for Item_param::param_type in 
    setup_one_conversion_function
tests/client_test.c:
  Test case for Bug#4026
2004-06-09 03:21:50 +04:00
unknown
ee401045be Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-08 19:55:35 +02:00
unknown
7bd8167fb7 Correction to replication of charsets in 4.1:
In mysqlbinlog, there was a problem with how we escaped the content of a string user variable.
To be perfect, we should have escaped with character_set_client. But this charset is unknown
to mysqlbinlog. So the simplest is to print the string in hex. This is unreadable but
100% safe with any charset (checked with Bar), no more need to bother with character_set_client.


mysql-test/r/rpl_charset.result:
  hex strings
mysql-test/r/rpl_user_variables.result:
  hex strings
mysql-test/r/user_var.result:
  hex strings
sql/log_event.cc:
  In mysqlbinlog, there was a problem with how we escaped the content of a string user variable.
  To be perfect, we should have escaped with character_set_client. But this charset is unknown
  to mysqlbinlog. So the simplest is to print the string in hex. This is unreadable but
  100% safe with any charset (checked with Bar), no more need to bother with character_set_client.
2004-06-08 19:55:04 +02:00
unknown
3feecf8237 Use LOGNAME instead of USER 2004-06-08 17:01:47 +02:00
unknown
789135dd75 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-06-08 17:09:59 +03:00
unknown
8ab01b335d WL#916: Unicode collations for some languages 2004-06-08 17:56:15 +05:00
unknown
19480ed616 Added function innobase_store_binlog_offset_and_flush_log requested by Guilhem
to ha_innodb.cc and ha_innodb.h


sql/ha_innodb.cc:
  /***********************************************************************
  This function stores binlog offset and flushes logs */
  
  void
  innobase_store_binlog_offset_and_flush_log(
  /*=============================*/
      char *binlog_name,          /* in: binlog name   */
      longlong offset             /* in: binlog offset */
  );
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-08 15:38:22 +03:00
unknown
a755009ce4 Bug #3717 ENCODE returns a character string, not a binary string 2004-06-08 15:36:44 +05:00
unknown
5cf5e43f17 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2004-06-08 15:36:43 +05:00
unknown
c47ec30811 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-08 12:36:42 +02:00
unknown
283e815608 fix for automake-1.5 2004-06-08 10:36:41 +00:00
unknown
bd3de2b189 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-06-08 09:32:52 +00:00
unknown
e673c9a1a6 Bug #2077 Japanese characters in enum/default values are reported incorrectly 2004-06-08 14:26:16 +05:00
unknown
b2ab6644dd ha_innodb.cc:
Fix Bug #4047: remove the improvement ported from 4.0 that made InnoDB to remember the original select_lock_type inside LOCK TABLES


sql/ha_innodb.cc:
  Fix Bug #4047: remove the improvement ported from 4.0 that made InnoDB to remember the original select_lock_type inside LOCK TABLES
2004-06-08 10:41:14 +03:00
unknown
742ca412b2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-08 08:33:17 +02:00
unknown
bcce99e9cb Sorry, forgot to commit together with the code change yesterday. 2004-06-08 11:33:16 +05:00
unknown
3b1a93bf89 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-08 00:12:55 +00:00
unknown
80213d665d some ndb printout cleanup
ndb/src/ndbapi/NdbDictionary.cpp:
  Print cleanup
ndb/test/src/NDBT_ResultRow.cpp:
  Print error
ndb/test/src/NDBT_Table.cpp:
  Print cleanup
2004-06-08 00:12:11 +00:00
unknown
838870d585 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-06-07 23:43:04 +03:00
unknown
c4d76f755a SQL Syntax for Prepared Statements: post-merge fixes 2004-06-08 00:43:03 +04:00
unknown
ec1c9ef7b6 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2004-06-07 23:50:59 +04:00
unknown
457aca6746 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-07 21:17:29 +02:00
unknown
b60686673a BUG#4034 2004-06-07 21:16:53 +02:00
unknown
be0f204c91 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-07 21:01:19 +02:00
unknown
40b622f271 BUG#4037 fix printout of limits 2004-06-07 20:57:28 +02:00
unknown
a729db61f7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-06-07 21:31:54 +03:00
unknown
46de0999e1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-07 18:26:12 +00:00
unknown
dfa8ee365f ndb source tree cleanup, see respective file
BitKeeper/deleted/.del-BinDist.sh~8ea6fee0be3de36:
  Delete: ndb/old_files/BinDist.sh
BitKeeper/deleted/.del-Defs.mk~fab44ad996ed5499:
  Delete: ndb/old_files/Defs.mk
BitKeeper/deleted/.del-Makefile~726e96331d4343ce:
  Delete: ndb/old_files/Makefile
BitKeeper/deleted/.del-SrcDist.sh~ad4f1cd7aae4265b:
  Delete: ndb/old_files/SrcDist.sh
BitKeeper/deleted/.del-configure~501239931f8bb1:
  Delete: ndb/old_files/configure
BitKeeper/deleted/.del-Epilogue.mk~60f7edf886726154:
  Delete: ndb/old_files/Epilogue.mk
BitKeeper/deleted/.del-README~b619a580720ec3d8:
  Delete: ndb/old_files/README
BitKeeper/deleted/.del-env.sh~91075f1664ce8292:
  Delete: ndb/old_files/env.sh
BitKeeper/deleted/.del-mysqlclusterenv.sh~f0d8a63e844255f5:
  Delete: ndb/old_files/mysqlclusterenv.sh
BitKeeper/deleted/.del-Defs.DEBUG.mk~8ed7bb195181c74a:
  Delete: ndb/config/old_files/Defs.DEBUG.mk
BitKeeper/deleted/.del-acinclude.m4~b1472f9faac0c71:
  Delete: ndb/config/old_files/acinclude.m4
BitKeeper/deleted/.del-Defs.HPUX.HPPA.GCC.mk~b50ab324c3ce07ce:
  Delete: ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk
BitKeeper/deleted/.del-Defs.IBMAIX.POWERPC.GCC.mk~76bea6928ca7b8f0:
  Delete: ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk
BitKeeper/deleted/.del-Defs.LINUX.x86.GCC.mk~15f3c82665d141a0:
  Delete: ndb/config/old_files/Defs.LINUX.x86.GCC.mk
BitKeeper/deleted/.del-Defs.LINUX.x86.ICC.mk~e51a6e19daeb353:
  Delete: ndb/config/old_files/Defs.LINUX.x86.ICC.mk
BitKeeper/deleted/.del-Defs.LINUX.x86_64.GCC.mk~9e853e7e1142b2d7:
  Delete: ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk
BitKeeper/deleted/.del-Defs.MACOSX.POWERPC.GCC.mk~d661574b758ac911:
  Delete: ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk
BitKeeper/deleted/.del-Defs.OSE.PPC750.DIAB.mk~d5d7116c512290bc:
  Delete: ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk
BitKeeper/deleted/.del-Defs.RELEASE.mk~6c195617d8e1c8ec:
  Delete: ndb/config/old_files/Defs.RELEASE.mk
BitKeeper/deleted/.del-Defs.RELEASE_TRACE.mk~e367d147bd3ad0bf:
  Delete: ndb/config/old_files/Defs.RELEASE_TRACE.mk
BitKeeper/deleted/.del-Defs.SIMCELLO.SOFTOSE.GCC.mk~5acee8046e3dfd21:
  Delete: ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk
BitKeeper/deleted/.del-Defs.WIN32.x86.VC7.mk~582038c28dd89391:
  Delete: ndb/config/old_files/Defs.WIN32.x86.VC7.mk
BitKeeper/deleted/.del-Defs.SOFTOSE.SPARC.GCC.mk~ebd0c4aab56c1202:
  Delete: ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk
BitKeeper/deleted/.del-Defs.SOLARIS.SPARC.FORTE6.mk~4367e18b8246761e:
  Delete: ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk
BitKeeper/deleted/.del-Defs.SOLARIS.SPARC.GCC.mk~d781a20b8235525c:
  Delete: ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk
BitKeeper/deleted/.del-Defs.SOLARIS.SPARC_64.GCC.mk~76626f56dcd0e8e9:
  Delete: ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk
BitKeeper/deleted/.del-Defs.SOLARIS6.SPARC.GCC.mk~2b05903f79ce771:
  Delete: ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk
BitKeeper/deleted/.del-Defs.TRU64X.ALPHA.GCC.mk~6ba3fc0cfaa37cb2:
  Delete: ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk
BitKeeper/deleted/.del-GuessConfig.sh~ebdb504ed6b7ab68:
  Delete: ndb/config/old_files/GuessConfig.sh
BitKeeper/deleted/.del-Makefile.am~c28d15539f926269:
  Delete: ndb/config/old_files/Makefile.am
BitKeeper/deleted/.del-configure.in~3e0ef32c155b79bc:
  Delete: ndb/config/old_files/configure.in
BitKeeper/deleted/.del-config.h.in~b9209994763e30f8:
  Delete: ndb/config/old_files/config.h.in
BitKeeper/deleted/.del-Makefile~71ad5c694da8711:
  Delete: ndb/src/old_files/Makefile
BitKeeper/deleted/.del-Makefile~261cfb7897aa2259:
  Delete: ndb/test/newtonapi/Makefile
BitKeeper/deleted/.del-Makefile~d46bb4a49ae611f9:
  Delete: ndb/test/odbc/Makefile
BitKeeper/deleted/.del-Makefile_old~5ce89facf68772b:
  Delete: ndb/test/Makefile_old
ndb/test/include/NdbSchemaCon.hpp:
  Rename: ndb/include/ndbapi/NdbSchemaCon.hpp -> ndb/test/include/NdbSchemaCon.hpp
ndb/test/include/NdbSchemaOp.hpp:
  Rename: ndb/include/ndbapi/NdbSchemaOp.hpp -> ndb/test/include/NdbSchemaOp.hpp
ndb/include/Makefile.am:
  removed NdbSchema from ndbapi
ndb/include/ndbapi/NdbDictionary.hpp:
  added Column::getSize()
  and print function for Column::Type
ndb/include/ndbapi/NdbRecAttr.hpp:
  made an operator<< friend to NdbRecAttr
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Rewritten restore to remove NdbSchema
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Rewritten restore to remove NdbSchema
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Rewritten restore to remove NdbSchema
ndb/src/ndbapi/Makefile.am:
  removed NdbSchema from ndbapi
ndb/src/ndbapi/NdbDictionary.cpp:
  added operator << for Column::Type
ndb/src/ndbapi/NdbRecAttr.cpp:
  updated operator<< for NdbRecAttr
ndb/src/ndbapi/Ndberr.cpp:
  removed NdbSchema from ndbapi
ndb/test/src/Makefile.am:
  moved NdbSchema to test
ndb/test/src/NDBT_ResultRow.cpp:
  use common print method for NDBT_ResultRow
ndb/test/src/NdbBackup.cpp:
  fixed bug in testBackup
ndb/test/src/NdbSchemaCon.cpp:
  moved NdbError NdbSchema
ndb/test/src/NdbSchemaOp.cpp:
  updated include file list
2004-06-07 17:31:32 +00:00
unknown
5b4120288e Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-07 18:56:33 +02:00
unknown
f8c86262c0 updating test's result now that SHOW BINLOG EVENTS quotes and escapes user variables.
mysql-test/r/rpl_user_variables.result:
  adding quotes to the variable names, and escaping, in the result
2004-06-07 18:55:53 +02:00
unknown
86ab1dd2d6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1


acconfig.h:
  Auto merged
configure.in:
  Auto merged
2004-06-07 17:58:35 +02:00
unknown
a3426dd8ab Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
2004-06-07 19:58:34 +04:00
unknown
fd94477b43 Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character
mysql-test/r/ctype_ucs.result:
  Test for bug#3946: Error in LPAD() when padstring is longer than 1 character
mysql-test/t/ctype_ucs.test:
  Test for bug#3946: Error in LPAD() when padstring is longer than 1 character
2004-06-07 17:39:17 +04:00
unknown
8e50d3768d mysqld.cc:
WL#1160.
  Adding variable-conformant startup options for --default-character-set and --default-collation


sql/mysqld.cc:
  WL#1160.
  Adding variable-conformant startup options for --default-character-set and --default-collation
2004-06-07 18:33:17 +05:00
unknown
ef3b0c2034 mysqldump.c:
Dump could fail to load because of --default-character-set command line option.
  More safe dump is now produces, --default-character-set doesn't matter.


client/mysqldump.c:
  Dump could fail to load because of --default-character-set command line option.
  More safe dump is now produces, --default-character-set doesn't matter.
2004-06-07 18:12:23 +05:00
unknown
d23821d515 client.c:
Bug #3990  	`--with-charset' ./configure's switch doesn'taffect mysql client library.


sql-common/client.c:
  Bug #3990  	`--with-charset' ./configure's switch doesn'taffect mysql client library.
2004-06-07 17:28:31 +05:00
unknown
8e5d446227 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-06-07 02:08:36 -07:00
unknown
89de63595f Last patch before push into main tree. Updated from code review and final once over.
A couple of small changes to ha_example (mainly comments). 


sql/examples/ha_archive.cc:
  Changes from Serg.
  A few styles changes, fix for potential hash insert gone wrong, removed bad tables if create fails, gzflush used for flushing by default (had problems with OSX 10.2), and some spelling corrections.
sql/examples/ha_archive.h:
  Removed fast_key_read() and changed the name of a conflicting variable.
sql/examples/ha_example.cc:
  Added a few new comments.
sql/examples/ha_example.h:
  Added pragma interface. Removed fast_key_read() and Serg's request
2004-06-07 02:06:33 -07:00