Commit graph

1792 commits

Author SHA1 Message Date
unknown
2ec8dce13d OpenSSL fixes. Should not affect anything else.
Makefile.am:
  Moved bio dir into server_dirs in acinclude.in
client/Makefile.am:
  We need OpenSSL includes here
include/global.h:
  Workaround for OPENSSL librar bug with defining crypt()
include/violite.h:
  small fixes
libmysql/Makefile.am:
  We need OpenSSL includes here
libmysql/Makefile.shared:
  Yes, we need to compile more programs whtn --with-openssl is used
libmysql/libmysql.c:
  Make it work! (openssl)
libmysql_r/Makefile.am:
  We need OpenSSL includes here
sql/mysqld.cc:
  Memory was not freed before
sql/sql_parse.cc:
  fix
vio/Makefile.am:
  Added testprogram compilation and openssl libraries linking
vio/viossl.c:
  Cleanups, fixes, etc...
vio/viosslfactories.c:
  Copyright was missing. Fixed renamed macros for newer OpenSSL
vio/viotest-ssl.c:
  Made testprogram work again
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-07-24 14:07:46 +08:00
unknown
ce77251db6 Merge work:/home/bk/mysql-4.0 into white.box:/home/tim/my/4 2001-06-28 03:54:56 -04:00
unknown
16bdfa8ffc Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-06-28 10:50:48 +03:00
unknown
833f353e34 Changed safe_mysqld -> mysqld_safe
Added some alias to SHOW commands
Prepare for dynamic changing of MySQL variables


man/Makefile.am:
  Changed safe_mysqld -> mysqld_safe
man/isamchk.1:
  Changed safe_mysqld -> mysqld_safe
man/isamlog.1:
  Changed safe_mysqld -> mysqld_safe
man/mysql.1:
  Changed safe_mysqld -> mysqld_safe
man/mysql_zap.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqlaccess.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqladmin.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld_multi.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld_safe.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqldump.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqlshow.1:
  Changed safe_mysqld -> mysqld_safe
man/perror.1:
  Changed safe_mysqld -> mysqld_safe
man/replace.1:
  Changed safe_mysqld -> mysqld_safe
man/which.2:
  Changed safe_mysqld -> mysqld_safe
myisam/mi_search.c:
  Fixed bug when using packed keys.
scripts/Makefile.am:
  Changed safe_mysqld -> mysqld_safe
scripts/make_binary_distribution.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysql_install_db.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_multi.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe-watch.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe.sh:
  Changed safe_mysqld -> mysqld_safe
sql/lex.h:
  Addex SHOW INDEXES as an alias for SHOW INDEX
sql/sql_class.cc:
  Prepare for dynamic changing of MySQL variables
sql/sql_lex.h:
  Prepare for dynamic changing of MySQL variables
sql/sql_yacc.yy:
  Some changes to SHOW commands.
support-files/binary-configure.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql-max.spec.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql-multi.server.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql.server.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql.spec.sh:
  Changed safe_mysqld -> mysqld_safe
2001-06-28 10:49:16 +03:00
unknown
12946a8640 Merge work:/home/bk/mysql-4.0 into white.box:/home/tim/my/4
mysql-test/mysql-test-run.sh:
  Auto merged
2001-06-28 03:22:51 -04:00
unknown
950a6871d9 Implement ORDER BY DESC optimization, which reads values in descending
order directly from the index instead of using a filesort.


mysql-test/mysql-test-run.sh:
  [ -n $SKIP_TEST ] --> [ -n "$SKIP_TEST" ]; portability fix
mysql-test/r/order_by.result:
  Added test for ORDER BY DESC optimization
mysql-test/t/order_by.test:
  Added test for ORDER BY DESC optimization
sql/opt_range.cc:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/opt_range.h:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/sql_select.cc:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
BitKeeper/etc/ignore:
  Added .gdbinit .vimrc to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-28 03:06:23 -04:00
