Commit graph

177 commits

Author SHA1 Message Date
unknown
811532f56f Fixed optimizer bug in ORDER BY where some ORDER BY parts where ignored.
Extended default arguments to be up to 4095 characters


Docs/manual.texi:
  Update lof LOCK TABLES
mysql-test/r/order_by.result:
  Test for optimizer bug in ORDER BY
mysql-test/t/order_by.test:
  Test for optimizer bug in ORDER BY
mysys/default.c:
  Extended default arguments to be up to 4095 characters
sql/sql_select.cc:
  Fixed optimizer bug in ORDER BY
2001-07-30 22:49:39 +03:00
unknown
22a5241f28 Add test case for update/replace bug in bdb.
Remove unused argument to ha_berkeley::remove_key().


mysql-test/r/bdb.result:
  Add test case for update/replace bug in bdb.
BitKeeper/etc/ignore:
  Added .gdbinit .vimrc to the ignore list
mysql-test/t/bdb.test:
  Add test case for update/replace bug in bdb.
sql/ha_berkeley.cc:
  The packed_record argument to ha_berkeley::remove_key() was never
  used; remove it.
sql/ha_berkeley.h:
  The packed_record argument to ha_berkeley::remove_key() was never
  used; remove it.
2001-07-24 12:23:17 -04:00
unknown
76eaa2595f fixed mysterious offset confusion bug
added a test case for it - took some creative work to figure out
how to make it happen at will
updated the manual


Docs/manual.texi:
  fixed wrong info on SLAVE_SKIP_COUNTER
  fixed wrong info in BitKeeper tree build instructions
  updated change history about bug fix
mysql-test/t/rpl_sporadic_master.test:
  tried hard to get slave confused, but failed. nevertheless, a more
  exhaustive test case does not hurt
sql/slave.cc:
  fixed mysterious offset confusion bug
2001-07-18 14:26:43 -06:00
unknown
653d19af02 Fixed problem with part keys and BDB tables
Docs/manual.texi:
  Changelog
2001-07-18 11:31:18 +03:00
unknown
964e409587 Added timeouts to make lock test repeatable
mysql-test/r/lock.result:
  Fixed wrong result for lock
mysql-test/t/lock.test:
  Added timeouts to make test repeatable
2001-07-17 22:59:14 +03:00
unknown
e2b803e3b6 Made replication test portable accross table handlers
mysql-test/r/rpl_sporadic_master.result:
  Made test portable accross table handlers
mysql-test/t/rpl_sporadic_master.test:
  Made test portable accross table handlers
2001-07-16 13:27:29 +03:00
unknown
fb1b1ba26b Merge
Docs/manual.texi:
  SCCS merged
2001-07-16 03:07:45 +03:00
unknown
2a18a762e1 Patch for netBSD
Added warning for tables where the auto_increment key is 0
Fixed DELETE ... LIMIT 0
Fixed UPDATE ..LIMIT 0


Docs/manual.texi:
  Changelog + Update to CHECK TABLE
configure.in:
  Patch for netBSD
mit-pthreads/gen/ctime.c:
  Patch for netBSD
mit-pthreads/machdep/netbsd-1.1/__signal.h:
  Patch for netBSD
mit-pthreads/stdio/strerror.c:
  Patch for netBSD
myisam/mi_check.c:
  Added warning for tables where the auto_increment key is 0
myisam/myisamchk.c:
  Added warning for tables where the auto_increment key is 0
mysql-test/r/auto_increment.result:
  Added warning for tables where the auto_increment key is 0
mysql-test/r/limit.result:
  Test of DELETE ... LIMIT 0
mysql-test/t/auto_increment.test:
  Added warning for tables where the auto_increment key is 0
mysql-test/t/limit.test:
  Test of DELETE ... LIMIT 0
sql/Makefile.am:
  Don't add mysqld_LDADD to mysqlbinlog (portability patch)
sql/ha_gemini.cc:
  Changed copyright (have got ok from NuSphere previously)
sql/ha_gemini.h:
  Changed copyright (have got ok from NuSphere previously)
sql/sql_delete.cc:
  Fixed DELETE ... LIMIT 0
sql/sql_update.cc:
  Fixed UPDATE ..LIMIT 0
2001-07-16 03:04:30 +03:00
unknown
1ce9f19b1f updated lock test
mysql-test/r/lock.result:
  updated result
