1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-08 00:28:29 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
9167c80312 Docs/manual.texi
fixed bug
sql/sql_repl.cc
    undid virtual master change



Docs/manual.texi:
  fixed bug
sql/sql_repl.cc:
  undid virtual master change
2001-05-03 16:01:13 -06:00
unknown
a605a9f0b6 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-05-03 11:58:35 -06: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
5461e6717c sql_yacc.yy changed ...IN SHARE MODE to ...LOCK IN SHARE MODE to resolve a parsing bug after a WHERE clause
sql/sql_yacc.yy:
  changed ...IN SHARE MODE to ...LOCK IN SHARE MODE to resolve a parsing bug after a WHERE clause
2001-05-03 14:41:03 +03:00
unknown
0f71614290 Fixed bug from last commit
Docs/manual.texi:
  Changelog
2001-05-03 08:46:58 +03:00
unknown
6c12715595 Fixed a bug with SELECT DISTINCT and HAVING
Docs/manual.texi:
  Update AIX information
support-files/Makefile.am:
  Removed mysql-max spec
2001-05-02 23:39:05 +03:00
unknown
9afb49f53c Merge
Docs/manual.texi:
  SCCS merged
2001-05-02 12:18:05 +02:00
unknown
64dcaea405 Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
sql/log_event.cc:
  Auto merged
2001-04-29 16:07:58 +03:00
unknown
eaa2350748 Cleanup
sql/log_event.cc:
  cleanup
sql/mysqld.cc:
  Portability fix for AIX 4.2
  Fix for services on Windows
2001-04-29 16:07:40 +03:00
unknown
d3eb9d52b8 Merge jamppa@work:/home/bk/mysql into hynda.mysql.fi:/data/my/bk/mysql 2001-04-26 01:13:18 +03:00
unknown
b74fd76c27 Added a new option --result-file to mysqlbinlog.
sql/mysqlbinlog.cc:
  Added option -r.
2001-04-26 01:12:51 +03:00
unknown
3598b1ea76 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-04-25 15:21:47 -06:00
unknown
bc564fd0bc fixed bug in mysqlbinlog 2001-04-25 15:20:59 -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
d909ccb6dc ha_innobase.cc Changed the error code HA_ERR_KEY_NOT_FOUND to HA_ERR_END_OF_INDEX in index_first to eliminate an error message
sql/ha_innobase.cc:
  Changed the error code HA_ERR_KEY_NOT_FOUND to HA_ERR_END_OF_INDEX in index_first to eliminate an error message
2001-04-25 14:44:35 +03:00
unknown
61a9643de6 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-04-24 17:40:25 -06: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
dbd56fcdc5 Fixes for embedded MySQL
Some limit optimization


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
client/errmsg.c:
  Moved error messages from libmysqld/
client/mysql.cc:
  Removed warnings
include/errmsg.h:
  New info for embedded versions
include/mysql_com.h:
  Fixes for embedded MySQL
libmysql/errmsg.c:
  Fixes for embedded MySQL
libmysqld/Makefile.am:
  Added HANDLER code
libmysqld/lib_sql.cc:
  Fixes for embedded MySQL
libmysqld/lib_vio.c:
  Fixes for embedded MySQL
BitKeeper/etc/ignore:
  Added libmysqld/sql_handler.cc to the ignore list
libmysqld/libmysqld.c:
  Fixes for embedded MySQL
mysql-test/r/null_key.result:
  Fixed result for 4.0
sql/net_serv.cc:
  Fixes for embedded MySQL
sql/sql_parse.cc:
  Fixes for embedded MySQL where the query could be a const char*
sql/sql_select.cc:
  Added limit optimization
sql/sql_select.h:
  Added limit optimization
2001-04-25 01:11:29 +03:00
unknown
4f8d308200 Fix for release
Docs/manual.texi:
  new links
scripts/make_binary_distribution.sh:
  Added missing files
sql/sql_select.cc:
  Added accidently removed line
2001-04-22 12:11:01 +03: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
4c5dd2f278 Fixed that database name is shown for CHECK TABLE
BitKeeper/etc/ignore:
  Added client/mysqlcheck to the ignore list
Docs/manual.texi:
  Changelog
2001-04-20 17:14:53 +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
1115a79126 Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged
2001-04-19 15:15:34 -04: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
7337a193b1 Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
sql/Makefile.am:
  SCCS merged
