Commit graph

8451 commits

Author SHA1 Message Date
unknown
d272a9e4d6 - removed internals.texi (has been moved to mysqldoc BK tree)
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Delete: Docs/internals.texi
Docs/Makefile.am:
   - removed all traces of internals.texi
2003-05-27 18:47:50 +02:00
unknown
8e20fc57ed - removed internals.texi (has been moved to the "mysqldoc" BK tree)
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Delete: Docs/internals.texi
2003-05-27 18:34:03 +02:00
unknown
da8f7ecadd Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-05-27 18:19:32 +02:00
unknown
c1607401de Removed bad mutex locking 2003-05-27 18:16:50 +02:00
unknown
ef6d3a8060 ORDER BY optimization
Fixed new bug when reading field types


client/mysql.cc:
  Fixed output for -T
libmysql/libmysql.c:
  Filled missing fields in new MYSQL_FIELD structure
  Fixed new bug when reading field types
mysql-test/r/order_by.result:
  Result after new order by optimization
sql/opt_range.cc:
  New ORDER BY optimization
sql/opt_range.h:
  New ORDER BY optimization
sql/set_var.cc:
  Speed optimization
sql/sql_select.cc:
  New ORDER BY optimization
  
  This alllows MySQL to change a ref/range index from (a,b) to (a,c) when 'b' was not used to find rows and one did
  ORDER BY a,c or ORDER BY c
2003-05-27 18:40:37 +03:00
unknown
1540912eca Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-27 16:44:06 +03:00
unknown
510e23a8cd Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-27 16:40:39 +03:00
unknown
4920a3326f Fixed problem with mysql prompt when server disconnect. (Bug 356)
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case.  (Bug 316)


client/mysql.cc:
  Fixed problem with prompt when server disconnect. (Bug 356)
client/mysqltest.c:
  More debug information
mysql-test/mysql-test-run.sh:
  Added support for --timezone in -master.opt
mysql-test/t/raid.test:
  Fixed test if raid is enabled
sql/field.cc:
  New my_gmt_sec() parameters
sql/mysql_priv.h:
  New my_gmt_sec() parameters
sql/mysqld.cc:
  Remove LOCK_timezone.
  Code cleanup
sql/time.cc:
  Fixed problem with localtime -> gmt where some times resulted in
  different (but correct) timestamps. Now MySQL should use the smallest
  possible timestamp value in this case.  (Bug 316)
2003-05-27 16:40:14 +03:00
unknown
685498e0ad Deleted internals.texi (moved to mysqldoc tree - Monty req).
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Delete: Docs/internals.texi
2003-05-27 15:31:18 +02:00
unknown
da338c599c temporary update of the test to satisfy merge; will commit a final update
soon.


mysql-test/r/rpl_insert_id.result:
  Auto merged
2003-05-27 14:50:14 +02:00
unknown
245c5086c1 fixed small merge bug
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-27 16:58:57 +05:00
unknown
b090bd08b8 conf_to_src.c:
Changes according to CHARSET_INFO structure


strings/conf_to_src.c:
  Changes according to CHARSET_INFO structure
2003-05-27 12:59:08 +05:00
unknown
cf240ee47c Index.xml:
utf8 was not marked as compiled


sql/share/charsets/Index.xml:
  utf8 was not marked as compiled
2003-05-27 12:57:02 +05:00
unknown
b68d3f459f Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4sm
sql/mysqld.cc:
  Auto merged
2003-05-27 04:42:47 +06:00
unknown
a132e799c5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/field.h:
  Auto merged
2003-05-26 20:59:40 +03:00
unknown
1ef96d2b76 Portability fix 2003-05-26 20:59:09 +03:00
unknown
da9bf1dec3 ixed wrong unlock of tables (new bug)
sql/sql_delete.cc:
  Comment cleanup
sql/sql_insert.cc:
  Comment cleanup
sql/sql_load.cc:
  Comment cleanup
