Commit graph

39,290 commits

Author SHA1 Message Date
unknown
80e550f8bd Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-05-02 11:22:56 +02:00
unknown
cde8f109b9 Bug#36465 mysqltest should always use the --tmpdir
client/mysqltest.c:
  Use the --tmpdir location to create temporary files
2008-05-02 11:22:10 +02:00
unknown
f508244ded Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
2008-05-02 09:15:23 +02:00
unknown
9018c56ac4 Bug#36463 mysql-test-run.pl should always use the --tmpdi
mysql-test/mysql-test-run.pl:
  Use the requested tmpdir in 'collect_mysqld_features', create
  it if it does not already exists
2008-05-02 09:13:43 +02:00
unknown
9418fd20d5 Merge bk-internal:/home/bk/mysql-5.0-build
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
2008-05-02 08:42:48 +02:00
unknown
abf8b70a0a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs
2008-05-01 12:15:38 -04:00
unknown
38c28141a8 Bug#36026 - Test funcs_1.<engine>_trig_03 failing on Windows
Bug#36028 - Test funcs_1.<engine>_trig_03e failing on Windows
Bug#36029 - Test funcs_1.<engine>_trig_0407 failing on Windows
Bug#36030 - Test funcs_1.<engine>_trig_08 failing on Windows

Adding $MASTER_MYSOCK to init_win_path()
When path names are short, master.sock ends up in MYSQL_TMP_DIR, but with longer path names,
master.sock ends up in /tmp/<random_string>/ and these tests will fail due to path delimiter difference.

New changeset to start with 5.0 -- Not all of these tests are present in 5.0, but want to keep mysqltest the same
2008-05-01 11:36:03 -04:00
unknown
1a68ec2809 Fix for bug #35298: GROUP_CONCAT with DISTINCT can crash the server
The bug is a regression introduced by the patch for bug32798.

The code in Item_func_group_concat::clear() relied on the 'distinct'
variable to check if 'unique_filter' was initialized. That, however,
is not always valid because Item_func_group_concat::setup() can do
shortcuts in some cases w/o initializing 'unique_filter'.

Fixed by checking the value of 'unique_filter' instead of 'distinct'
before dereferencing.


mysql-test/r/func_gconcat.result:
  Added test cases for bugs #35298 and #36024.
mysql-test/t/func_gconcat.test:
  Added test cases for bugs #35298 and #36024.
sql/item_sum.cc:
  Check if unique_filter != NULL before dereferencing it. Non-zero value
  of distinct does not always mean that unique_filter is initialized
  because Item_func_group_concat::setup() can do shortcuts is some cases
2008-05-01 13:49:26 +03:00
unknown
cf2b2cc506 Merge bk-internal:/home/bk/mysql-5.0
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
2008-05-01 13:40:56 +03:00
unknown
b028f1fcc7 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-04-30 17:30:39 -06:00
unknown
e65b875094 make_binary_distribution.sh:
Copy all of the "std_data" directory


scripts/make_binary_distribution.sh:
  Copy all of the "std_data" directory
2008-04-28 21:53:52 +02:00
unknown
627d7d0efd Merge amd64.(none):/src/mysql-5.0-release
into  amd64.(none):/src/rel_clean_up/my50-release
2008-04-28 15:03:33 -04:00
unknown
da7b9c5882 Merge amd64.(none):/src/rel_clean_up/my50-release
into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up
2008-04-28 15:00:31 -04:00
unknown
57036d8a71 Correct failing build. 2008-04-28 14:58:32 -04:00
unknown
96e405b662 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam
into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up
2008-04-28 13:58:19 -04:00
unknown
1e7367e49a Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  amd64.(none):/src/rel_clean_up/my50-release
2008-04-28 13:56:15 -04:00
unknown
e20145f626 Merge amd64.(none):/src/rel_clean_up/my50-release
into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up
2008-04-28 13:41:50 -04:00
unknown
8def2e0993 Avoid compilation problem on AIX. 2008-04-28 13:41:12 -04:00
unknown
89b866e7bf Bug#36023: Incorrect handling of zero length caused an assertion to fail.
When a zero length is provided to the my_decimal_length_to_precision
function along with unsigned_flag set to false it returns a negative value.
For queries that employs temporary tables may cause failed assertion or
excessive memory consumption while temporary table creation.

