Commit graph

35865 commits

Author SHA1 Message Date
lzhou/zhl@dev3-63.(none)
2b2ad6d605 BUG#24793 Add SO_KEEPALIVE socket option to avoid cluster nodes keeping dead connections forever. 2007-03-30 15:01:03 +00:00
msvensson@shellback.(none)
724573f7ff Cset exclude: msvensson@shellback.(none)|ChangeSet|20070330134336|02280 2007-03-30 16:43:15 +02:00
lzhou/zhl@dev3-63.(none)
d8b5edb0bd Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354
2007-03-30 14:40:49 +00:00
evgen@sunlight.local
7c42232d1d Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the
NO_AUTO_VALUE_ON_ZERO mode.

In the NO_AUTO_VALUE_ON_ZERO mode the table->auto_increment_field_not_null
variable is used to indicate that a non-NULL value was specified by the user
for an auto_increment column. When an INSERT .. ON DUPLICATE updates the
auto_increment field this variable is set to true and stays unchanged for the
next insert operation. This makes the next inserted row sometimes wrongly have
0 as the value of the auto_increment field.

Now the fill_record() function resets the table->auto_increment_field_not_null
variable before filling the record.
The table->auto_increment_field_not_null variable is also reset by the
open_table() function for a case if we missed some auto_increment_field_not_null
handling bug.
Now the table->auto_increment_field_not_null is reset at the end of the
mysql_load() function.

Reset the table->auto_increment_field_not_null variable after each
write_row() call in the copy_data_between_tables() function.
2007-03-30 18:13:33 +04:00
msvensson@shellback.(none)
060fb5ed39 Bug#25657 mysql-test-run.pl kill itself under ActiveState perl
- Read the pid from pidfile in order to be able to kill the real process
instead of the pseudo process. Most platforms will have the same real_pid
as pid
- Kill using the real pid
2007-03-30 15:43:36 +02:00
istruewing@chilla.local
dd13c3839f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-03-30 11:02:19 +02:00
svoj@mysql.com/june.mysql.com
556de62f8d BUG#26138 - REPAIR TABLE with option USE_FRM erases all records in
ARCHIVE table
ARCHIVE table was truncated by REPAIR TABLE ... USE_FRM statement.
The table handler returned its file name extensions in a wrong order.
REPAIR TABLE believed it has to use the meta file to create a new table
from it.

With the fixed order, REPAIR TABLE does now use the data file to create
a new table. So REPAIR TABLE ... USE_FRM works well with ARCHIVE engine
now.

This issue affects 5.0 only, since in 5.1 ARCHIVE engine stores meta
information and data in the same file.
2007-03-30 13:00:21 +05:00
bar@mysql.com
f685ae0758 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql.com:/home/bar/mysql-5.0.b22638
2007-03-30 11:36:09 +05:00
istruewing@chilla.local
90b09d2866 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-03-29 21:32:34 +02:00
svoj@mysql.com/april.(none)
75f0416532 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines
2007-03-29 21:50:54 +05:00
gkodinov/kgeorge@magare.gmz
fca2a0c4ac Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt
2007-03-29 19:20:33 +03:00
iggy@recycle.(none)
6a9811b594 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  recycle.(none):/src/bug23491/my50-bug23491
2007-03-29 12:20:13 -04:00
gkodinov/kgeorge@magare.gmz
57b71f3490 Merge magare.gmz:/home/kgeorge/mysql/work/B26815-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt
2007-03-29 19:20:04 +03:00
gkodinov/kgeorge@magare.gmz
c52e8b3e64 Bug #26815:
When creating a temporary table the concise column type
 of a string expression is decided based on its length:
 - if its length is under 512 it is stored as either 
   varchar or char.
 - otherwise it is stored as a BLOB.
 
 There is a flag (convert_blob_length) to create_tmp_field 
 that, when >0 allows to force creation of a varchar if the
 max blob length is under convert_blob_length.
 However it must be verified that convert_blob_length 
 (settable through a SQL option in some cases) is 
 under the maximum that can be stored in a varchar column.
 While performing that check for expressions in 
 create_tmp_field_from_item the max length of the blob was
 used instead. This causes blob columns to be created in the
 heap temp table used by GROUP_CONCAT (where blobs must not
 be created in the temp table because of the constant 
 convert_blob_length that is passed to create_tmp_field() ).
 And since these blob columns are not expected in that place
 we get wrong results.
 Fixed by checking that the value of the flag variable is 
 in the limits that fit into VARCHAR instead of the max length
 of the blob column.
