22098 Commits

Author SHA1 Message Date
unknown
eec84895b7 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/item.cc:
  Auto merged
2005-03-17 17:00:31 +01:00
unknown
e66af8ad32 sql/ha_federated.cc: update to new prototype
sql/item_cmpfunc.cc:     typo fixed


sql/ha_federated.cc:
  update to new prototype
sql/item_cmpfunc.cc:
  typo fixed
2005-03-17 16:58:23 +01:00
unknown
ee98733152 endspace.result:
Update endspace.result now that InnoDB pads BLOBs properly with spaces in comparisons


mysql-test/r/endspace.result:
  Update endspace.result now that InnoDB pads BLOBs properly with spaces in comparisons
2005-03-17 17:44:28 +02:00
unknown
31ab90c805 data0type.ic:
Fix that 'a' LIKE 'a%' was not true for an InnoDB BLOB or TEXT type column prefix index search: InnoDB assumed that the BLOB and TEXT should not be padded with space in comparisons; this bug is also in 4.1; it may have worked in 4.1 because MySQL may have asked there for strings >= 'a', while in 5.0 it asks for strings >= 'a        '


innobase/include/data0type.ic:
  Fix that 'a' LIKE 'a%' was not true for an InnoDB BLOB or TEXT type column prefix index search: InnoDB assumed that the BLOB and TEXT should not be padded with space in comparisons; this bug is also in 4.1; it may have worked in 4.1 because MySQL may have asked there for strings >= 'a', while in 5.0 it asks for strings >= 'a        '
2005-03-17 17:44:27 +02:00
unknown
e4a2c7e92f endspace.result:
Someone has fixed the calculation of length() for a returned InnoDB VARCHAR value: update endspace.result to have the correct value length('teststring') == 10


mysql-test/r/endspace.result:
  Someone has fixed the calculation of length() for a returned InnoDB VARCHAR value: update endspace.result to have the correct value length('teststring') == 10
2005-03-17 17:44:26 +02:00
unknown
94c3958e5d Manual merge. 2005-03-17 16:44:25 +01:00
unknown
0c0a2d5590 after merge fix 2005-03-17 18:44:24 +03:00
unknown
05534c4df0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 15:51:52 +01:00
unknown
17791f9500 Merge 4.1 -> 5.0
heap/hp_create.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_string.h:
  Auto merged
client/mysqldump.c:
  Manual merge
mysql-test/r/func_gconcat.result:
  Manual merge
mysql-test/r/func_str.result:
  Manual merge
mysql-test/t/func_gconcat.test:
  Manual merge
sql/ha_heap.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge
2005-03-17 16:51:07 +03:00
unknown
93c928d3a7 safer creation of temp files used in replication of LOAD DATA INFILE.
When we come to create these, they may already exist and it's necessary to delete these old, useless copies.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-17 14:39:39 +01:00
unknown
b6e29d09b0 Field::quote_data():
don't call escape_string_for_mysql() unnecesary
  don't overwrite local buffer
escape_string_for_mysql():
  take a length of the destination buffer as an argument


include/my_sys.h:
  prototype changed
libmysql/libmysql.c:
  prototype changed
mysys/charset.c:
  escape_string_for_mysql():
    take a length of the destination buffer as an argument
sql/field.cc:
  Field::quote_data():
    don't call escape_string_for_mysql() unnecesary
    don't overwrite local buffer
sql/item.cc:
  prototype changed
sql/sql_prepare.cc:
  prototype changed
2005-03-17 12:27:45 +01:00
unknown
621abfacfe Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-17 13:25:19 +03:00
unknown
278e691ba8 Automerge
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-17 10:10:26 +01:00
unknown
2b466294e3 Automerge
sql/sql_parse.cc:
  Auto merged
sql/handler.cc:
  SCCS merged
sql/mysql_priv.h:
  SCCS merged
2005-03-17 10:06:49 +01:00
unknown
4079a85af4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-17 11:02:11 +03:00
unknown
5c1b91f1ee Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-03-17 08:46:48 +01:00
unknown
3e4ae65a14 Merge
sql/key.cc:
  Auto merged
mysql-test/r/update.result:
  SCCS merged
mysql-test/t/update.test:
  SCCS merged
2005-03-17 10:59:25 +04:00
unknown
7ceb5c6cef A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
sql/key.cc:
  A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
  For "partial" key parts (e.g. key(a(20), ...) we create different
  key_part->field, see sql/table.cc; so we have to use the eq() 
  function here to compare fields.
2005-03-17 10:24:50 +04:00
unknown
2bbde22d84 Fixed two bugs in MySQL ACL.
First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.

Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)

