Commits · b1819586679c076487e171ae2de42ba88f1fa14b · nexedi / MariaDB

07 Nov, 2002 8 commits

Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 · b1819586
unknown authored Nov 07, 2002

b1819586
Portability fix (accidently left out from last changeset) · 76b9e0b8
unknown authored Nov 07, 2002

76b9e0b8

Many files: · d5c2c1f8

unknown authored Nov 07, 2002

  Fix hang introduced by selective deadlock resolution
srv0srv.c, row0mysql.c:
  Fix hang introduced by selective deadlock resolution + corruption caused by lock timeout or sel deadl res in ON DELETE CASCADE


innobase/include/que0que.h:
  Fix hang introduced by selective deadlock resolution
innobase/include/trx0trx.h:
  Fix hang introduced by selective deadlock resolution
innobase/include/ut0ut.h:
  Fix hang introduced by selective deadlock resolution
innobase/lock/lock0lock.c:
  Fix hang introduced by selective deadlock resolution
innobase/log/log0log.c:
  Fix hang introduced by selective deadlock resolution
innobase/que/que0que.c:
  Fix hang introduced by selective deadlock resolution
innobase/row/row0mysql.c:
  Fix hang introduced by selective deadlock resolution + corruption caused by lock timeout or sel deadl res in ON DELETE CASCADE
innobase/srv/srv0srv.c:
  Fix hang introduced by selective deadlock resolution + corruption caused by lock timeout or sel deadl res in ON DELETE CASCADE
innobase/trx/trx0sys.c:
  Fix hang introduced by selective deadlock resolution
innobase/trx/trx0trx.c:
  Fix hang introduced by selective deadlock resolution

d5c2c1f8

Portability fix extern "C" static -> extern "C" · 74baca84

unknown authored Nov 07, 2002


client/mysqlbinlog.cc:
  Portability fix
sql/gen_lex_hash.cc:
  Portability fix
sql/repl_failsafe.cc:
  Portability fix
sql/sql_class.cc:
  Portability fix
sql/sql_udf.cc:
  Portability fix
sql/mysqld.cc:
  Portability fix
sql/sql_base.cc:
  Portability fix
sql/sql_insert.cc:
  Portability fix
sql/sql_parse.cc:
  Portability fix
sql/sql_delete.cc:
  Portability fix

74baca84

merge · 95823ed3

unknown authored Nov 07, 2002


configure.in:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

95823ed3

Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 · 5481d8ad
unknown authored Nov 07, 2002
```
sql/field.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
```
5481d8ad

Put temporary files in binlog cache when using BEGIN/COMMIT · 4952de9f

unknown authored Nov 07, 2002

Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE


mysql-test/r/rpl_log.result:
  Update of results after last replication change
mysql-test/r/variables.result:
  Test of new variables @@rand_seed1 and @@rand_seed2
mysql-test/t/variables.test:
  Test of new variables @@rand_seed1 and @@rand_seed2
sql/field.cc:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/field.h:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/item_func.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/log.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
  More debug information
sql/log_event.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/log_event.h:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/set_var.cc:
  Add system variables @@rand_seed1 and @@rand_seed2
sql/set_var.h:
  Add system variables @@rand_seed1 and @@rand_seed2
sql/slave.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_acl.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_base.cc:
  Store DROP of temporary tables in binlog cache
sql/sql_class.h:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_db.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_delete.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_insert.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_lex.h:
  DROP TEMPORARY TABLE
sql/sql_load.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_parse.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_rename.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_repl.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_repl.h:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_table.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_update.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_yacc.yy:
  DROP TEMPORARY
sql/table.cc:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/unireg.cc:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions

4952de9f

Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. · 099974b5

unknown authored Nov 07, 2002


client/mysqlbinlog.cc:
  Portability fix
configure.in:
  Added use of ASFLAGS (For Solaris with Forte 5.0)
include/my_global.h:
  Portability fix
