Commit graph

5843 commits

Author SHA1 Message Date
unknown
0cfa328eac Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-11 19:27:17 +01:00
unknown
dbbcc4223b removed auto-generated files, some fixups
BitKeeper/deleted/.del-rpc_server_ext.h~7c955499fca6dc77:
  Delete: bdb/dbinc_auto/rpc_server_ext.h
BitKeeper/deleted/.del-btree_ext.h~35de1585d63d72ff:
  Delete: bdb/dbinc_auto/btree_ext.h
BitKeeper/deleted/.del-clib_ext.h~f279b5b64b6b5ade:
  Delete: bdb/dbinc_auto/clib_ext.h
BitKeeper/deleted/.del-common_ext.h~d8ab025e1be030ae:
  Delete: bdb/dbinc_auto/common_ext.h
BitKeeper/deleted/.del-db_ext.h~a62714b06359a95e:
  Delete: bdb/dbinc_auto/db_ext.h
BitKeeper/deleted/.del-dbreg_ext.h~4d2ca3859b11d8c2:
  Delete: bdb/dbinc_auto/dbreg_ext.h
BitKeeper/deleted/.del-env_ext.h~6f604f4533cc5427:
  Delete: bdb/dbinc_auto/env_ext.h
BitKeeper/deleted/.del-ext_185_def.in~a6545f6dd455a6bd:
  Delete: bdb/dbinc_auto/ext_185_def.in
BitKeeper/deleted/.del-ext_185_prot.in~51f8b1efdc79204c:
  Delete: bdb/dbinc_auto/ext_185_prot.in
BitKeeper/deleted/.del-ext_def.in~eb85579468346302:
  Delete: bdb/dbinc_auto/ext_def.in
BitKeeper/deleted/.del-ext_prot.in~1123bab8d321561d:
  Delete: bdb/dbinc_auto/ext_prot.in
BitKeeper/deleted/.del-fileops_ext.h~cb8ee1d24c011cac:
  Delete: bdb/dbinc_auto/fileops_ext.h
BitKeeper/deleted/.del-hash_ext.h~9cc6cefb2d5cdee:
  Delete: bdb/dbinc_auto/hash_ext.h
BitKeeper/deleted/.del-hmac_ext.h~da1552dc3f7b9f46:
  Delete: bdb/dbinc_auto/hmac_ext.h
BitKeeper/deleted/.del-lock_ext.h~f9ce9b184d784d74:
  Delete: bdb/dbinc_auto/lock_ext.h
BitKeeper/deleted/.del-log_ext.h~f1309f8f47b5e812:
  Delete: bdb/dbinc_auto/log_ext.h
BitKeeper/deleted/.del-mp_ext.h~863c07eb97ff21fb:
  Delete: bdb/dbinc_auto/mp_ext.h
BitKeeper/deleted/.del-mutex_ext.h~f0c6b65f493723e6:
  Delete: bdb/dbinc_auto/mutex_ext.h
BitKeeper/deleted/.del-os_ext.h~6f51a66237a20ca3:
  Delete: bdb/dbinc_auto/os_ext.h
BitKeeper/deleted/.del-qam_ext.h~a0e8f87ead2e3846:
  Delete: bdb/dbinc_auto/qam_ext.h
BitKeeper/deleted/.del-rep_ext.h~94f25917d5d2623:
  Delete: bdb/dbinc_auto/rep_ext.h
BitKeeper/deleted/.del-rpc_client_ext.h~8fb31274cb4dc50:
  Delete: bdb/dbinc_auto/rpc_client_ext.h
BitKeeper/deleted/.del-tcl_ext.h~6004cb009c5424ee:
  Delete: bdb/dbinc_auto/tcl_ext.h
BitKeeper/deleted/.del-txn_ext.h~c30807d88c7b11ea:
  Delete: bdb/dbinc_auto/txn_ext.h
BitKeeper/deleted/.del-xa_ext.h~3f131d16d9cc5e:
  Delete: bdb/dbinc_auto/xa_ext.h
bdb/java/src/com/sleepycat/db/Db.java.in:
  Rename: bdb/java/src/com/sleepycat/db/Db.java -> bdb/java/src/com/sleepycat/db/Db.java.in
bdb/dist/s_java:
  avoid in-place editing
bdb/dist/s_rpc:
  be consistent
2002-11-11 17:17:28 +01:00
unknown
79f8a525a3 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-11 17:47:07 +02:00
unknown
736e3c3c17 some bug fixes related to derived tables 2002-11-11 17:45:23 +02:00
unknown
6ffc1c5e90 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-11 17:29:25 +02:00
unknown
b7d3c9ca6b fixed select_lex & max_join_size parameters with BIG_TABLES
sql/set_var.h:
  new constaructor
2002-11-11 17:28:58 +02:00
unknown
84b95682cf USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
Bug fix in ctype-utf8.c


