Commits · 54998d6125e273a910bb55dcee3253c7d48487fa · nexedi / MariaDB

13 May, 2008 1 commit

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 54998d61

unknown authored May 13, 2008

into  mysql.com:/home/kent/bk/mysql-5.0-release-merge


BUILD/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/innodb_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/memory_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb1.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb2.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb3.txt:
  Auto merged
mysql-test/std_data/funcs_1/myisam_tb4.txt:
  Auto merged
mysql-test/std_data/funcs_1/t3.txt:
  Auto merged
mysql-test/std_data/funcs_1/t4.txt:
  Auto merged
mysql-test/std_data/funcs_1/t7.txt:
  Auto merged
mysql-test/std_data/funcs_1/t9.txt:
  Auto merged
mysql-test/suite/funcs_1/README.txt:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
  Auto merged
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
  Auto merged
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Auto merged
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
  Auto merged
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Auto merged
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Auto merged
mysql-test/suite/funcs_1/t/is_basics_mixed.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Auto merged
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Auto merged
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Auto merged
mysql-test/suite/funcs_1/views/func_view.inc:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
BitKeeper/deleted/.del-load_file.txt:
  Delete: mysql-test/std_data/funcs_1/load_file.txt

54998d61

05 May, 2008 1 commit

Merge bk-internal:/home/bk/mysql-5.0 · ac8585e8

unknown authored May 05, 2008

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam


mysql-test/mysql-test-run.pl:
  Auto merged

ac8585e8

02 May, 2008 5 commits

Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463 · 6aadc3e2
unknown authored May 02, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-bugteam


client/mysqltest.c:
  Auto merged
```
6aadc3e2

Bug#36469 mysql_upgrade does not use --tmpdir · 6add5be7

unknown authored May 02, 2008


client/mysql_upgrade.c:
  Add --tmpdir option to mysql_upgrade and use it when creating temporary files.
mysql-test/mysql-test-run.pl:
  Pass --tmpdir to mysql_upgrade

6add5be7

Bug#35986 valgrind warning in DbugParse for empty string in SET GLOBAL DEBUG="" · 7f5119d3

unknown authored May 02, 2008

 - Code in DbugParse was reading from beyond end of the control string


dbug/dbug.c:
  Don't try to parse control strings that hasn't got any tokens
  or is zero size

7f5119d3

Bug#36465 mysqltest should always use the --tmpdir · cde8f109
unknown authored May 02, 2008
```
client/mysqltest.c:
  Use the --tmpdir location to create temporary files
```
cde8f109

Bug#36463 mysql-test-run.pl should always use the --tmpdi · 9018c56a

unknown authored May 02, 2008


mysql-test/mysql-test-run.pl:
  Use the requested tmpdir in 'collect_mysqld_features', create
  it if it does not already exists

9018c56a

01 May, 2008 4 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam · abf8b70a
unknown authored May 01, 2008
```
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs
```
abf8b70a

Bug#36026 - Test funcs_1.<engine>_trig_03 failing on Windows · 38c28141

unknown authored May 01, 2008

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

38c28141

Fix for bug #35298: GROUP_CONCAT with DISTINCT can crash the server · 1a68ec28

unknown authored May 01, 2008

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

1a68ec28

Merge bk-internal:/home/bk/mysql-5.0 · cf2b2cc5
unknown authored May 01, 2008
```
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
```
cf2b2cc5

30 Apr, 2008 1 commit
- Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · b028f1fc
  unknown authored Apr 30, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
```
  b028f1fc
28 Apr, 2008 8 commits
- make_binary_distribution.sh: · e65b8750
  unknown authored Apr 28, 2008
```
  Copy all of the "std_data" directory


scripts/make_binary_distribution.sh:
  Copy all of the "std_data" directory
```
  e65b8750
- Merge amd64.(none):/src/mysql-5.0-release · 627d7d0e
  unknown authored Apr 28, 2008
```
into  amd64.(none):/src/rel_clean_up/my50-release
```
  627d7d0e