Fixed tests grant.pl and grant2, which were wrong.
2005-03-17 08:16:56 +02:00
unknown
f3a63cdef5 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.0
2005-03-16 18:04:28 -08:00
unknown
a131e4d12d Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/item.h:
  Auto merged
2005-03-16 17:50:03 -08:00
unknown
9045b70f40 Fix failure in 'kill' test due to change of default
reconnect setting in mysql client library. (Bug #8866)


client/mysqltest.c:
  Make sure reconnect is always set on connections, and
  note that there is a test that relies on this
2005-03-16 17:13:45 -08:00
unknown
6eac27a9cd Fix 64-bit issue with mysql_client_test. (Bug #8047)
tests/mysql_client_test.c:
  Fix data type of variable used in bind
2005-03-16 16:29:43 -08:00
unknown
98de4d79ed Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup).
BitKeeper/deleted/.del-mysqlfs.m4~2c0a06625ffdef2:
  Delete: config/ac-macros/mysqlfs.m4
Makefile.am:
  Removed fs_dir (since dropping mysqlfs support)
configure.in:
  Removed support for MySQLFS.
  Gone is support for mit-threads.
  Gone is Raid.
  I feel like if I say "gone" one more time I should embed a secret country song somewhere in the source as an easter egg.
dbug/Makefile.am:
  Removed mit-threads
extra/Makefile.am:
  Removed mit-threads
heap/Makefile.am:
  removed mit-threads
libmysql_r/Makefile.am:
  removed mit-threads
libmysqld/Makefile.am:
  removed mit-threads
myisam/Makefile.am:
  remove mt-threads
myisammrg/Makefile.am:
  removed mit-threas
mysys/Makefile.am:
  removed mit-threads
regex/Makefile.am:
  removed mit-treads
sql/Makefile.am:
  removed mit-threads
strings/Makefile.am:
  removed mit-threads
tests/Makefile.am:
  removed mit-threads
tools/Makefile.am:
  removed mit-threads
2005-03-16 16:22:56 -08:00
unknown
31f6b0dde8 olap.result, olap.test:
Added a test for bug #8615.
sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.


sql/sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.
mysql-test/t/olap.test:
  Added a test for bug #8615.
mysql-test/r/olap.result:
  Added a test for bug #8615.
2005-03-16 15:55:04 -08:00
unknown
b766082bfb Merge with global tree
mysql-test/r/federated.result:
  merge
sql/ha_federated.cc:
  merge
2005-03-17 01:27:04 +02:00
unknown
1c5ca8061d Move handler dependent tests to the specific handler (myisam, bdb, innodb)
Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP


mysql-test/include/varchar.inc:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/r/innodb.result:
  Added varchar tests
mysql-test/r/myisam.result:
  Update results
mysql-test/t/bdb.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/t/innodb.test:
  Enabled VARCHAR testing
mysql-test/t/myisam.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
sql/sql_parse.cc:
  Indentation fixes
sql/sql_table.cc:
  Fixed bug introduced when doing cleanup
2005-03-17 01:22:12 +02:00
unknown
94ad6930fb drop database on the right server :) 2005-03-16 23:56:37 +01:00
unknown
e28dc4c7ef log_event.cc:
#ifdef USING_TRANSACTIONS
ha_innodb.cc:
  comment
rpl_drop_temp.test, rpl_drop_temp.result:
  cleanup


mysql-test/r/rpl_drop_temp.result:
  cleanup
mysql-test/t/rpl_drop_temp.test:
  cleanup
sql/ha_innodb.cc:
  comment
sql/log_event.cc:
  #ifdef USING_TRANSACTIONS
2005-03-16 23:47:38 +01:00
unknown
2815daf7f7 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1 2005-03-16 23:44:47 +01:00
unknown
b3ff091f15 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2005-03-16 22:40:58 +01:00
unknown
06f59b28ab Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-03-16 22:59:06 +02:00
unknown
74007170b5 Fixes after Sinisa and Serg comments after push of patch for BUG#9123.
BUG#9123 is solved earlier than this patch though.
2005-03-16 21:56:56 +01:00
unknown
61a717f67e Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 12:56:40 -08:00
unknown
f9792042eb Fixed binlog.test failure which occured after patch implementing
WL#874 "Extended LOAD DATA" was pushed.


mysql-test/r/binlog.result:
  Addition of two new types of binary log events shifted binlog positions.
  Updated test's results and made it more robust for future similar
  changes.
