Commit graph

14101 commits

Author SHA1 Message Date
unknown
96de5fabb2 Merge mysql.com:/usr/home/ram/work/bug21789/my50-bug21789
into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged
2006-11-22 12:13:09 +04:00
unknown
b275e4f019 Merge mysql.com:/usr/home/ram/work/bug21789/my41-bug21789
into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  merging
2006-11-22 12:10:18 +04:00
unknown
2bd1c73e3d Fix for bug #21789: DATETIME with 0000-00-00 11:22:33 should be invalid, but is accepted
Reject '0000-00-00 01:01:01' dates.


mysql-test/r/date_formats.result:
  Fix for bug #21789: DATETIME with 0000-00-00 11:22:33 should be invalid, but is accepted 
    - test results adjusted.
sql-common/my_time.c:
  Fix for bug #21789: DATETIME with 0000-00-00 11:22:33 should be invalid, but is accepted 
    - don't allow dates with NULL date part and not NULL time part.
2006-10-04 16:00:44 +05:00
unknown
1b212ad950 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-09-28 15:54:59 -04:00
unknown
d8387be448 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305


mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2006-09-28 14:33:39 -04:00
unknown
e99cf7edb9 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305


mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
mysql-test/t/analyse.test:
  manual merge
2006-09-28 14:32:30 -04:00
unknown
314e10592c Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D)
mysql-test/r/analyse.result:
  Added Results
mysql-test/t/analyse.test:
  Added test cases to make sure field_str and field_real return correctly.
sql/sql_analyse.cc:
  According the manaul, when declaring a FLOAT(M, N), N equals the number of decimal places and M equals the total number of
  digits in the number.
2006-09-28 14:30:20 -04:00
unknown
9163d93fb5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 10:32:37 -04:00
unknown
98715089c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


include/mysql_com.h:
  Auto merged
mysql-test/include/have_ndb.inc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2006-09-28 10:15:32 -04:00
unknown
4d0c4c5ca1 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-28 13:54:48 +02:00
unknown
96bc9f8079 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


client/mysql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_string.cc:
  Auto merged
2006-09-28 07:35:04 -04:00
unknown
d165736b8d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_string.cc:
  Auto merged
strings/strtod.c:
  Auto merged
client/mysql.cc:
  Manual merge.
mysql-test/r/ctype_utf8.result:
  Manual merge.
2006-09-28 07:30:24 -04:00
unknown
4f810b3b0b Increase time to wait for mysqld to get restarted(it will take some time when running in valgrind) 2006-09-28 11:53:42 +02:00
unknown
440135998d Merge neptunus.(none):/home/msvensson/mysql/work/my51-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 09:38:26 +02:00
unknown
07e79071fd Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-28 09:33:09 +02:00
unknown
3f01b5df81 Increase test suite timeout to 3 hours 2006-09-28 09:30:24 +02:00
unknown
2d48a1f2a3 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new


sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/sp.result:
  manual merge
mysql-test/t/sp.test:
  manual merge
storage/csv/ha_tina.cc:
  manual merge
storage/myisam/ha_myisam.cc:
  manual merge
2006-09-28 04:44:55 +04:00
unknown
d6d786a07e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-27 20:08:44 -04:00
unknown
a1067d16ac Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-27 20:06:59 -04:00
unknown
4c43c2016c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2006-09-27 15:48:40 -04:00
unknown
7f221a1837 Bug#21476: (Thread stack overrun not caught, causing SEGV)
The STACK_MIN_SIZE is currently set to 8192, when we actually need 
(emperically discovered) 9236 bytes to raise an fatal error, on Ubuntu 
Dapper Drake, libc6 2.3.6-0ubuntu2, Linux kernel 2.6.15-27-686, on x86.

I'm taking that as a new lower bound, plus 100B of wiggle-room for sundry
word sizes and stack behaviors.

The added test verifies in a cross-platform way that there are no gaps 
between the space that we think we need and what we actually need to report 
an error.

DOCUMENTERS:  This also adds "let" to the mysqltest commands that evaluate
an argument to expand variables therein.  (Only right of the "=", of course.)


client/mysqltest.c:
  Add "let" to the list of mysqltest commands that evaluates its arguments (only
  the right-hand-side of the equals-sign expression).
mysql-test/r/mysqltest.result:
  Added test to show that mysqltest "let" will evaluate the RHS correctly (and 
  expand the backslash test).
mysql-test/t/mysqltest.test:
  Added test to show that mysqltest "let" will evaluate the RHS correctly (and 
  expand the backslash test).
sql/mysql_priv.h:
  Increase the amount we require to be available for the stack, since 
  experience told us that the previous amount was too little by at least
  1044 bytes.
mysql-test/r/execution_constants.result:
  New BitKeeper file ``mysql-test/r/execution_constants.result''
mysql-test/t/execution_constants.test:
  New BitKeeper file ``mysql-test/t/execution_constants.test''
2006-09-27 14:42:56 -04:00
unknown
e3bec94493 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/work/my51-work


mysql-test/valgrind.supp:
  Merge suppressions 5.0 -> 5.1
2006-09-27 18:34:36 +02:00
unknown
5454ca7582 Add suppressions seen on maint1, nothing new just a nother version of libc 2006-09-27 18:10:15 +02:00
unknown
ac4b662363 Remove unused error messages (no release contains them
at the moment, so we can safely do that). Update an error
mesage to make it translateable.


mysql-test/r/log_tables.result:
  update result file
sql/share/errmsg.txt:
  remove unused error messages
sql/sql_table.cc:
  Use name of the statements rather then English words.
  This way error message is translateable.