sql/sql_update.cc:
  Fixed wrong unlock of tables.
  (Unlock must be done after writing to binary log
2003-05-26 20:48:40 +03:00
unknown
926add9c88 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1-narttu
2003-05-26 20:38:47 +03:00
unknown
515ca2c4b4 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
sql/mysqld.cc:
  Auto merged
2003-05-26 20:35:27 +03:00
unknown
cd554e9ed6 Fixed bug when installing mysqld as a service with 2 arguments (option + service-name) 2003-05-26 20:09:53 +03:00
unknown
6f8e0d1364 Fix for 64 bit machines (To remove warnings on Itanium)
mysys/thr_alarm.c:
  Safety fix
2003-05-26 19:11:22 +03:00
unknown
cf381ae46b ha_innodb.cc:
Remove accidenatlly committed debug printfs when query cache is used
sql_update.cc, sql_load.cc, sql_insert.cc, sql_delete.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.


sql/sql_delete.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
sql/sql_insert.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
sql/sql_load.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
sql/sql_update.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
sql/ha_innodb.cc:
  Remove accidenatlly committed debug printfs when query cache is used
2003-05-26 19:10:43 +03:00
unknown
1007a2031e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1-narttu


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2003-05-26 19:03:25 +03:00
unknown
5d3eec14dd New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set
Docs/internals.texi:
  Updated protocol information
include/mysql.h:
  Added catalog to MYSQL_FIELD
  Added sqlstate handling to protocol
include/mysql_com.h:
  New 4.1 protocol
libmysql/libmysql.c:
  Added sqlstate handling
  Added CLIENT_MULTI_RESULTS
sql/field.cc:
  Indentation cleanup
sql/field.h:
  Indentation cleanup
sql/mysql_priv.h:
  Changed arguments to close_connection()
sql/mysqld.cc:
  Changed arguments to close_connection()
  Added checking of extra arguments to mysqld
sql/protocol.cc:
  Fixed bug in TIME handling
  Added SQLSTATE on errors
  Removed net_send_error()
sql/protocol.h:
  Removed net_send_error()
sql/repl_failsafe.cc:
  Fixed arguments to close_connection()
sql/sql_parse.cc:
  New 4.1 protocol
2003-05-26 19:01:20 +03:00
unknown
720584b0c6 --with-charset was not up to date
ctype_ucs2 and ctype_ujis were skipped in mistake
2003-05-26 20:22:23 +05:00
unknown
12604089b6 Index.xml:
cp1250_czech_ci was displayed even when not compiled-in in mistake.


sql/share/charsets/Index.xml:
  cp1250_czech_ci was displayed even when not compiled-in in mistake.
2003-05-26 20:01:18 +05:00
unknown
6fea1f3373 Merge with 3.23 to get fix for kill mysqld-pid
BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/ha_innodb.cc:
  Keep local copy
2003-05-26 17:55:49 +03:00
unknown
8ec9bd59ee Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-05-26 17:29:32 +03:00
unknown
1ed4e006bd Fixed problem with 'kill pid-of-mysqld' on Mac OS X 2003-05-26 17:24:16 +03:00
unknown
145aa40d59 merging
sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-05-26 15:52:19 +03:00
unknown
5dfc7130a8 Merge jani@192.168.0.2:/my/mysql-4.0
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-26 15:50:05 +03:00
unknown
ecdd47a72f code cleanup
mysql-test/r/rpl_insert_id.result:
  Test logging of FOREIGN_KEY_CHECKS
mysql-test/t/rpl_insert_id.test:
  Test logging of FOREIGN_KEY_CHECKS
sql/log.cc:
  Code cleanup
2003-05-26 15:08:17 +03:00
unknown
a222789320 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


sql/log_event.cc:
  Auto merged
2003-05-26 13:36:43 +03:00
unknown
306b74fcc8 Fixed core dump bug when shuting down mysqld 2003-05-26 13:10:08 +03:00
unknown
e864f2592d Added testing of LOAD DATA ... STARTING BY
Added read_only variable


mysql-test/r/loaddata.result:
  Added testing of STARTING BY
mysql-test/t/loaddata.test:
  Added testing of STARTING BY
sql/log_event.cc:
  Code cleanup
sql/set_var.cc:
  Added read_only variable
sql/sql_update.cc:
  Remove not used variable
2003-05-26 11:47:03 +03:00
unknown
ea99087e88 Added missing free for last patch 2003-05-26 06:16:50 +03:00
unknown
3d6a2f475a Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-05-26 05:57:53 +03:00
unknown
069141f229 Remove not used flag 2003-05-26 05:57:27 +03:00
unknown
2917fdb9d3 - Fix for memory leak if the SQL slave thread is killed just after reading an event.
- A few more mutex locks and unlocks of rli.log_space_lock for doing clean reads of
rli.ignore_log_space_limit
- Broadcast after unlock, not before (small speed optimisation).
2003-05-25 23:09:46 +02:00
unknown
dc90f5ccd7 log.cc:
If FOREIGN_KEY_CHECKS=0, wrap in binlog SQL statements inside SET FOREIGN_...=0; ... ; SET FOREIGN_...=1


sql/log.cc:
  If FOREIGN_KEY_CHECKS=0, wrap in binlog SQL statements inside SET FOREIGN_...=0; ... ; SET FOREIGN_...=1
2003-05-25 23:37:32 +03:00
unknown
a6ebf38d72 symlink.result:
Character set in this test results was displayed dispite the fact that the table has the same character set


mysql-test/r/symlink.result:
  Character set in this test results was displayed dispite the fact that the table has the same character set
2003-05-24 23:30:55 +05:00
unknown
73e80314aa Fix for bug #490 and #491 (see details below)
mysql-test/r/insert_select.result:
  Result update.
mysql-test/r/rpl_insert_id.result:
  Test update
mysql-test/t/insert_select.test:
  Check if a partly completed INSERT SELECT (failing because of "Duplicate key"
  after successfully inserting other rows) is written to the binlog if the
  table is not transactional and at least one row has been inserted (bug #491)
mysql-test/t/rpl_insert_id.test:
  Test for bug #490 (INSERT SELECT in auto_increment)
sql/sql_insert.cc:
  - In INSERT ... SELECT, if it fails with error but one row has been inserted and
  the table is not transactional, we must write to the binlog (the slave will stop
  because of the error code in the binlog event, this is normal). bug 491.
  - we must set INSERT_ID before writing to the binlog (bug 490
  accidentally introduced by another dev in 4.0.13).
2003-05-24 16:43:53 +02:00
unknown
cceae0577b Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0


configure.in:
  Auto merged
2003-05-23 18:23:50 +02:00
unknown
4198322bef Outcome of discussions with Lenz and Monty about handling ccache in the build commands.
BUILD/SETUP.sh:
  Quote $CXX to make a test work even if CXX had spaces in it.
  Automatically add ccache to CC and CXX if ccache is present.
configure.in:
  Accept "ccache gcc" in the test.
2003-05-23 18:20:57 +02:00
unknown
7dcf24a3a4 Fix for #468 [Ver]: SHOW VARIABLES trims innodb_data_file_path
(this bug was already fixed in 4.0, I just copied and pasted two lines).
2003-05-23 16:40:21 +02:00
unknown
bb01fb82ab latin7.xml:
c
Index.xml:
  Collation names form lati7 were mixed


sql/share/charsets/Index.xml:
  Collation names form lati7 were mixed
sql/share/charsets/latin7.xml:
  c
2003-05-23 18:54:48 +05:00
unknown
afc8396919 BINARY collations for every character set 2003-05-23 18:39:55 +05:00
unknown
5aae66c101 CHARSET_INFO structure reorganization for easier maintainance 2003-05-23 17:45:52 +05:00
unknown
f461dea4d7 Character set sets now check if required non-dynamic charsets were really compiled
BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9:
  Delete: mysql-test/t/ctype_ujis-master.opt
2003-05-23 15:10:05 +05:00
unknown
f985f468ef - Portability fix: FreeBSD 4.8-STABLE (480101) and 5.0-CURRENT (500110)
now have a thread safe realpath(3) implementation - added check to only
   define -DHAVE_BROKEN_REALPATH where required
   (thanks to Martin Blapp from the FreeBSD team for the patch)


configure.in:
   - FreeBSD 4.8-STABLE (480101) and 5.0-CURRENT (500110) now have a thread
     safe realpath(3) implementation - added check to only define
     -DHAVE_BROKEN_REALPATH where required
2003-05-23 11:38:37 +02:00