Commits · cd6c3add364e0537cb32ad4975735cefe360058f · nexedi / MariaDB

02 Jun, 2005 5 commits

Merge · cd6c3add

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

cd6c3add

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


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


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

tztime.cc: · 504d71aa

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

504d71aa

01 Jun, 2005 27 commits

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


sql/sql_table.cc:
  Auto merged
```
76b96080

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

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

9025af72

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

b8059bb4
Fix compile error when HAVE_BERKELEY_DB · 0eb7be3a
unknown authored Jun 01, 2005
```
sql/sql_table.cc:
  Add missing argument
```
0eb7be3a
Update results of test after merge of bugfix · 362ab06c
unknown authored Jun 01, 2005
```
mysql-test/r/rpl_failed_optimize.result:
  Update results
```
362ab06c
Merge mysql.com:/home/jimw/my/mysql-4.1-8572 · 8d5c88c3
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
8d5c88c3
Merge mysql.com:/home/jimw/my/mysql-4.1-9660 · 73ecad9c
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
```
73ecad9c
Merge mysql.com:/home/jimw/my/mysql-4.1-10944 · 7e1dfcdf
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
7e1dfcdf
Merge mysql.com:/home/jimw/my/mysql-4.1-8135 · 3543c49f
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
```
3543c49f

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

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()

b3958861

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 92653f49
unknown authored Jun 01, 2005
```
into mysql.com:/space/my/mysql-5.0
```
92653f49
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 468ad9dd
unknown authored Jun 01, 2005
```
into mysql.com:/space/my/mysql-5.0
```
468ad9dd
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4d59d94a
unknown authored Jun 01, 2005
```
into mysql.com:/Users/mikron/bug10837
```
4d59d94a

Renamed bugs.test to default.test · b06510d2

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.

b06510d2

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


sql/sql_yacc.yy:
  Auto merged
```
0bad4fcb

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

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.

d07ac7be

Merge of 4.1 -> 5.0 · f7e61a02

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

f7e61a02

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

- removed references to some obsolete files (BUG#10824) · 3a192cf5

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

3a192cf5

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

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

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.

d9d0c96a

Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. · 19788d38

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

19788d38

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

99db091f

31 May, 2005 8 commits

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

Merge · e5755ffe

unknown authored May 31, 2005


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

e5755ffe

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

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

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

d825d48f

Bug#10413 - Invalid column name is not rejected · 5907a9cd

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.

5907a9cd

Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure name · 404b2109

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.

404b2109

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

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

a44ac5b2