Commit graph

5843 commits

Author SHA1 Message Date
unknown
23f4865b16 Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-06 00:41:26 +02:00
unknown
2eb2786dcc fixed bdb transaction with query cache bug 2002-11-06 00:41:25 +02:00
unknown
841fa6f694 Removed wrong patch to fix DATE BETWEEN TIMESTAMP1 AND TIMESTAMP2
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
2002-11-05 22:45:42 +02:00
unknown
781c7901cb updated test results 2002-11-05 18:38:27 +01:00
unknown
66f4e1b9ac merged
BitKeeper/deleted/.del-compile-pentium-valgrind-max:
  Delete: BUILD/compile-pentium-valgrind-max
Build-tools/Do-compile:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
2002-11-05 17:10:31 +01:00
unknown
c0309e5a2f added DBUG_ENTER/RETURN tags, dbug_add_tags.pl bugfix
dbug/dbug_add_tags.pl:
  small fix
sql/ha_myisam.cc:
  added DBUG_ENTER/RETURN tags
sql/ha_myisammrg.cc:
  added DBUG_ENTER/RETURN tags
sql/handler.cc:
  added DBUG_ENTER/RETURN tags
2002-11-05 16:06:11 +01:00
unknown
7675eafe15 DBUG_ENTER/RETURN tags added
perl script to tag all the functions in a C/C++ file automatically


sql/opt_range.cc:
  DBUG_ENTER/RETURN tags added
sql/sql_select.cc:
  DBUG_ENTER/RETURN tags added
2002-11-05 15:15:56 +01:00
unknown
11c6f6c451 fix for BDB 4.1.24
deleted unnecessary files from bdb/


BitKeeper/deleted/.del-crypto_ext.h~3cb68f2aa5f8cd83:
  Delete: bdb/dbinc_auto/crypto_ext.h
BitKeeper/deleted/.del-int_def.in~2fb1cf84ef399553:
  Delete: bdb/dbinc_auto/int_def.in
BitKeeper/deleted/.del-TESTS~71f3060229e13171:
  Delete: bdb/test/TESTS
bdb/dist/s_tags:
  fix for BDB 4.1.24
2002-11-05 18:12:53 +04:00
unknown
7bf4febc25 Merge akeremidarski@work.mysql.com:/home/bk/mysql
into geopard.(none):/storage/bk/mysql-3.23
2002-11-05 15:53:39 +02:00
unknown
eaa8d9a9d4 Merge akishkin@work.mysql.com:/home/bk/mysql
into mysql.com:/home/walrus/bk/323
2002-11-05 17:19:43 +05:00
unknown
4e533c9efe CREATE DATABASE now tries to execute SHOW CREATE DATABASE first 2002-11-05 15:10:13 +04:00
unknown
ec2df91657 Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
2002-11-05 11:55:17 +01:00
unknown
8169483375 Fixed accidentally inverted assert condition 2002-11-05 11:24:44 +02:00
unknown
69a5dd196c Error code for ssl connection
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
2002-11-05 12:05:58 +04:00
unknown
1f176ab226 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1
2002-11-05 01:10:36 +02:00
unknown
1b26dbbda0 move similar code to inline function 2002-11-05 01:10:05 +02:00
unknown
3fbb702946 TEMPORARY MERGE tables are allowed 2002-11-05 00:00:51 +01:00
unknown
94cbd46aa5 Removed wrong bug fix for problem with timestamp and BETWEEN.
Will be properly fixed in 4.1 and 5.0


sql/field.h:
  Removed wrong (not used code)
sql/item_cmpfunc.cc:
  Removed wrong bug fix for problem with timestamp and BETWEEN.
2002-11-05 00:24:59 +02:00
unknown
610b66932f Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23 2002-11-05 00:08:45 +02:00
unknown
0a5ed3de92 Fix to get core file on Linux
Docs/manual.texi:
  ChangeLog
sql/mysqld.cc:
  Write info about writing core file to stderr
2002-11-05 00:04:36 +02:00
unknown
53a386ca87 moved similar code to function
onversion with check


sql/item.cc:
  removed similar code
sql/item_sum.cc:
  conversion with check