unknown
d2a5fab24d --do-test option in mysql-test-run - will do only tests that match the pattern
updated rotate event to set new position along with the new log


mysql-test/mysql-test-run.sh:
  added --do-test
mysql-test/r/rpl_log.result:
  update for new rotate event format
sql/log_event.cc:
  rotate event now supports forcing a new position, not just the log
sql/log_event.h:
  clean-up of rotate event, support for position force with rotate event
sql/slave.cc:
  accept position setting from rotate event
sql/sql_repl.cc:
  updates to fake_rotate_event() for the new format
2001-06-26 17:02:33 -06:00
unknown
f246b61915 Fixed length rows should not use row checksum in MyISAM tables
Fixed bug in handling of packed MyISAM keys


myisam/mi_create.c:
  Fixed length rows should not use row checksum
myisam/mi_search.c:
  Fixed bug in handling packed keys.
myisam/mi_statrec.c:
  Fixed bug when using --checksum on fixed length rows
2001-06-26 10:23:50 +03:00
unknown
4d5dcac35e Fixed bug when sorting big files (introduced with multi-table-delete)
Changed mysql-test to use --language
Cleaned up parameters to filesort()


configure.in:
  Fixed typo
mysql-test/install_test_db.sh:
  Changed test case to use --language
mysql-test/mysql-test-run.sh:
  Changed test case to use --language
  Fixed that test names are not 'cut'-ed.
mysql-test/r/select_found.result:
  Fixed test case to make it repeatable
mysql-test/t/insert.test:
  Added test of unique key handling
mysql-test/t/order_fill_sortbuf.test:
  Cleaned up test
mysql-test/t/select_found.test:
  Fixed test case to make it repeatable
sql/filesort.cc:
  Fixed bug when sorting big files (introduced with multi-table-delete)
  cleaned up parameters.
sql/mysql_priv.h:
  Cleaned up parameters to filesort()
sql/mysqld.cc:
  Fixed typo on enum
sql/sql_delete.cc:
  Cleanup
sql/sql_select.cc:
  Cleanup
sql/sql_table.cc:
  Cleanup
sql/sql_test.cc:
  Cleanup
sql/sql_update.cc:
  Cleanup
2001-06-25 11:35:22 +03:00
unknown
157c1bc5f9 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
mysql-test/mysql-test-run.sh:
  Auto merged
2001-06-24 22:11:27 +03:00
unknown
a96e1b6954 Fixed bug in multi-table-delete code
client/mysqltest.c:
  Added --big-test argument
libmysqld/lib_sql.cc:
  Reset error messages before new query.
libmysqld/lib_vio.c:
  Fixed reading of results.
mysql-test/mysql-test-run.sh:
  Added option --big
mysql-test/r/multi_update.result:
  More multi-delete tests
mysql-test/t/bdb-crash.test:
  Added missing test if BDB is supported
mysql-test/t/multi_update.test:
  More multi-delete tests
2001-06-24 22:11:00 +03:00
unknown
bcc51cb0a3 show master forced rotate info in SHOW BINLOG EVENTS
mark a master-forced rotate with a special flag


mysql-test/r/rpl000014.result:
  updated result
mysql-test/r/rpl000015.result:
  updated result
mysql-test/r/rpl000016.result:
  updated result
mysql-test/r/rpl_log.result:
  updated result
mysql-test/t/rpl000017-slave.sh:
  fix for change in master.info format
mysql-test/t/rpl_log.test:
  test for correct last_log_seq in show slave status
sql/log.cc:
  mark a master-forced rotate with a special flag
sql/log_event.cc:
  show master forced rotate info in SHOW BINLOG EVENTS
sql/log_event.h:
  master forced rotation flag
sql/slave.cc:
  keep trace of last log sequences in MASTER_INFO
  do not rotate on slave, if the rotation on master was forced by its master
sql/slave.h:
  keep track of last log sequence number in MASTER_INFO