mysql-test/t/lock.test:
  updated test
2001-07-13 17:45:14 -06:00
unknown
959c180b5a test case for low priority updates race bug
not yet fixed


mysql-test/r/lock.result:
  updated result
mysql-test/t/lock.test:
  test case for low prior updates bug
2001-07-13 17:25:37 -06:00
unknown
7c7647850b fixed float test result for updated test case
mysql-test/r/type_float.result:
  fixed test result
2001-06-28 19:19:23 -06:00
unknown
c7e200cdd8 fixed message in post-commit trigger
added debugging options to master to behave sporadically, and a 
test case to make sure the slave can deal with it


BitKeeper/triggers/post-commit:
  fixed message
sql/mysqld.cc:
  added debugging options to force the master to occasionally break
  replication
sql/slave.cc:
  cosmetic change to improve readability
sql/sql_repl.cc:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
sql/sql_repl.h:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
2001-06-28 18:22:29 -06:00
unknown
0481ebbe4f merged test from 4.0
mysql-test/r/drop.result:
  merged a test from 4.0
mysql-test/t/drop.test:
  updated test results
2001-06-21 16:48:18 -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
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
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
29f1fd81ab Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-06-12 11:59:37 +03:00
unknown
01c886ee22 Added --verbose option to mysqlshow
Fixes for making distribution


Build-tools/Do-compile:
  Added --no-strip option
Docs/manual.texi:
  Changelog and some fixes to comparison section
client/mysqlshow.c:
  Added --verbose option
mysql-test/r/create.result:
  Test of CREATE ... SELECT with keys
mysql-test/t/create.test:
  Test of CREATE ... SELECT with keys
scripts/make_binary_distribution.sh:
  Changed to use long options
sql-bench/Comments/postgres.benchmark:
  update
sql-bench/server-cfg.sh:
  update to use 'vacuum analyze'
2001-06-12 11:59:14 +03:00
unknown
54fe14e2f6 send a separate commit message to internals
added a test for check table


BitKeeper/triggers/post-commit:
  send a separate commit message to internals
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-11 20:26:24 -06:00
unknown
765940cb3a Changed compare in MyISAM to use my_pread()
Fixed that @VAR shows all decimals
Fixed problem with FLUSH TABLES and LOCK TABLE
CREATE ... SELECT now creates keys later
Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key


Docs/manual.texi:
  Added MySQL/PostgreSQL comparison
isam/_dynrec.c:
  Fixed wrong compare (not used in MySQL)
myisam/mi_dynrec.c:
  Fixed wrong compare (not used in MySQL).
  Changed compare to use my_pread()
myisam/mi_packrec.c:
  cleanup
mysql-test/r/alter_table.result:
  Added test for ALTER TABLE
mysql-test/r/variables.result:
  Added test for variables with REAL values.
mysql-test/t/alter_table.test:
  Added test for ALTER TABLE
mysql-test/t/variables.test:
  Added test for variables with REAL values.
mysys/my_pread.c:
  Cleanup
sql-bench/Makefile.am:
  removed extra \
sql-bench/README:
  Fixed typo.
sql/item_func.cc:
  Fixed that @VAR shows all decimals
sql/share/swedish/errmsg.OLD:
  update
sql/sql_base.cc:
  Fixed problem with FLUSH TABLES and LOCK TABLE
sql/sql_insert.cc:
  CREATE ... SELECT now creates keys later
sql/sql_table.cc:
  Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key.
BitKeeper/etc/ignore:
  Added sql-bench/graph-compare-results to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-11 15:01:28 +03:00
unknown
9d4272bbac manual.texi website address change
row0sel.c	CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.c	CHECK TABLE now also for InnoDB, a join speed optimization
rem0cmp.c	CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.c	CHECK TABLE now also for InnoDB, a join speed optimization
page0page.c	CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.h	CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.ic	CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.c	CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.c	CHECK TABLE now also for InnoDB, a join speed optimization
btr0sea.c	CHECK TABLE now also for InnoDB, a join speed optimization
innodb.result	CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.cc	CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.h	CHECK TABLE now also for InnoDB, a join speed optimization


sql/ha_innobase.cc:
  CHECK TABLE now also for InnoDB, a join speed optimization
