Commit graph

21568 commits

Author SHA1 Message Date
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
unknown
1707d5e6e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-09 15:36:13 -05:00
unknown
62e0e608ff mysql-test/install_test_db.sh
Adapt to the different path of the server program, if installation was by RPM.
    Missing in the first changeset for bug#17194.


mysql-test/install_test_db.sh:
  Adapt to the different path of the server program, if installation was by RPM.
  Missing in the first changeset for bug#17194.
2006-11-09 17:43:31 +01:00
unknown
69d8bfe231 Fix for bug #23653: Crash if last_day('0000-00-00')
As get_arg0_date() in the Item_func_last_day::get_date() returns 
0000-00-00 date sometimes, we have to check ltime->month for 0 after the call.


mysql-test/r/func_time.result:
  Fix for bug #23653: Crash if last_day('0000-00-00')
    - test result.
mysql-test/t/func_time.test:
  Fix for bug #23653: Crash if last_day('0000-00-00')
    - test case.
sql/item_timefunc.cc:
  Fix for bug #23653: Crash if last_day('0000-00-00')
    - return error if month is 0.
2006-11-09 16:17:50 +04:00
unknown
5cad819c12 Merge bk-internal:/home/bk/mysql-4.1-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/mem-test-4.1-opt
2006-11-09 12:07:58 +02:00
unknown
fc449ac174 Fix problem when running mysql_client_test in "binary dist", path should include the binary name 2006-11-09 09:48:50 +01:00
unknown
4a1869b1b2 Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-09 09:46:35 +01:00
unknown
870b2e0a2b This ChangeSet must be null-merged to 5.0. Applied innodb-4.1-ss33
Fixes:
- Bug #24089: Race condition in fil_flush_file_spaces()