2001-06-23 19:37:24 -06:00
unknown
a697e30a3a added test case for the bug in ORDER BY when we fill up sort buffer
Note that if you change sort buffer to be bigger, the bug will not show
2001-06-22 15:13:33 -06:00
unknown
d26e8c3944 merged new 3.23 errors
fixed bugs in log seq - now starting to look good
fixes for SHOW BINLOG EVENTS
will push this one


include/mysqld_error.h:
  merged errors from 3.23
mysql-test/mysql-test-run.sh:
  wrong quotes in --skip-test
mysql-test/r/drop.result:
  updated test
mysql-test/r/rpl_log.result:
  updated test
mysql-test/t/drop.test:
  updated test
mysql-test/t/rpl_log.test:
  fixed bugs in test case
sql/item_sum.h:
  remove compiler warning about re-ordered initialization
sql/log.cc:
  fixed a bunch of loq_seq bugs
sql/log_event.cc:
  fixed log seq bugs, added info for Slave event in SHOW BINLOG EVENTS
sql/share/czech/errmsg.txt:
  merged errors from 3.23
sql/share/danish/errmsg.txt:
  merged errors from 3.23
sql/share/dutch/errmsg.txt:
  merged errors from 3.23
sql/share/english/errmsg.txt:
  merged errors from 3.23
sql/share/estonian/errmsg.txt:
  merged errors from 3.23
sql/share/french/errmsg.txt:
  merged errors from 3.23
sql/share/german/errmsg.txt:
  merged errors from 3.23
sql/share/greek/errmsg.txt:
  merged errors from 3.23
sql/share/hungarian/errmsg.txt:
  merged errors from 3.23
sql/share/italian/errmsg.txt:
  merged errors from 3.23
sql/share/japanese/errmsg.txt:
  merged errors from 3.23
sql/share/korean/errmsg.txt:
  merged errors from 3.23
sql/share/norwegian-ny/errmsg.txt:
  merged errors from 3.23
sql/share/norwegian/errmsg.txt:
  merged errors from 3.23
sql/share/polish/errmsg.txt:
  merged errors from 3.23
sql/share/portuguese/errmsg.txt:
  merged errors from 3.23
sql/share/romanian/errmsg.txt:
  merged errors from 3.23
sql/share/russian/errmsg.txt:
  merged errors from 3.23
sql/share/slovak/errmsg.txt:
  merged errors from 3.23
sql/share/spanish/errmsg.txt:
  merged errors from 3.23
sql/share/swedish/errmsg.txt:
  merged errors from 3.23
sql/slave.cc:
  fixed log_seq bugs
2001-06-22 08:35:18 -06:00
unknown
d310ce7699 merge
sql/slave.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
2001-06-21 16:15:00 -06:00
unknown
a7fa56c173 fixed drop/create database bug when holding global read lock
preserve originating server id in Intvar events to avoid inifinite loops


include/mysqld_error.h:
  new error messages
mysql-test/r/drop.result:
  updated result
mysql-test/r/flush.result:
  updated result
mysql-test/t/drop.test:
  test for proper handling of drop/create database when holding
  global read lock
mysql-test/t/flush.test:
  test to see if other thread would block on drop database if we
  are holding global read lock
sql/log.cc:
  preserve originating server id in Intvar log event
sql/share/czech/errmsg.txt:
  new error messages
sql/share/danish/errmsg.txt:
  new error messages
sql/share/dutch/errmsg.txt:
  new error messages
sql/share/english/errmsg.txt:
  new error messages
sql/share/estonian/errmsg.txt:
  new error messages
sql/share/french/errmsg.txt:
  new error messages
sql/share/german/errmsg.txt:
  new error messages
sql/share/greek/errmsg.txt:
  new error messages
sql/share/hungarian/errmsg.txt:
  new error messages
sql/share/italian/errmsg.txt:
  new error messages
sql/share/japanese/errmsg.txt:
  new error messages
sql/share/korean/errmsg.txt:
  new error messages
sql/share/norwegian-ny/errmsg.txt:
  new error messages
sql/share/norwegian/errmsg.txt:
  new error messages
