Commits · f8c0b06a5ca2b7d36b5904009c3adb999f6936d4 · Kirill Smelkov / mariadb

20 Jun, 2005 18 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f8c0b06a
unknown authored Jun 20, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


Makefile.am:
  Auto merged
```
f8c0b06a

Fix a formatting bug and add a test for it. · c8c0140e

unknown authored Jun 20, 2005


sql/share/errmsg.txt:
  Fix a formatting bug.
sql/sql_prepare.cc:
  Fix a formatting bug.
tests/mysql_client_test.c:
  Test the server side error message.

c8c0140e

Merge · 28d40442
unknown authored Jun 20, 2005

28d40442

Makefile.am: · c8714788

unknown authored Jun 20, 2005

  Use the Perl version of mysql-test-run


Makefile.am:
  Use the Perl version of mysql-test-run

c8714788

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 20c63a30

unknown authored Jun 20, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


configure.in:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged

20c63a30

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 1c756c04
unknown authored Jun 20, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
```
1c756c04

mysql-test-run.pl: · 2aa1a04c

unknown authored Jun 20, 2005

  Corrected path to 'mysql_fix_privilege_tables'


mysql-test/mysql-test-run.pl:
  Corrected path to 'mysql_fix_privilege_tables'

2aa1a04c

mysql-test-run.pl: · 92d9f2ca

unknown authored Jun 20, 2005

  Added --log-bin-trust-routine-creators to server start
  Increase and autoextend innodb tables


mysql-test/mysql-test-run.pl:
  Added --log-bin-trust-routine-creators to server start
  Increase and autoextend innodb tables

92d9f2ca

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 00787a9c
unknown authored Jun 20, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
```
00787a9c

mysql-test-run.pl: · d0a7c124

unknown authored Jun 20, 2005

  Corrected path to 'mysql_fix_privilege_tables'
  Corrected dummy --manager-port to take integer argument


mysql-test/mysql-test-run.pl:
  Corrected path to 'mysql_fix_privilege_tables'

d0a7c124

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2ccb5106

unknown authored Jun 20, 2005

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0


sql/item_buff.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged

2ccb5106

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 82a69ff1

unknown authored Jun 20, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  Auto merged

82a69ff1

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34dc6ac3
unknown authored Jun 20, 2005
```
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
```
34dc6ac3
Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1 · e9a87395
unknown authored Jun 20, 2005
```
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
```
e9a87395

ha_ndbcluster.cc: · 1bc23847

unknown authored Jun 20, 2005

  remove typecheck in ndb handler not needed


sql/ha_ndbcluster.cc:
  remove typecheck in ndb handler not needed

1bc23847

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 485e941e

unknown authored Jun 20, 2005

into mysql.com:/home/stewart/Documents/MySQL/5.0/main


ndb/src/kernel/SimBlockList.cpp:
  Auto merged

485e941e

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 77cac251
unknown authored Jun 20, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
77cac251
BUG#11377 Building cluster in 4.1 BK tree fails with GCC4.0 · 8d87d9bf
unknown authored Jun 20, 2005
```
ndb/src/kernel/SimBlockList.cpp:
  GCC 4.0 build fix
```
8d87d9bf

19 Jun, 2005 8 commits

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · c7e49b6b

unknown authored Jun 19, 2005

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


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

c7e49b6b

mysql-test-run.pl: · f35c177a

unknown authored Jun 19, 2005

  Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test-run.pl:
  Set environment variable MYSQL_SHOW, to be used in test cases


mysql-test/lib/mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test/mysql-test-run.pl:
  Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files

f35c177a

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · fc390fe6
unknown authored Jun 19, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
```
fc390fe6

WL#2286 - Compile MySQL w/YASSL support · 2c8ee686

unknown authored Jun 19, 2005

Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
These compilers have problem with implicit template instantiation in archives
(libyassl.a, libtaocrypt.a). Instantiate templates explicitly.

Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
__cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.


configure.in:
  Better CXX_VERSION guessing.
  EXPLICIT_TEMPLATE_INSTANTIATION macro indicates whether to instantiate templates explicitly.
  Instantiate templates explicitly on MIPSpro, Compaq, Forte.
extra/yassl/src/crypto_wrapper.cpp:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
extra/yassl/src/template_instnt.cpp:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
  More portable templates instantiation.
extra/yassl/src/yassl_int.cpp:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
  More portable templates instantiation.
extra/yassl/taocrypt/include/runtime.hpp:
  Fix for link failure on powermacg5 (gcc 3.3). __cxa_pure_virtual must never be inlined.
extra/yassl/taocrypt/src/algebra.cpp:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
extra/yassl/taocrypt/src/integer.cpp:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
extra/yassl/taocrypt/src/template_instnt.cpp:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/field.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/item.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/item_buff.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/mysqld.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/opt_range.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/set_var.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/slave.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/sql_acl.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/sql_class.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/sql_insert.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/sql_map.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/sql_select.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/sql_show.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
sql/table.cc:
  Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.

