Commit graph

21559 commits

Author SHA1 Message Date
unknown
02cd4f5ada BUG#24274 option "--big-test" of mysql-test-run.pl does not work anymore
mysql-test/lib/mtr_cases.pl:
  Don't look at lines that start with # ie. a comment
mysql-test/mysql-test-run.pl:
  Set env BIG_TEST if --big-test passed
2006-11-17 13:14:07 +01:00
unknown
f3e8cb194f remove junk comment 2006-11-17 13:10:54 +01:00
unknown
a3d041559d ABI fix
include/mysql_h.ic:
  this one should actually be removed from the ABI
2006-11-17 14:30:08 +04:00
unknown
07a6c29399 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383
2006-11-17 12:41:17 +03:00
unknown
2d04b1914d BUG#23383: mysql_affected_rows() returns different values than
mysql_stmt_affected_rows()

The problem was that affected_rows for prepared statement wasn't updated
in the client library on the error.  The solution is to always update
affected_rows, which will be equal to -1 on the error.


libmysql/libmysql.c:
  Update status variables even in the case of an error.  Some variables
  have a defined value on the error (like affected_rows is -1), others are
  undefined, so updating them won't harm.
libmysqld/lib_sql.cc:
  Update status variables even in the case of an error.  Some variables
  have a defined value on the error (like affected_rows is -1), others are
  undefined, so updating them won't harm.
tests/mysql_client_test.c:
  Add test for bug#23383: mysql_affected_rows() returns different values
  than mysql_stmt_affected_rows().
2006-11-17 12:21:32 +03:00
unknown
16599454e1 Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2006-11-16 21:04:01 +01:00
unknown
e78fd1d14b merging 2006-11-16 23:00:48 +04:00
unknown
83a7bbf730 merging 2006-11-16 21:23:34 +04:00
unknown
17c238a15b Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/home/hf/work/mysql-4.1-mrg


include/mysql.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_class.h:
  Auto merged
Makefile.am:
  merging
client/mysqltest.c:
  merging
mysql-test/t/mysql_client.test:
  merging