- Merge amd64.(none):/src/rel_clean_up/my50-release · da7b9c58
  unknown authored Apr 28, 2008
```
into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up
```
  da7b9c58
- Correct failing build. · 57036d8a
  unknown authored Apr 28, 2008
  
  57036d8a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam · 96e405b6
  unknown authored Apr 28, 2008
```
into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up
```
  96e405b6
- Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 1e7367e4
  unknown authored Apr 28, 2008
```
into  amd64.(none):/src/rel_clean_up/my50-release
```
  1e7367e4
- Merge amd64.(none):/src/rel_clean_up/my50-release · e20145f6
  unknown authored Apr 28, 2008
```
into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up
```
  e20145f6
- Avoid compilation problem on AIX. · 8def2e09
  unknown authored Apr 28, 2008
  
  8def2e09
24 Apr, 2008 2 commits

Bug#36023: Incorrect handling of zero length caused an assertion to fail. · 89b866e7

unknown authored Apr 25, 2008

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.

89b866e7

Fix for funcs_1 tests which fail in 5.0.60 · c82f8595

unknown authored Apr 24, 2008

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

c82f8595

23 Apr, 2008 3 commits

Many files: [Changes done by mleich] · 905594b0

unknown authored Apr 24, 2008

  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

905594b0

Raise version number after cloning 5.0.60 · b9efbe48
unknown authored Apr 23, 2008

b9efbe48

subselect.test, subselect.result: · 415112a9

unknown authored Apr 23, 2008

  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).

415112a9

22 Apr, 2008 3 commits

Merge host.loc:/home/uchum/work/5.0-bugteam-35993 · c2d1ac6e
unknown authored Apr 23, 2008
```
into  host.loc:/home/uchum/work/5.0-bugteam
```
c2d1ac6e

Fixed bug#36005: server crashes inside NOT IN clause subquery with · 73f7de59

unknown authored Apr 23, 2008

                 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.

73f7de59

Fixed bug #35993: memory corruption and crash with multibyte conversion. · d8ebf276

unknown authored Apr 23, 2008

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.

d8ebf276

21 Apr, 2008 1 commit

BUG#36139 "float, zerofill, crash with subquery" · 1c1f0a62

unknown authored Apr 22, 2008

- 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

1c1f0a62

18 Apr, 2008 1 commit
- Merge trift2.:/MySQL/M50/bug34291-5.0 · 835aa144
  unknown authored Apr 18, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
  835aa144
17 Apr, 2008 1 commit

Fix for Bug #34291 compile-amd64-debug-max-no-ndb missing · d4e5ae56

unknown authored Apr 17, 2008

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.

d4e5ae56

10 Apr, 2008 2 commits

Fix mismerge. · 57784eae
unknown authored Apr 10, 2008
```
sql/field.cc:
  Fix indentation of new line.
```
57784eae

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore · f7687010

unknown authored Apr 09, 2008

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

f7687010

09 Apr, 2008 3 commits

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 · e2420997

unknown authored Apr 09, 2008

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.

e2420997

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 · a16a72b6

unknown authored Apr 09, 2008

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

a16a72b6

Follow-up to B-g#15776, test failures on 64-bit linux. · 2bc7179d

unknown authored Apr 09, 2008

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.

2bc7179d

04 Apr, 2008 3 commits
- Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · f89f3c80
  unknown authored Apr 04, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
  f89f3c80
- Backport of fix made in 5.1 to 5.0 · 1daeb665
  unknown authored Apr 04, 2008
```
mysql-test/Makefile.am   :    Fix a copy-paste error ...


mysql-test/Makefile.am:
  Correct the variables used for target directory
  of copy action.
```
  1daeb665
- Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean · e6523d76
  unknown authored Apr 04, 2008
```
into  five.local.lan:/work/merge/mysql-5.0-build
```
  e6523d76
03 Apr, 2008 1 commit
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 · b36b860e
  unknown authored Apr 03, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


sql/tztime.cc:
  Auto merged
```
  b36b860e