Commits · 8d3952e99b1271fc40cc4cd920ecb04b5a8aadac · Kirill Smelkov / mariadb

02 May, 2008 9 commits

Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463 · 8d3952e9

unknown authored May 02, 2008

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build


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

8d3952e9

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

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

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

Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463 · 80e550f8
unknown authored May 02, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
```
80e550f8
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

Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463 · f508244d

unknown authored May 02, 2008

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build


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

f508244d

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

Merge bk-internal:/home/bk/mysql-5.0-build · 9418fd20

unknown authored May 02, 2008

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build


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

9418fd20

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
23 Apr, 2008 1 commit
- Raise version number after cloning 5.0.60 · b9efbe48
  unknown authored Apr 23, 2008
  
  b9efbe48
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 4 commits

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

Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3 · 90112d11

unknown authored Apr 03, 2008

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

90112d11

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build · a0d02a94

unknown authored Apr 03, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


sql/share/errmsg.txt:
  Auto merged

a0d02a94

Merge trift2.:/MySQL/M50/mysql-5.0 · 69c54e54
unknown authored Apr 03, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
69c54e54

02 Apr, 2008 5 commits

Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · c4996b32
unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
c4996b32
Correct the location of the directory for · 1a07ecba
unknown authored Apr 02, 2008
```
"funcs_1" data load
```
1a07ecba

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build · cb29e239

unknown authored Apr 02, 2008

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

cb29e239

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

unknown authored Apr 02, 2008

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.

babd981e

Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 393c1a01
unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
393c1a01

01 Apr, 2008 4 commits
- Merge five.local.lan:/work/merge/mysql-5.0-Bug · 68bd2e4a
  unknown authored Apr 01, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
  68bd2e4a
- Test updated. · a9e65840
  unknown authored Apr 01, 2008
  
  a9e65840
- Post-merge fixes. · edcf2742
  unknown authored Apr 01, 2008
```
mysql-test/r/binlog_index.result:
  Result set change.
```
  edcf2742
- Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 · e5387613
  unknown authored Apr 01, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge


sql/share/errmsg.txt:
  Manual merge.
```
  e5387613
31 Mar, 2008 3 commits

Fix for · 00412389

unknown authored Mar 31, 2008

   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)


BitKeeper/deleted/.del-triggers_master.test:
  Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
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:
  Introduce installation of funcs_1 files in std_data.
mysql-test/mysql-test-run.pl:
  The tests within funcs_1 need a server started with
      --secure-file-priv=<MYSQLTEST_VARDIR>
  like the main regression tests.
mysql-test/suite/funcs_1/README.txt:
  Extended description
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
  Cleanup
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Cleanup
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb1.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb2.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb3.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/memory_tb4.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/include/sp_tb.inc:
  Adjustment to new storage place of infile.
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
  "--echo" instead of SQL command.
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
  Adjustment to new storage place of infile
  + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Backport from 5.1 + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
  Minor improvements + correct formatting.
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Backport from 5.1 + correct formatting
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
  Backport from 5.1. + correct formatting
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
  Cleanup
mysql-test/suite/funcs_1/t/is_basics_mixed.test:
  Adjustment to new storage place of outfile.
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
  Cleanup
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
  Cleanup
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
  Cleanup
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
  Cleanup
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/views/func_view.inc:
  Backport from 5.1
mysql-test/suite/funcs_1/views/views_master.inc:
  Cleanup
mysql-test/std_data/funcs_1/load_file.txt:
  New BitKeeper file ``mysql-test/std_data/funcs_1/load_file.txt''

00412389

Removing race conditions from rpl_packet causing test to fail. · a49184af

unknown authored Mar 31, 2008


mysql-test/r/rpl_packet.result:
  Result change.
mysql-test/t/rpl_packet.test:
  Setting net_buffer_length correctly for the test instead of relying on it
  being set correctly. Waiting for slave to stop after issuing a SLAVE STOP
  and waiting for slave to start when issuing a SLAVE START to prevent race
  conditions causing test failure.

a49184af

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 · d59b8cf0
unknown authored Mar 31, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
```
d59b8cf0

30 Mar, 2008 1 commit
- Bug#26243 - Cleanup Valgrind error · 6edab4bc
  unknown authored Mar 30, 2008
  
  6edab4bc
29 Mar, 2008 2 commits
- fixed warnings from the fix of 26243 · 11714e68
  unknown authored Mar 29, 2008
  
  11714e68
- fixes for warnings and compile errors for the fix of bug 26243 · 8ae5aa3b
  unknown authored Mar 29, 2008
  
  8ae5aa3b