Commits · 7615543895edf732625236a48f907058684fc3b9 · nexedi / MariaDB

31 Oct, 2002 8 commits

Merge mysql.com:/space/my/mysql-4.0 · 76155438
unknown authored Oct 31, 2002
```
into mysql.com:/space/my/mysql-4.0-build
```
76155438

- Do-compile: added a fast test run with dynamic-row tables · 8520dfbc

unknown authored Oct 31, 2002

 - Do-compile: fix small (cosmetical, not critical) typo


Build-tools/Do-compile:
   - added a fast test run with dynamic-row tables
   - fix small (cosmetical, not critical) typo

8520dfbc

Merge heikki@work.mysql.com:/home/bk/mysql-4.0 · fbd0e588
unknown authored Oct 31, 2002
```
into hundin.mysql.fi:/home/heikki/mysql-4.0
```
fbd0e588
Merge vvagin@work.mysql.com:/home/bk/mysql-4.0 · c34035c7
unknown authored Oct 31, 2002
```
into genie.(none):/home/vva/work/4.0
```
c34035c7
discard superflous os2/Makefile in dependence list.. · 280465fe
unknown authored Oct 31, 2002

280465fe

srv0start.h, srv0start.c, ha_innodb.cc: · e4e58e68

unknown authored Oct 31, 2002

Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules

sql/ha_innodb.cc:
Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules
innobase/srv/srv0start.c:
Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules
innobase/include/srv0start.h:
Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules

e4e58e68

ha_innodb.cc: · ba32d528

unknown authored Oct 31, 2002

Fix bug: mysqld-debug-max failed standard test because a safe mutex size was seen as 24 bytes in the body of ha_innodb.cc, but 64 bytes in read0read.c

sql/ha_innodb.cc:
Fix bug: mysqld-debug-max failed standard test because a safe mutex size was seen as 24 bytes in the body of ha_innodb.cc, but 64 bytes in read0read.c

ba32d528

Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 · 02566232
unknown authored Oct 31, 2002
```
mysql-test/r/innodb.result:
  Auto merged
```
02566232

30 Oct, 2002 7 commits

ha_innodb.cc: · 7f389b34

unknown authored Oct 31, 2002

Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX

sql/ha_innodb.cc:
Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX

7f389b34

innodb.result: · b79e2f84

unknown authored Oct 30, 2002

  We changed MySQL default isolation yesterday to REPEATABLE READ


mysql-test/r/innodb.result:
  We changed MySQL default isolation yesterday to REPEATABLE READ

b79e2f84

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 49a13c87
unknown authored Oct 30, 2002
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
```
49a13c87
A fix for bug when comparing a datetime column with timestamp · cf31314d
unknown authored Oct 30, 2002
```
values with BETWEEN clause
```
cf31314d

Some changes for SSL · 5c491aca

unknown authored Oct 30, 2002


sql-bench/bench-init.pl.sh:
  Add option connect-options(using with SSL)
sql-bench/server-cfg.sh:
  Add option connect-option(using with SSL)
sql/sql_acl.cc:
  Fix bug when GRANT ... REQUIRE NONE doesn't unset SSL requirements
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

5c491aca

Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 · 0eae83a6
unknown authored Oct 30, 2002
```
sql/mysqld.cc:
  Auto merged