sql/item_strfunc.cc:
  USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
sql/item_strfunc.h:
  USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
sql/procedure.h:
  USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
strings/ctype-utf8.c:
  Bug fix
2002-11-11 18:43:33 +04:00
unknown
3165440cde Fixed that NULL and 0 returns 0 instead of NULL
This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL


mysql-test/r/bdb.result:
  Fix results after serges last patch
mysql-test/r/innodb.result:
  Fix results after serges last patch
mysql-test/r/null.result:
  Update for new AND handling of NULL
scripts/mysqld_safe.sh:
  Fix 'isroot' test to work even if user is not root
sql/item.h:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/item_cmpfunc.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/item_cmpfunc.h:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_base.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_parse.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_select.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_yacc.yy:
  Fixed that NULL and 0 returns 0 instead of NULL
2002-11-11 15:57:35 +02:00
unknown
e8390bfa88 - "head/tail -<num>" is obsolete according to POSIX.1-2001 - use
"head/tail -n <num>" instead
2002-11-11 14:25:30 +01:00
unknown
50b32edc76 thread charset related improvements 2002-11-11 16:46:11 +04:00
unknown
9134db473d Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_derived.cc:
  Auto merged
2002-11-11 14:05:57 +02:00
unknown
20ea534d0c small bug fix 2002-11-11 14:04:50 +02:00
unknown
5c556c053b bdb.result:
- fixed yet another wrong result after error messages had been changed


mysql-test/r/bdb.result:
   - fixed yet another wrong result after error messages had been changed
2002-11-11 12:13:20 +01:00
unknown
d3ab839315 innodb.result:
- fixed test results after error messages had been modified


mysql-test/r/innodb.result:
   - fixed test results after error messages had been modified
2002-11-11 11:49:25 +01:00
unknown
4fb279493a Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-11 13:57:18 +04:00
unknown
6a9a51d67d Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1
2002-11-11 13:35:54 +04:00
unknown
10ba987c5e fix for HEAP rb-tree indexes and BIG_TABLES problem (serg: thanks for discovery) 2002-11-11 13:34:47 +04:00
unknown
ae9b4fe2a7 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-11 13:11:12 +04:00
unknown
f4ba3d9058 For coding convenuence cs->mbmaxlen is now 1 for 8bit charsets 2002-11-11 13:10:39 +04:00
unknown
fa771db2e7 Merge akeremidarski@work.mysql.com:/home/bk/mysql
into geopard.(none):/storage/bk/mysql-3.23


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
2002-11-11 10:52:39 +02:00
unknown
4832ebce86 prevent using expernal fields in derived tables
mysql-test/r/subselect.result:
  test of derived table external field bug
mysql-test/t/subselect.test:
  test of derived table external field bug
sql/sql_derived.cc:
  lex->current_select always should point on current SELECT_LEX_NODE during query execution
2002-11-11 10:49:41 +02:00
unknown
2d14fa5b39 disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
delete auto-generated files
remove in-place editing


BitKeeper/deleted/.del-ex_apprec_auto.c~6e4c8882b1f0fe9d:
  Delete: bdb/examples_c/ex_apprec/ex_apprec_auto.c
BitKeeper/deleted/.del-ex_apprec_auto.h~d01f1e472bf1b59f:
  Delete: bdb/examples_c/ex_apprec/ex_apprec_auto.h
BitKeeper/deleted/.del-ex_apprec_template~4157a705d73c1209:
  Delete: bdb/examples_c/ex_apprec/ex_apprec_template
bdb/rpc_server/c/db_server_proc.c.in:
  Rename: bdb/rpc_server/c/db_server_proc.c -> bdb/rpc_server/c/db_server_proc.c.in
BitKeeper/deleted/.del-rpc_defs.in~bfc9820a618d5926:
  Delete: bdb/dbinc_auto/rpc_defs.in
BitKeeper/deleted/.del-db_server.h~1c77cc0d19f3ecf:
  Delete: bdb/dbinc_auto/db_server.h
BitKeeper/deleted/.del-db_server_proc.sed~94a351b3e31c0ad0:
  Delete: bdb/rpc_server/c/db_server_proc.sed
BitKeeper/deleted/.del-db_server_svc.c~66ae3c56737e07ab:
  Delete: bdb/rpc_server/c/db_server_svc.c
BitKeeper/deleted/.del-db_server_xdr.c~518231ed78b9cdcf:
  Delete: bdb/rpc_server/c/db_server_xdr.c
BitKeeper/deleted/.del-gen_db_server.c~51935e227c7c23ac:
  Delete: bdb/rpc_server/c/gen_db_server.c
bdb/dist/RELEASE:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
bdb/dist/s_crypto:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
bdb/dist/s_perm:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
bdb/dist/s_recover:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
bdb/dist/s_rpc:
  NEVER modify files in-place!!!
