Commits · 06f671794b107eca3f9b4b19b0ccc9566ce48fea · nexedi / MariaDB

09 Aug, 2006 1 commit
- sql_view.cc: · 06f67179
  unknown authored Aug 09, 2006
```
  After merge fix


sql/sql_view.cc:
  After merge fix
```
  06f67179
08 Aug, 2006 3 commits

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c806a0e1
unknown authored Aug 09, 2006
```
into  sunlight.local:/local_work/leak_fix


sql/sql_view.cc:
  Auto merged
```
c806a0e1

Merge sunlight.local:/home/evgen/bk-trees/mysql-5.0 · 3d8a2c77

unknown authored Aug 09, 2006

into  sunlight.local:/local_work/leak_fix


sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_view.cc:
  Manually merged

3d8a2c77

sql_base.cc, unireg.h, sql_lex.h, table.cc, sql_view.h, sql_view.cc: · 2a0e6f80

unknown authored Aug 09, 2006

  Correct memory leak fix


sql/unireg.h:
  Correct memory leak fix
sql/table.cc:
  Correct memory leak fix
sql/sql_view.h:
  Correct memory leak fix
sql/sql_view.cc:
  Correct memory leak fix
sql/sql_lex.h:
  Correct memory leak fix
sql/sql_base.cc:
  Correct memory leak fix

2a0e6f80

07 Aug, 2006 1 commit
- sql_view.cc: · fcdcb2c9
  unknown authored Aug 07, 2006
```
  Memory leak fix


sql/sql_view.cc:
  Memory leak fix
```
  fcdcb2c9
06 Aug, 2006 3 commits
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c9464eb6
  unknown authored Aug 07, 2006
```
into  sunlight.local:/local_work/leak_fix


sql/sql_view.cc:
  Auto merged
```
  c9464eb6
- Merge sunlight.local:/home/evgen/bk-trees/mysql-5.0 · 29a53394
  unknown authored Aug 07, 2006
```
into  sunlight.local:/local_work/leak_fix


sql/sql_view.cc:
  Auto merged
```
  29a53394
- sql_view.cc: · 925fe041
  unknown authored Aug 07, 2006
```
  Memory leak fix


sql/sql_view.cc:
  Memory leak fix
```
  925fe041
03 Aug, 2006 13 commits

Add my_memmem.c to mysys.dsp (needed by mysql_client_test) · 636cfcca
unknown authored Aug 04, 2006

636cfcca

Fix a bug in the .dsp file. Ignore a symlink. · b0f5a4bb

unknown authored Aug 04, 2006


BitKeeper/etc/ignore:
  Added ndb/src/common/util/testBitmask.cpp to the ignore list
VC++Files/sql/mysqld.dsp:
  Fix a bug in the .dsp file.

b0f5a4bb

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

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

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

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

e02afca5

Remove double error printout in mysqldump · 4ed6d44f

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

4ed6d44f

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

unknown authored Aug 03, 2006

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


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

b5bac47f

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

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

347e9a28

Removing disabling of lowercase_fs_off · f83d7121
unknown authored Aug 03, 2006

f83d7121

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

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

4ef68339

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

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

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

28895729

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

02 Aug, 2006 16 commits

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

20bbefdb

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

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.

4f3a18e1

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

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


client/mysql.cc:
  Auto merged
```
b9dc69b8

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

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

397be189

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

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

d47f48f7

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

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

ffdb852f

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

Merge moonbone.local:/work/tmp_merge-4.1 · 02c4142f

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

02c4142f

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

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

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.

9813aff5

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

Fix a compilation failiure on QNX · ec05d4b0

unknown authored Aug 02, 2006


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

ec05d4b0

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

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.

00e2974f

Disable test case for for bug 21042 · 2d3f06d2
unknown authored Aug 02, 2006

2d3f06d2

.del-sp.test.orig: · eae15716

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

eae15716

01 Aug, 2006 3 commits

Applied innodb-5.0-ss677 snapshot. · bc7a1822

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)

bc7a1822

Merge 192.168.0.20:mysql/mysql-5.0-maint · 25f70554

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

25f70554

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

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

f84692f3