Commit graph

22098 commits

Author SHA1 Message Date
unknown
44dcec99b1 ndb - testOIBasic.cpp: 4.1->5.0 fix
ndb/test/ndbapi/testOIBasic.cpp:
  4.1->5.0 fix
2005-04-10 07:55:30 +02:00
unknown
120352af5f New versions of mail_to_db.pl and pmail.pl.
Added email threading capabilities to both
programs.


tests/mail_to_db.pl:
  Changes to mail_to_db.pl
  - Removed table name as optional. Future releases may require
    more than one table, after which it's better to have a fixed
    table name.
  - Fixed a bug in report (division by zero error), if table was created,
    but no mails was inserted.
  - Added fields message_id and in_reply_to.
tests/pmail.pl:
  Changed pmail:
  
  New option: --thread. Prints all sub sequent replies in the thread.
  New option: --message_id. Prints message_id and number of replies found.
  Both options are run recursively. That means, not just direct replies to
  the mail found are being searched, but also replies to replies and so on
  until the whole thread has been found.
  
  Clean up: Localized variables and moved code into functions.
2005-04-09 18:37:32 +03:00
unknown
f2824c4d60 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1
2005-04-09 07:37:00 +01:00
unknown
dc2841e6a6 Fix warning and error when compiling on Windows.
sql/item_sum.cc:
  Cast byte* to char* for creating String
sql/field.cc:
  Add missing parameter for logging warning
2005-04-09 03:05:47 +02:00
unknown
2054223668 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1
into xiphis.org:/var/db/bk/work-acurtis/bug6776.2


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_udf.cc:
  Auto merged
2005-04-09 00:36:08 +01:00
unknown
fbb21ebfe2 Fix typos in Bug#6776
sql/sql_udf.cc:
  Fix typos
2005-04-09 00:21:51 +01:00
unknown
01b0f1a3e5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-08 22:49:08 +02:00
unknown
be400cb092 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1


sql/sql_udf.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-04-08 21:40:50 +01:00
unknown
81b822082a Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-08 14:17:29 -05:00
unknown
dab65c7131 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-04-08 22:17:28 +03:00
unknown
fc5db93516 Fixed BUG#9073: Able to declare two handlers for same condition in same scope
mysql-test/r/sp-error.result:
  Added test case for BUG#9073.
mysql-test/t/sp-error.test:
  Added test case for BUG#9073.
sql/share/errmsg.txt:
  New error message for duplicate condition handlers in stored procedures.
sql/sp_pcontext.cc:
  Keep track on condition handlers in the same block for error checking.
sql/sp_pcontext.h:
  Keep track on condition handlers in the same block for error checking.
sql/sql_yacc.yy:
  Keep track on condition handlers in the same block for error checking.
2005-04-08 19:58:04 +02:00
unknown
693663e1ec Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-08 19:57:07 +02:00
unknown
127b0271b0 Merge
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
2005-04-08 19:42:57 +02:00
unknown
452794235c Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-08 17:32:50 +02:00
unknown
4215d120a3 Fixed BUG#6900: Stored procedure inner handler ignored
and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied


mysql-test/r/sp.result:
  New test cases for BUG#6900 and BUG#9074 (duplicates).
mysql-test/t/sp.test:
  New test cases for BUG#6900 and BUG#9074 (duplicates).
sql/sp_rcontext.cc:
  Corrected logic for finding condition handlers - pick the innermost one.
2005-04-08 17:31:37 +02:00
unknown
533b3f0af1 Merge from fix of Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-08 16:49:14 +02:00
unknown
c88d49bd76 Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server


sql/mysqld.cc:
  removed the code that set the shared memory connect event since this also being done in kill_server
2005-04-08 09:17:19 -05:00
unknown
0c3d72ab58 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-08 09:17:18 -05:00
unknown
e1efe79731 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-08 16:17:17 +02:00
unknown
5f006200d1 Fixed BUG#7299: Stored procedures: exception handler catches not-found conditions
mysql-test/r/sp-error.result:
  Added test case for BUG#7299.
mysql-test/t/sp-error.test:
  Added test case for BUG#7299.
sql/sp_rcontext.cc:
  Corrected cut&paste error; make sure we only catch actual errors with sqlexception.
2005-04-08 16:05:16 +02:00
unknown
7397aeb050 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11
configure.in:
  Auto merged
2005-04-08 16:04:37 +02:00
unknown
20b9946d9e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2005-04-08 14:16:57 +02:00
unknown
9896cfdf32 bug#9749 - ndb
test case for case 9749, ndb lock upgrade via NDBAPI


ndb/test/ndbapi/testOperations.cpp:
  bug#9749 - test case for case 9749
2005-04-08 14:15:37 +02:00
unknown
7ff8fc73c9 Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
Since 4.1 keys are compared with trailing spaces. 
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did.


myisam/mi_search.c:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  Fixed some function comments.
  In the case when we insert a different key between two identical keys,
  the difference must be additional spaces. In this case the prefix is 
  the same as that of the new key instead of the (zero) remaining length.
myisam/mi_write.c:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  Fixed a function comment.
mysql-test/r/myisam.result:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  The test result.
mysql-test/t/myisam.test:
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  The test case.
2005-04-08 14:13:02 +02:00
unknown
b9f486cd02 Add missing parts for the "Cybozu" custom build, to avoid future manual patches.
configure.in:
  Normally, 'configure' does only support "case-insensitive" collations for UTF-8 character sets.
  However, a certain customer requires builds with a "case-sensitive" collation: 'utf8_general_cs'.
  In order to do custom builds without manual patches, this value gets special handling in 'configure'.
  Also, when it is given, the CPP symbol enabling the additional code is set.