sql/ha_innobase.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
mysql-test/r/innodb.result:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0btr.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0cur.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0sea.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0btr.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0cur.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.ic:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/row0mysql.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/trx0trx.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/page/page0page.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/rem/rem0cmp.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0mysql.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0sel.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/trx/trx0trx.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
Docs/manual.texi:
  website address change
2001-06-03 22:58:03 +03:00
unknown
d405cfb996 test if dirty close releases global read lock held by a thread 2001-06-01 17:43:32 -06:00
unknown
9ad7aedb41 Fixed problems with decimals withing IF()
Force add of FN_LIBCHAR to symlinks on windows


Docs/manual.texi:
  Cleanup & Changelog
client/mysqladmin.c:
  Added quoting for 'drop database'
client/mysqlcheck.c:
  Fixed wrong comment syntax
libmysql/net.c:
  Cleanup
mysql-test/mysql-test-run.sh:
  Better error message.
mysql-test/r/func_test.result:
  test for if()
mysql-test/t/func_test.test:
  test for if()
mysys/mf_pack.c:
  Force add of FN_LIBCHAR to symlinks on windows.
sql/item_cmpfunc.cc:
  Fixed problems with decimals withing IF()
sql/mysqlbinlog.cc:
  Better error messages.
sql/sql_repl.cc:
  Better error messages.
2001-05-29 13:46:17 +03:00
unknown
41dd2aa2b5 Remove wrong access check for locks.
Fixed problem with fuzzy dates.


mysql-test/r/func_time.result:
  Added test of fuzzy dates
mysql-test/t/func_time.test:
  Added test of fuzzy dates
sql/item.cc:
  Fixed bug with fuzzy dates