Now the my_decimal_length_to_precision and the my_decimal_precision_to_length
functions take unsigned_flag into account only if the length/precision
argument is non-zero.


mysql-test/t/type_decimal.test:
  Added a test case for the bug#36023: Incorrect handling of zero length caused
   an assertion to fail.
mysql-test/r/type_decimal.result:
  Added a test case for the bug#36023: Incorrect handling of zero length caused
   an assertion to fail.
sql/my_decimal.h:
  Bug#36023: Incorrect handling of zero length caused an assertion to fail.
  Now the my_decimal_length_to_precision and the my_decimal_precision_to_length
  functions take unsigned_flag into account only if the length/precision
  argument is non-zero.
2008-04-25 00:39:37 +04:00
unknown
c82f8595b9 Fix for funcs_1 tests which fail in 5.0.60
This is basically a backport of changes (only a few were missing)
which were already pushed to 5.0-build and upmerged to
5.1-build, 6.0-build


mysql-test/std_data/funcs_1/innodb_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb1.txt -> mysql-test/std_data/funcs_1/innodb_tb1.txt
mysql-test/std_data/funcs_1/innodb_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb2.txt -> mysql-test/std_data/funcs_1/innodb_tb2.txt
mysql-test/std_data/funcs_1/innodb_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb3.txt -> mysql-test/std_data/funcs_1/innodb_tb3.txt
mysql-test/std_data/funcs_1/innodb_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/innodb_tb4.txt -> mysql-test/std_data/funcs_1/innodb_tb4.txt
mysql-test/std_data/funcs_1/memory_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb1.txt -> mysql-test/std_data/funcs_1/memory_tb1.txt
mysql-test/std_data/funcs_1/memory_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb2.txt -> mysql-test/std_data/funcs_1/memory_tb2.txt
mysql-test/std_data/funcs_1/memory_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb3.txt -> mysql-test/std_data/funcs_1/memory_tb3.txt
mysql-test/std_data/funcs_1/memory_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/memory_tb4.txt -> mysql-test/std_data/funcs_1/memory_tb4.txt
mysql-test/std_data/funcs_1/myisam_tb1.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb1.txt -> mysql-test/std_data/funcs_1/myisam_tb1.txt
mysql-test/std_data/funcs_1/myisam_tb2.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb2.txt -> mysql-test/std_data/funcs_1/myisam_tb2.txt
mysql-test/std_data/funcs_1/myisam_tb3.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb3.txt -> mysql-test/std_data/funcs_1/myisam_tb3.txt
mysql-test/std_data/funcs_1/myisam_tb4.txt:
  Rename: mysql-test/suite/funcs_1/data/myisam_tb4.txt -> mysql-test/std_data/funcs_1/myisam_tb4.txt
mysql-test/std_data/funcs_1/t3.txt:
  Rename: mysql-test/suite/funcs_1/data/t3.txt -> mysql-test/std_data/funcs_1/t3.txt
mysql-test/std_data/funcs_1/t4.txt:
  Rename: mysql-test/suite/funcs_1/data/t4.txt -> mysql-test/std_data/funcs_1/t4.txt
mysql-test/std_data/funcs_1/t7.txt:
  Rename: mysql-test/suite/funcs_1/data/t7.txt -> mysql-test/std_data/funcs_1/t7.txt
mysql-test/std_data/funcs_1/t9.txt:
  Rename: mysql-test/suite/funcs_1/data/t9.txt -> mysql-test/std_data/funcs_1/t9.txt
mysql-test/Makefile.am:
  Correction for location of loadfiles
mysql-test/std_data/funcs_1/load_file.txt:
  Missing file