sql/share/polish/errmsg.txt:
  new error messages
sql/share/portuguese/errmsg.txt:
  new error messages
sql/share/romanian/errmsg.txt:
  new error messages
sql/share/russian/errmsg.txt:
  new error messages
sql/share/slovak/errmsg.txt:
  new error messages
sql/share/spanish/errmsg.txt:
  new error messages
sql/share/swedish/errmsg.txt:
  new error messages
sql/slave.cc:
  fixed typo in comment
sql/sql_db.cc:
  global read lock should block drop/create database
2001-06-21 15:59:51 -06:00
unknown
63bd9b5053 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2001-06-21 13:20:22 -06:00
unknown
5eefda7a85 added SHOW BINLOG EVENTS
fixed log sequence bugs
fixed bugs in handling Slave event
added test case with SHOW BINLOG EVENTS
have not fixed all the bugs - found some that are also in 3.23,
will fix them there first, then do pull and cleanup

will not push this changeset


include/mysqld_error.h:
  new error
mysql-test/mysql-test-run.sh:
  use quotes in expr
sql/lex.h:
  SHOW BINLOG EVENTS
sql/log.cc:
  fixed log sequence bugs
sql/log_event.cc:
  SHOW BINLOG EVENTS
  fixed bugs Slave event handling
sql/log_event.h:
  SHOW BINLOG EVENTS
sql/share/english/errmsg.txt:
  SHOW BINLOG EVENTS
sql/sql_lex.h:
  SHOW BINLOG EVENTS
sql/sql_parse.cc:
  SHOW BINLOG EVENTS
sql/sql_repl.cc:
  SHOW BINLOG EVENTS
sql/sql_repl.h:
  SHOW BINLOG EVENTS
sql/sql_yacc.yy:
  SHOW BINLOG EVENTS
2001-06-21 13:19:24 -06:00
unknown
8f33f8d4d3 merge
Docs/manual.texi:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2001-06-21 11:03:54 +02:00
unknown
066eddd862 UNIQUE keys are not anymore shown as PRIMARY KEY
Docs/manual.texi:
  Changelog
mysql-test/r/show_check.result:
  Added test for SHOW CREATE
mysql-test/t/show_check.test:
  Added test for SHOW CREATE
sql/mysqld.cc:
  Fixed messages
2001-06-21 10:50:14 +03:00
unknown
b5f7e2408f Added --warnings to mysqld
Docs/manual.texi:
  Changelog
sql/mysql_priv.h:
  Added --warnings
sql/mysqld.cc:
  Added --warnings
sql/sql_parse.cc:
  Added --warnings
2001-06-21 01:12:29 +03:00
unknown
4564c64a00 added --skip-test option 2001-06-19 16:08:19 -06:00
unknown
023f23d016 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


sql/sql_class.h:
  Auto merged
2001-06-19 15:04:24 -06:00
unknown
5e2639830e Added event sequence number and flags to binlog
Documented/cleaned up log event code
Updated tests


mysql-test/r/rpl000014.result:
  new binlog format
mysql-test/r/rpl000015.result:
  new binlog format
mysql-test/r/rpl000016.result:
  new binlog format
mysql-test/std_data/master-bin.001:
  new binlog format
mysql-test/t/rpl000014.test:
  new binlog format
sql/log.cc:
  new binlog format
sql/log_event.cc:
  new binlog format
sql/log_event.h:
  new binlog format
sql/sql_class.cc:
  new binlog format
sql/sql_class.h:
  new binlog format
sql/sql_repl.cc:
  new binlog format
2001-06-19 15:03:48 -06:00
unknown
f12f40d050 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
  Auto merged
2001-06-19 14:30:37 +03:00
unknown
877e3be4af Fixed bug in mysqlcheck when using --fast
Fixed problem when converting bigint to double.
Fixed bug in count(distinct null)
Fixed bug with empty BDB tables.