```
0eae83a6

row0undo.c: · 040481bd

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

040481bd

29 Oct, 2002 6 commits

lexyy.c: · 135d10b4

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

135d10b4

merge · 9a90ed40

unknown authored Oct 29, 2002


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

9a90ed40

configure.in: · acad3df6

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

acad3df6

Many files: · 20f0aa16

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

20f0aa16

Added --skip-safemalloc to mysqltest · eb1bbe1c

unknown authored Oct 29, 2002

Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
Small change in EXCHANGE output
Propagate open-files-limit from mysqld_safe -> mysqld
Fixed speed bug in GROUP BY
Added quotes around database name in CREATE DATABASE db_name (for binary log)


BitKeeper/etc/ignore:
  added stamp-h1
Docs/manual.texi:
  Added 4.1 manual section
  Updated changelog
client/mysqltest.c:
  Added --skip-safemalloc
include/my_global.h:
  Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
mysql-test/mysql-test-run.sh:
  Start mysqltest with --skip-safemalloc (To get it faster)
mysql-test/r/bdb.result:
  Update for new EXPLAIN output
mysql-test/r/compare.result:
  Update for new EXPLAIN output
mysql-test/r/create.result:
  Update for new EXPLAIN output
mysql-test/r/distinct.result:
  Update for new EXPLAIN output
mysql-test/r/explain.result:
  Update for new EXPLAIN output
mysql-test/r/group_by.result:
  Update for new EXPLAIN output
mysql-test/r/heap.result:
  Update for new EXPLAIN output
mysql-test/r/innodb.result:
  Update for new EXPLAIN output
mysql-test/r/join_outer.result:
  Update for new EXPLAIN output
mysql-test/r/key_diff.result:
  Update for new EXPLAIN output
mysql-test/r/merge.result:
  Update for new EXPLAIN output
mysql-test/r/null_key.result:
  Update for new EXPLAIN output
mysql-test/r/order_by.result:
  Update for new EXPLAIN output
mysql-test/r/select.result:
  Update for new EXPLAIN output
mysql-test/r/temp_table.result:
  Fixed speed bug in GROUP BY
mysql-test/r/type_datetime.result:
  Update for new EXPLAIN output
mysql-test/r/user_var.result:
  Update for new EXPLAIN output
mysql-test/r/variables.result:
  Removed variable safe_show_database
mysql-test/t/temp_table.test:
  Fixed speed bug in GROUP BY
mysql-test/t/variables.test:
  Removed not used variable safe_show_databases
scripts/mysqld_safe.sh:
  Propagate open-files-limit from mysqld_safe -> mysqld
sql/mysqld.cc:
  Removed variable safe_show_database
sql/set_var.cc:
  Removed variable safe_show_database
sql/slave.cc:
  Updated error message
sql/sql_db.cc:
  Added quotes around database name in CREATE DATABASE db_name
sql/sql_select.cc:
  Fixed speed bug in GROUP BY

eb1bbe1c

Merge bk://work.mysql.com:7001 · c327bf8a
unknown authored Oct 29, 2002
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
```
c327bf8a

28 Oct, 2002 4 commits
- fixed "huge number of packed rows in MyISAM" bug in 4.0 tree · 6f4f5a74
  unknown authored Oct 28, 2002
  
  6f4f5a74
- merged using "ul" · 4019551f
  unknown authored Oct 28, 2002
  
  4019551f
- fixed MyISAM crash on dynamic-row tables with huge number of to-be-packed fields · ab548174
  unknown authored Oct 28, 2002
  
  ab548174
- finally pushing what I could not due to BK problems · c8b1d59c
  unknown authored Oct 28, 2002
  
  c8b1d59c
26 Oct, 2002 2 commits
- fixing after automerge with 3.23 · e78a2a04
  unknown authored Oct 26, 2002
  
  e78a2a04
- sql_yacc.yy: · 44e38619
  unknown authored Oct 26, 2002
```
  cleanup


sql/sql_yacc.yy:
  cleanup
```
  44e38619
25 Oct, 2002 7 commits

Merge work:/home/bk/mysql-4.0 · eb7c5e44

unknown authored Oct 25, 2002

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


sql/mysqld.cc:
  Auto merged

eb7c5e44

merged · 3aa17fde

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

3aa17fde

merged · 83930c1d

unknown authored Oct 25, 2002


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

83930c1d

BK automatic LOD removal. · e55b2801

unknown authored Oct 25, 2002


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

e55b2801

memory leak closed · d857870e
unknown authored Oct 25, 2002

d857870e

lexyy.c, pars0grm.c: · f75463aa

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

f75463aa

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

24 Oct, 2002 4 commits

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

55b93383

- replaced all occurences of HPUX with HPUX10 (to be prepared for eventual · 8be6f478

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

8be6f478

added new syntax: · 31401744

unknown authored Oct 24, 2002

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

31401744

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

23 Oct, 2002 2 commits
- Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23 · 93e62836
  unknown authored Oct 24, 2002
  
  93e62836
- Merge work:/home/bk/mysql-4.0 · 82385f9e
  unknown authored Oct 23, 2002
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
  82385f9e