2008-04-24 17:13:35 +02:00
unknown
905594b008 Many files: [Changes done by mleich]
Fix for
     Bug#35335 funcs_1: Some tests fail within load_file during
                        pushbuild runs
     Solution: 1. Move files with input data used in load_file,
                  load data etc.
                  from suite/funcs_1/<whatever>
                  to std_data
               2. Use for testsuite funcs_1 the server option
                  --secure-file-priv=<MYSQLTEST_VARDIR>
               3. Outfiles have to be stored under MYSQLTEST_VARDIR
  + changes according to WL#4304 Cleanup in funcs_1 tests
    - backport of fixes/improvements made in 5.1 to 5.0
      The differences between scripts in 5.0 and 5.1 cause
      much additional and annoying work during any upmerge.
    - replace error numbers with names
    - improved comments
    - improved formatting
    - Unify storage engine names so that result files for
      storage engine variants do not differ (some tests)
    - remove a script no more used (tests are done in other scripts)


BUILD/Makefile.am:
  Test case adjustments
mysql-test/Makefile.am:
  Test case adjustments
mysql-test/mysql-test-run.pl:
  Test case adjustments
mysql-test/suite/funcs_1/README.txt:
  Test case adjustments
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
  Test case adjustments
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
  Test case adjustments
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/innodb_views.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/memory_views.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Test case adjustments
mysql-test/suite/funcs_1/r/myisam_views.result:
  Test case adjustments
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
  Test case adjustments
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Test case adjustments
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Test case adjustments
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Test case adjustments
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Test case adjustments
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Test case adjustments
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/is_basics_mixed.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Test case adjustments
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
  Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Test case adjustments
mysql-test/suite/funcs_1/views/func_view.inc:
  Test case adjustments
mysql-test/suite/funcs_1/views/views_master.inc:
  Test case adjustments