2007-03-29 19:19:31 +03:00
msvensson@pilot.blaudden
f41764433c Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 14:37:29 +02:00
msvensson@pilot.blaudden
79b2bd53b2 Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-03-29 14:33:50 +02:00
msvensson@pilot.blaudden
f03ea622eb Update test result after merge 2007-03-29 14:21:45 +02:00
msvensson@pilot.blaudden
110c2961dd Merge bk-internal:/home/bk/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-03-29 14:21:26 +02:00
tomas@whalegate.ndb.mysql.com
51105a7781 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-29 14:20:34 +02:00
msvensson@pilot.blaudden
f9c5bb36b0 Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 14:16:28 +02:00
msvensson@pilot.blaudden
a71d195183 Bug#25482 GRANT statements are not replicated if you use "replicate-ignore-table"
- GRANT and REVOKE statments didn't have the "updating" flag set and
   thus statements with a table specified would not replicate if
   slave filtering rules where turned on.
   For example "GRANT ... ON test.t1 TO ..." would not replicate.
2007-03-29 14:12:32 +02:00
msvensson@pilot.blaudden
f5b888db39 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 13:44:49 +02:00
msvensson@pilot.blaudden
7cf0722474 Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 13:37:40 +02:00
tsmith@quadxeon.mysql.com
a778498fc1 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-29 13:37:32 +02:00
msvensson@pilot.blaudden
eac521a9f6 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 13:30:21 +02:00
tsmith@quadxeon.mysql.com
9e99b24305 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-29 13:09:16 +02:00
tsmith@quadxeon.mysql.com
a7f506db2a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-29 12:52:31 +02:00
tsmith@quadxeon.mysql.com
91f4b48541 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-29 12:40:49 +02:00
msvensson@pilot.blaudden
0e2de06a2a Merge pilot.blaudden:/home/msvensson/mysql/bug26837/my50-bug26837
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 12:34:44 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
75668471d1 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-29 12:25:28 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
890bdb4fed Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b21976/my50-b21976
2007-03-29 15:17:18 +05:00
msvensson@pilot.blaudden
071783117f Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 11:54:59 +02:00
msvensson@pilot.blaudden
72cc8618d7 Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 11:40:38 +02:00
msvensson@pilot.blaudden
0e04aec960 Make the script detect --default-storage-engine=x and
mark the test as requiring that storage engine(if we need to do that)
Make --ndb and --with-ndbcluster and alias for
--mysqld=--default-storage-engine=ndbcluster
2007-03-29 11:31:50 +02:00
tsmith@quadxeon.mysql.com
07f94fa199 gis_generic test cases:
Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
2007-03-29 11:20:08 +02:00
gkodinov/kgeorge@magare.gmz
82ecff6a76 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
2007-03-29 12:09:55 +03:00
tsmith@quadxeon.mysql.com
12535fd423 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-29 10:46:43 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c132038451 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b21976/my50-b21976
2007-03-29 13:37:07 +05:00
gkodinov/kgeorge@magare.gmz
1a2ca44e2b Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
2007-03-29 11:01:32 +03:00
sergefp@mysql.com
399bc9861e Merge of BUG#26624 and BUG#26625 2007-03-29 10:35:28 +04:00
sergefp@mysql.com
9939b3b75e BUG#26624: high mem usage (crash) in range optimizer
- Post-review fixes
2007-03-29 10:27:58 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
73f0c5d7c6 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b26359/b26359.5.0
2007-03-29 11:06:15 +05:00
bar@mysql.com
d5c6680443 Code layout fix for bug N 27079
Thanks to Gluh for suggestion.
2007-03-29 10:32:38 +05:00
bar@mysql.com
6d290278cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql.com:/home/bar/mysql-5.0.b27079
2007-03-29 10:19:45 +05:00
bar@mysql.com
98a4bb356a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql.com:/home/bar/mysql-5.0.b22378
2007-03-29 10:00:01 +05:00
tsmith@siva.hindu.god
83694ca440 Apply innodb-5.0-ss1372 snapshot
Bug #27381: InnoDB exits when attempting to rename table to non-existant database
  Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
  os_file_handle_error().
2007-03-28 22:41:21 -06:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e3c34c9cbf Fix for bugs
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode

Problems: 
1. storing a string to an integer field we don't check 
   if strntoull10rnd() returns MY_ERRNO_EDOM error.
   Fix: check for MY_ERRNO_EDOM.
2. storing a string to an year field we use my_strntol() function.
   Fix: use strntoull10rnd() instead.
2007-03-29 09:08:30 +05:00
tsmith@siva.hindu.god
024be23a82 Fix warning on Windows 2007-03-28 19:49:30 -06:00
tsmith@siva.hindu.god
d4e0de8fda Update test for bug #24563 (MBROverlaps does not seem to function propertly.); ARCHIVE doesn't support AUTO_INCREMENT, so specify PK values explicitly 2007-03-28 19:39:43 -06:00
tsmith@siva.hindu.god
979102de3b Remove warning when compiling libmysqld/log.cc 2007-03-28 17:50:06 -06:00