BitKeeper/deleted/.del-ATIS-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~dd306b2e583ebde4:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~11038a44f73070e7:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~662b96bc66bc91b6:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~788ad492867b1226:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~5316add301edb60:
  Delete: sql-bench/Results/connect-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~26e09af61f88d8c9:
  Delete: sql-bench/Results/create-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~fd2699adb3190d07:
  Delete: sql-bench/Results/insert-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~b01175ad38fd12b6:
  Delete: sql-bench/Results/select-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~8ba598d217450157:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
Docs/manual.texi:
  Changelog + update to Linux section
client/mysqlcheck.c:
  Fixed bug when using --fast
  --check --auto-repair --fast will not anymore repair tables that
  had warnings but where ok.
mysql-test/r/bdb.result:
  New test case
mysql-test/r/bigint.result:
  New test case
mysql-test/r/count_distinct.result:
  New test case
mysql-test/t/bdb.test:
  New test case
mysql-test/t/bigint.test:
  New test case
mysql-test/t/count_distinct.test:
  New test case
sql-bench/Comments/postgres.benchmark:
  Update for PostgreSQL 7.1.2
sql-bench/graph-compare-results.sh:
  Fixed colors for mysql --fast tests
sql/field.cc:
  Fixed problem when converting bigint to double.
sql/item_sum.cc:
  Fixed bug in count(distinct null)
sql/item_sum.h:
  Fixed bug in count(distinct null)
sql/mysqlbinlog.cc:
  Fixed typo
sql/sql_base.cc:
  cleanup
sql/sql_select.cc:
  Fixed bug with empty BDB tables.
sql/time.cc:
  Removed warning when reading timestamps with sub seconds.
2001-06-19 14:30:12 +03:00
unknown
e303524967 manual.texi $tab -> @tab
manual.texi	ALTER TABLE clarification


Docs/manual.texi:
  $tab -> @tab
2001-06-18 15:52:24 -05:00
unknown
9227621cce Further work on UNIONS
BitKeeper/etc/ignore:
  Added libmysqld/hash_filo.cc libmysqld/sql_unions.cc libmysqld/stacktrace.c sql/share/mysql to the ignore list
sql/sql_parse.cc:
  Fixing some stuff for UNION's
2001-06-18 12:55:41 +03:00
unknown
cded0f915d bk resolve changes
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_delete.cc:
  Same as above
2001-06-16 14:06:54 +03:00
unknown
f38e23207e Changes for multi-table delete and UNION's
mysql-test/t/multi_update.test:
  Made a test feasible. It will last very long time, so I will change 
  it again as soon as Monty pull's it
sql/sql_class.h:
  Some small changes
sql/sql_delete.cc:
  Fixed one bug in my stripping code
sql/sql_parse.cc:
  Additional stuff for UNION's
2001-06-16 13:58:01 +03:00
unknown
01dc56a544 Fixed bug when using more than 1 connection
libmysqld/Makefile.am:
  Added missing files
libmysqld/libmysqld.c:
  cleanup
2001-06-15 22:55:15 +03:00
unknown
8b96a960c3 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_class.h:
  Auto merged
2001-06-15 05:03:37 +03:00
unknown
e96fcbcfe9 Fixed multi-table-delete
Optimize fixed length MyISAM rows to use pread/pwrite.


BUILD/compile-pentium-debug-max:
  Also build embedded server
libmysqld/lib_vio.c:
  Add vio_poll_read()
myisam/mi_statrec.c:
  Use pread()/pwrite() instead of seek+read/write
mysql-test/r/multi_update.result:
  Fix multi-table-delete test
mysql-test/t/multi_update.test:
  Fix multi-table-delete test
sql/filesort.cc:
  Fix multi-table-delete
sql/mysql_priv.h:
  Fix multi-table-delete
sql/sql_class.h:
  Fix multi-table-delete
sql/sql_delete.cc:
  Fix multi-table-delete
sql/sql_parse.cc:
  Fix multi-table-delete
sql/sql_select.cc:
  Fix multi-table-delete
sql/sql_table.cc:
  cleanup
sql/sql_unions.cc:
  cleanup