sql/sql_parse.cc:
  Remove wrong access check for locks.
  (This has to be delayed for 4.0 because there is currently now way
  to check for "any of the following privileges"
Docs/manual.texi:
  Changelog
2001-05-23 02:40:24 +03:00
unknown
82a404d9fb Fixed test case to work with the new auto_increment handling in InnoDB 2001-05-23 02:40:23 +03:00
unknown
36b93f91db Updated documentation of how to add new native functions.
Small cleanups


Docs/manual.texi:
  Updated how to add new native functions
mysql-test/r/func_crypt.result:
  Fix for crypt on FreeBSD
mysql-test/t/func_crypt.test:
  Fix for crypt on FreeBSD
mysys/thr_lock.c:
  Changed to use statistics_increment macro for statistic variables.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-23 02:30:17 +03:00
unknown
e40f0f1c3f merged 2001-05-16 23:22:27 +02:00
unknown
89ec1da4fb Fulltext manual changed, MERGE bug fixed
Docs/manual.texi:
  Fulltext manual changed, MERGE bug added to changelog
myisammrg/mymrgdef.h:
  MERGE bug fixed
myisammrg/myrg_rkey.c:
  MERGE bug fixed
myisammrg/myrg_rnext.c:
  MERGE bug fixed
myisammrg/myrg_rprev.c:
  MERGE bug fixed
mysql-test/r/merge.result:
  MERGE bug fixed
mysql-test/t/merge.test:
  MERGE bug fixed
2001-05-16 23:06:30 +02:00
unknown
fa33f49834 mysql-test/r/rpl000001.result
forgot to add result


mysql-test/r/rpl000001.result:
  forgot to add result
2001-05-16 13:21:49 -06:00
unknown
0fece375f2 Applied patches for BDB tables
Fixes to InnoDB to compile on Windows
Fix for temporary InnoDB tables
Fixed bug in REPLACE()
Fixed sub char keys for InnoDB


Docs/manual.texi:
  Changelog + update of table types
bdb/include/log.h:
  Patch from Sleepycat
bdb/log/log.c:
  Patch from Sleepycat
bdb/log/log_rec.c:
  Patch from Sleepycat
client/mysqladmin.c:
  Cleanup
innobase/include/univ.i:
  Fix for compilation on Windows
innobase/os/os0file.c:
  cleanup
innobase/pars/pars0grm.y:
  Fix for compilation on Windows
mysql-test/r/innodb.result:
  New test case
mysql-test/t/innodb.test:
  New test case
sql/ha_innobase.cc:
  cleanup
sql/ha_innobase.h:
  Fix for prefix keys
sql/handler.h:
  Fix for temporary Innodb tables
sql/item_strfunc.cc:
  Fixed bug in REPLACE()
sql/lock.cc:
  Fix for temporary Innodb tables
sql/mysqld.cc:
  Added --skip-stack-trace
sql/share/english/errmsg.txt:
  Better error messages
sql/sql_base.cc:
  Fix for temporary Innodb tables
sql/sql_select.cc:
  Fix for temporary Innodb tables
sql/sql_table.cc:
  Fixed sub char keys for InnoDB
sql/table.h:
  Fix for temporary Innodb tables
2001-05-09 23:02:36 +03:00
unknown
70f585cbd6 reversed virtual master
BitKeeper/deleted/.del-binlog-backup-restore.test~d5b0b9bd83738a9f:
  Delete: mysql-test/t/binlog-backup-restore.test
BitKeeper/deleted/.del-binlog-backup-restore.result~605de78abda64d27:
  Delete: mysql-test/r/binlog-backup-restore.result
2001-05-03 11:46:49 -06:00
unknown
6ca7bfb9e0 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqlbinlog.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2001-04-25 22:44:57 +03:00
unknown
97907ee8d7 Portability fixes for Ia64 and Sgi compiler
DROP DATABASE in mysqladmin asks for confirmation (again)
Added examined_rows to slow query log
SHOW CREATE for TEMPORARY table


BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5:
  Delete: mysql-test/r/shw000001.result
BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20:
  Delete: mysql-test/t/shw000001.test
Docs/manual.texi:
  Added information about InnoDB and TEMPORARY tables
acinclude.m4:
  Portability fixes
client/errmsg.c:
  merge with libmysqd/errmsg.c
client/mysqladmin.c:
  DROP DATABASE asks for confirmation (again)
client/mysqltest.c:
  Portability fixes
configure.in:
  Portability fixes for SGI compiler on Ia64
extra/resolve_stack_dump.c:
  Portability fixes
include/global.h:
  Portability fixes
isam/_dbug.c:
  Portability fixes
mysql-test/mysql-test-run.sh:
  Portability fixes
mysql-test/r/show_check.result:
  New test for SHOW CREATE
mysql-test/t/show_check.test:
  New test for SHOW CREATE
scripts/make_binary_distribution.sh:
  Added missing files
sql/filesort.cc:
  Added examined_rows to slow query log
sql/log.cc:
  Added examined_rows to slow query log
sql/mysql_priv.h:
  Added examined_rows to slow query log
sql/mysqlbinlog.cc:
  Fixed core dump when using wrong option
sql/mysqld.cc:
  Removed not used argument
sql/sql_base.cc:
  Fixed name problem with SHOW CREATE for TEMPORARY table
sql/sql_class.h:
  Added examined_rows to slow query log
sql/sql_parse.cc:
  Added examined_rows to slow query log
sql/sql_select.cc:
  Added examined_rows to slow query log
sql/sql_select.h:
  Added examined_rows to slow query log
sql/sql_show.cc:
  Fixed SHOW CREATE for TEMPORARY table
sql/sql_table.cc:
  Added examined_rows to slow query log
2001-04-25 22:44:27 +03:00
unknown
dc394cb9b5 fixed redundant repetition of use db in mysqlbinlog
added support for virtual master ( replicating from a directory with binlogs)
test case for backup/restore with virtual master


client/mysqltest.c:
  fix to accomodate for new test case
mysql-test/mysql-test-run.sh:
  do not automagically start slave
sql/log.cc:
  support for virtual master
sql/log_event.cc:
  fix for mysqlbinlog
sql/log_event.h:
  fix for mysqlbinlog
sql/mysqlbinlog.cc:
  fix for mysqlbinlog
sql/slave.cc:
  virtual master
sql/slave.h:
  virtual master
sql/sql_class.h:
  clean-up/fixes for virtual master
sql/sql_repl.cc:
  cleanup/fixes for virtual master
sql/sql_repl.h:
  virtual master
2001-04-24 17:39:26 -06:00
unknown
0574441192 Fixed probelm with count(*) and normal functions when no matchin rows.
Changed 'lib' to 'master-data'
Fix for slow slaves


Docs/manual.texi:
  Changelog
include/mysql.h:
  Fixes for Cygwin
libmysql/libmysql.c:
  Fixes for Cygwin
mysql-test/Makefile.am:
  Include missing test files
mysql-test/include/master-slave.inc:
  Fixes for slow slaves
mysql-test/install_test_db.sh:
  Change 'lib' to 'master-data'
mysql-test/mysql-test-run.sh:
  Change 'lib' to 'master-data'
mysql-test/r/group_by.result:
  Test case for count(*) problem
mysql-test/t/group_by.test:
  Test case for count(*) problem
mysql-test/t/rpl000018-master.sh:
  Change 'lib' to 'master-data'
sql/sql_select.cc:
  Fix for count(*) problem
2001-04-21 17:12:59 +03:00
unknown
94ab8e9c4c Fixed portability problems in mysqlcheck
Docs/manual.texi:
  Updated TODO
client/mysqlcheck.c:
  Fixed portability problems
mysql-test/r/backup.result:
  Fixed output after format change for BACKUP TABLE
sql/ha_berkeley.cc:
  Added missing variable
sql/opt_range.cc:
  Small optimization when calculating key blocks
2001-04-21 03:03:08 +03:00
unknown
4a7af05c7f Portability fixes
BitKeeper/deleted/.del-compile-ia64-O0-sgicc~a4e0732013d6b602:
  Delete: BUILD/compile-ia64-O0-sgicc
BitKeeper/deleted/.del-compile-ia64-O0~3a41dfebefc817d1:
  Delete: BUILD/compile-ia64-O0
BitKeeper/deleted/.del-compile-ia64-O2-sgicc~6ff796ecac337849:
  Delete: BUILD/compile-ia64-O2-sgicc
BitKeeper/deleted/.del-compile-ia64-O2~87d13594c3599830:
  Delete: BUILD/compile-ia64-O2
BitKeeper/deleted/.del-compile-ia64-O6~c34e6b943b12c468:
  Delete: BUILD/compile-ia64-O6
Docs/manual.texi:
  Cleanup
mysql-test/r/rpl000014.result:
  Change port number for comparison
mysql-test/r/rpl000015.result:
  Change port number for comparison
mysql-test/r/rpl000016.result:
  Change port number for comparison
mysql-test/t/rpl000014.test:
  Change port number for comparison
mysql-test/t/rpl000015.test:
  Change port number for comparison
mysql-test/t/rpl000016.test:
  Change port number for comparison
sql-bench/Results/ATIS-mysql-NT_4.0:
  New test results
sql-bench/Results/RUN-mysql-NT_4.0:
  New test results
sql-bench/Results/alter-table-mysql-NT_4.0:
  New test results
sql-bench/Results/big-tables-mysql-NT_4.0:
  New test results
sql-bench/Results/connect-mysql-NT_4.0:
  New test results
sql-bench/Results/create-mysql-NT_4.0:
  New test results
sql-bench/Results/insert-mysql-NT_4.0:
  New test results
sql-bench/Results/select-mysql-NT_4.0:
  New test results
sql-bench/Results/wisconsin-mysql-NT_4.0:
  New test results
sql/slave.cc:
  Removed not used variable
2001-04-20 15:18:46 +03:00
unknown
e69d8fb32a Fix for BDB and LOCK TABLES
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
  Delete: innobase/ib_config.h.in
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
  Delete: innobase/ib_config.h
Docs/manual.texi:
  Changelog
myisam/mi_locking.c:
  Cleanup
mysql-test/r/bdb.result:
  Test for LOCK TABLES
mysql-test/r/innodb.result:
  Test for LOCK TABLES
mysql-test/t/bdb.test:
  Test for LOCK TABLES
mysql-test/t/innodb.test:
  Test for LOCK TABLES
sql-bench/test-insert.sh:
  Allow loop to be small
sql/ha_berkeley.cc:
  Fixed bug when using LOCK TABLES with BDB
sql/ha_berkeley.h:
  Fixed bug when using LOCK TABLES with BDB
sql/handler.h:
  Fixed bug when using LOCK TABLES with BDB
sql/sql_base.cc:
  Fixed bug when using LOCK TABLES with BDB
sql/sql_parse.cc:
  UNLOCK TABLES ends transaction
sql/sql_select.cc:
  Fix to not call index_end() twice
2001-04-19 20:41:19 +03:00
unknown
9d36f27bb0 Added test for PTHREAD_YIELD
Removed test of default master parameter
Don't lock locked tables in REPAIR
Changed optimzation for SELECT * from table,table ORDER BY keypart LIMIT


BitKeeper/deleted/.del-have_default_master.inc~a54c86e65a6c4af:
  Delete: mysql-test/include/have_default_master.inc
BitKeeper/deleted/.del-have_default_master.require~1465255ffdaf82f:
  Delete: mysql-test/r/have_default_master.require
Docs/manual.texi:
  Changelog for 3.23.38
acconfig.h:
  Added test for PTHREAD_YIELD
acinclude.m4:
  Added test for PTHREAD_YIELD
configure.in:
  Added test for PTHREAD_YIELD
innobase/os/os0thread.c:
  Added test for PTHREAD_YIELD
mysql-test/r/lock.result:
  Added test of lock bug
mysql-test/t/lock.test:
  Added test of lock bug
mysql-test/t/rpl000014.test:
  Removed test of default master parameter
mysql-test/t/rpl000015.test:
  Removed test of default master parameter
mysql-test/t/rpl000016.test:
  Removed test of default master parameter
sql/ha_myisam.cc:
  Don't lock locked tables in REPAIR
sql/sql_select.cc:
  Changed optimzation for SELECT * from table,table ORDER BY keypart LIMIT
2001-04-18 23:47:11 +03:00
unknown
583160afe2 Don't force conf_to_src to be static an all systems
Removed unpredictable test from rpl000001.test


Docs/manual.texi:
  Added some information about table locks
libmysql/Makefile.shared:
  Don't force conf_to_src to be static an all systems
mysql-test/r/rpl000001.result:
  Removed unpredictable test
mysql-test/t/rpl000001.test:
  Removed unpredictable test
scripts/mysql_zap.sh:
  Added --help
strings/ctype-ujis.c:
  Removed warnings
2001-04-18 02:53:21 +03:00
unknown
1a3e335580 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-17 14:17:48 +02:00
unknown
023f4e54f1 bugfix: HAVING MATCH 2001-04-17 14:17:22 +02:00
unknown
51c2a1ebb0 Fixed that -ldl is not used for clients
Fixed rpl000001 to handle the most common mysql-test-run ports.


configure.in:
  Fixed that -ldl is not used for clients
  (The old version breaked when client was compiled staticly)
mysql-test/r/rpl000001.result:
  Fix to handle the most common mysql-test-run ports.
mysql-test/t/rpl000001.test:
  Fix to handle the most common mysql-test-run ports.
mysys/my_alloc.c:
  Extended min block a little to get faster mallocs
scripts/mysql_install_db.sh:
  Fixed bug when using RPM and one had --basedir in my.cnf
sql/Makefile.am:
  Add -ldl to mysqld link line
strings/ctype-ujis.c:
  Remove warnings
2001-04-17 14:02:28 +03:00
unknown
8512c526ab Don't use ranges on HEAP tables with LIKE
Don't reconnect client on close


libmysql/libmysql.c:
  Don't reconnect on close
mysql-test/r/heap.result:
  Fixed heap table test
sql/field.cc:
  Backed out wrong HEAP table bug fix
sql/ha_heap.h:
  cleanup
sql/mini_client.cc:
  Don't reconnect on close
sql/opt_range.cc:
  Don't use ranges on HEAP tables with LIKE
2001-04-17 03:55:25 +03:00
unknown
e5bd740dea Fixed bug with HEAP tables when using LIKE
Docs/manual.texi:
  Updated information about BDB tables.
mysql-test/r/heap.result:
  Added test for HEAP bug
mysql-test/t/heap.test:
  Added test for HEAP bug
sql/field.cc:
  Fixed bug with HEAP tables
sql/gen_lex_hash.cc:
  Smallare array
2001-04-16 14:05:55 +03:00
unknown
0948956b80 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-13 12:39:34 +03:00
unknown
3e6215d9d0 Changed Innobase to Innodb
Deleted a lot of old benchmark runs


BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_i686_xeon~3e820c28bf4af63a:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_i686_xeon~17854e751e1d9d1d:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_i686_xeon~64cc4b874cd6fabf:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_i686_xeon~290c2c3de9d8e6b:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_i686_xeon~ea19dc3ec55b3618:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_i686_xeon~50d15991293030ef:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_i686_xeon~c683ee4b9d214298:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_i686_xeon~ead3f11b46ac626f:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_i686_xeon~7525b23938631801:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_my_SMP_i686~d275df58a04737c8:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_my_SMP_i686~d4766c7f8e70d7a2:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_my_SMP_i686~155a83b53c0e9d6:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_my_SMP_i686~f1127add9307098b:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_my_SMP_i686~45d2cdf9bea9cc37:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_my_SMP_i686~d46860c29c5d51ee:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_my_SMP_i686~e1771e0a164bc310:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_my_SMP_i686~ee2a063d66a183d:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_my_SMP_i686~b7552710d35202b6:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-ATIS-mysql-3.21-Linux_2.2.1_i686~660fb76ed6ccfb6f:
  Delete: sql-bench/Results/ATIS-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-RUN-mysql-3.21-Linux_2.2.1_i686~f6fdd64859e11de9:
  Delete: sql-bench/Results/RUN-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-alter-table-mysql-3.21-Linux_2.2.1_i686~f6f7ccd7b3c35f97:
  Delete: sql-bench/Results/alter-table-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-big-tables-mysql-3.21-Linux_2.2.1_i686~baa649caba113497:
  Delete: sql-bench/Results/big-tables-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-connect-mysql-3.21-Linux_2.2.1_i686~c0c26d4320182d85:
  Delete: sql-bench/Results/connect-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-create-mysql-3.21-Linux_2.2.1_i686~51581b24f45e0f5c:
  Delete: sql-bench/Results/create-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-insert-mysql-3.21-Linux_2.2.1_i686~fd082017c7c57a6:
  Delete: sql-bench/Results/insert-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-select-mysql-3.21-Linux_2.2.1_i686~ed3687e713ff0571:
  Delete: sql-bench/Results/select-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-wisconsin-mysql-3.21-Linux_2.2.1_i686~8147dc16a1dc6c47:
  Delete: sql-bench/Results/wisconsin-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-ATIS-mysql_3.21-Linux_2.0.35_i686~c25425e045ca8dfc:
  Delete: sql-bench/Results/ATIS-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-RUN-mysql_3.21-Linux_2.0.35_i686~ea8672d8473435:
  Delete: sql-bench/Results/RUN-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-alter-table-mysql_3.21-Linux_2.0.35_i686~762639f2560976bd:
  Delete: sql-bench/Results/alter-table-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-big-tables-mysql_3.21-Linux_2.0.35_i686~190e827e569c99a4:
  Delete: sql-bench/Results/big-tables-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-connect-mysql_3.21-Linux_2.0.35_i686~650abd213e6828c6:
  Delete: sql-bench/Results/connect-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-create-mysql_3.21-Linux_2.0.35_i686~df1b037d17b33587:
  Delete: sql-bench/Results/create-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-insert-mysql_3.21-Linux_2.0.35_i686~60c0965dff31db07:
  Delete: sql-bench/Results/insert-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-select-mysql_3.21-Linux_2.0.35_i686~5fadbac5f98696a:
  Delete: sql-bench/Results/select-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-wisconsin-mysql_3.21-Linux_2.0.35_i686~31703d40ea6b4f66:
  Delete: sql-bench/Results/wisconsin-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.10_i686~3fa4d167cceff7e8:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.10_i686~712f52be5d195406:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.10_i686~93b78a85b720a186:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.10_i686~99daa1c5370d077d:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.10_i686~c92505d77e19d5ec:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-create-mysql-Linux_2.2.10_i686~9e7822f66df6aa76:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.10_i686~763edf9aec633f51:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-select-mysql-Linux_2.2.10_i686~a2e264d777b787d:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.10_i686~301a82b12a84922b:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-ATIS-mysql-win98~cd0705815d3af451:
  Delete: sql-bench/Results-win32/ATIS-mysql-win98
BitKeeper/deleted/.del-RUN-mysql-win98~7f09e396772a8665:
  Delete: sql-bench/Results-win32/RUN-mysql-win98
BitKeeper/deleted/.del-alter-table-mysql-win98~e8743982f790462:
  Delete: sql-bench/Results-win32/alter-table-mysql-win98
BitKeeper/deleted/.del-big-tables-mysql-win98~99a1882effebbdf2:
  Delete: sql-bench/Results-win32/big-tables-mysql-win98
BitKeeper/deleted/.del-connect-mysql-win98~2a11d5e3dfc0bc67:
  Delete: sql-bench/Results-win32/connect-mysql-win98
BitKeeper/deleted/.del-create-mysql-win98~f66c2cb2909c4792:
  Delete: sql-bench/Results-win32/create-mysql-win98
BitKeeper/deleted/.del-insert-mysql-win98~6d6cafc85a6c837:
  Delete: sql-bench/Results-win32/insert-mysql-win98
BitKeeper/deleted/.del-select-mysql-win98~f370fac2d66a9faf:
  Delete: sql-bench/Results-win32/select-mysql-win98
BitKeeper/deleted/.del-wisconsin-mysql-win98~8b3da9c5c5d2365b:
  Delete: sql-bench/Results-win32/wisconsin-mysql-win98
BUILD/compile-pentium-debug-max:
  Innobase -> Innodb
BUILD/compile-pentium-max:
  Innobase -> Innodb
Docs/manual.texi:
  Innobase -> Innodb
acinclude.m4:
  Innobase -> Innodb
bdb/Makefile.in:
  Fix that make clean works
configure.in:
  Innobase -> Innodb
mysql-test/include/have_innodb.inc:
  Innobase -> Innodb
mysql-test/install_test_db.sh:
  Innobase -> Innodb
mysql-test/mysql-test-run.sh:
  Innobase -> Innodb
mysql-test/r/have_innodb.require:
  Innobase -> Innodb
mysql-test/r/innodb.result:
  Innobase -> Innodb
mysql-test/t/innodb.test:
  Innobase -> Innodb
scripts/mysql_install_db.sh:
  Innobase -> Innodb
scripts/mysqlhotcopy.sh:
  Remove some warnings
sql-bench/server-cfg.sh:
  Innobase -> Innodb
sql/Makefile.am:
  Innobase -> Innodb
sql/ha_innobase.cc:
  Innobase -> Innodb
sql/ha_innobase.h:
  Innobase -> Innodb
sql/handler.cc:
  Innobase -> Innodb
sql/mysqld.cc:
  Innobase -> Innodb
sql/sql_delete.cc:
  Innobase -> Innodb
support-files/my-huge.cnf.sh:
  Innobase -> Innodb
support-files/my-large.cnf.sh:
  Innobase -> Innodb
support-files/my-medium.cnf.sh:
  Innobase -> Innodb
support-files/my-small.cnf.sh:
  Innobase -> Innodb
support-files/mysql-max.spec.sh:
  Innobase -> Innodb
support-files/mysql.spec.sh:
  Innobase -> Innodb
tests/fork_big.pl:
  Added checking of whole database
2001-04-13 12:25:12 +03:00
unknown
4d4dbc94c2 BitKeeper/triggers/post-commit
do REAL_EMAIL magic
mysql-test/mysql-test-run.sh
    added show_failed_diffs
mysql-test/r/bench_count_distinct.result
    tired of waiting :-)