2006-11-16 20:44:37 +04:00
unknown
6ce5681b12 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  example.com:/work/bug24219/my41
2006-11-16 16:29:06 +01:00
unknown
d274d475f8 Put more spcific paths at the top of list to search for binaries 2006-11-16 15:23:13 +01:00
unknown
fb1aab1a4d Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Manual merge of fix for location of mysql_client_test
2006-11-16 15:11:12 +01:00
unknown
aa13653a1c support-files/mysql.spec.sh : Add an "Obsoletes" note relative to SuSE RPMs (bug#22081).
support-files/mysql.spec.sh:
  Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) replace 
  "mysql-shared" (as distributed by SuSE) to allow easy upgrading (bug#22081).
2006-11-16 14:01:31 +01:00
unknown
f754fd2543 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug23653/my41-bug23653
2006-11-16 16:19:10 +04:00
unknown
09fc514bd5 Fix for bug#24219 ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crash
There was an improper order of doing chained operations.

To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other
ALTER TABLE clause, leads to server crash independent of the presence of
indices and data in the table.


mysql-test/r/alter_table.result:
  update result
mysql-test/t/alter_table.test:
  add test for bug#24129
sql/sql_table.cc:
  If there is operation on the KEYS, first do it
  and then do a rename if there is such. Or, we will crash because
  the underlying table has changed.
2006-11-16 13:18:37 +01:00
unknown
db336c0544 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug17047
2006-11-16 14:15:56 +03:00
unknown
e40e8052e8 BUG#17047: CHAR() and IN() can return NULL without signaling NULL result
The problem was that some functions (namely IN() starting with 4.1, and
CHAR() starting with 5.0) were returning NULL in certain conditions,
while they didn't set their maybe_null flag.  Because of that there could
be some problems with 'IS NULL' check, and statements that depend on the
function value domain, like CREATE TABLE t1 SELECT 1 IN (2, NULL);.

The fix is to set maybe_null correctly.


mysql-test/r/func_in.result:
  Add result for bug#17047: CHAR() and IN() can return NULL without
  signaling NULL result.
mysql-test/t/func_in.test:
  Add test case for bug#17047: CHAR() and IN() can return NULL without
  signaling NULL result.
sql/item_cmpfunc.cc:
  Remove assignment to maybe_null, as it was already set in fix_fields()
  based on all arguments, not only on the first.
2006-11-16 13:21:38 +03:00
unknown
5363ec5275 support-files/mysql.spec.sh : Use "report features" in the first test run.
support-files/mysql.spec.sh:
  Switch from "make test*" to explicit calls of the test suite, so that "report features" can be used.
2006-11-15 20:27:02 +01:00
unknown
ce51ceb5e1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my41-bug17700
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-15 10:03:54 -05:00
unknown
78278bc4f5 Bug#17700: mysql_fix_privilege_tables cannot handle a password \
with embedded spaces
  
Problem:  Original code written assuming password contains no spaces.
Further, because of how sh interprets characters in variables, you
cannot do the "simple solution".
  
Solution:  Move the "was a password provided" check to the end. This
allows us to correctly quote the password argument when passed to the
mysql client program.  Addendum:  Put this check inside of a shell fn
to simplify the code.


scripts/mysql_fix_privilege_tables.sh:
  Moved password existence check to end to allow for passwords with
  with embedded spaces.
2006-11-15 09:54:54 -05:00
unknown
6bd194d7ca Merge mysql.com:/home/bkroot/mysql-4.1-rpl
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
2006-11-15 12:39:21 +01:00
unknown
9cde979eb7 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
mending windows test.


mysql-test/r/rpl_packet.result:
  results changed
mysql-test/t/rpl_packet.test:
  removing because of the connection with windows client can be lost instead of
  the error code back (source: manual).
2006-11-15 12:53:07 +02:00
unknown
260c1632ae Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2006-11-15 10:26:01 +01:00
unknown
3bf9b43182 make_binary_distribution should of course also copy .test files from mysql-test/include 2006-11-14 14:44:20 +01:00
unknown
cab0dc6544 Merge polly.local:/tmp/maint/bug22129/my41-bug22129
into  polly.local:/home/kaa/src/maint/mysql-4.1-maint
2006-11-14 16:36:31 +03:00
unknown
b295756927 make dist now copies .test files in mysql-test/include
mysql-test/Makefile.am:
  add include/*.test to dist-hook and install-data-local targets to include the three .test files in mysql-test/include with make dist
2006-11-14 14:29:05 +01:00
unknown
178dddb54f Fix "make dist" 2006-11-14 09:42:01 +01:00
unknown
8d2a7d11b2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-axmrg


sql/sql_insert.cc:
  Auto merged
2006-11-13 21:49:00 +01:00
unknown
1eb70558ef Remove test-force-pl-mem and add test-force-mem 2006-11-13 19:16:23 +01:00
unknown
6da91bfff3 Use mysql-test-run.pl
mysql-test/mysql-test-run-shell.sh:
  Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh
mysql-test/Makefile.am:
  Remove build of mysql_test_run_new
  Symlink mysql-test-run.pl to mysql-test-run
  Rename mysql-test-run.sh to mysql-test-run-shell.sh
2006-11-13 19:12:34 +01:00
unknown
e56742d7a9 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B19216-4.1-opt
2006-11-13 15:40:19 +02:00
unknown
24ca44731d Remove the tmp file produced when checking abi 2006-11-13 13:32:39 +01:00
unknown
8fd48ccec0 Merge mysql.com:/home/bkroot/mysql-4.1-rpl
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
2006-11-13 12:44:24 +01:00
unknown
27a0ce64ff Make --mem a pure flag. If there is need to specifically set the location
use MTR_MEM environment variable
2006-11-13 12:44:12 +01:00
unknown
f53af7b8e5 Bug #19216: Client crashes on long SELECT
The server sends a number of columns to the client.
 It uses a limited "fast" function for that instead of the
 general one. This fast function cannot send numbers larger 
 than 2 bytes. 
 This causes the client to expect smaller number of columns. 
 The client writes outside of the allocated memory buffer 
 as a result.
 Fixed the server to use the general function to send column
 count.
 Fixed the client to check the column count before writing
 column data. 


mysql-test/t/mysql_client.test:
  Bug #19216: Client crashes on long SELECT
   - test case
sql/protocol.cc:
  Bug #19216: Client crashes on long SELECT
   - renamed the function for bether comprehention
     and made it local
   - used the right (non-local) function to transfer 
     the column count in Protocol::send_fields
sql/protocol.h:
  Bug #19216: Client crashes on long SELECT
   - made optimized net_store_length local
sql-common/client.c:
  Bug #19216: Client crashes on long SELECT
   - fixed the client to check for older servers (without the fix).
2006-11-13 12:28:55 +02:00
unknown
57ba34ff8a bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
comments are fixed as was suggested in reviews.


sql/log_event.h:
  fixing comments
sql/slave.cc:
  fixing comments
sql/sql_repl.cc:
  fixing comments
2006-11-12 20:01:58 +02:00
unknown
a403c2f925 Correcting BUG/WL identifier extraction to allow multiple references to auxilary
bugs/wls in cset's comments. The targetted BUG's or WL's identifier must be specified
the first in the comments. The referred bugs wls can be typed in same as the targeted
clickable format.
If the the target of the fix is a WL and there are some references to bugs
then the first found reference is regarded as "co-target" so that the bug's identifier
comes up on the subject line along with the WL's and commit mail will update
the bug page. The latter feature can be disarmed (if there is no need to update
the referred bug's page) with typing the first a pseudo-bug pattern (bug#0).

This paticular cset will generate subject line containing bug#0 (as it was the first
referred) whereas the old version would put in the subject line the last referred
pattern (e.g bug#2147483648).


BitKeeper/triggers/post-commit:
  fixing greedyness of old extraction
2006-11-12 13:38:13 +02:00
unknown
e7cee5b5c4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-11 09:01:25 -05:00
unknown
c6d317831a mysql-test-run.pl:
Test for base directory when a RPM install corrected


mysql-test/mysql-test-run.pl:
  Test for base directory when a RPM install corrected
2006-11-11 14:12:30 +01:00
unknown
93e1030ddd Bug #22860: Option --memlock should be revisited
Support says that memlock doesn't work on OSes other than Solaris.  
Add a warning about --memlock to the crash monologue.


sql/mysqld.cc:
  On a crash when --memlock was active, emit advice about the insta-
  bility of that parameter.
2006-11-10 16:36:08 -05:00
unknown
09a65b47be Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-10 15:53:34 -05:00
unknown
7a0e75103f Test Suite failing on Windows because the $opt_report_features variable was not defined before use.
mysql-test/mysql-test-run.pl:
  Defined global variable.
2006-11-10 15:47:11 -05:00
unknown
68ae8da64c Look for "mysqlmanager" also in "bin" directory
Improve log message
2006-11-10 15:58:38 +01:00
unknown
aa341c498e Merge trift2.:/MySQL/M41/bug17194-4.1
into  trift2.:/MySQL/M41/push-4.1
2006-11-10 15:54:58 +01:00
unknown
744aadbef9 Merge trift2.:/MySQL/M41/clone-4.1
into  trift2.:/MySQL/M41/push-4.1


myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.
2006-11-10 15:52:53 +01:00
unknown
1cb38d3be6 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
into  kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
2006-11-10 14:49:07 +01:00
unknown
fbd4378b85 Bug#10608 mysqladmin breaks on "database" variable in my.cnf
- Add printout of "Warning" or "Note" for non error messages in default_reporter
 - Add test for the above in new mysqladmin.test


mysql-test/mysql-test-run.pl:
  Add support for mysqladmin to mysql-test-run.pl
mysys/my_getopt.c:
  Add printout of Warning: or Info: in 'default_reporter', this
  will make the user aware of the problem but can filter it
  as a warning or note.
mysql-test/r/mysqladmin.result:
  New BitKeeper file ``mysql-test/r/mysqladmin.result''
mysql-test/t/mysqladmin.test:
  New BitKeeper file ``mysql-test/t/mysqladmin.test''
2006-11-10 13:25:10 +01:00
unknown
df1b6ae6e1 add --report-features to mysql-test-run.pl
mysql-test/mysql-test-run.pl:
  add --report-features
mysql-test/include/report-features.test:
  test file showing server features for mysql-test-run.pl --report-features
2006-11-10 13:12:08 +01:00
unknown
cb80733a89 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/t/rename.test:
  choose one of the race problem solutions. It was solved
  differently in -runtime and mainstream
2006-11-10 15:05:38 +03:00
unknown
facaaeb4c4 mysql-test-run.sh:
Added --force-restart pseudo server argument to shell version as well


mysql-test/mysql-test-run.sh:
  Added --force-restart pseudo server argument to shell version as well
2006-11-10 02:22:33 +01:00