2001-04-19 00:58:30 +02: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
17ef8ef444 ft_* variables added 2001-04-17 21:30:02 +02:00
unknown
b0e8ab1931 Merge
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  SCCS merged
2001-04-17 09:18:37 -04:00
unknown
b279170bf3 sql_select.cc sizeof(**TABLE) -> sizeof(*TABLE) in malloc()
sql/sql_select.cc:
  sizeof(**TABLE) -> sizeof(*TABLE) in malloc()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-17 09:13:10 -04: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
6738cfb979 Moved test to keep Tim happy 2001-04-17 14:07:38 +03: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
aab24fff88 The environment variable PAGER is now used as the default pager
Fixed bug with float columns



Docs/manual.texi:
  Added new link
client/mysql.cc:
  The environment variable PAGER is now used as the default pager
sql/field.cc:
  Fixed bug with float columns.
2001-04-17 01:45:30 +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
09f0384e7a fully functional HANDLER table CLOSE
sql/mysql_priv.h:
  new function: close_thread_table()
sql/sql_base.cc:
  new function: close_thread_table()
2001-04-15 22:56:20 +02:00
unknown
d288993577 mysqltest bugfix
typo/bad merge fixed
chmod a-x for man/*.1 files


man/isamchk.1:
  Change mode to -rw-rw-r--
man/mysqlaccess.1:
  Change mode to -rw-rw-r--
man/mysqladmin.1:
  Change mode to -rw-rw-r--
man/mysqld.1:
  Change mode to -rw-rw-r--
man/mysqldump.1:
  Change mode to -rw-rw-r--
man/mysqlshow.1:
  Change mode to -rw-rw-r--
man/perror.1:
  Change mode to -rw-rw-r--
man/safe_mysqld.1:
  Change mode to -rw-rw-r--
mysql-test/r/handler.result:
  new tests added
client/mysqltest.c:
  bug fixed: errors from handler.test (that is send_error()
  after send_fields) weren't catched by expected_errno
mysql-test/t/handler.test:
  typo fixed
sql/Makefile.am:
  bad merge fixed
sql/sql_yacc.yy:
  bad merge (?) fixed
2001-04-15 20:14:40 +02:00
unknown
9f7ef3624a Fix RPM to be able to build MySQL-Max
Docs/manual.texi:
  Added information about mysqld-max
sql/gen_lex_hash.cc:
  Smaller table
support-files/mysql.spec.sh:
  Fix RPM
2001-04-14 01:30:52 +03:00
unknown
cb02f1671d merged 2001-04-13 21:29:06 +02:00
unknown
5128e3750d merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/sql_delete.cc:
  Auto merged
2001-04-13 21:16:53 +02:00
unknown
6efc95d5a0 Changed -O6 to -O3
Portability fix for Innodb


BUILD/compile-pentium-max:
  Change mode to -rwxrwxr-x
BUILD/SETUP.sh:
  Changed -O6 to -O3
Docs/manual.texi:
  Changed -O6 to -O3
configure.in:
  Changed -O6 to -O3
  Added test of pthread_yield (For Innodb)
innobase/os/os0thread.c:
  Fix portability problem with RedHat 6.1
scripts/safe_mysqld.sh:
  Fix option --mysqld-version
sql/gen_lex_hash.cc:
  Smaller array
support-files/mysql.spec.sh:
  Changed -O6 to -O3
2001-04-13 22:09:33 +03:00
unknown
ce3b58d6c9 this won't be pushed
Docs/manual.texi:
  HANDLER documented
mysql-test/t/handler.test:
  more tests
2001-04-13 16:18:44 +02:00
unknown
00b254969d log0recv.c Change Innobase text to InnoDB
log0log.c	Change Innobase text to InnoDB
srv0start.c	Change Innobase text to InnoDB
srv0srv.c	Change Innobase text to InnoDB
ha_innobase.cc	Change Innobase text to InnoDB


sql/ha_innobase.cc:
  Change Innobase text to InnoDB
innobase/srv/srv0srv.c:
  Change Innobase text to InnoDB
innobase/srv/srv0start.c:
  Change Innobase text to InnoDB
innobase/log/log0log.c:
  Change Innobase text to InnoDB
innobase/log/log0recv.c:
  Change Innobase text to InnoDB
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-04-13 16:36:54 +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
b5fa754f7b Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2001-04-11 19:39:04 -06:00
unknown
71af8ca9bf Ugly merge of 3.23 changes into 4.0 - fix up needed
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
myisam/mi_search.c:
  the ugliest merge I've ever done! And I already see this has introduced a bug - will have to do a fix-up afterwards
2001-04-11 19:09:00 -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