Commits · bda8d58d8eb58017c8745a9fac418d87e7e889c5 · Kirill Smelkov / mariadb

02 Jun, 2005 5 commits

Merge · bda8d58d

unknown authored Jun 02, 2005


BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
  Auto merged
client/sql_string.cc:
  Auto merged
mysys/raid.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_uniq.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/procedure.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol_cursor.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_map.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged

bda8d58d

Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 288008ea
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean


BUILD/SETUP.sh:
  Merge from 4.1
```
288008ea
Restore a bit of code accidently deleted during merge · c0df79f9
unknown authored Jun 01, 2005
```
sql/item_func.cc:
  Restore accidently deleted code
```
c0df79f9
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · e71ef941
unknown authored Jun 02, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


sql/item_func.cc:
  Auto merged
```
e71ef941

tztime.cc: · cee10f97

unknown authored Jun 02, 2005

  Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION


client/sql_string.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
mysys/raid.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/field.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_berkeley.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_blackhole.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_heap.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_innodb.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_isam.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_isammrg.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_myisam.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_myisammrg.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_ndbcluster.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/handler.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/hash_filo.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_cmpfunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_func.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_geofunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_strfunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_subselect.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_sum.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_timefunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_uniq.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/log_event.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/opt_range.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/procedure.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/protocol.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/protocol_cursor.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/set_var.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_analyse.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_class.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_crypt.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_list.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_map.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_olap.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/examples/ha_archive.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_select.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_string.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_udf.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/examples/ha_example.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/examples/ha_tina.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/tztime.cc:
  Set #pragma implementation" earlier

cee10f97

01 Jun, 2005 27 commits

Fix --with-bdb to be --with-berkeley-db in BUILD/SETUP.sh · 638bb0a2
unknown authored Jun 01, 2005
```
BUILD/SETUP.sh:
  Fix --with-bdb to --with-berkeley-db
```
638bb0a2
Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 54999b26
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/sql_table.cc:
  Auto merged
```
54999b26

Merge mysql.com:/home/jimw/my/mysql-4.1-clean · daf8cc67

unknown authored Jun 01, 2005

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/rpl_failed_optimize.result:
  Auto merged
vio/viossl.c:
  Auto merged
mysql-test/t/func_str.test:
  Merge from 4.1
sql/item_func.cc:
  Merge from 4.1
sql/sql_table.cc:
  Merge from 4.1

daf8cc67

Bug #11019 mgmapi start backup in some cases returns wrong backupid · 2b3a1494
unknown authored Jun 02, 2005

2b3a1494
Fix compile error when HAVE_BERKELEY_DB · 4e19af27
unknown authored Jun 01, 2005
```
sql/sql_table.cc:
  Add missing argument
```
4e19af27
Update results of test after merge of bugfix · b4953598
unknown authored Jun 01, 2005
```
mysql-test/r/rpl_failed_optimize.result:
  Update results
```
b4953598
Merge mysql.com:/home/jimw/my/mysql-4.1-8572 · 8dad75b2
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
8dad75b2
Merge mysql.com:/home/jimw/my/mysql-4.1-9660 · be804109
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
```
be804109
Merge mysql.com:/home/jimw/my/mysql-4.1-10944 · 61bb1f34
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
61bb1f34
Merge mysql.com:/home/jimw/my/mysql-4.1-8135 · dd1168a3
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
```
dd1168a3

Fix handling of NULL fields in FIELD(). (Bug #10944) · f20c56a9

unknown authored Jun 01, 2005


mysql-test/r/func_str.result:
  Update results
mysql-test/t/func_str.test:
  Add regression tests
sql/item_func.cc:
  Handle NULL as first argument to FIELD()

f20c56a9

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · b5889b90
unknown authored Jun 01, 2005
```
into mysql.com:/space/my/mysql-5.0
```
b5889b90
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · fc68609c
unknown authored Jun 01, 2005
```
into mysql.com:/space/my/mysql-5.0
```
fc68609c
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 20ba6d92
unknown authored Jun 01, 2005
```
into mysql.com:/Users/mikron/bug10837
```
20ba6d92

Renamed bugs.test to default.test · 2af74b7e

unknown authored Jun 01, 2005

Moved enabling of warnings to ensure that no warnings are generated
when this test case is executed on a clone where InnoDB is not
activated. This would fail the test case in those clones otherwise.


mysql-test/r/default.result:
  Rename: mysql-test/r/bugs.result -> mysql-test/r/default.result
mysql-test/t/default.test:
  Moved enabling of warnings to ensure that no warnings are generated
  when this test case is executed on a clone where InnoDB is not
  activated. This would fail the test case in those clones otherwise.

2af74b7e

Merge mysql.com:/usr/local/bk/mysql-5.0 · aecb4409
unknown authored Jun 01, 2005
```
into mysql.com:/home/pem/work/mysql-5.0