include/myisam.h:
  Portability fix
include/queues.h:
  Portability fix
innobase/include/ut0ut.h:
  Portability fix
innobase/log/log0log.c:
  Portability fix
innobase/rem/rem0cmp.c:
  Portability fix
innobase/trx/trx0sys.c:
  Portability fix
isam/pack_isam.c:
  Portability fix
myisam/ft_boolean_search.c:
  Portability fix
myisam/mi_dynrec.c:
  Code change to go around bug in Forte 5.0
myisam/sort.c:
  Portability fix
mysys/my_aes.c:
  Portability fix
scripts/Makefile.am:
  Support for ASFLAGS
scripts/mysqlbug.sh:
  Support for ASFLAGS
sql/field.cc:
  Portability fix
sql/filesort.cc:
  Portability fix
sql/gen_lex_hash.cc:
  Portability fix
sql/ha_innodb.cc:
  Portability fix
  Changed SHOW INNODB STATUS to return error instead of writing message to log file.
sql/ha_isammrg.cc:
  Portability fix
sql/ha_myisam.cc:
  Portability fix
sql/ha_myisammrg.cc:
  Portability fix
sql/hash_filo.h:
  Portability fix
sql/hostname.cc:
  Portability fix
sql/item_cmpfunc.h:
  Indentation change
sql/item_func.cc:
  Portability fix
sql/item_func.h:
  Portability fix
sql/log.cc:
  Portability fix
sql/log_event.cc:
  Portability fix
sql/mysql_priv.h:
  Portability fix
sql/mysqld.cc:
  Portability fix
  Fixed bug with rpl_recovery_rank command line option on 64 bit systems
sql/opt_range.cc:
  Portability fix
sql/repl_failsafe.cc:
  Portability fix
sql/slave.cc:
  Portability fix
sql/slave.h:
  Portability fix
sql/sql_acl.cc:
  Portability fix
sql/sql_base.cc:
  Portability fix
sql/sql_cache.cc:
  Portability fix
sql/sql_cache.h:
  Portability fix
sql/sql_class.cc:
  Portability fix
sql/sql_delete.cc:
  Portability fix
sql/sql_insert.cc:
  Portability fix
sql/sql_manager.cc:
  Portability fix
sql/sql_parse.cc:
  Portability fix
BUILD/compile-solaris-sparc-forte:
  C
sql/sql_udf.cc:
  Portability fix
sql/sql_update.cc:
  Portability fix
strings/Makefile.am:
  Portability fix
strings/bmove_upp-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/str_test.c:
  Cleanup
strings/strappend-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strend-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strmake-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strmov-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strnmov-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strstr-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strxmov-sparc.s:
  Fixes to make this more portable, but it's still not usable on 64 bit systems :(
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

099974b5

06 Nov, 2002 5 commits

- configure.in: replaced AM_PROG_LIBTOOL with AC_PROG_LIBTOOL, since the · b122c756

unknown authored Nov 06, 2002

   old macro name is deprecated (according to the libtool 1.4.2 docs).


configure.in:
   - replaced AM_PROG_LIBTOOL with AC_PROG_LIBTOOL, since the old macro name
     is deprecated (according to the libtool 1.4.2 docs).

b122c756

Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.0 · 766036c0
unknown authored Nov 06, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0-root
```
766036c0

Final decimal bug fix changeset (hope) · c3785072

unknown authored Nov 06, 2002


sql/field.cc:
  Code cleanup for Floating point overflow bug fix. According to Monty's comments

c3785072

Merge sgluhov@work.mysql.com:/home/bk/mysql-4.0 · 788c0e93

unknown authored Nov 06, 2002

into gluh.(none):/home/gluh/mysql-4.0.bklast


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

788c0e93

Merge mysql.com:/home/pz/mysql/mysql-4.0-root · 6b09da54
unknown authored Nov 06, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0
```
6b09da54