2008-04-24 00:06:46 +02:00
unknown
b9efbe4890 Raise version number after cloning 5.0.60 2008-04-23 20:54:53 +02:00
unknown
415112a940 subselect.test, subselect.result:
Post-commit minor cleanup of testcase (bug#36139).


mysql-test/r/subselect.result:
  Post-commit minor cleanup of testcase (bug#36139).
mysql-test/t/subselect.test:
  Post-commit minor cleanup of testcase (bug#36139).
2008-04-23 14:22:49 +05:00
unknown
c2d1ac6e2c Merge host.loc:/home/uchum/work/5.0-bugteam-35993
into  host.loc:/home/uchum/work/5.0-bugteam
2008-04-23 02:29:37 +05:00
unknown
73f7de59c2 Fixed bug#36005: server crashes inside NOT IN clause subquery with
impossible WHERE/HAVING clause
                 (subselect_single_select_engine::exec).

Allocation and initialization of joined table list t1, t2... of
subqueries like:

    NOT IN (SELECT ... FROM t1,t2,... WHERE 0)

is optimized out, however server tries to traverse this list.


mysql-test/r/subselect3.result:
  Added test case for bug#36005.
mysql-test/t/subselect3.test:
  Added test case for bug#36005.
sql/sql_select.cc:
  Fixed bug#36005.
  
  1. JOIN::prepare initializes JOIN::table counter (actually a size
     of the JOIN::join_tab array) and sets it to a number of joined tables.
  
  2. The make_join_statistics function (when called from JOIN::optimize)
     allocates and fills the JOIN::join_tab array.
     However, when optimizing subselect has impossible (definite false)
     WHERE or HAVING clause, optimizer skips call to make_join_statistics
     and leaves JOIN::join_tab == NULL.
  
  3. subselect_single_select_engine::exec does traversal of the JOIN::join_tab
     array and the server dies because array is not allocated but array
     counter is greater than 0.
  
  The JOIN::optimize method has been modified to reset the JOIN::table
  counter to 0 in cause of impossible WHERE/HAVING clause.
2008-04-23 02:27:23 +05:00
unknown
d8ebf27639 Fixed bug #35993: memory corruption and crash with multibyte conversion.
Grouping or ordering of long values in not indexed BLOB/TEXT columns
with GBK or BIG5 charsets crashes the server.

MySQL server uses sorting (the filesort procedure) in the temporary
table to evaluate the GROUP BY clause in case of lack of suitable index.
That procedure takes into account only first @max_sort_length bytes
(system variable, usually 1024) of TEXT/BLOB sorting key string.
The my_strnxfrm_gbk and my_strnxfrm_big5 fill temporary keys
with data of whole blob length instead of @max_sort_length bytes
length. That buffer overrun has been fixed.


mysql-test/r/ctype_gbk.result:
  Added test case for bug #35993.
mysql-test/t/ctype_gbk.test:
  Added test case for bug #35993.
strings/ctype-big5.c:
  Fixed bug #35993: memory corruption and crash with multibyte conversion.
  
  Buffer overrun has been fixed in the my_strnxfrm_big5 function.
strings/ctype-gbk.c:
  Fixed bug #35993: memory corruption and crash with multibyte conversion.
  
  Buffer overrun has been fixed in the my_strnxfrm_gbk function.
2008-04-23 02:14:58 +05:00
unknown
1c1f0a62e1 BUG#36139 "float, zerofill, crash with subquery"
- Make convert_zerofill_number_to_string() take into account that the 
  constant it is converting may evaluate to NULL.


mysql-test/r/subselect.result:
  BUG#36139 "float, zerofill, crash with subquery"
  - Testcase
mysql-test/t/subselect.test:
  BUG#36139 "float, zerofill, crash with subquery"
  - Testcase
2008-04-22 02:53:12 +04:00
unknown
835aa144c2 Merge trift2.:/MySQL/M50/bug34291-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-04-18 19:54:08 +02:00
unknown
d4e5ae56ae Fix for Bug #34291 compile-amd64-debug-max-no-ndb missing
Include several "BUILD/compile-*" files in a source tarball ("make dist" target)
which might be useful to community users who want to build from source.

When merging this up, the "BUILD/compile-*" file list needs to be checked.


BUILD/Makefile.am:
  Fix for   Bug #34291  compile-amd64-debug-max-no-ndb missing
  
  Include several "BUILD/compile-*" files in a source tarball ("make dist" target)
  which might be useful to community users who want to build from source.
2008-04-17 18:41:23 +02:00
unknown
57784eae12 Fix mismerge.
sql/field.cc:
  Fix indentation of new line.
2008-04-10 15:55:37 -04:00
unknown
f768701000 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.h:
  Auto merged
2008-04-09 20:34:38 -04:00
unknown
e2420997e6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge.
mysql-test/t/type_blob.test:
  manual merge.
2008-04-09 17:14:10 -04:00
unknown
a16a72b6c3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/unireg.h:
  Auto merged
2008-04-09 12:27:51 -04:00
unknown
2bc7179d2d Follow-up to B-g#15776, test failures on 64-bit linux.
Make maximum blob size to be 2**32-1, regardless of word size.

Fix failure of timestamp with size of 2**31-1.  The method of
rounding up to the nearest even number would overflow.


mysql-test/r/type_blob.result:
  2**32-1 is not a special case for timestamp.
  
  Test 2**32-1 and 2**64 as the reliable test points for both 32-
  and 64-bit machines.  I'd like to test 2**32, but that would make 
  tests that vary between architectures.
  
  I'd like to generalize the tests by pulling the max blob size from
  the server, and then "eval"ing N-1, N, and N+1 instead of all these
  literal numbers, but I have not found a way to get UINT_MAX.
mysql-test/t/type_blob.test:
  2**32-1 is not a special case for timestamp.
  
  Test 2**32-1 and 2**64 as the reliable test points for both 32-
  and 64-bit machines.  I'd like to test 2**32, but that would make 
  tests that vary between architectures.
  
  I'd like to generalize the tests by pulling the max blob size from
  the server, and then "eval"ing N-1, N, and N+1 instead of all these
  literal numbers, but I have not found a way to get UINT_MAX.
sql/field.cc:
  Fix a bug where the round-to-even code for TIMESTAMP fields
  failed where the size would overflow the size to zero and then
  fail.
  
  Also, since we silently truncate the size of TIMESTAMP fields, set
  the maximum size we report is allowable to be the largest parsable
  number.
sql/unireg.h:
  Make BLOB size the maximum that the packed value in 
  field_blob::get_length() allows.
2008-04-09 12:27:30 -04:00
unknown
8765b5f021 Work around for older version of cmake. 2008-04-07 18:40:37 -04:00
unknown
1a43dd8a24 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql.com:/home/ksm/mysql/bugs/commit-mysql-5.0-rpl-bug32653


mysql-test/t/disabled.def:
  Auto merged
2008-04-07 15:59:51 +04:00
unknown
25e57ca9c4 Changes for Visual Studio 9 2008-04-07 01:32:59 -04:00
unknown
4091635247 Bug#32654. The reason of bug is incorrect clean up during restarting of mysqld under Windows platform (seems some files were in-use).
Mtr restarts servers because an option file exist for slave.
The option file for slave forces to skip test.foo table for replication. 
But really test case does not invlved test.foo table at all.
So option file can be removed and mtr will not restart servers for test case. 


BitKeeper/deleted/.del-rpl_view-slave.opt:
  Rename: mysql-test/t/rpl_view-slave.opt -> BitKeeper/deleted/.del-rpl_view-slave.opt
mysql-test/t/disabled.def:
  updated
2008-04-06 22:24:29 +04:00
unknown
f89f3c803d Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-04 18:02:55 +02:00
unknown
1daeb66563 Backport of fix made in 5.1 to 5.0
mysql-test/Makefile.am   :    Fix a copy-paste error ...


mysql-test/Makefile.am:
  Correct the variables used for target directory
  of copy action.
2008-04-04 17:41:14 +02:00
unknown
e6523d7667 Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean
into  five.local.lan:/work/merge/mysql-5.0-build
2008-04-04 14:51:43 +02:00
unknown
b2799ebf5a Bug#32653.
Added --log-slave-updates because test requires it. 
The events based on LOAD DATA INFILE masked by --replace_regex instead restarting of slave.
Added waiting start and stop of slave after START|STOP SLAVE statements.


mysql-test/r/rpl_log.result:
  updated result file
mysql-test/t/disabled.def:
  updated disabled.def
mysql-test/t/rpl_log-slave.opt:
  updated option for slave
mysql-test/t/rpl_log.test:
  updated test
2008-04-04 01:16:55 +04:00
unknown
b36b860edf Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


sql/tztime.cc:
  Auto merged
2008-04-03 13:19:55 -04:00
unknown
90112d1175 Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3
When linking with some external programs, "multiple definition 
of `init_time'"

Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).


client/mysqlbinlog.cc:
  Rename init_time() to my_init_time().
include/my_time.h:
  Rename init_time() to my_init_time().
sql-common/my_time.c:
  Rename init_time() to my_init_time().
sql/init.cc:
  Rename init_time() to my_init_time().
sql/tztime.cc:
  Rename init_time() to my_init_time().
2008-04-03 11:32:00 -04:00
unknown
a0d02a942a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


sql/share/errmsg.txt:
  Auto merged
2008-04-03 11:28:10 -04:00
unknown
69c54e5438 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-04-03 15:30:39 +02:00
unknown
c4996b3282 Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-02 21:29:43 +02:00
unknown
1a07ecbab5 Correct the location of the directory for
"funcs_1" data load
2008-04-02 19:47:20 +02:00
unknown
cb29e2396b Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2008-04-02 10:58:37 -04:00
unknown
babd981e41 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


sql/field.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/type_blob.result:
  Manual merge.
mysql-test/t/type_blob.test:
  Manual merge.
2008-04-02 10:56:49 -04:00