sql/sql_yacc.yy:
  cleanup/ optimize
sql/structs.h:
  Fix multi-table-delete
sql/uniques.cc:
  Fix multi-table-delete
2001-06-15 05:03:15 +03:00
unknown
c498794d70 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


sql/sql_class.h:
  Auto merged
2001-06-14 14:13:31 -06:00
unknown
7bf5eb91f0 Added slave log event to record the master position in of slave thread
in slave binlog - needed for synchronization slave during recovery


sql/log.cc:
  slave log event
sql/log_event.cc:
  slave log event
sql/log_event.h:
  slave log event
sql/slave.cc:
  slave log event
sql/sql_class.h:
  slave log event
2001-06-14 14:12:40 -06:00
unknown
8d6348f650 merge 2001-06-14 15:14:27 +03:00
unknown
48bc7b7822 cleanup; Fixed type bug in new delete code.
sql/sql_class.h:
  Fixed types
sql/sql_delete.cc:
  Fixed typo-bug.
2001-06-14 15:12:01 +03:00
unknown
fe459063ee Merge paul@work.mysql.com:/home/bk/mysql
into teton.kitebird.com:/home/paul/mysql


Docs/manual.texi:
  Auto merged
2001-06-13 17:12:29 -05:00
unknown
b6a0f0a58e manual.texi release note cleanups
Docs/manual.texi:
  release note cleanups
2001-06-13 17:11:04 -05:00
unknown
dab9319d21 manual.texi Corrected all occurances of license.htmy
Docs/manual.texi:
  Corrected all occurances of license.htmy
2001-06-13 16:25:27 -05:00
unknown
ce74f933c6 manual.texi Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39
mysqld.cc	Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39


sql/mysqld.cc:
  Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39
Docs/manual.texi:
  Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39
2001-06-13 19:27:51 +03:00
unknown
97e204f75d manual.texi Added hyperlink tags to InnoDB contact info
Docs/manual.texi:
  Added hyperlink tags to InnoDB contact info
2001-06-13 16:42:13 +03:00
unknown
140ab2945e row0mysql.c Include rem0cmp.h to compile on Windows, on Unix it is for some reason included
innobase/row/row0mysql.c:
  Include rem0cmp.h to compile on Windows, on Unix it is for some reason included
2001-06-13 14:53:45 +03:00
unknown
ac90eda014 Forgot to add new source file
sql/Makefile.am:
  New source file
2001-06-13 13:51:29 +03:00
unknown
b13388806d Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2001-06-13 13:40:31 +03:00
unknown
1f07c0b7a5 Second phase of UNIONS (please do not test it yet) and some other
changes. This is mostly a merge between my repository and central 
one, so that I can take a test for multi table delete and fix it.


sql/mysql_priv.h:
  Added new functions needed for UNIONS, EXCEPT's etc
sql/sql_class.h:
  A little change in multi_delete class
sql/sql_lex.h:
  Added command for UNION's
sql/sql_parse.cc:
  One new function and SQLCOM_UNION_SELECT.
  
  Please do not test UNION's. This is just a start of the work on them
sql/sql_yacc.yy:
  Parsing stuff for the UNION's
2001-06-13 13:36:53 +03:00
unknown
9d0e2843c4 mysql-test/t/check.test
missed change


mysql-test/t/check.test:
  missed change
2001-06-12 15:32:07 -06:00
unknown
ad6ea3f3d4 merged
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
2001-06-12 15:08:58 -06:00
unknown
6e2184aff0 manual.texi Any server can be installed as a service under NT
Docs/manual.texi:
  Any server can be installed as a service under NT
2001-06-12 15:32:11 -05:00
unknown
e2029449a0 BitKeeper/triggers/post-commit
fixed post-commit message
mysql-test/t/check.test
    fixed bug from 3.23 merge


BitKeeper/triggers/post-commit:
  fixed post-commit message
mysql-test/t/check.test:
  fixed bug from 3.23 merge
2001-06-12 14:06:05 -06:00