sql/sql_yacc.yy:
  Auto merged
```
aecb4409

Fixed BUG#10969: Stored procedures: crash if default() function · ae28b3bd

unknown authored Jun 01, 2005

  Return an error if default() is used on a local variable.
  This is actaully a side-effect of BUG#5967: Stored procedure declared
  variable used instead of column (to be fixed later), so this is really a
  workaround until that is fixed.


mysql-test/r/sp-error.result:
  New test case for BUG#10969.
mysql-test/t/sp-error.test:
  New test case for BUG#10969.
sql/item.h:
  Get name of local variable for error messages.
sql/sql_yacc.yy:
  Return an error if default() is applied on a local SP variable.

ae28b3bd

Merge of 4.1 -> 5.0 · 29fb604d

unknown authored Jun 01, 2005


VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
  Auto merged
VC++Files/client/mysqltest.dsp:
  Auto merged
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
  Auto merged
VC++Files/strings/strings.dsp:
  Auto merged
VC++Files/strings/strings_ia64.dsp:
  Auto merged
include/config-win.h:
  Auto merged
myisammrg/myrg_open.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
configure.in:
  - manual merge, fixed NDB_VERSION_BUILD

29fb604d

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · bac98672
unknown authored Jun 01, 2005
```
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
```
bac98672
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. · 388d9df1
unknown authored Jun 01, 2005
```
After merge fixes.
```
388d9df1
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 · 853a55ad
unknown authored Jun 01, 2005
```
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
```
853a55ad

- removed references to some obsolete files (BUG#10824) · 0d4b1184

unknown authored Jun 01, 2005

- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)


BitKeeper/deleted/.del-mysql-max.spec.sh~ca055d86585c1010:
  Delete: support-files/mysql-max.spec.sh
configure.in:
  - removed references to some obsolete files
scripts/make_binary_distribution.sh:
  - removed references to some obsolete files

0d4b1184

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 87459997
unknown authored Jun 01, 2005
```
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
```
87459997
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · a0affca7
unknown authored Jun 01, 2005
```
into mysql.com:/space/my/mysql-4.1
```
a0affca7

Fixed BUG#10961: Stored procedures: crash if select * from dual · 77bd9d36

unknown authored Jun 01, 2005

  Have to catch errors from SELECT when opening a cursor.


mysql-test/r/sp.result:
  New test case for BUG#10961.
mysql-test/t/sp.test:
  New test case for BUG#10961.
sql/protocol.h:
  Init data in Protocol_cursor constructor, for error cases.
sql/sp_head.cc:
  Catch "hidden" errors during SELECT when opening a cursor.

77bd9d36

Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. · 046ced26

unknown authored Jun 01, 2005

Manual merge from 4.1.


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

046ced26

merging: the patch rejected as the code differs much; should be rewritten for 5.0. · abbdab6a
unknown authored Jun 01, 2005

abbdab6a

31 May, 2005 8 commits

Merge bk-internal:/home/bk/mysql-5.0 · 8d5edfda
unknown authored Jun 01, 2005
```
into siva.hindu.god:/opt/home/tim/m/50/a
```
8d5edfda

Merge · 10481cd0

unknown authored May 31, 2005


mysql-test/r/create.result:
  SCCS merged
mysql-test/t/create.test:
  SCCS merged

10481cd0

Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. · 601b5bca
unknown authored May 31, 2005
```
After merge fix.
```
601b5bca
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 · e0fbac19
unknown authored May 31, 2005
```
into xiphis.org:/usr/home/antony/work2/p4-bug10413.2
```
e0fbac19

Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. · 57d4adf6

unknown authored May 31, 2005

Hand merged from 4.0.


sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

57d4adf6

Bug#10413 - Invalid column name is not rejected · 2b548fe9

unknown authored May 31, 2005

  Stop ignoring name parts and check for validity


mysql-test/r/create.result:
  Test for bug#10413
mysql-test/t/create.test:
  Test for bug#10413
sql/sql_yacc.yy:
  Bug#10413
    Stop ignoring parts of fully qualified names.

2b548fe9

Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure name · 3f7b0f70

unknown authored May 31, 2005

                during creation.
  Although it returns an error, consistent with the behaviour for other objects.
  (Unclear why we would allow the creation of SPs with truncated names.)


mysql-test/r/sp-error.result:
  New test case for BUG#9529.
mysql-test/t/sp-error.test:
  New test case for BUG#9529.
sql/sp.cc:
  Check SP name length on creation (and drop).
sql/sp.h:
  New status code for bad (too long) name.
sql/sql_parse.cc:
  New status code for bad (too long) name.

3f7b0f70

WL#2286 - Compile MySQL w/YASSL support · b3d646e6

unknown authored May 31, 2005

merge with latest yaSSL, move templates instantiation into separate file where it is possible


extra/yassl/include/buffer.hpp:
  merge with latest yaSSL
extra/yassl/include/crypto_wrapper.hpp:
  merge with latest yaSSL
extra/yassl/include/socket_wrapper.hpp:
  merge with latest yaSSL
extra/yassl/include/yassl_imp.hpp:
  merge with latest yaSSL
extra/yassl/include/yassl_types.hpp:
  merge with latest yaSSL
extra/yassl/mySTL/helpers.hpp:
  merge with latest yaSSL
extra/yassl/mySTL/list.hpp:
  merge with latest yaSSL
extra/yassl/mySTL/memory.hpp:
  merge with latest yaSSL
extra/yassl/mySTL/vector.hpp:
  merge with latest yaSSL
extra/yassl/src/Makefile.am:
  Include template_instnt.cpp into libyassl_a_SOURCES.
extra/yassl/src/buffer.cpp:
  merge with latest yaSSL
extra/yassl/src/cert_wrapper.cpp:
  merge with latest yaSSL
extra/yassl/src/crypto_wrapper.cpp:
  merge with latest yaSSL
extra/yassl/src/handshake.cpp:
  merge with latest yaSSL
extra/yassl/src/lock.cpp:
  merge with latest yaSSL
extra/yassl/src/log.cpp:
  merge with latest yaSSL
extra/yassl/src/socket_wrapper.cpp:
  merge with latest yaSSL
extra/yassl/src/ssl.cpp:
  merge with latest yaSSL
extra/yassl/src/timer.cpp:
  merge with latest yaSSL
extra/yassl/src/yassl_error.cpp:
  merge with latest yaSSL
extra/yassl/src/yassl_imp.cpp:
  merge with latest yaSSL
extra/yassl/src/yassl_int.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/include/algebra.hpp:
  merge with latest yaSSL
extra/yassl/taocrypt/include/asn.hpp:
  merge with latest yaSSL
extra/yassl/taocrypt/include/block.hpp:
  merge with latest yaSSL
extra/yassl/taocrypt/include/hash.hpp:
  merge with latest yaSSL
extra/yassl/taocrypt/include/integer.hpp:
  merge with latest yaSSL
extra/yassl/taocrypt/include/misc.hpp:
  merge with latest yaSSL
extra/yassl/taocrypt/include/modes.hpp:
  merge with latest yaSSL
extra/yassl/taocrypt/include/runtime.hpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/Makefile.am:
  Include template_instnt.cpp into libtaocrypt_a_SOURCES.
extra/yassl/taocrypt/src/aestables.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/algebra.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/arc4.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/asn.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/coding.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/dh.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/dsa.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/file.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/integer.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/misc.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/random.cpp:
  merge with latest yaSSL
extra/yassl/taocrypt/src/rsa.cpp:
  merge with latest yaSSL

b3d646e6