mysql-test/t/binlog.test:
  Addition of two new types of binary log events shifted binlog positions.
  Updated test's results and made it more robust for future similar
  changes.
2005-03-16 23:12:27 +03:00
unknown
a97fd472a9 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 12:05:58 -08:00
unknown
7fe43b71b9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
2005-03-16 16:57:59 +00:00
unknown
91df4830f2 Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.2
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-03-16 16:27:07 +00:00
unknown
1f91905231 merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-16 17:13:43 +01:00
unknown
0c0b3ea9b9 data0data.c:
Allow also long VARCHARs to be stored externally, not just BLOBs; fixes a bug reported by Trudy Pelzer; needs more testing


innobase/data/data0data.c:
  Allow also long VARCHARs to be stored externally, not just BLOBs; fixes a bug reported by Trudy Pelzer; needs more testing
2005-03-16 18:05:08 +02:00
unknown
ef62de3307 Manual merge: Do not re-use the same identifier at loop level within a function (IRIX!). 2005-03-16 17:05:07 +01:00
unknown
a3869dd811 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 07:55:56 -08:00
unknown
01774e960b Small fix to innodb.test that Heikki probably simply forgot to commit.
mysql-test/r/innodb.result:
  Added proper cleanup after test.
mysql-test/t/innodb.test:
  We don't expect error if we create varchar(16384) column in Innodb
  table anymore. (Heikki already removed error message from .result
  file.) Also we should do proper cleanup after the test.
2005-03-16 18:48:13 +03:00
unknown
5be39a0c95 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-03-16 16:44:31 +01:00
unknown
0f3b3d3a7b Add information to the log file written by 'Do-compile' that allows to calculate
the time spent in the various steps.


Build-tools/Do-compile:
  Add information to the log file that allows to calculate the time spent in the
  various steps:
  
  1) Introduce a global variable 'global_step'.
  2) Before each major step, set it to some descriptive value.
  3) Expand the 'log_timestamp()' function to take a parameter (typical: "START",
     "DONE", or "ABORT") and append that to the timestamp in the log file,
     followed by the contents of 'global_step'.
  4) Add the "START" string as parameter to the 'log_timestamp' calls preceding a step.
  5) Add 'log_timestamp("DONE");' calls after the relevant steps.
  6) Add 'log_timestamp("ABORT");' calls to the error exits.
2005-03-16 16:33:06 +01:00
unknown
533d218738 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-16 18:09:01 +03:00
unknown
98eecc7b35 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-03-16 17:06:04 +02:00
unknown
6bd23c1877 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-16 17:37:28 +03:00
unknown
05e25d047a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
2005-03-16 17:14:08 +03:00
unknown
284b8b8b63 Cleanup during reviews
Removed some optional arguments
Fixed portability problem in federated tests


client/sql_string.cc:
  update from sql/sql_string.cc
client/sql_string.h:
  update from sql/sql_string.h
mysql-test/r/federated.result:
  Fixed error message
sql/field.cc:
  Cleanup during review
  Remove const in 'const unsigned int'
sql/field.h:
  Remove const in 'const unsigned int'
sql/ha_federated.cc:
  Better error string.  Add missing argument to error (before 'errno' was picked up from stack)
sql/handler.cc:
  Removed compiler warning
sql/item_func.cc:
  Cleanup during review
sql/item_sum.cc:
  Cleanup during review
sql/lock.cc:
  Remove optional arguments
sql/log_event.cc:
  Remove optional arguments
sql/mysql_priv.h:
  Remove optional arguments
  cahnge preapre_create_fields to use pointers instead of references
sql/opt_range.cc:
  Fix arguments so that return value is last
sql/sql_base.cc:
  Remove optional arguments
sql/sql_delete.cc:
  Remove optional arguments
sql/sql_error.cc:
  Remove optional arguments
sql/sql_help.cc:
  Remove optional arguments
sql/sql_parse.cc:
  Remove optional arguments
sql/sql_prepare.cc:
  Remove optional arguments
sql/sql_rename.cc:
  Remove optional arguments
sql/sql_select.cc:
  Remove optional arguments
sql/sql_show.cc:
  Cleanup during review
sql/sql_string.cc:
  Simple optimization
sql/sql_table.cc:
  Remove optional arguments
  Fixed indentation
sql/sql_update.cc:
  Remove optional arguments
sql/sql_yacc.yy:
  Change references to pointers
2005-03-16 16:11:01 +02:00