Commits · 65866b7bbaf571964ad328265f3ff7b0b0a47d4b · Kirill Smelkov / mariadb

03 Aug, 2006 11 commits

Make test case for bug#21215repeateble by calling "reset master" · 65866b7b
unknown authored Aug 03, 2006

65866b7b
Update result after merge, since the function Item::tmp_table_field_from_field_type() · 98157e78
unknown authored Aug 03, 2006
```
now takes mbmaxlen into account when calculating max_length of new field. 
```
98157e78

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

unknown authored Aug 03, 2006

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


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

4b579171

Remove double error printout in mysqldump · 234bb881

unknown authored Aug 03, 2006


client/mysqldump.c:
  Remove double error printout, mysql_query_with_error_report will do that. And set the exit code for us.
mysql-test/r/mysqldump.result:
  Update test result after merge

234bb881

Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218 · 9744e7f8

unknown authored Aug 03, 2006

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


mysql-test/t/mysqlbinlog.test:
  Null merge

9744e7f8

Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215 · 607b8e5e

unknown authored Aug 03, 2006

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


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
client/mysqldump.c:
  Manual merge
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge

607b8e5e

Removing disabling of lowercase_fs_off · 45275fbc
unknown authored Aug 03, 2006

45275fbc

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

unknown authored Aug 03, 2006

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


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/func_group.result:
  Merge manually
mysql-test/t/func_group.test:
  Merge manually

ed44a2ee

Merge rama.(none):/home/jimw/my/mysql-5.0-19147 · 695c534d
unknown authored Aug 02, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-16502
```
695c534d

Merge rama.(none):/home/jimw/my/mysql-5.0-16881 · 827e6a85

unknown authored Aug 02, 2006

into  rama.(none):/home/jimw/my/mysql-5.0-16502


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

827e6a85

Merge bk-internal:/home/bk/mysql-5.0-maint · 7f69aee4
unknown authored Aug 02, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-16502
```
7f69aee4

02 Aug, 2006 16 commits

Disable a failing test case (filed a p1 bug) · 3c8150b7
unknown authored Aug 02, 2006

3c8150b7

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

unknown authored Aug 02, 2006

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/r/udf.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
mysql-test/t/udf.test:
  Manual merge.

e44e344c

A post-merge fix. · a0efaba3
unknown authored Aug 02, 2006

a0efaba3
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1cf65f31
unknown authored Aug 02, 2006
```
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
```
1cf65f31

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a5812433

unknown authored Aug 02, 2006

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged

a5812433

Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql · 0825bad9

unknown authored Aug 02, 2006

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


mysql-test/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
client/mysqltest.c:
  Manual merge

0825bad9

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c102fe94

unknown authored Aug 02, 2006

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
mysql-test/t/sp.test:
  Manual merge

c102fe94

Merge moonbone.local:/work/tmp_merge-4.1 · 328e8c74
unknown authored Aug 02, 2006
```
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
```
328e8c74

Merge moonbone.local:/work/tmp_merge-4.1 · 84ece59c

unknown authored Aug 02, 2006

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql


sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

84ece59c

Merge bk@192.168.21.1:mysql-4.1 · 504e3756
unknown authored Aug 02, 2006
```
into  mysql.com:/home/hf/work/mysql-4.1.20317
```
504e3756

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

unknown authored Aug 02, 2006

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


include/mysql.h:
  Auto merged
include/sql_common.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/ps.result:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/sql_prepare.cc:
  Manual merge.
sql/table.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

f3919e92

Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · ed19079c
unknown authored Aug 02, 2006
```
into  lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
```
ed19079c

Fix a compilation failiure on QNX · cb6e70a5

unknown authored Aug 02, 2006


sql/udf_example.c:
  Declare tmp_error at the beginning of the block (this is C now)

cb6e70a5

Bug #21396: Wrong error number generated for a missing table · a29f10e8

unknown authored Aug 02, 2006


BitKeeper/etc/collapsed:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.0/BitKeeper/etc/collapsed
mysys/my_open.c:
  Win64 bit fix: Replacing 32-bit value (0xFFFFFFFF) by a generic error constant.

a29f10e8

Disable test case for for bug 21042 · 10ee3a50
unknown authored Aug 02, 2006

10ee3a50

.del-sp.test.orig: · 53cc83fe

unknown authored Aug 02, 2006

  Delete: mysql-test/t/sp.test.orig


BitKeeper/deleted/.del-sp.test.orig:
  Delete: mysql-test/t/sp.test.orig

53cc83fe

01 Aug, 2006 13 commits

Applied innodb-5.0-ss677 snapshot. · 75e40b16

unknown authored Aug 01, 2006

Fixes:
- bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
- bug #21112: InnoDB slow with > 100,000 .ibd files
- bug #21113: Duplicate printout in SHOW INNODB STATUS


innobase/fil/fil0fil.c:
  Applied innodb-5.0-ss677 snapshot.
    Make the tablespace cache hash size 100 or 1000 times bigger. Fixes bug #21112.
innobase/ibuf/ibuf0ibuf.c:
  Applied innodb-5.0-ss677 snapshot.
    ibuf_print(): Don't print redundant information. Fixes bug #21113.
sql/ha_innodb.cc:
  Applied innodb-5.0-ss677 snapshot.
    ha_innobase::start_stmt(): patch from Heikki:
    Do not call read_view_close_for_mysql().  (Bug #19834)

75e40b16

Merge 192.168.0.20:mysql/mysql-5.0-maint · a5c45ac6

unknown authored Aug 01, 2006

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


extra/yassl/taocrypt/include/asn.hpp:
  Auto merged
extra/yassl/taocrypt/src/asn.cpp:
  Auto merged

a5c45ac6

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

unknown authored Aug 01, 2006

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


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1081dd6f

Import latest version of yaSSL · 805c439b

unknown authored Aug 01, 2006


extra/yassl/include/yassl_imp.hpp:
  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/include/asn.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/asn.cpp:
  Import patch yassl.diff
extra/yassl/COPYING:
  Import patch yassl.diff

805c439b

Merge bk-internal:/home/bk/mysql-4.1 · 87fc6265
unknown authored Aug 01, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
87fc6265
Merge bk-internal:/home/bk/mysql-5.0-maint · 2660a6bb
unknown authored Aug 01, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
2660a6bb
Add missing $ · de99af69
unknown authored Aug 01, 2006

de99af69
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 7b914fbb
unknown authored Aug 01, 2006
```
into  maint1.mysql.com:/data/localhome/igreenhoe/mysql-5.0-maint
```
7b914fbb

Bug#21367 IM tests do not recognize "win2003-amd64" as Windows · 938d3056

unknown authored Aug 01, 2006

 - Disable Instance manager on Windows


mysql-test/mysql-test-run.pl:
  Disable Instance manager on Windows.

938d3056

Change error code to test for "unknown error" with to 10000 · 8b3ef8c1
unknown authored Aug 01, 2006

8b3ef8c1
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 759027d1
unknown authored Aug 01, 2006
```
into  rakia.(none):/home/kgeorge/mysql/autopush/B20103-5.0-opt
```
759027d1

Bug #20103: Escaping with backslash does not work · ec95bf78

unknown authored Aug 01, 2006

 - make the client to respect the server-side 
   no_backslash_escapes option and disable the 
   special meaning of backslash also at client side.


mysql-test/r/mysql_client.result:
  Bug #20103: Escaping with backslash does not work
   - test case
mysql-test/t/mysql_client.test:
  Bug #20103: Escaping with backslash does not work
   - test case

ec95bf78

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · edeea349
unknown authored Aug 01, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
edeea349