Commit graph

5348 commits

Author SHA1 Message Date
unknown
3559b2f158 Fixed a problem with reading some innodb options that may contain semicolin. 2002-11-12 11:39:52 +02:00
unknown
8ba63f5dad Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2002-11-12 08:34:27 +01:00
unknown
b18dec6110 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-11 22:43:28 +01:00
unknown
c5960eb579 removed DBUG_ENTER/RETURN tags 2002-11-11 22:43:07 +01: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
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
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
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
31201e6617 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-09 16:01:52 +02: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
unknown
36f5ff834d fixed test for "root", on some installations / is mounted read-only 2002-11-08 22:45:31 +01:00
unknown
93b95819da corrected error message for OPTIMIZE/ANALYZE/etc,
also for InnoDB that supports CHECK table but not REPAIR
2002-11-08 22:22:23 +01:00
unknown
ba56443956 Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2002-11-09 01:25:49 +05:00
unknown
45c6bcd54b Merge akishkin@work.mysql.com:/home/bk/mysql
into mysql.com:/home/walrus/bk/323
2002-11-09 01:22:44 +05:00
unknown
c17485bed0 Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40


BitKeeper/etc/logging_ok:
  auto-union
2002-11-09 01:16:40 +05:00
unknown
f76bf0d9db Delete: innobase/stamp-h.in 2002-11-08 21:16:30 +01:00
unknown
363cdb3aa7 --use-frm option to mysqlcheck 2002-11-08 20:57:36 +01:00
unknown
c219f509c2 log0recv.c:
Removed compiler warnings about wrong printf formats


innobase/log/log0recv.c:
  Removed compiler warnings about wrong printf formats
2002-11-08 18:44:42 +02:00
unknown
db0e12c4e4 Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2002-11-08 16:14:36 +01:00
unknown
d3db9453c8 - Typo fixed 2002-11-08 16:13:46 +01:00
unknown
a0fa94827c Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-11-08 17:05:30 +02:00
unknown
91181f0905 Changes that will enable proper wildcarding of databases, plus
proper escaping of databases with '_' in their name.
More explanations in the manual.
2002-11-08 17:02:33 +02:00
unknown
cbc851c605 Merge akeremidarski@work.mysql.com:/home/bk/mysql
into geopard.(none):/storage/bk/mysql-3.23
2002-11-08 16:40:19 +02:00
unknown
34d29fca2d Merge from 3.23 to get fix for GROUP BY bug
sql/sql_select.cc:
  Auto merged
innobase/row/row0mysql.c:
  merge (user 4.1 version)
2002-11-08 15:12:51 +02:00
unknown
2d3a2cfae6 Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-08 15:12:50 +02:00
unknown
aaf6f63ba7 Do-compile:
- added build option "--with-debug" to build unstripped binaries with
   debugging enabled


Build-tools/Do-compile:
   - added build option "--with-debug" to build unstripped binaries with
     debugging enabled
2002-11-08 14:12:49 +01:00
unknown
30396dac3b Do-compile:
- "--config-env" can now be given more than once
 - don't be smart about version suffixes


Build-tools/Do-compile:
   - "--config-env" can now be given more than once
   - don't be smart about version suffixes
2002-11-08 11:52:16 +01:00
unknown
de6eea8b6f Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23 2002-11-08 10:00:40 +02:00
unknown
41f55113f4 Fixed rare core dump bug when using complicated GROUP BY query that didn't return any results.
This only showed up under heavy load.
2002-11-08 09:58:28 +02:00
unknown
125913c3e1 manually merged
sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2002-11-07 21:56:24 +01:00
unknown
f57822ccfd btr0btr.c, buf0buf.c:
Fix a glitch: under heavy ibuf activity InnoDB could print the whole contents of ibuf tree to the error log


innobase/buf/buf0buf.c:
  Fix a glitch: under heavy ibuf activity InnoDB could print the whole contents of ibuf tree to the error log
innobase/btr/btr0btr.c:
  Fix a glitch: under heavy ibuf activity InnoDB could print the whole contents of ibuf tree to the error log
2002-11-07 21:04:26 +02:00