bdb/dist/s_symlink:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
bdb/dist/s_tags:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
2002-11-11 00:08:42 +01:00
unknown
828c0e9ac1 fix of yet another join_free bug
decreased number of check of "!join->select_lex->dependent"


mysql-test/r/subselect.result:
  test of yet another join_free bug
mysql-test/t/subselect.test:
  test of yet another join_free bug
2002-11-11 00:15:38 +02:00
unknown
446a5b0ad5 my_snprintf_ucs2 bug fix 2002-11-10 17:44:36 +04:00
unknown
992075e209 New field snprintf() in CHARSET_INFO structure 2002-11-10 16:14:39 +04:00
unknown
1a7533074e Fix syntax to be more clean:
SHOW CREATE DATABASE [WITH IF NOT EXISTS] dbname
2002-11-10 14:45:21 +04:00
unknown
74985d1353 Fixes for fault about String::copy() 2002-11-10 14:05:17 +04:00
unknown
1b6548d54d Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-10 09:39:50 +02:00
unknown
c88db89d62 Added 4.1 protocol description
innobase/log/log0log.c:
  Removed compiler warnings
2002-11-10 09:39:00 +02:00
unknown
dce4b2c958 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-09 20:29:22 +01:00
unknown
bb2ceda1b2 results fixed
mysql-test/r/isam.result:
  fixed result for new errmsg
mysql-test/r/select.result:
  fixed result for IGNORE/USE INDEX
2002-11-09 19:57:13 +01:00
unknown
773fd5f2a1 merged
BitKeeper/etc/ignore:
  auto-union
2002-11-09 19:27:28 +01:00
unknown
8c14ed4230 IGNORE/USE INDEX now work with HA_EXTRA_KEYREAD
BitKeeper/etc/ignore:
  Added depcomp to the ignore list
2002-11-09 19:15:46 +01:00
unknown
bfec3dab33 ha_innodb.cc:
Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE


sql/ha_innodb.cc:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
2002-11-09 18:34:52 +02:00
unknown
04ca9bcdec Many files:
Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE


innobase/include/btr0btr.h:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/include/btr0pcur.h:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/include/db0err.h:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/include/btr0pcur.ic:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/btr/btr0btr.c:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/page/page0page.c:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
innobase/row/row0sel.c:
  Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
2002-11-09 18:23:09 +02:00
unknown
2d0dedbbf6 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-09 15:09:55 +01:00
unknown
3cff56d096 typo fixed 2002-11-09 15:09:24 +01:00
unknown
f980950bb3 Some code optimisations related to EXPLAIN of derived tables and the
resulting code cleanup in our main loop.
2002-11-09 15:40:46 +02:00
unknown
e5d0df2c06 fixing gone file ONCE AGAIN 2002-11-09 13:54:27 +01:00
unknown
59838a577a Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-09 13:40:44 +02:00
unknown
52cc340c13 Small fix in configure for HPUX11
configure.in:
  Move +O2 up as with_debug wasn't defined at this point
2002-11-09 13:39:27 +02:00
unknown
212fe9d13e Portability fixes for HP compiler and HPUX11
Docs/internals.texi:
  Added protocol information
  (needs to be converted to texi and merged with the old documentation)
configure.in:
  Updates for HP compiler (cc)
include/my_global.h:
  Add option to handle bugs in 'inline' for HP compiler
libmysql/password.c:
  Portability fix (for HP compiler)
mysys/hash.c:
  Portability fix (for HP compiler)
mysys/my_static.c:
  Portability fix (for HPUX11)
mysys/my_static.h:
  Portability fix (for HPUX11)
mysys/my_tempnam.c:
  Portability fix (for HPUX11)
sql/sql_analyse.cc:
  Fixed bug in decimal handling
2002-11-09 13:26:46 +02:00
unknown
b3a8b8bd19 Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/item_cmpfunc.cc:
  Create an AND expression from two expressions
sql/item_cmpfunc.h:
  Create an AND expression from two expressions
2002-11-09 09:51:03 +02:00
unknown
7ee75d7a92 fixed gone file ONCE AGAIN 2002-11-08 23:34:17 +01:00
unknown
e0e3336627 Merge serg.mysql.com:/usr/home/serg/Abk/mysql
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


BitKeeper/etc/gone:
  auto-union
2002-11-08 23:24:55 +01:00
unknown
811e225933 fixing gone file ONCE AGAIN 2002-11-08 23:24:38 +01:00
unknown
ee17338aa7 Merge serg.mysql.com:/usr/home/serg/Abk/mysql
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
2002-11-08 23:19:52 +01:00
unknown
02e5b37a93 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/gone:
  auto-union
2002-11-08 23:12:00 +01:00
unknown
4a5097a412 being tired to fix gone file in 4.0 after every pull from 3.23, I fixed it here 2002-11-08 23:11:33 +01:00
unknown
4a53654cb9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-08 22:46:06 +01:00