mysys/charset-def.c:
  Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
strings/ctype-utf8.c:
  Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
2005-04-08 13:56:48 +02:00
unknown
dc1343239a Fixed broken auto_increment 2005-04-08 12:34:52 +02:00
unknown
317b4074d7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
  Auto merged
2005-04-08 11:50:01 +02:00
unknown
5474a95aa5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-08 11:39:22 +02:00
unknown
61fed028ba Added more tests for auto_increment 2005-04-08 11:38:40 +02:00
unknown
cbd3334701 Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
The shared memory connect event was not being set in kill_server.
This caused the thread that is handling shared memory connections to never
exit.


sql/mysqld.cc:
  Added code to set the shared memory connect event upon server termination
2005-04-08 00:16:02 -05:00
unknown
a35b19af45 Test result fixed
mysql-test/r/cast.result:
  test result fixed
2005-04-08 09:23:10 +05:00
unknown
45b9f0e3a0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-08 08:31:53 +05:00
unknown
81e8630e2f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-08 00:56:29 +03:00
unknown
e997201180 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-07 21:29:33 +02:00
unknown
6a2a0ae5a7 - bumped up the version number in configure.in from 5.0.4 to 5.0.5 to indicate that engineering
has branched off from the 4.1 tree to build the 5.0.4 release
2005-04-07 21:04:18 +02:00
unknown
e036d3cf26 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/sql_select.cc:
  Auto merged
2005-04-07 22:02:24 +03:00
unknown
22f1d637fd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-07 20:21:17 +02:00
unknown
5fa93a136d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
2005-04-07 20:19:25 +02:00
unknown
f9d6463fdf BUG#6762 ALTER TABLE gives weird results and error message
- Removed hardcoded error message from 4.1


include/my_base.h:
  Adding error message for the case when table definition has changed in storage engine
mysql-test/t/ndb_alter_table.test:
  Updated testresult to expect new error code
sql/ha_ndbcluster.cc:
  Add mapping for ndb error 284 to HA_ERR_TABLE_DEF_CHANGED, this error will occur when the table definition has been changed by another MySQL Server connected to the cluster.
  Remove hardcoded errormessage from 4.1
sql/handler.cc:
  Adding error message for the case when table definition has changed in storage engine
sql/share/errmsg.txt:
  Adding error message for the case when table definition has changed in storage engine
2005-04-07 20:17:37 +02:00
unknown
d100003e88 Merge
sql/ha_ndbcluster.cc:
  SCCS merged
2005-04-07 20:10:50 +02:00
unknown
ae2f0d9872 Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post review fix 2005-04-07 20:08:01 +02:00
unknown
bebf439a73 Merge 2005-04-07 19:48:00 +02:00
unknown
d13a7b53c1 Add cp932 and eucjpms character sets to Windows build. (Bug #9479)
VC++Files/client/mysqlclient.dsp:
  Add new character sets
VC++Files/client/mysqlclient_ia64.dsp:
  Add new character sets
VC++Files/libmysql/libmysql.dsp:
  Add new character sets
VC++Files/libmysql/libmysql_ia64.dsp:
  Add new character sets
VC++Files/strings/strings.dsp:
  Add new character sets
VC++Files/strings/strings_ia64.dsp:
  Add new character sets
include/config-win.h:
  Add new character sets
2005-04-07 09:51:56 -07:00
unknown
f03cc7cc38 Merge 2005-04-07 18:37:04 +02:00
unknown
90b7d13ab4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/sql_select.cc:
  Auto merged
2005-04-07 19:25:20 +03:00
unknown
e10d81448d Moved some old test and added a new test to only be run with mysql-test-run --big
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files


BitKeeper/etc/ignore:
  added tools/mysqltestmanager
client/mysqltest.c:
  Ensure that BIG_TEST is always set to 0 or 1
  Fix the 'eval' also honors 'require'
mysql-test/mysql-test-run.sh:
  Enlarge InnoDB table space for --big tests
mysql-test/r/heap.result:
  Fix after adding more optimzation for filsort
mysql-test/r/sum_distinct.result:
  Move 'slow' part of test to sum_distinct-big.test
mysql-test/t/heap.test:
  Ensure that results are indpendent of optimizer
mysql-test/t/sum_distinct.test:
  Move 'slow' part of test to sum_distinct-big.test
sql/filesort.cc:
  Use 'sort with data' also on temporary files and with INSERT ... SELECT
sql/ha_innodb.h:
  Remove HA_FAST_KEY_READ to enable buffered-record-reads after filesort
sql/handler.h:
  More comments
sql/mysql_priv.h:
  A bit smaller limit for cache for buffered-records-read (after testing)
sql/records.cc:
  Don't use buffered-record-reads if ref_length > MAX_REFLENGTH
  Fixed warning from valgrind in 'sum_distinct'
sql/sql_select.cc:
  Ensure that tempory tables has query_id set for all fields
  (Required for sort-with-data to work on temp files)
2005-04-07 19:24:14 +03:00
unknown
7259aabc37 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-07 17:51:53 +02:00
unknown
606f0a1335 Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
unknown
6f0f3b0733 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-07 19:30:14 +05:00
unknown
1fa01e6245 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.errmsg
2005-04-07 19:25:13 +05:00