Commit graph

35797 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
9f11d74cb0 Give the "sync_slave_with_master" something to do 2007-04-10 12:19:00 +02:00
msvensson@pilot.blaudden
7cf3a2a6a5 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 12:13:47 +02:00
anozdrin/alik@ibm.
09cfc052f7 Polishing: note added. 2007-04-06 20:21:30 +04:00
anozdrin/alik@ibm.
08b8639361 Polishing: add comments. 2007-04-06 18:56:39 +04:00
msvensson@pilot.blaudden
c3dc142df5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-05 13:54:24 +02:00
msvensson@pilot.blaudden
9cd8b2b8fb Protect against dying twice
Cleanup exit handling
2007-04-05 13:53:44 +02:00
msvensson@pilot.blaudden
3f365383de Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-04 19:20:14 +02:00
msvensson@pilot.blaudden
c159836fdc Bug#27344 Total failure to start the server
- length($sockdir) >= 80 !!
2007-04-04 19:19:26 +02:00
msvensson@pilot.blaudden
8cd59587d8 Bug#27344 Total failure to start the server
- length($sockdir) >= 80 !!
2007-04-04 19:16:09 +02:00
msvensson@pilot.blaudden
678a358746 Skip test cases if the script or binary they need can't be found 2007-04-04 15:40:40 +02:00
msvensson@pilot.blaudden
3b1fc84a5e Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-04 15:17:00 +02:00
msvensson@pilot.blaudden
fc992b0667 Add "skip" function, makeing mysqltest return an
error code indicating test should be skipped
2007-04-04 15:15:40 +02:00
msvensson@pilot.blaudden
19801cbfdc Add expansion of $variables in "let from query",
"if with query" and "while with query"
2007-04-04 15:09:12 +02:00
tsmith@quadxeon.mysql.com
ab15c0fb94 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/50
2007-04-04 11:06:48 +02:00
msvensson@pilot.blaudden
bc675fb568 Only check for warnings produced by mysqltest if --check-testcases 2007-04-04 10:59:00 +02:00
msvensson@pilot.blaudden
39cca0323c Look for "testname.warnings" file produced by mysqltest, could find
problems like misspelled -- commands
2007-04-02 22:58:25 +02:00
iggy@recycle.(none)
5c0d886248 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  recycle.(none):/src/bug23491_ii/my50-bug23491_ii
2007-04-02 16:25:06 -04:00
iggy@recycle.(none)
19a2630641 Minor test cleanup. 2007-04-02 16:21:12 -04:00
kostja@bodhi.local
31a8bfbe2e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-04-02 22:06:15 +04:00
msvensson@pilot.blaudden
697b94a854 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:52:47 +02:00
msvensson@pilot.blaudden
bb9a601829 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:50:39 +02:00
msvensson@pilot.blaudden
252e3f03c7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-02 10:48:11 +02:00
msvensson@pilot.blaudden
cb3091c166 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:42:08 +02:00
msvensson@pilot.blaudden
c731bad918 Cset exclude: tsmith@siva.hindu.god|ChangeSet|20070328212513|13373 2007-04-02 10:39:23 +02:00
msvensson@pilot.blaudden
9692592143 Fix spelling error 2007-04-02 10:17:29 +02:00
msvensson@pilot.blaudden
a5bc60f559 Bug#27049 Race condition in test mysqlbinlog.test
Remove the setting of --local-load parameter for mysqlbinlog and leave that to the testcases
to decide what params to use.
2007-04-02 10:14:45 +02:00
ibabaev@bk-internal.mysql.com
898ec87e14 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-04-02 03:56:39 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
572c034485 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-04-01 01:48:21 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c32c54881e Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-04-01 01:46:38 +02:00
msvensson@pilot.blaudden
d96319299b Add correct replace 2007-03-31 17:18:03 +02:00
msvensson@pilot.blaudden
398c24d1a1 Bug#27049 Race condition in test mysqlbinlog.test
- Add --local-load option to avoidthat the load data file requested
   by mysqlbinlog end up in local var/tmp dir and not in system global
   tmpdir
2007-03-31 15:07:48 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
cec17aa0ba Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-31 12:36:50 +02:00
ibabaev@bk-internal.mysql.com
466586472b Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
2007-03-31 09:52:18 +02:00
igor@olga.mysql.com
0c5ba6246b Fixed bug #27154: memory corruption when using row equalities in where
conditions.
When allocating memory for KEY_FIELD/SARGABLE_PARAM structures the
function update_ref_and_keys did not take into account the fact that
a single row equality could be replaced by several simple equalities.
Fixed by adjusting the counter cond_count accordingly for each subquery
when performing substitution of a row equality for simple equalities.
2007-03-31 00:23:03 -07:00
ibabaev@bk-internal.mysql.com
9a21d1d50a Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-03-31 05:31:35 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
9c6dc8c853 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-31 00:15:20 +02:00
sergefp@mysql.com
dd7e39f441 BUG#26624, pushbuild fixes: Merge to 5.0 2007-03-31 00:48:31 +04:00
sergefp@mysql.com
dcb2551347 BUG#26624: high mem usage (crash) in range optimizer
Pushbuild fixes: 
 - Make MAX_SEL_ARGS smaller (even 16K records_in_range() calls is 
   more than it makes sense to do in typical cases)
 - Don't call sel_arg->test_use_count() if we've already allocated 
   more than MAX_SEL_ARGs elements. The test will succeed but will take
   too much time for the test suite (and not provide much value).
2007-03-31 00:29:18 +04:00
kent@mysql.com/kent-amd64.(none)
2d0da97164 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-30 22:26:06 +02:00
msvensson@shellback.(none)
724573f7ff Cset exclude: msvensson@shellback.(none)|ChangeSet|20070330134336|02280 2007-03-30 16:43:15 +02: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
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