Commits · 5cad510490ee56630f667af6091702116086332a · Kirill Smelkov / mariadb

29 Nov, 2006 19 commits

Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1 · 5cad5104
unknown authored Nov 29, 2006
```
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt
```
5cad5104

func_in.result, group_min_max.result: · 50c5e112

unknown authored Nov 29, 2006

  merged 5.0 testcases


mysql-test/r/func_in.result:
  merged 5.0 testcases
mysql-test/r/group_min_max.result:
  merged 5.0 testcases

50c5e112

Merge mysql.com:/home/kent/bk/mysql-5.0-build · d6eb3627

unknown authored Nov 29, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged

d6eb3627

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · e93a20a5
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


sql-common/my_time.c:
  Auto merged
```
e93a20a5
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 412d284e
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
```
412d284e
Merge mysql.com:/home/kent/bk/mysql-4.1-build · ea7559ce
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build
```
ea7559ce

Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt · 3e0d5bc2

unknown authored Nov 29, 2006

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/r/type_varchar.result:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/field.cc:
  SCCS merged

3e0d5bc2

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · d765ed0c
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
d765ed0c

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · e0bf8da9

unknown authored Nov 29, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


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

e0bf8da9

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · b58adf2f
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


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

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · abb3dfc4

unknown authored Nov 29, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


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

abb3dfc4

minor fix · 3344298d

unknown authored Nov 29, 2006


mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere

3344298d

Merge bk-internal:/home/bk/mysql-5.1 · b51cf266

unknown authored Nov 29, 2006

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


sql/sql_parse.cc:
  Auto merged

b51cf266

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 84d5733b
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
84d5733b
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · a73e04bb
unknown authored Nov 29, 2006
```
into  mysql.com:/home/hf/work/thfix/my51-thfix


client/mysqltest.c:
  Auto merged
```
a73e04bb
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 6c0ff6c2
unknown authored Nov 29, 2006
```
into  mysql.com:/home/hf/work/thfix/my50-thfix
```
6c0ff6c2
Merge mysql.com:/home/hf/work/thfix/my50-thfix · a708ae1b
unknown authored Nov 29, 2006
```
into  mysql.com:/home/hf/work/thfix/my51-thfix


client/mysqltest.c:
  Auto merged
```
a708ae1b
Merge mysql.com:/home/hf/work/thfix/my41-thfix · 95129e9e
unknown authored Nov 29, 2006
```
into  mysql.com:/home/hf/work/thfix/my50-thfix


client/mysqltest.c:
  Auto merged
```
95129e9e

fixed compilation failure on hpux · af618524

unknown authored Nov 29, 2006

the problem is that client tools are compiled with UNDEF_THREADS_HACK
flag, and my thread-related additions to the mysqltest.c can't be compiled.
Easy solution is to disable these in not-embedded case completely.


client/mysqltest.c:
  it's used in embedded server only

af618524

28 Nov, 2006 20 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 269d32b6

unknown authored Nov 28, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged

269d32b6

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · fe99bda8
unknown authored Nov 28, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-24486


sql/sql_parse.cc:
  Auto merged
```
fe99bda8

Merge kahlann.erinye.com:/home/df/mysql/build/51 · d7403d0a

unknown authored Nov 28, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged

d7403d0a

A fix for Bug#24486 "Valgrind warnings: sp_head(), · 76833ac4

unknown authored Nov 28, 2006

deadlock_innodb:events_grant". This was a memory leak introduced by 
the patch for Bug 22830.
Post-review fixes.


sql/sql_parse.cc:
  A fix for Bug#24486 "Valgrind warnings: sp_head(),
   deadlock_innodb:events_grant": delete the sphead object before
  returning with an error.

76833ac4

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 00fec63a
unknown authored Nov 28, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
00fec63a
Merge trift2.:/M50/mysql-5.0 · fa26de19
unknown authored Nov 28, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
fa26de19

netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain wrong - drop it. · 5be953f8

unknown authored Nov 28, 2006


netware/BUILD/nwbootstrap:
  Editing "mwenv" is now obsolete,
  as this file gets its variable settings from the environment already;
  and it is even plain wrong,
  because the assignments to those variables are written in such a way that
  replacing the variables by values (as tried here) yields invalid shell lines.

5be953f8

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · a18d3eff

unknown authored Nov 28, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged

a18d3eff

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build · d41b660b
unknown authored Nov 28, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build
```
d41b660b

Makefile.am: · 89a71063

unknown authored Nov 28, 2006

  Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.


sql/Makefile.am:
  Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.

89a71063

Merge mysql.com:/home/kent/bk/mysql-4.1-build · 4d08b747
unknown authored Nov 28, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build


Docs/Makefile.am:
  Auto merged
```
4d08b747