2c8ee686

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6f86198b
unknown authored Jun 19, 2005
```
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
```
6f86198b
correcting error messages after discussion with Paul (replication of routines). · ac442144
unknown authored Jun 19, 2005
```
mysql-test/r/rpl_sp.result:
  result update
sql/share/errmsg.txt:
  correcting error messages after discussion with Paul.
```
ac442144
Rewrite the test for Bug#9992. · c4bd17c0
unknown authored Jun 19, 2005

c4bd17c0
Fix the test for Bug#11111: coding style, a compiler warning, don't · 0f92333d
unknown authored Jun 19, 2005
```
use tabs.
```
0f92333d

18 Jun, 2005 4 commits

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 16613aad
unknown authored Jun 18, 2005
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
```
16613aad
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · e148529e
unknown authored Jun 18, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
e148529e
BSD make compatibility. bug#9828 · 3e4082cd
unknown authored Jun 18, 2005

3e4082cd

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5ac7f0b3

unknown authored Jun 18, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

5ac7f0b3

17 Jun, 2005 10 commits

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0945dea8

unknown authored Jun 17, 2005

into xiphis.org:/usr/home/antony/work2/p3-bug6877.3


sql/mysql_priv.h:
  Auto merged
sql/table.cc:
  Auto merged

0945dea8

Bug#6877 MySQL should give an error if the requested table type is not available · c25470e3

unknown authored Jun 17, 2005

  Implement new SQL mode - NO_ENGINE_SUBSTITUTION


mysql-test/r/sql_mode.result:
  Test for bug 6877
mysql-test/t/sql_mode.test:
  Test for bug 6877
sql/handler.cc:
  change to ha_checktype()
sql/handler.h:
  change to ha_checktype()
sql/mysql_priv.h:
  new sql mode NO_ENGINE_SUBSTITUTION
  change to args for get_table_type() and create_frm()
sql/mysqld.cc:
  new sql mode NO_ENGINE_SUBSTITUTION
sql/set_var.cc:
  change to ha_checktype() args
sql/sql_delete.cc:
  change to get_table_type() args
sql/sql_rename.cc:
  change to get_table_type() args
sql/sql_table.cc:
  move common code to check_engine()
  change to ha_checktype(), get_table_type() args
sql/table.cc:
  change to ha_checktype(), create_frm(), get_table_type() args
sql/unireg.cc:
  change to create_frm() args

c25470e3

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 06d99235

unknown authored Jun 17, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged

06d99235

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · f16b102f
unknown authored Jun 17, 2005
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
```
f16b102f

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

unknown authored Jun 17, 2005

into mysql.com:/opt/local/work/mysql-5.0-10736


sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

c0918af2

Rename all prepared statements COM_ commands to prefix with COM_STMT_ · 63c21c07

unknown authored Jun 17, 2005


libmysql/libmysql.c:
  Rename.
libmysqld/lib_sql.cc:
  Rename.
sql/item_cmpfunc.cc:
  Use proper method to check for stmt prepare, only_prepare is removed.
sql/mysql_priv.h:
  Remove an obsolete define. Rename mysql_stmt_free to mysql_stmt_close.
sql/sql_class.h:
  Remove THD::only_prepare.
  Rename.
sql/sql_lex.cc:
  Rename COM_PREPARE -> COM_STMT_PREPARE
sql/sql_parse.cc:
  Rename.
sql/sql_prepare.cc:
  Rename.
sql/sql_yacc.yy:
  Rename.
tests/mysql_client_test.c:
  Rename.

63c21c07

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 46fa81f9

unknown authored Jun 17, 2005

into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0


sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged

46fa81f9

fixed printing of sum(distinct ) & avg(distinct ) & cast(... as decimal) (BUG#7015, BUG#11387) · 467ca505

unknown authored Jun 17, 2005


mysql-test/r/view.result:
  using sum(distinct ), cast(... as decimal) & avg(distinct ) in views
mysql-test/t/view.test:
  using sum(distinct ), cast(... as decimal) & avg(distinct ) in views
sql/item.h:
  Add a comment for Item::print
sql/item_func.cc:
  Use functype(), not func_name() for item equvalence detection
sql/item_func.h:
  Missed function typoes added
  Add a comment for Item_func::func_name()
  style fix
sql/item_strfunc.cc:
  Use functype(), not func_name() for item equvalence detection
sql/item_strfunc.h:
  Add missing func_name and func_type
sql/item_sum.cc:
  Item_sum func_name report beggining of function till first argument
sql/item_sum.h:
  Item_sum func_name report beggining of function till first argument
sql/item_timefunc.cc:
  Use functype(), not func_name() for item equvalence detection
sql/item_timefunc.h:
  Add missing func_name and func_type
sql/item_uniq.h:
  Add missing func_name

467ca505

ha_ndbcluster.cc: · cee6d8bb

unknown authored Jun 17, 2005

  workaround for bug being fixed


sql/ha_ndbcluster.cc:
  workaround for bug being fixed

cee6d8bb

disabled.def: · c9521cea
unknown authored Jun 17, 2005
```
  merge


mysql-test/t/disabled.def:
  merge
```
c9521cea