mysql-test/r/rpl000001.result
    new test results after implementing Monty's Hack (TM)
mysql-test/t/bench_count_distinct.test
    tired of waiting
mysql-test/t/rpl000001.test
    implemented Monty's Hack (TM) to kill a query in the middle of update
    without generating a table with 30,000 rows. This will also avoice the
    timing uncertainty


BitKeeper/triggers/post-commit:
  do REAL_EMAIL magic
mysql-test/mysql-test-run.sh:
  added show_failed_diffs
mysql-test/r/bench_count_distinct.result:
  tired of waiting :-)
mysql-test/r/rpl000001.result:
  new test results after implementing Monty's Hack (TM)
mysql-test/t/bench_count_distinct.test:
  tired of waiting
mysql-test/t/rpl000001.test:
  implemented Monty's Hack (TM) to kill a query in the middle of update
  without generating a table with 30,000 rows. This will also avoice the
  timing uncertainty
2001-04-12 13:46:19 -06:00
unknown
d6ca0213b0 merge
BitKeeper/etc/logging_ok:
  auto-union
2001-04-11 16:49:40 -06:00
unknown
72ccee9d37 fixed bugs in the new stuff in rpl000001 test
start slave thread if master.info is present and server_id is set
updates for rpl000015 and rpl000016 to remove master.info to make sure
master info struct does not get auto-initialized


Docs/manual.texi:
  updates for recent changes
mysql-test/r/rpl000001.result:
  update for test case change
mysql-test/t/rpl000001.test:
  fixed bugs in the test case
mysql-test/t/rpl000015.test:
  wrong change - to be reversed
sql/mysqld.cc:
  start slave thread if master.info is present and server_id is set
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-11 16:29:15 -06:00