Commits · 3ef571302df5fa868d82e44a942e1b8de89362b9 · nexedi / MariaDB

07 Nov, 2002 6 commits

Portability fix (accidently left out from last changeset) · 3ef57130
unknown authored Nov 07, 2002

3ef57130

Portability fix extern "C" static -> extern "C" · 8fc4319a

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

8fc4319a

merge · 8d0d518c

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

8d0d518c

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

Put temporary files in binlog cache when using BEGIN/COMMIT · 72413e7f

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

72413e7f

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

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

c88b9102

06 Nov, 2002 5 commits

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

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).

b0da9dbd

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

Final decimal bug fix changeset (hope) · 071669d9

unknown authored Nov 06, 2002


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

071669d9

Merge sgluhov@work.mysql.com:/home/bk/mysql-4.0 · 0e56af07

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

0e56af07

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

05 Nov, 2002 5 commits

Many files: · 444d8207

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

444d8207

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

23f4865b
fixed bdb transaction with query cache bug · 2eb2786d
unknown authored Nov 06, 2002

2eb2786d

Removed wrong patch to fix DATE BETWEEN TIMESTAMP1 AND TIMESTAMP2 · 841fa6f6

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

841fa6f6

Error code for ssl connection · 69a5dd19

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

69a5dd19

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

Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 · d19f89f9
unknown authored Oct 31, 2002
```
configure.in:
  Auto merged
```
d19f89f9
Merge mysql.com:/space/my/mysql-4.0 · 3e320066
unknown authored Oct 31, 2002
```
into mysql.com:/space/my/mysql-4.0-build
```
3e320066

- Do-compile: added a fast test run with dynamic-row tables · 0bd1b796

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

0bd1b796

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

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

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

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

e53b7488

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

ha_innodb.cc: · f2649f10

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

f2649f10

Merge · ec952f21

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

ec952f21

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

30 Oct, 2002 10 commits

ha_innodb.cc: · 842fc58e

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

842fc58e

innodb.result: · 35396ec7

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

35396ec7

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

Decimal field fix overflow · 6b586013

unknown authored Oct 30, 2002


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

6b586013

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

Some changes for SSL · f6b9a33f

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

f6b9a33f

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
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 · 9e620c8e
unknown authored Oct 30, 2002
```
sql/mysqld.cc:
  Auto merged
```
9e620c8e

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