Commit graph

1778 commits

Author SHA1 Message Date
unknown
8b76fb7f3e Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
Docs/manual.texi:
  Auto merged
2001-06-11 15:07:43 +03:00
unknown
036396bc66 Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
sql-bench/README:
  Auto merged
2001-06-11 15:07:42 +03: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
44b670f650 Small fixes in the manual.
BitKeeper/etc/ignore:
  Added sql-bench/compare-results-all sql-bench/template.html to the ignore list
Docs/manual.texi:
  Changed innodb_unix_file_flush_method -> innodb_flush_method.
2001-06-11 12:23:30 +03:00
unknown
e47948041a manual.texi HPUX -> HP-UX where necessary
Docs/manual.texi:
  HPUX -> HP-UX where necessary
2001-06-10 13:31:52 -05:00
unknown
6cddf47086 fixed new error messages and got vio to compile
client/Makefile.am:
  cleanup to make vio compile
client/errmsg.c:
  cleanup
libmysql/Makefile.am:
  vio fix
libmysql/Makefile.shared:
  vio fix
libmysql/errmsg.c:
  fixed up messages
2001-06-08 21:26:59 -06:00
unknown
9de8ae5fd0 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
client/mysqltest.c:
  Auto merged
2001-06-08 19:26:11 -06:00
unknown
26ffc5d4de auto-magic replication redirection logic support in the client,
compiles, passes test suite, does magic, has bugs, but none that I know 
at this point. Have not tested everything yet, though. Changed
a lot of code in the client, but normal stuff appears to be working.


BUILD/SETUP.sh:
  make sure client link statically
client/mysqltest.c:
  new commands to test replication probe/parse
include/errmsg.h:
  new error messages
include/mysql.h:
  support for replication auto-magic
libmysql/errmsg.c:
  new error messages
libmysql/libmysql.c:
  replication probe/parse auto-magic
mysql-test/mysql-test-run.sh:
  --client-gdb to run the client in debugger
2001-06-08 19:24:41 -06:00
unknown
458d62a0f3 README msyql -> mysql
sql-bench/README:
  msyql -> mysql
2001-06-08 18:16:20 -05:00
unknown
b44a7c93e9 manual.texi cleanup
Docs/manual.texi:
  cleanup
2001-06-08 18:14:30 -05:00
unknown
0d38f57199 manual.texi Added another Contrib software entry.
Docs/manual.texi:
  Added another Contrib software entry.
2001-06-08 16:07:28 -05:00
unknown
f4d5d2d979 manual.texi Contrib software additions.
Docs/manual.texi:
  Contrib software additions.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-08 15:54:20 -05:00
unknown
2db2a22cbf Merge tonu@work.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/tonu/mysql-4.0
2001-06-08 22:31:43 +03:00
unknown
32692277b9 Fixed compile-time warnings
vio/viossl.c:
  Fixed compile-time warnings by moving code around plus small fixes
2001-06-08 22:28:57 +03:00
unknown
8b204f16fa Merge paul@work.mysql.com:/home/bk/mysql
into teton.kitebird.com:/home/paul/mysql


BitKeeper/etc/logging_ok:
  auto-union
2001-06-08 11:01:49 -05:00
unknown
f00c02293d manual.texi minor cleanup
Docs/manual.texi:
  minor cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-08 10:59:05 -05:00
unknown
0f9b1363b3 row0sel.c Fix a bug in consistent read through a secondary index
innobase/row/row0sel.c:
  Fix a bug in consistent read through a secondary index
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-08 18:03:24 +03:00
unknown
95015b0844 Added a link to manual.
Docs/manual.texi:
  Added a link.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-08 17:29:03 +03:00
unknown
9de7a21654 trx0roll.c Changed Innobase to Innodb in some fprintfs
trx0sys.c	Changed Innobase to Innodb in some fprintfs


innobase/trx/trx0roll.c:
  Changed Innobase to Innodb in some fprintfs
innobase/trx/trx0sys.c:
  Changed Innobase to Innodb in some fprintfs
2001-06-07 20:24:53 +03:00
unknown
50861b3142 manual.texi Change my email address (of course I read also from the old address)
Docs/manual.texi:
  Change my email address (of course I read also from the old address)
2001-06-07 19:26:00 +03:00
unknown
9c20e1e704 page0cur.ic Fix a bug in insert buffer and multiversioning
manual.texi	Changed innodb_unix_file_flush_method to innodb_flush_method in the manual


Docs/manual.texi:
  Changed innodb_unix_file_flush_method to innodb_flush_method in the manual
innobase/include/page0cur.ic:
  Fix a bug in insert buffer and multiversioning
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-07 17:32:02 +03:00
unknown
9cda81a4b8 bk resolve work
BitKeeper/etc/logging_ok:
  auto-union
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_lex.h:
  Added SQLCOM_MULTI_DELETE