innobase/fil/fil0fil.c:
  Applied innodb-4.1-ss33
  
  Revision r33:
  innodb-4.1: Merge r1002 from innodb/trunk:
  
  fil_flush_file_spaces(): Copy the system->unflushed_spaces list to an
  array while holding the mutex.  This removes the crash-triggering
  race condition that was introduced when fixing Bug 15653.  (Bug #24089)
2006-11-09 05:03:35 +01:00
unknown
671d863ca5 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g41
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
2006-11-09 00:47:48 +01:00
unknown
f11d883954 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-09 00:27:33 +01:00
unknown
d3b049a6bf Update of --mem flag after comments
mysql-test/mysql-test-run.pl:
  Allow --mem to be specified as a flag or --mem=<dir>
  Add /tmp to locations to search
  Update comments and usage description
2006-11-08 23:16:44 +01:00
unknown
26e6d78845 No need to pass an additional arg to to mtr_add_arg when there is no % sign 2006-11-08 22:56:06 +01:00
unknown
427f1acaaa Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine.
client/mysqltest.c:
  Add new option --character-sets-dir to mysqltest
  Set MYSQL_SET_CHRSET_DIR before connecting to mysqld if the above variable is set
mysql-test/mysql-test-run.pl:
  Pass $path_charsetsdir to mysqltest
2006-11-08 22:53:40 +01:00
unknown
c98a6dc8af Don't run mysqltest with both --silent and --verbose 2006-11-08 22:45:52 +01:00
unknown
a033047b79 Merge trift2.:/MySQL/M41/bug24023-4.1
into  trift2.:/MySQL/M41/clone-4.1
2006-11-08 21:27:58 +01:00
unknown
96a78a6321 Merge trift2.:/MySQL/M41/bug17194-4.1
into  trift2.:/MySQL/M41/clone-4.1
2006-11-08 21:22:52 +01:00
unknown
1144a46631 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1-rpl
into  mysql.com:/usr/home/bar/mysql-4.1.b23451v2


mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
2006-11-08 22:03:08 +04:00
unknown
23493eb222 Removed the underflow check (bug #22129)
mysql-test/r/type_float.result:
  Fixed the testcase
strings/strtod.c:
  Removed the underflow check
2006-11-08 19:07:21 +03:00
unknown
8b1f7c4852 bug#19402 SQL close to the size of the max_allowed_packet fails on slave
fixing a flow of the test


mysql-test/r/rpl_packet.result:
  results changed
mysql-test/t/rpl_packet.test:
  fixing a flaw in the test to create a table in MAX_NAME-sized db indeed.
  Upon that the `select to return 1' invariant holds.
2006-11-08 17:17:28 +02:00
unknown
93b36e8e05 Make a new test target for autopush.pl to run memory based tests 2006-11-08 15:15:56 +02:00
unknown
6befbec8bc Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/4.1/bug19402-max_allowed
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-4.1-rpl


sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
2006-11-08 09:57:20 +02:00
unknown
d167b60f63 Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic
into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic


README:
  Auto merged
2006-11-07 22:49:46 +01:00
unknown
22655de1d5 make_binary_distribution.sh:
Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt


README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt
scripts/make_binary_distribution.sh:
  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
2006-11-07 22:26:37 +01:00
unknown
5af4fd2563 Bug #11032: getObject() returns a String for a sub-query of type datetime
- When returning metadata for scalar subqueries the actual type of the
   column was calculated based on the value type, which limits the actual
   type of a scalar subselect to the set of (currently) 3 basic types : 
   integer, double precision or string. This is the reason that columns
   of types other then the basic ones (e.g. date/time) are reported as
   being of the corresponding basic type.
   Fixed by storing/returning information for the column type in addition
   to the result type.


mysql-test/r/subselect.result:
  Bug #11032: getObject() returns a String for a sub-query of type datetime
   - test case
mysql-test/t/subselect.test:
  Bug #11032: getObject() returns a String for a sub-query of type datetime
   - test case
sql/item_subselect.cc:
  Bug #11032: getObject() returns a String for a sub-query of type datetime
   - store and return the field type as well in addition to result type for 
     single row subqueries
sql/item_subselect.h:
  Bug #11032: getObject() returns a String for a sub-query of type datetime
   - store and return the field type as well in addition to result type for 
     single row subqueries
2006-11-07 18:16:17 +02:00
unknown
a797e75a3e Bug#23981 memory leaks from yassl code + other
- Readd --skip-bdb when valgrinding


mysql-test/mysql-test-run.pl:
  Readd --skip-bdb when valgrinding
2006-11-07 16:09:32 +01:00
unknown
6f65b2c0cc Fix bug#24023: Let "ndb/src/common/portlib/gcc.cpp" export a dummy symbol.
ndb/src/common/portlib/gcc.cpp:
  Fix bug#24023:  Make sure this module always exports some symbol, whether used anywhere or not.
2006-11-07 16:01:54 +01:00
unknown
a44762bcbd Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-4.1-engines
2006-11-07 17:01:34 +04:00
unknown
a10cfc6a0c Don't allow path to be passed to --mem 2006-11-07 13:01:32 +01:00
unknown
3893f90764 Correct faulty commit, the opt_tastcase_timeout value is in minutes, to it need to be multiplied with 60 before ping passed to mtr_timer_start 2006-11-07 12:56:55 +01:00
unknown
b227a3d348 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-11-07 12:00:55 +01:00
unknown
04d32c1dd2 Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-07 11:09:14 +01:00
unknown
434192fe54 Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory>
include/abi_check.ic:
  Ignore file
include/abi_check:
  Ignore file
2006-11-07 11:07:27 +01:00
unknown
d9360eae3b Bug#23451 GROUP_CONCAT truncates a multibyte utf8 character
Problem: GROUP_CONCAT on a multi-byte column can truncate
  in the middle of a multibyte character when applying
  group_concat_max_len limit. It produces an invalid
  multi-byte character in the result string.
  
The second, easier version - reusing old "warning_for_row" flag,
instead of introducing of "result_is_full" - which was
added in the previous commit.


mysql-test/r/func_gconcat.result:
  Adding test case
mysql-test/t/func_gconcat.test:
  Adding test case
sql/item_sum.cc:
  Adding well_formed_len() call not to cut
      in the middle of a multi-byte character.
2006-11-07 12:45:48 +04:00
unknown
02e764bd10 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-06 18:01:47 -05:00
unknown
2b35fee8ab Bug#23411: ... MOD-ing zero returns strange result
The Item_func_mod objects never had maybe_null set, so users had no reason 
to expect that they can be NULL, and may therefore deduce wrong results.
Now, set maybe_null.


mysql-test/r/func_test.result:
  Verify that the predictions are true.
mysql-test/t/func_test.test:
  Verify that the predictions are true.
sql/item_func.cc:
  MOD functions may be NULL.
2006-11-06 17:13:19 -05:00
unknown
6cf8ceebbf Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1-runtime
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2006-11-06 00:05:02 +03:00
unknown
e32e7ca060 Add missing DBUG_RETURN() 2006-11-05 23:25:34 +03:00
unknown
c095f98ff7 Bug #22457: Column alias in ORDER BY works, but not if in an expression
The parser is allocating Item_field for references by name in ORDER BY
 expressions. Such expressions however may point not only to Item_field 
 in the select list (or to a table column) but also to an arbitrary Item. 
 This causes Item_field::fix_fields to throw an error about missing 
 column.
 The fix substitutes Item_field for the reference with an Item_ref when 
 not pointing to Item_field.


mysql-test/r/order_by.result:
  Bug #22457: Column alias in ORDER BY works, but not if in an expression
   - test case
mysql-test/t/order_by.test:
  Bug #22457: Column alias in ORDER BY works, but not if in an expression
   - test case
sql/item.cc:
  Bug #22457: Column alias in ORDER BY works, but not if in an expression
   - transform the Item_field made by the parser into Item_ref if it 
     doesn't point to Item_field and it is in allowed context
2006-11-03 18:48:16 +02:00
unknown
16a671c021 Don't warn about "Found non pid file" for elements that are not files. 2006-11-03 15:26:42 +01:00
unknown
0d92b17851 Cleanup: fix race in rename.test.
mysql-test/r/rename.result:
  Update result.
mysql-test/t/rename.test:
  Remove the race by replacing sleep with a reap.
2006-11-03 12:16:31 +03:00
unknown
e3fd562c0a Fix compile failure.
myisam/sort.c:
  Moved DBUG_PRINT statement to declaration section.
2006-11-02 21:03:41 -05:00
unknown
6bc475c5e3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-02 20:43:48 -05:00