Commits · 8bba02e6066f03051399c336a8b7778c210b910e · Kirill Smelkov / mariadb

30 Oct, 2002 2 commits

Merge mysql.com:/home/pz/mysql/mysql-4.0-root · 8bba02e6
unknown authored Oct 30, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0
```
8bba02e6

row0undo.c: · 59f65c4b

unknown authored Oct 30, 2002

  Partial fix to a hang introduced in CREATE TABLE in the push last night


innobase/row/row0undo.c:
  Partial fix to a hang introduced in CREATE TABLE in the push last night

59f65c4b

29 Oct, 2002 6 commits

lexyy.c: · af858031

unknown authored Oct 30, 2002

  Update instructions about editing the files generated by flex and bison


innobase/pars/lexyy.c:
  Update instructions about editing the files generated by flex and bison

af858031

configure.in: · 2f7981b7

unknown authored Oct 29, 2002

  In Linux do not printb thread id's but process no's in SHOW INNODB STATUS


innobase/configure.in:
  In Linux do not printb thread id's but process no's in SHOW INNODB STATUS

2f7981b7

Many files: · 3cb98f0d

unknown authored Oct 29, 2002

Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
mysqld.cc:
Change MySQL default isolation level to REPEATABLE READ; note that InnoDB has always had that default, and BDB and MyISAM always run at SERIALIZABLE level anyway

sql/mysqld.cc:
Change MySQL default isolation level to REPEATABLE READ; note that InnoDB has always had that default, and BDB and MyISAM always run at SERIALIZABLE level anyway
sql/ha_innodb.cc:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
sql/ha_innodb.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/buf0buf.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/dict0dict.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/fil0fil.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/lock0lock.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/os0file.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/os0proc.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/os0thread.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/page0cur.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/page0page.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/read0read.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/rem0rec.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/srv0srv.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/sync0rw.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/sync0sync.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/trx0purge.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/trx0trx.h:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/include/rem0rec.ic:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/btr/btr0btr.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/btr/btr0cur.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/btr/btr0pcur.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/buf/buf0buf.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/buf/buf0flu.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/dict/dict0dict.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/fil/fil0fil.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/fsp/fsp0fsp.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/ibuf/ibuf0ibuf.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/lock/lock0lock.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/mem/mem0dbg.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/os/os0file.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/os/os0proc.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/page/page0cur.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/page/page0page.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/pars/lexyy.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/pars/pars0grm.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/read/read0read.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/row/row0ins.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/row/row0mysql.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/row/row0purge.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/row/row0sel.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/row/row0uins.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/row/row0undo.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/row/row0upd.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/srv/srv0srv.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/srv/srv0start.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/sync/sync0rw.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/sync/sync0sync.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/trx/trx0purge.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
innobase/trx/trx0trx.c:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution

3cb98f0d

Merge mysql.com:/home/pz/mysql/mysql-4.0-root · 31ddd476
unknown authored Oct 29, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0
```
31ddd476
Merge bk://work.mysql.com:7001 · 2d9a473b
unknown authored Oct 29, 2002
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
```
2d9a473b
Merge mysql.com:/home/pz/mysql/mysql-4.0-root · 509529dc
unknown authored Oct 29, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0
```
509529dc

28 Oct, 2002 4 commits
- fixed "huge number of packed rows in MyISAM" bug in 4.0 tree · 14c5bdbc
  unknown authored Oct 28, 2002
  
  14c5bdbc
- merged using "ul" · 554182ca
  unknown authored Oct 28, 2002
  
  554182ca
- fixed MyISAM crash on dynamic-row tables with huge number of to-be-packed fields · 05512a01
  unknown authored Oct 28, 2002
  
  05512a01
- finally pushing what I could not due to BK problems · 7a8b483d
  unknown authored Oct 28, 2002
  
  7a8b483d
26 Oct, 2002 3 commits
- fixing after automerge with 3.23 · 271695f8
  unknown authored Oct 26, 2002
  
  271695f8
- sql_yacc.yy: · fc08d48c
  unknown authored Oct 26, 2002
```
  cleanup


sql/sql_yacc.yy:
  cleanup
```
  fc08d48c
- Merge mysql.com:/home/pz/mysql/mysql-4.0-root · 7cbe5734
  unknown authored Oct 26, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0