sql/sql_parse.cc:
  added division of LEX while keeping Monty's code for symlinks
2001-06-07 14:25:45 +03:00
unknown
823586b2c7 Enhancing both multi-table delete and division of LEX
sql/filesort.cc:
  removing of some extra comments
sql/sql_class.h:
  Clear division between new and old stripping code
sql/sql_delete.cc:
  Stripping of unnecessary code and making it more efficient
sql/sql_parse.cc:
  Better split of LEX into two and enhancements in multi table delete
sql/sql_yacc.yy:
  More efficient division of LEX and optional syntax in multi - table delete
sql/uniques.cc:
  fixing some additional bugs
2001-06-07 14:10:58 +03:00
unknown
17bc31504d Removed --use-symbolic-links 2001-06-07 00:23:55 +03:00
unknown
14289d42ed Changed innodb_unix_file_flush_method -> innodb_flush_method
Cleaned up error messages.


mysql-test/mysql-test-run.sh:
  Added option --mysqld to send arguments to mysqld.
sql/ha_innobase.cc:
  Shortended messages a bit to correspond to the rest of MySQL.
sql/mysqld.cc:
  Changed innodb_unix_file_flush_method -> innodb_flush_method
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-07 00:10:59 +03:00
unknown
bb72939a5b sql_table.cc re-apply a lost change where we check to see if the
sql_table.cc	table handler supports temporary tables


sql/sql_table.cc:
  re-apply a lost change where we check to see if the
  table handler supports temporary tables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-06 15:45:07 -04:00
unknown
5388d91592 ha_innobase.cc Improved error message in the case the .frm file exists but InnoDB data dictionary does not conatin the table
sql/ha_innobase.cc:
  Improved error message in the case the .frm file exists but InnoDB data dictionary does not conatin the table
2001-06-06 16:12:30 +03:00
unknown
124c535dc0 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
  Auto merged
