Commits · 48595c284dd5bebbc513f611811f8d2cb4ee658e · nexedi / MariaDB

01 Dec, 2006 2 commits

Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043 · 48595c28

unknown authored Dec 01, 2006

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  - Merged

48595c28

Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS" · 2f0b1d65

unknown authored Dec 01, 2006

- Refactoring of duplicate code
- Modified bad test cases
- Changed expected error when operating on information_schema.


mysql-test/r/information_schema.result:
  - updated result file with new error code.
mysql-test/r/rpl_sp.result:
  - Modified test case
mysql-test/t/information_schema.test:
  - Changed error code for operations on information_schema
mysql-test/t/rpl_sp.test:
  - Modified test case
sql/sql_parse.cc:
  - Cleaned up code:
    * replace tab with space
    * simplified if/switch statements
    * refactored duplicated code

2f0b1d65

30 Nov, 2006 3 commits
- Include *.MY* files from std_data in dist · ebed0fe1
  unknown authored Nov 30, 2006
  
  ebed0fe1
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · daa14544
  unknown authored Nov 30, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/r/mysqltest.result:
  Manual merge
```
  daa14544
- Add "chmod" command to mysqltest · 708bce0a
  unknown authored Nov 30, 2006
  
  708bce0a
29 Nov, 2006 13 commits

Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 · 30278aed

unknown authored Nov 29, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/handler.cc:
  Auto merged
client/mysqltest.c:
  Manual merge

30278aed

Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1 · 8e0614c8

unknown authored Nov 29, 2006

 - chmod the saved files from 4.1 to make sure they are writable


mysql-test/t/varbinary.test:
  As the files saved from 4.1 has been in bk they muight be readonly
  Use "chmod" to make sure they are writable

8e0614c8

Add command "chmod" to mysqltest · 0e8ed1b5

unknown authored Nov 29, 2006


client/mysqltest.c:
  Add "chmod" command
mysql-test/r/mysqltest.result:
  Update result file
mysql-test/t/mysqltest.test:
  Add tests for chmod

0e8ed1b5

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 66466ddf

unknown authored Nov 29, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

66466ddf

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · acce5337

unknown authored Nov 29, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


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

acce5337

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 2aac04f9

unknown authored Nov 29, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


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

2aac04f9

After 5.1.6 just turn on logging, it will be sent to tables by default · 7bc069d1
unknown authored Nov 29, 2006

7bc069d1

Change mode of the checked in 4.1 version files so they are writable · 6f1c3848

unknown authored Nov 29, 2006


mysql-test/std_data/bug19371.frm:
  Change mode to -rw-rw--w-
mysql-test/std_data/bug19371.MYD:
  Change mode to -rw-rw--w-
mysql-test/std_data/bug19371.MYI:
  Change mode to -rw-rw--w-

6f1c3848

Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint · 8e5203ae
unknown authored Nov 29, 2006
```
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
```
8e5203ae

Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043 · 8ac71ce7

unknown authored Nov 29, 2006

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint


sql/sql_parse.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  - merged
mysql-test/t/rpl_sp.test:
  -merged

8ac71ce7

Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · cd69f462
unknown authored Nov 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/yassl_import/mysql-5.0-maint


extra/yassl/src/ssl.cpp:
  Auto merged
```
cd69f462

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 89d106c1

unknown authored Nov 29, 2006

into  mysql.com:/usr/home/ram/work/bug22229/my50-bug22229


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

89d106c1

Import version 1.50 of yaSSL · eb6ab467

unknown authored Nov 29, 2006


extra/yassl/README:
  Import patch yassl.diff
extra/yassl/examples/client/client.cpp:
  Import patch yassl.diff
extra/yassl/examples/echoclient/echoclient.cpp:
  Import patch yassl.diff
extra/yassl/examples/echoserver/echoserver.cpp:
  Import patch yassl.diff
extra/yassl/examples/server/server.cpp:
  Import patch yassl.diff
extra/yassl/include/factory.hpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/include/socket_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_error.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_imp.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_int.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_types.hpp:
  Import patch yassl.diff
extra/yassl/src/handshake.cpp:
  Import patch yassl.diff
extra/yassl/src/make.bat:
  Import patch yassl.diff
extra/yassl/src/socket_wrapper.cpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_error.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_imp.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/include/aes.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/algebra.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/arc4.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/asn.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/block.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/blowfish.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/des.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/integer.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/md5.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/modes.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/ripemd.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/rsa.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/sha.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/twofish.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/aes.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/algebra.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/arc4.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/blowfish.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/des.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/src/md4.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/md5.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/random.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/ripemd.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/sha.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/twofish.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/make.bat:
  Import patch yassl.diff
extra/yassl/testsuite/test.hpp:
  Import patch yassl.diff
extra/yassl/include/openssl/prefix_ssl.h:
  New prefic file for ssl.h generated

eb6ab467

28 Nov, 2006 22 commits

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · a5aa9f64

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

a5aa9f64

Remove the moved check a second time. · 3cd30397
unknown authored Nov 28, 2006
```
mysql-test/mysql-test-run.pl:
  Remove the moved check
```
3cd30397

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 1e875747

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


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

1e875747

Move the check that $opt_vardir could be created and was writable to the function · b3273629
unknown authored Nov 28, 2006
```
where we know how to creat the vardir 
Remove unused variable
```
b3273629

Merge bk-internal:/home/bk/mysql-5.0-maint · 38da90cc

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/t/mysql.test:
  Auto merged

38da90cc

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 6e36d3c5

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


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

6e36d3c5

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · a7bad254

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


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

a7bad254

Bug#24335 mysql-test-run.pl fails with ActiveState Perl on Windows · e789cdaa

unknown authored Nov 28, 2006

 - Avoid use of mtr_run when executing "mysqld --verbose --help" to find
   version and supported features


mysql-test/mysql-test-run.pl:
  Don't use mtr_run when executing "mysqld --verbose --help" to find
  version and supported features.

e789cdaa

Fix missing parameter declaration · 27f9c2c1
unknown authored Nov 28, 2006

27f9c2c1

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 7e14b6cb

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


Docs/Makefile.am:
  Auto merged
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge

7e14b6cb

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · befbebcf

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge

befbebcf

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · bd4c0c11
unknown authored Nov 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
bd4c0c11

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · c789301f

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_deadlock.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
include/my_sys.h:
  Manual merge, my_getpagesize broken out of "#ifdef HAVE_SYS_MMAN_H"

c789301f

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 8143ab23

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Manual merge

8143ab23

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · e3a9d949

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


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

e3a9d949

Look for client binaries also in bin/ directory · e8d8ddad
unknown authored Nov 28, 2006

e8d8ddad

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 90c57042

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


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

90c57042

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · c5f7e078

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


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

c5f7e078

Create new function "run_testcase_mark_logs' and use it to mark start of testcase · 92ac0e73
unknown authored Nov 28, 2006
```
in all cuurently known log files 
```
92ac0e73

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · bb4b8d38

unknown authored Nov 28, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


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

bb4b8d38

Only force mysqld to use log file up until 5.1.6 · a60fe75f

unknown authored Nov 28, 2006

After that it will by default use log tables. That setting can be overruled
by adding a -master.opt file like mysql_client_test has.

a60fe75f

Revert charset breakage. · be820c11
unknown authored Nov 28, 2006

be820c11