Makefile.am: · 0fb76499

unknown authored Nov 28, 2006

  If using \$(srcdir)/mysql.info in action, use same in rule.


Docs/Makefile.am:
  If using \$(srcdir)/mysql.info in action, use same in rule.

0fb76499

Merge bk-internal:/home/bk/mysql-5.1 · 95b72158

unknown authored Nov 28, 2006

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged

95b72158

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 852d3780
unknown authored Nov 28, 2006
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B24156-5.0-opt
```
852d3780

Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar · 762f4ac1

unknown authored Nov 28, 2006

           statements
Currently the optimizer evaluates loose index scan only for top-level SELECT
statements
Extend loose index scan applicability by :
 - Test the applicability of loose scan for each sub-select, instead of the
   whole query. This change enables loose index scan for sub-queries.
 - allow non-select statements with SELECT parts (like, e.g. 
   CREATE TABLE .. SELECT ...) to use loose index scan.


mysql-test/r/group_min_max.result:
  Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
             statements
   - test case
mysql-test/t/group_min_max.test:
  Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
             statements
   - test case
sql/opt_range.cc:
  Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
             statements
   - loose index scan will be tried over the current subselect 
     (lex->current_select) instead of the whole query (lex->select_lex).
   - allow non-select statements with SELECT parts (like, e.g. 
     CREATE TABLE .. SELECT ...) to use loose index scan.

762f4ac1

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bce65bf4

unknown authored Nov 28, 2006

into  rakia.gmz:/home/kgeorge/mysql/autopush/B11927-5.0-opt


mysql-test/r/func_gconcat.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_string.h:
  Auto merged

bce65bf4

BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0) · 9221a548

unknown authored Nov 28, 2006

 When implicitly converting string fields to numbers the 
 string-to-number conversion error was not sent to the client.
 Added code to send the conversion error as warning.
 
 We also need to prevent generation of warnings from the places
 where val_xxx() methods are called for the sole purpose of updating
 the Item::null_value flag.
 To achieve that a special function is added (and called) : 
 update_null_value(). This function will set the no_errors flag and
 will call val_xxx(). The warning generation in Field_string::val_xxx()
 will use the flag when generating the conversion warnings. 


mysql-test/r/compare.result:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - non-convertible strings in arithmetic operations
mysql-test/r/func_gconcat.result:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - non-convertible strings in arithmetic operations
mysql-test/r/func_group.result:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - non-convertible strings in arithmetic operations
mysql-test/r/type_varchar.result:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - test case
mysql-test/t/type_varchar.test:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - test case
sql/field.cc:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - send conversion warning to the client
sql/item.cc:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - send conversion warning to the client
sql/item.h:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - added a special function to explicitly update the null_value
sql/item_func.h:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - added a special function to explicitly update the null_value
sql/item_subselect.h:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - added a special function to explicitly update the null_value
sql/item_sum.cc:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - added a special function to explicitly update the null_value
sql/item_sum.h:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - added a special function to explicitly update the null_value
sql/sql_string.h:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - send conversion warning to the client

9221a548

opt_range.cc: · 7fe3f313

unknown authored Nov 28, 2006

  dummy commit to trigger pushbuild


sql/opt_range.cc:
  dummy commit to trigger pushbuild

7fe3f313

Merge trift2.:/M50/mysql-5.0 · c8b23c37

unknown authored Nov 28, 2006

into  trift2.:/MySQL/M50/push-5.0


extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged

c8b23c37

Fixed portablity problem · 76b4ccbd

unknown authored Nov 28, 2006

Removed warnings from mysqltest scripts


cmd-line-utils/readline/undo.c:
  Fixed portability problem
mysql-test/include/mix2.inc:
  Removed mysqltest warnings
mysql-test/include/query_cache.inc:
  Removed mysqltest warnings
mysql-test/r/ndb_binlog_ddl_multi.result:
  Update tests after fixing wrong connection command in test
mysql-test/t/greedy_optimizer.test:
  Removed mysqltest warnings
mysql-test/t/join.test:
  Removed mysqltest warnings
mysql-test/t/ndb_binlog_ddl_multi.test:
  Removed mysqltest warnings
mysql-test/t/ndb_blob_partition.test:
  Removed mysqltest warnings
mysql-test/t/ndb_index_ordered.test:
  Removed mysqltest warnings
storage/ndb/src/kernel/vm/Rope.cpp:
  Removed compiler warning

76b4ccbd

27 Nov, 2006 1 commit
- Merge mysql.com:/home/kent/bk/mysql-4.1-build · 344db8ab
  unknown authored Nov 28, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build
```
  344db8ab