2001-06-06 03:10:22 +03:00
unknown
30bd6b3bbc Updated manual about symlinks on window and adding users
BitKeeper/etc/ignore:
  added sql-bench/gif/*
2001-06-06 03:10:00 +03:00
unknown
0065ea3d9a Merge paul@work.mysql.com:/home/bk/mysql
into teton.kitebird.com:/home/paul/mysql
2001-06-05 16:52:19 -05:00
unknown
3e50dc1958 manual.texi minor clarifications to Windows section
Docs/manual.texi:
  minor clarifications to Windows section
2001-06-05 16:46:51 -05:00
unknown
703b2384df manual.texi correct instance of mysql_escape() to mysql_escape_string();
manual.texi	add mention of mysql_escape_string() for PHP API;
manual.texi	add mention of PreparedStatement, placeholders for JDBC API.


Docs/manual.texi:
  correct instance of mysql_escape() to mysql_escape_string();
  add mention of mysql_escape_string() for PHP API;
  add mention of PreparedStatement, placeholders for JDBC API.
2001-06-05 16:29:52 -05:00
unknown
1efd1b1507 mem0pool.h Fix a bus error in aligment of longlong on Solaris
innobase/include/mem0pool.h:
  Fix a bus error in aligment of longlong on Solaris
2001-06-05 21:49:03 +03:00
unknown
19e5415385 Updated benchmark results.
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~f761da5546f0d362:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~79ac0482599eace1:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~dfc480becae45236:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~a2a77f37b689cd63:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~7dd5ac726f86cf0b:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~441a6aefd381e319:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~d12a7edef05d7185:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~ddcf36cdf3f72e8c:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~2db07249379f36:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
sql-bench/Comments/postgres.benchmark:
  b
2001-06-05 16:27:59 +03:00
unknown
85929a164d manual.texi 1) manual says mysql.server uses "user"; it doesn't.
manual.texi	2) manual says mysql.server uses "bindir"; it doesn't.


Docs/manual.texi:
  1) manual says mysql.server uses "user"; it doesn't.
  2) manual says mysql.server uses "bindir"; it doesn't.
2001-06-04 20:33:10 -05:00
unknown
dd7e72573c Merge paul@work.mysql.com:/home/bk/mysql
into teton.kitebird.com:/home/paul/mysql


Docs/manual.texi:
  Auto merged
2001-06-04 20:21:21 -05:00
unknown
ccf31559fc manual.texi fix more out-of-date mysql.server commentary, plus
manual.texi	small misc changes


Docs/manual.texi:
  fix more out-of-date mysql.server commentary, plus
  small misc changes
2001-06-04 20:20:34 -05:00
unknown
db6d4e9faa Merge work:/my/mysql-4.0 into hundin.mysql.fi:/home/tim/mysql-4.0
BitKeeper/etc/logging_ok:
  auto-union
2001-06-05 04:18:23 +03:00
unknown
d637e1dcd5 violite.h Don't define st_vio if EMBEDDED_LIBRARY.
include/violite.h:
  Don't define st_vio if EMBEDDED_LIBRARY.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-05 04:15:13 +03:00
unknown
8da0f5f263 Merge
Docs/manual.texi:
  SCCS merged
2001-06-05 04:07:23 +03:00
unknown
b1e00c9680 Updated benchmarks and crash-me for postgreSQL 7.1.1
Fixed option for symlinks


Docs/manual.texi:
  Updated symlink handling.
sql-bench/Comments/postgres.benchmark:
  Updated benchmark text
sql-bench/Makefile.am:
  Added graph-compare-results
sql-bench/compare-results.sh:
  Don't reset the cmp option.
sql-bench/crash-me.sh:
  Updated transaction testing.
sql-bench/limits/mysql-3.23.cfg:
  Updated benchmark run
sql-bench/limits/mysql.cfg:
  Updated benchmark run
sql-bench/limits/pg.cfg:
  Updated benchmark run
sql-bench/server-cfg.sh:
  Don't do vacuum too often.
sql-bench/test-insert.sh:
  Don't do vacuum too often.
sql/mysqld.cc:
  Changed skip-symlinks to skip-symlink
2001-06-05 04:05:33 +03:00
unknown
5332aba471 manual.texi 1) earlier change to @xref{} used 2-arg form; change
manual.texi	to 3-arg form so last arg shows up in printed output.
manual.texi	2) mysql.server no longer needs to use su or store the
manual.texi	root password.
manual.texi	3) other misc small changes.


Docs/manual.texi:
  earlier change to @xref{} used 2-arg form; change
  to 3-arg form so last arg shows up in printed output.
  mysql.server no longer needs to use su or store the
  root password.
  other misc small changes
2001-06-04 20:05:21 -05:00
unknown
53b2430218 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-06-05 03:49:56 +03:00
unknown
ab4d92798f Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
2001-06-05 02:49:55 +02:00
unknown
d82a86e61b merge
client/mysqltest.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-06-05 03:48:25 +03:00
unknown
fe1842d9ee Symlinking of tables should not work.
Fixed error number handling bug in mysqltest.
Fixed that error number from insert delayed is reported correctly.
merged new vio code with old violite code.


client/mysqltest.c:
  Fixed bug that error numbers wasn't tested properly.
myisam/mi_check.c:
  Moved initialization of variables to avoid a bug.
myisam/mi_create.c:
  Fixed bug in symlink handling.
myisam/mi_test_all.sh:
  Fixed script so that it works.
myisam/myisamchk.c:
  Removed --no-symlinks option
mysql-test/mysql-test-run.sh:
  Cleaned up error message
mysql-test/t/bdb.test:
  Fixed wrong error numbers
mysql-test/t/err000001.test:
  Fixed wrong error numbers
mysql-test/t/innodb.test:
  Fixed wrong error numbers
mysql-test/t/overflow.test:
  Fixed wrong error numbers
mysql-test/t/status.test:
  Ensure that we are using myisam tables for the lock test.
mysys/my_delete.c:
  cleanup
mysys/my_symlink2.c:
  Added option to not overwrite files when using symlinks.
sql/Makefile.am:
  Moved vio to avoid link error.
sql/ha_myisam.cc:
  Fixed symlink handling.
sql/mysqld.cc:
  Changed --skip-symlinks to --skip-symlink
sql/sql_insert.cc:
  Fixed that error number from insert delayed is reported correctly
sql/sql_parse.cc:
  Fixed symlink handling.
sql/sql_table.cc:
  Fixed symlink handling.
vio/vio.c:
  cleanup
vio/viosocket.c:
  c
2001-06-05 03:38:10 +03:00
unknown
011b141574 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-06-04 18:06:27 -06:00
unknown
0b4000fe07 manual.texi mysqlhotcopy reads [mysqlhotcopy] option group,
manual.texi	not [mysql-hot-copy].


Docs/manual.texi:
  mysqlhotcopy reads [mysqlhotcopy] option group,
  not [mysql-hot-copy].
2001-06-04 18:53:20 -05:00
unknown
bd58e5e12f Merge work:/home/bk/mysql-4.0
into threads.polyesthetic.msg:/home/tim/my/4
2001-06-04 19:40:44 -04:00
unknown
1baef9839d Merge work:/home/bk/mysql-4.0
into threads.polyesthetic.msg:/home/tim/my/4


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-04 19:39:55 -04:00