sql/sql_delete.cc:
  conversion with check
sql/sql_derived.cc:
  style fix
sql/sql_lex.cc:
  conversion with check
  moved similar code to function
sql/sql_lex.h:
  conversion with check
  moved similar code to function
sql/sql_parse.cc:
  conversion with check
sql/sql_update.cc:
  conversion with check
sql/sql_yacc.yy:
  conversion with check
2002-11-04 22:12:45 +02:00
unknown
b091ed655d Merge akishkin@work.mysql.com:/home/bk/mysql
into mysql.com:/home/walrus/bk/323
2002-11-05 00:33:11 +05:00
unknown
299cdd402a Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
2002-11-05 00:26:45 +05:00
unknown
b749585481 Merge mysql.com:/home/walrus/bk/41 into mysql.com:/home/walrus/bk/41.1 2002-11-05 00:15:12 +05:00
unknown
9cd8bd657e Merge akishkin@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/walrus/bk/41
2002-11-05 00:09:54 +05:00
unknown
034fbeb61e add safe ariphmetic test to crash-me
sql-bench/crash-me.sh:
  add safe ariphmetic test
2002-11-04 23:12:31 +05:00
unknown
8285b95779 add Test of prepared+execute/once prepared many execute selects 2002-11-04 23:03:21 +05:00
unknown
07573b03af Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1


sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-04 15:45:54 +02:00
unknown
a4e64e252d Fixed error handling bug
sql/sql_class.h:
  new function for clean out error message
2002-11-04 00:56:25 +02:00
unknown
195aa6c98f fixed a bug where "MATCH ... AGAINST () >=0" was treated as if it was > 2002-11-02 20:35:32 +01:00
unknown
4a09aa82eb Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-11-02 17:30:20 +03:00
unknown
54ebb4175b Remove warnings/errors on Solaris when doing automake
(Has to be properly fixed at some point)
2002-11-01 11:30:19 +02:00
unknown
d19f89f9bd Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0
configure.in:
  Auto merged
2002-10-31 16:43:42 +02:00
unknown
4358ac0c9f Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into ram.(none):/home/ram/work/mysql-4.1
2002-10-31 17:12:53 +04:00
unknown
1bdf4a9c6d fix for BDB 4.1.24 2002-10-31 17:06:23 +04:00
unknown
3e320066e7 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2002-10-31 14:04:14 +01:00
unknown
0bd1b79691 - Do-compile: added a fast test run with dynamic-row tables
- 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
2002-10-31 13:56:25 +01:00
unknown
111cbf9fd4 Merge akeremidarski@work.mysql.com:/home/bk/mysql
into geopard.(none):/storage/bk/mysql-3.23
2002-10-31 13:08:22 +02:00
unknown
94853b17f2 Merge heikki@work.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2002-10-31 13:00:59 +02:00
unknown
df5c284bf8 Merge vvagin@work.mysql.com:/home/bk/mysql-4.0
into genie.(none):/home/vva/work/4.0
2002-10-31 15:00:58 +04:00
unknown
7ff18489f9 discard superflous os2/Makefile in dependence list.. 2002-10-31 14:58:05 +04:00
unknown
23f69bb229 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-10-31 13:43:41 +03:00
unknown
e53b7488dc srv0start.h, srv0start.c, ha_innodb.cc:
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
2002-10-31 12:03:34 +02:00
unknown
e03ca6bda4 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-10-31 12:57:57 +03:00
unknown
615f358129 Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-10-31 11:35:35 +02:00
unknown
f2649f104b 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


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
2002-10-31 11:32:42 +02:00
unknown
9d765f756d 30 % faster longlong10_to_str function 2002-10-31 11:27:52 +02:00
unknown
ec952f21f8 Merge
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
2002-10-31 10:44:20 +02:00
unknown
7806888465 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
mysql-test/r/innodb.result:
  Auto merged
2002-10-31 10:44:19 +02:00
unknown
3cc1e1e6d7 Merge mysql.com:/home/nick/mysql/repository/mysql-4.1
into mysql.com:/home/nick/mysql/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
sql/sql_yacc.yy:
  Auto merged
2002-10-30 23:58:52 -07:00