2006-09-27 17:48:00 +04:00
unknown
9f9e8dc660 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-27 14:41:29 +02:00
unknown
9d23c72df3 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1
2006-09-27 13:56:32 +02:00
unknown
9a00f96f21 When valgrinding add /usr/lib/debug" to LD_LIBRARY_PATH if available
mysql-test/mysql-test-run.pl:
  Rewrite the setup of LD_LIBRARY_PATH and DYLD_LIBRARY_PATH to make it easier to modify
  Valgrind need to be run with debug libraries  otherwise it's almost impossible to add
  correct supressions, that means if "/usr/lib/debug" is available, it should be added to
  LD_LIBRARY_PATH
2006-09-27 13:42:16 +02:00
unknown
7c59445af0 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21414


sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
2006-09-27 12:22:16 +04:00
unknown
effadd7ce1 Merge neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-26 16:30:50 +02:00
unknown
5529b7fb95 Added more tests of field conversions. 2006-09-26 17:20:14 +03:00
unknown
014e0d417c Update patch that restores slave databases from snapshots before start for 5.1 2006-09-26 16:01:16 +02:00
unknown
7bf40904e7 Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-26 15:07:00 +02:00
unknown
f9cfbe72a7 Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969
into  neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969


mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1
2006-09-26 14:40:03 +02:00
unknown
e9a84303c0 Bug#18969 race condition involving slave and mysqltest. was rpl_insert_id test case fails
- As the slaves are restarted for each testcase, take the opportunity to restore their databases to a known state with the help of the snapshot(s)
 - Count max number of slaves used in testcases
 - Use copy_install_db to speed up "Installing db" phase


mysql-test/mysql-test-run.pl:
  Count max number of slaves used for a test run and use that when installing slave databases etc.
  Use "copy_install_db" for all but the first db to install
  After having stopped the slave database, restore it's database files from the snapshot.
2006-09-26 13:49:42 +02:00
unknown
770e9b4b5e Fix for bug#20208
A better fix for bug#10025.

Fixed test case plus added new tests.

After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
became more accurate. Earlier mediumtext got converted to longtext,
although mediumtext was enough to contain the results. Now it converts
correctly to mediumtext, if the length does not exceed that and if none
of the original fields were type longtext.

Type longtext still converts correctly to type longtext, as the extra
tests prove.


mysql-test/r/union.result:
  Fixed an earlier test case plus added two new tests.
mysql-test/t/union.test:
  Fixed an earlier test case plus added two new tests.
2006-09-26 13:19:25 +03:00
unknown
5e2a38b0f2 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-25 20:45:27 +02:00
unknown
17e3f89975 Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped 2006-09-25 20:28:40 +02:00
unknown
070c8e7437 Fix for bug#22662 Inconsistent values displayed for event_scheduler
when set to DISABLED
  
It was a silly ordering number error.



sql/events.h:
  fix ordinal number, the cause for bug #22662
  Inconsistent values displayed for event_scheduler when set to DISABLED
mysql-test/r/events_restart_phase0.result:
  New BitKeeper file ``mysql-test/r/events_restart_phase0.result''
mysql-test/t/events_restart_phase0.log:
  New BitKeeper file ``mysql-test/t/events_restart_phase0.log''
mysql-test/t/events_restart_phase0.result:
  New BitKeeper file ``mysql-test/t/events_restart_phase0.result''
2006-09-25 17:22:23 +02:00
unknown
6c9400b930 Fix for bug#22397 Events: crash with procedure which alters events
ALTER EVENT in stored procedure body led to a crash during the
procedure call. Affected was only ALTER EVENT which changed the
interval of the event. No problems with AT, STARTS, ENDS and so on.



mysql-test/r/events_bugs.result:
  fix result
mysql-test/t/events_bugs.test:
  add test case for bug 22397 : Events, crash with procedure which alters body
sql/event_data_objects.cc:
  fix copy&paste error in code, which resulted in bug#22397
  Events: crash with procedure which alters body
2006-09-25 16:49:25 +02:00
unknown
038fbc273a cleanups - fix a test and remove unneeded declaration
mysql-test/r/events.result:
  test result
mysql-test/t/events.test:
  fix test
sql/sql_show.cc:
  remove unneeded declaration
2006-09-25 15:50:49 +02:00
unknown
6862670e77 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
2006-09-25 13:30:19 +04:00
unknown
895efbbe06 Merge polly.local:/tmp/22129/bug22129/my51-bug22129
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
2006-09-25 13:23:33 +04:00
unknown
98493e2dd6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
2006-09-25 13:07:41 +04:00
unknown
313e74c533 Merge polly.local:/tmp/22129/bug22129/my50-bug22129
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt


mysql-test/r/strict.result:
  Auto merged
2006-09-25 13:04:46 +04:00
unknown
06e9a32bfb Merge polly.local:/tmp/22129/bug22129/my50-bug22129
into  polly.local:/tmp/22129/bug22129/my51-bug22129


mysql-test/r/strict.result:
  Auto merged
2006-09-25 12:52:01 +04:00
unknown
0fca1e8b38 Fixed broken 'strict' test which relied on incorrect behaviour of my_strtod() (fixed in bug #22129) 2006-09-25 12:50:32 +04:00
unknown
207fd3fa03 Fixed a test result. Value of MAX_BLOB_WIDTH changed. 2006-09-25 10:30:23 +03:00
unknown
af3f646c29 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into  production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208


BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
2006-09-25 08:10:58 +02:00
unknown
ff27c085bc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/home/brian/mysql/merge-5.1


sql/mysql_priv.h:
  Auto merged
2006-09-23 12:13:30 -07:00
unknown
53d2e32b81 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-09-23 09:55:16 -04:00