```
  7cbe5734
25 Oct, 2002 7 commits

Merge work:/home/bk/mysql-4.0 · 26121e00

unknown authored Oct 25, 2002

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged

26121e00

merged · f5563dda

unknown authored Oct 25, 2002


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
  Delete: BitKeeper/etc/skipkeys
BitKeeper/etc/skipkeys:
  Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
Build-tools/Do-compile:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/pars/pars0grm.c:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/nt_servc.cc:
  Auto merged
sql/nt_servc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/bdb-crash.test:
  Auto merged

f5563dda

merged · 43abd169

unknown authored Oct 25, 2002


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~9d3403dbb31de075:
  'Auto converge rename'

43abd169

BK automatic LOD removal. · 48e93f81

unknown authored Oct 25, 2002


BitKeeper/etc/skipkeys:
  auto add
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

48e93f81

memory leak closed · 4952223e
unknown authored Oct 25, 2002

4952223e

lexyy.c, pars0grm.c: · f4ebc48e

unknown authored Oct 25, 2002

Include univ.i before any system headers to remove a large file compilation failure on AIX

innobase/pars/pars0grm.c:
Include univ.i before any system headers to remove a large file compilation failure on AIX
innobase/pars/lexyy.c:
Include univ.i before any system headers to remove a large file compilation failure on AIX

f4ebc48e

Merge nleippe@work.mysql.com:/home/bk/mysql-4.0 · f5f15255
unknown authored Oct 24, 2002
```
into mysql.com:/home/nick/mysql/repository/mysql-4.0
```
f5f15255

24 Oct, 2002 4 commits

fixed prev. commit (was commited in disabled state) · d39f5278
unknown authored Oct 24, 2002

d39f5278

- replaced all occurences of HPUX with HPUX10 (to be prepared for eventual · 6f043c35

unknown authored Oct 24, 2002

   differences in HPUX11)


acconfig.h:
   - fixed typo
configure.in:
   - replaced HPUX -> HPUX10
   - added -DHPUX11 (not being used yet) to hpux11 workarounds
include/my_global.h:
   - replaced HPUX -> HPUX10
include/my_net.h:
   - replaced HPUX -> HPUX10
include/my_pthread.h:
   - replaced HPUX -> HPUX10
libmysql/libmysql.c:
   - replaced HPUX -> HPUX10
mysys/my_append.c:
   - replaced HPUX -> HPUX10
mysys/my_copy.c:
   - replaced HPUX -> HPUX10
mysys/my_pthread.c:
   - replaced HPUX -> HPUX10
mysys/my_redel.c:
   - replaced HPUX -> HPUX10
mysys/thr_alarm.c:
   - replaced HPUX -> HPUX10
sql/mini_client.cc:
   - replaced HPUX -> HPUX10
sql/mysqld.cc:
   - replaced HPUX -> HPUX10
strings/do_ctype.c:
   - replaced HPUX -> HPUX10

6f043c35

added new syntax: · 47ffb583

unknown authored Oct 24, 2002

STOP|START SLAVE
rather than SLAVE STOP|START, which is now deprecated and should be deleted in 4.1

47ffb583

Merge lgrimmer@work.mysql.com:/home/bk/mysql · ad25c3b9
unknown authored Oct 24, 2002
```
into mysql.com:/space/my/mysql-3.23
```
ad25c3b9

23 Oct, 2002 7 commits

Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23 · fda6d203
unknown authored Oct 24, 2002

fda6d203
Merge work:/home/bk/mysql-4.0 · 68a5932a
unknown authored Oct 23, 2002
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
68a5932a

Fixed problem with BDB tables and ALTER TABLE · 7a8e330f

unknown authored Oct 24, 2002


Docs/manual.texi:
  ChangeLog
mysql-test/t/bdb-crash.test:
  Don't run test if BDB is not configured
sql/sql_base.cc:
  Added free on error

7a8e330f

less restrictive test for max key length in mi_create · 0f5e4382
unknown authored Oct 23, 2002

0f5e4382

Do-compile fixes: · 7e9e3715

unknown authored Oct 23, 2002

 - fixed essential piece missing from last merge with 3.23 tree
   (InnoDB option)
 - Added "autoextend" parameter to InnoDB startup options to be able
   to pass the full sql-bench run without hitting an "table space full"
   error


Build-tools/Do-compile:
   - fixed essential piece missing from last merge with 3.23 tree
     (InnoDB option)
   - Added "autoextend" parameter to InnoDB startup options to be able
     to pass the full sql-bench run without hitting an "table space full"
     error

7e9e3715

- Fix for Do-compile: Enable InnoDB to autoextend the table space if · 19879ad1

unknown authored Oct 23, 2002

   necessary (required to actually pass the sql-bench without aborting
   with "table space full")


Build-tools/Do-compile:
   - Enable InnoDB to autoextend the table space if necessary (required to
     actually pass the sql-bench without aborting with "table space full")

19879ad1

Merge mysql.com:/home/pz/mysql/mysql-4.0-root · d8661f9e
unknown authored Oct 23, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0
```
d8661f9e

22 Oct, 2002 4 commits
- Merge mysql.com:/home/nick/mysql/repository/mysql-4.0 · ebe07fa4
  unknown authored Oct 22, 2002
```
into mysql.com:/home/nick/mysql/mysql-4.0


sql/item_func.cc:
  Auto merged
```
  ebe07fa4
- Added Rand_log_event · d326428c
  unknown authored Oct 22, 2002
  
  d326428c
- truncate both MYI and MYD files on DELETE FROM table; to avoid warnings on CHECK TABLE · 78d524b3
  unknown authored Oct 22, 2002
```
myisam/mi_delete_all.c:
  truncate both MYI and MYD files to avoid warnings on CHECK TABLE
```
  78d524b3
- Merge mysql.com:/home/pz/mysql/mysql-4.0-root · c37ef8e3
  unknown authored Oct 22, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0
```
  c37ef8e3
21 Oct, 2002 3 commits

- added "darwin" to the list of systems that are known to support the · 6f3b5e12
unknown authored Oct 21, 2002
```
   -p option for cp and the -r option for scp (thank to Paul DuBois for
   the patch)
 - fixed a typo
```
6f3b5e12
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.0 · 14cbecdc
unknown authored Oct 21, 2002
```
into genie.(none):/home/hf/work/04


BitKeeper/etc/logging_ok:
  auto-union
```
14cbecdc

Embedded server bugfix · 911a8e1b

unknown authored Oct 21, 2002


libmysqld/lib_sql.cc:
  Necessary thd->scramble initialization added
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

911a8e1b