05 Nov, 2002 5 commits

Many files: · 899babbd

unknown authored Nov 06, 2002

  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock


sql/ha_innodb.cc:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/dict/dict0crea.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/dict/dict0dict.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/log0recv.h:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/row0mysql.h:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/srv0srv.h:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/include/trx0trx.h:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/log/log0recv.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/os/os0sync.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/os/os0thread.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0ins.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0mysql.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0purge.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0undo.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/row/row0upd.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/srv/srv0srv.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/srv/srv0start.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/trx/trx0roll.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
innobase/trx/trx0trx.c:
  Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock

899babbd

Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 · 58cc5007
unknown authored Nov 06, 2002

58cc5007
fixed bdb transaction with query cache bug · e4f5e839
unknown authored Nov 06, 2002

e4f5e839

Removed wrong patch to fix DATE BETWEEN TIMESTAMP1 AND TIMESTAMP2 · de1e9555

unknown authored Nov 05, 2002

Some simple optimizations


Docs/manual.texi:
  Updted how binary log works
mysql-test/mysql-test-run.sh:
  Added usage of --port to mysqltest
mysql-test/r/func_test.result:
  Moved test of datetime comparison to func_time
mysql-test/r/func_time.result:
  New test
mysql-test/t/func_test.test:
  Moved test of datetime comparison to func_time
mysql-test/t/func_time.test:
  Test of DATE BETWEEN TIMESTAMPS
sql/field.h:
  Removed wrong patch
sql/item_cmpfunc.cc:
  Removed wrong patch
  (Need to be fixed by taking into account all arguments to between)
sql/lock.cc:
  Removed call to current_thd
sql/set_var.cc:
  Don't show 'socket' variable if sockets are not used
sql/sql_base.cc:
  Simple optimisation

de1e9555

Error code for ssl connection · 74a99e4a

unknown authored Nov 05, 2002

Fix bug when server hang(with SSL, with modified libmysql)
Add options master-ssl-capath and master-ssl-cipher
Add some error checking(SSL) 


include/errmsg.h:
  Error code for SSL connection
include/violite.h:
  Change return value in sslaccept
  Remove unused variable open_
libmysql/errmsg.c:
  Add client side descriptive message when ssl handshake fail
libmysql/libmysql.c:
  Add ssl error code
  Add proper error checking
sql/mysqld.cc:
  Add options master-ssl-capath and master-ssl-cipher
sql/sql_parse.cc:
  Add error checking after sslaccept
vio/viossl.c:
  Add ssl handshake error cheking
vio/viosslfactories.c:
  Change error description when using wrong key or certificate

74a99e4a

02 Nov, 2002 1 commit
- Merge mysql.com:/home/pz/mysql/mysql-4.0-root · f3b89852
  unknown authored Nov 02, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0
```
  f3b89852
01 Nov, 2002 1 commit
- Remove warnings/errors on Solaris when doing automake · a3d9ade1
  unknown authored Nov 01, 2002
```
(Has to be properly fixed at some point)
```
  a3d9ade1
31 Oct, 2002 12 commits

Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 · dc2270bc
unknown authored Oct 31, 2002
```
configure.in:
  Auto merged
```
dc2270bc
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
Merge mysql.com:/home/pz/mysql/mysql-4.0-root · 3d7f0352
unknown authored Oct 31, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0
```
3d7f0352

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

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

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 · d009d64c

unknown authored Oct 31, 2002


configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
Docs/manual.texi:
  SCCS merged

d009d64c

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 8 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

Decimal field fix overflow · e7d6225a

unknown authored Oct 30, 2002


sql/field.cc:
  Fixes for Decimal crash bug patch according to Monty's comments ?

e7d6225a

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

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 mysql.com:/home/pz/mysql/mysql-4.0-root · 74f4648c
unknown authored Oct 30, 2002
```
into mysql.com:/home/pz/mysql/mysql-4.0
```
74f4648c