1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

7111 Commits

Author SHA1 Message Date
monty@work.mysql.com
7f68199648 merge 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
monty@hundin.mysql.fi
11e567229a UNIQUE keys are not anymore shown as PRIMARY KEY 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
monty@hundin.mysql.fi
34b528f13f Added --warnings to mysqld 2001-06-21 01:12:29 +03: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
heikki@donna.mysql.fi
fef5a6d84a 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
2001-06-13 19:27:51 +03: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
sasha@mysql.sashanet.com
f0c252e6a9 merged 2001-06-12 15:08:58 -06:00
unknown
043c49aade Added --skip-stack to mysql-test-run
Docs/manual.texi:
  Changelog
mysql-test/mysql-test-run.sh:
  Added --skip-stack when using gdb
sql/mysqld.cc:
  Changed reference to bugs@lists.mysql.com to manual reference.
2001-06-12 18:00:36 +03:00
monty@hundin.mysql.fi
6aa6374e3e Added --skip-stack to mysql-test-run 2001-06-12 18:00:36 +03:00
unknown
a9e6b975fc merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql-bench/server-cfg.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2001-06-12 14:12:35 +02:00
monty@work.mysql.com
0652902ab5 merge 2001-06-12 14:12:35 +02:00
unknown
17bc31504d Removed --use-symbolic-links 2001-06-07 00:23:55 +03:00
monty@hundin.mysql.fi
e1d12383fa 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
monty@hundin.mysql.fi
b79da88808 Changed innodb_unix_file_flush_method -> innodb_flush_method
Cleaned up error messages.
2001-06-07 00:10:59 +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
monty@hundin.mysql.fi
704c03ca57 Updated benchmarks and crash-me for postgreSQL 7.1.1
Fixed option for symlinks
2001-06-05 04:05:33 +03:00
unknown
d82a86e61b merge
client/mysqltest.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-06-05 03:48:25 +03:00
monty@hundin.mysql.fi
6cce897696 merge 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
monty@hundin.mysql.fi
4cbe66582c 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.
2001-06-05 03:38:10 +03:00
unknown
fdff9c0a45 Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysys/tree.c:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-06-04 17:34:11 -06:00
sasha@mysql.sashanet.com
060da63ab3 Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-06-04 17:34:11 -06:00
unknown
83c9bb3b73 Fixed portability problem.
sql-bench/Comments/postgres.benchmark:
  Added warning about PostgreSQL 7.1.1
2001-06-04 04:08:30 +03:00
monty@hundin.mysql.fi
bea6d78873 Fixed portability problem. 2001-06-04 04:08:30 +03:00
unknown
0105fae75f Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
2001-06-03 09:06:12 +02:00
serg@serg.mysql.com
30bb7b5171 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2001-06-03 09:06:12 +02:00
unknown
b6cb800dbe misplaced #ifdef fixed
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-03 09:03:24 +02:00
serg@serg.mysql.com
8e4246ca97 misplaced #ifdef fixed 2001-06-03 09:03:24 +02:00
unknown
2cf8889f57 do not show user/pass for slave unless running with show-slave-auth-info
cleanup of register_slave_on_master()


mysql-test/r/rpl000002.result:
  new output of show slave hosts
sql/mysqld.cc:
  user and password are shown in show slave hosts only if show-slave-auth-info option is on
sql/slave.cc:
  cleanup of register_slave_on_master()
sql/sql_repl.cc:
  do not show user/pass for slave unless running with show-slave-auth-info
sql/sql_repl.h:
  show-slave-auth-info
2001-06-01 21:15:15 -06:00
sasha@mysql.sashanet.com
ad0b92f941 do not show user/pass for slave unless running with show-slave-auth-info
cleanup of register_slave_on_master()
2001-06-01 21:15:15 -06:00
unknown
9f0b7b7cf7 merge
BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
2001-06-01 23:51:23 +02:00
monty@work.mysql.com
ef8d161dea merge 2001-06-01 23:51:23 +02:00
unknown
455b6952d6 Added --skip-symlinks
Don't force repair of tables that are not closed properly.


Docs/manual.texi:
  Added information about symbolic links.
include/my_sys.h:
  symbolic link support
myisam/mi_check.c:
  Don't force repair of tables that are not closed properly.
myisam/myisamchk.c:
  Version number change.
mysys/my_static.c:
  symbolic link support
mysys/my_symlink2.c:
  Disabling of symbolic link support
sql/mysqld.cc:
  Disabling of symbolic link support
2001-06-01 19:38:47 +03:00
monty@hundin.mysql.fi
dd83beb76a Added --skip-symlinks
Don't force repair of tables that are not closed properly.
2001-06-01 19:38:47 +03:00
unknown
fb15124a94 Merge tonu@work.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/tonu/mysql-4.0


include/mysql_com.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2001-05-31 17:20:02 +03:00
tonu@hundin.mysql.fi
537846a412 Merge tonu@work.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/tonu/mysql-4.0
2001-05-31 17:20:02 +03:00
unknown
20d04c924b Support for VIO library
Makefile.am:
  Added vio
include/mysql_com.h:
  Removed ancient defines from Vio++ times
include/violite.h:
  Added vio
libmysql/Makefile.shared:
  Removed sqlobject line with violite.lo
libmysql/libmysql.c:
  Openssl stuff & sons
sql/Makefile.am:
  Added vio
sql/mini_client.cc:
  Added vio
sql/mysqld.cc:
  Added vio
sql/net_serv.cc:
  Added vio
sql/sql_parse.cc:
  Added vio
vio/Makefile.am:
  Removed C++ stuff
vio/vio.c:
  st_vio -> Vio
vio/viosocket.c:
  st_vio -> Vio
vio/viossl.c:
  st_vio -> Vio
vio/viosslfactories.c:
  vio.h-> violite.h
2001-05-31 17:18:25 +03:00
tonu@hundin.mysql.fi
1519e5d01d Support for VIO library 2001-05-31 17:18:25 +03:00
unknown
e6ecbfd629 merge
BitKeeper/triggers/post-commit:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-05-31 12:56:05 +02:00
monty@work.mysql.com
df56b252a7 merge 2001-05-31 12:56:05 +02:00
unknown
ecba786861 A slave now can optionally register with the master providing the
info on how to connect to the slave for the clients that connect to
the master, but would like to know where the slaves are


include/mysql_com.h:
  register slaves
mysql-test/mysql-test-run.sh:
  parameters to test slave registration
mysql-test/r/rpl000002.result:
  test of slave registration
mysql-test/t/rpl000002.test:
  test slave registration
sql/mysql_priv.h:
  slave registration
sql/mysqld.cc:
  slave registration
sql/slave.cc:
  slave registration
sql/slave.h:
  slave registration
sql/sql_lex.h:
  slave registration
sql/sql_parse.cc:
  slave registration
sql/sql_repl.cc:
  slave registration
sql/sql_repl.h:
  slave registration
sql/sql_yacc.yy:
  slave registration
2001-05-30 18:50:56 -06:00
sasha@mysql.sashanet.com
a817bd3862 A slave now can optionally register with the master providing the
info on how to connect to the slave for the clients that connect to
the master, but would like to know where the slaves are
2001-05-30 18:50:56 -06:00
unknown
bd130011e1 Fixed portability bug in my_config.sh
Added print of --use-symbolic-links in mysqld


Docs/manual.texi:
  Added new links
configure.in:
  Fixes for gcc
scripts/mysql_config.sh:
  Fixed portability bug.
sql/mysqld.cc:
  Added print of --use-symbolic-links
2001-05-28 02:45:19 +03:00
monty@tik.mysql.fi
38c035c098 Fixed portability bug in my_config.sh
Added print of --use-symbolic-links in mysqld
2001-05-28 02:45:19 +03:00
unknown
f19c846325 Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
2001-05-23 23:54:18 +03:00
monty@donna.mysql.fi
3641a481d2 Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0 2001-05-23 23:54:18 +03:00
unknown
7927e83e4c Merge
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged
2001-05-23 22:52:21 +02:00