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

2146 Commits

Author SHA1 Message Date
unknown
fa043c7200 Small addition to SHOW GRANTS 2002-02-23 14:00:07 +02:00
unknown
1e468e3bd7 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-02-22 15:30:28 +04:00
unknown
32a08516c9 Added GIS extension
BitKeeper/etc/ignore:
  Added myisam/rt_test myisam/sp_test to the ignore list
2002-02-22 15:24:42 +04:00
unknown
c0b5bf5e14 some UNION bug fixes.. 2002-02-21 13:40:22 +02:00
unknown
8f61f5475c Changes for to control the tables and log clean up.
sql/mysqld.cc:
  Added Monty's code for to call the handler of named pipes
  at shutdown.
  Change the code to call the stop service after the clean up.
  Change the create/open the mysql.err files for to print the
  InnoDB start messages.
sql/nt_servc.cc:
  Modify the WaitHint for to kill the service.
  This will be modify for to be defined through an user variable.
2002-02-20 23:20:15 -03:00
unknown
6c174e2c56 memory leak with broken tables fixed
Docs/manual.texi:
  news updated
2002-02-20 13:06:54 +00:00
unknown
e07c92cd95 small bug fix for 2.95.4 2002-02-19 15:32:11 +02:00
unknown
ddb2a89599 small fix for 2.95.4 compiler 2002-02-19 15:10:12 +02:00
unknown
b78743d566 Fix to work with old ISAM privilege tables + ssl support.
Docs/manual.texi:
  Small change to binary install
2002-02-18 23:54:45 +02:00
unknown
0ee35d6da9 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_parse.cc:
  Auto merged
2002-02-15 02:51:43 +02:00
unknown
93c1f96f7d Fix after merge from 3.23
Docs/manual.texi:
  Added section about LOAD DATA LOCAL
libmysqld/lib_sql.cc:
  Remove not used option
mysql-test/r/comments.result:
  Updated results
sql/sql_parse.cc:
  Fix queries / second
2002-02-15 02:49:02 +02:00
unknown
5fa6df3081 merge with 3.23.49
BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
Docs/manual.texi:
  Auto merged
client/client_priv.h:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
mysql-test/t/comments.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/unireg.h:
  Auto merged
2002-02-14 18:58:24 +02:00
unknown
7bff1b0c34 Fix for gethostbyname_r detection (for solaris).
configure.in:
  Fix for gethostbyname_r (for solaris)
mysql-test/r/innodb.result:
  Fix innodb results
sql/mysql_priv.h:
  Added OPTION_FOUND_COMMENTS
2002-02-14 18:10:44 +02:00
unknown
3a231663f0 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-02-14 15:25:26 +02:00
unknown
4866455558 Don't give warnings for empty statements with comments 2002-02-14 15:04:14 +02:00
unknown
199e17e577 dict0dict.h, dict0dict.c, row0mysql.c, ha_innobase.cc:
Add some more safety if MySQL tries to drop a table on which there are open handles


sql/ha_innobase.cc:
  Add some more safety if MySQL tries to drop a table on which there are open handles
innobase/row/row0mysql.c:
  Add some more safety if MySQL tries to drop a table on which there are open handles
innobase/dict/dict0dict.c:
  Add some more safety if MySQL tries to drop a table on which there are open handles
innobase/include/dict0dict.h:
  Add some more safety if MySQL tries to drop a table on which there are open handles
2002-02-14 10:24:27 +02:00
unknown
5c08b0fbab row0mysql.c, sql_db.cc:
Try to make sure DROP DATABASE does not cause a deadlock because we now let InnoDB wait MySQL does not have open handles to tables we drop


sql/sql_db.cc:
  Try to make sure DROP DATABASE does not cause a deadlock because we now let InnoDB wait MySQL does not have open handles to tables we drop
innobase/row/row0mysql.c:
  Try to make sure DROP DATABASE does not cause a deadlock because we now let InnoDB wait MySQL does not have open handles to tables we drop
2002-02-14 03:45:45 +02:00
unknown
01f1db421f changed bool -> my_bool 2002-02-14 02:41:29 +02:00
unknown
a3e6a43d0f Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-02-14 02:39:38 +02:00
unknown
74e8b0a60d ha_innobase.cc:
DROP DATABASE required that the database name is in lower case to work; put it always to lower case in innobase_drop_database


sql/ha_innobase.cc:
  DROP DATABASE required that the database name is in lower case to work; put it always to lower case in innobase_drop_database
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-02-14 00:00:09 +02:00
unknown
429abf3560 Added --user=userid to mysqld
Fix for ctypes on windows
Cleanup max_queries_per_hour


mysql-test/t/dirty_close.test:
  Rename: mysql-test/t/dirty-close.test -> mysql-test/t/dirty_close.test
mysql-test/r/dirty_close.result:
  Rename: mysql-test/r/dirty-close.result -> mysql-test/r/dirty_close.result
Docs/manual.texi:
  Added --user=userid
include/m_ctype.h:
  Fix for ctypes on windows
mysql-test/r/join.result:
  Update join results
sql/mysqld.cc:
  Added --user=userid
sql/sql_parse.cc:
  Cleanup max_queries_per_hour
2002-02-13 22:37:19 +02:00
unknown
26b57d2a15 Use NAMES_SEP_CHAR also for enums (Fix for supportwizard)
sql/unireg.cc:
  Use NAMES_SEP_CHAR also for enums
sql/unireg.h:
  cleanup
2002-02-13 22:01:43 +02:00
unknown
a0ea16f1c2 Fix for LOAD DATA LOCAL INFILE patch 2002-02-13 22:01:41 +02:00
unknown
bf67d42f2d Merge hundin:/my/mysql-3.23 into tik.mysql.fi:/home/my/mysql-3.23
sql/mysqld.cc:
  Auto merged
2002-02-13 22:01:40 +02:00
unknown
33d2d76549 Made LOAD DATA LOCAL INFILE more secure
Docs/manual.texi:
  Changelog
sql/sql_yacc.yy:
  optimization
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-02-13 21:53:26 +02:00
unknown
67d8e88241 Don't print out 'got signal' if not using --warnings 2002-02-13 17:49:21 +02:00
unknown
728c191b11 reverting wrong fix 2002-02-11 14:47:22 +02:00
unknown
e0ccdc17a2 merge with 3.23.48
BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-alpha:
  Auto merged
BUILD/compile-pentium-gcov:
  Auto merged
BUILD/compile-pentium-gprof:
  Auto merged
BUILD/compile-pentium:
  Auto merged
BitKeeper/deleted/.del-my_new.cc:
  Delete: mysys/my_new.cc
Build-tools/Do-compile:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
bdb/dist/configure.in:
  Auto merged
client/Makefile.am:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/my_lock.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
support-files/my-medium.cnf.sh:
  Auto merged
support-files/my-small.cnf.sh:
  Auto merged
configure.in:
  merge
innobase/row/row0mysql.c:
  merge
innobase/trx/trx0trx.c:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join.result:
  merge
sql/ha_innodb.cc:
  merge
sql/slave.cc:
  merge
2002-02-11 13:48:59 +02:00
unknown
501650c5b1 Updated changelog of 3.23.48 with InnoDB changes.
sql/sql_table.cc:
  Fixed comment
2002-02-11 12:56:48 +02:00
unknown
ed30774e8b Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-02-11 05:04:09 +02:00
unknown
4122b3928b Cleanup
Docs/manual.texi:
  Update information about IS NULL.
myisam/myisamchk.c:
  Portability fix
sql/mysqld.cc:
  Changed log_long_queries -> log_slow_queries
2002-02-11 04:55:52 +02:00
unknown
5081986810 Remove uage of static variable from file locks.
mysql-test/mysql-test-run.sh:
  Cleanup
2002-02-10 20:28:58 +02:00
unknown
c1caaf756f Fixed bug in full join with many NULL fields.
Build-tools/Do-compile:
  Fixed 'touch' and 'chmod' of files.
Docs/manual.texi:
  Changelog
2002-02-10 12:47:37 +02:00
unknown
61b769d94a Fix for customer build 2002-02-10 02:28:24 +02:00
unknown
6f11331945 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-02-09 13:59:30 -07:00
unknown
ff3b98e631 updated test suite to be able to run 3.23 master and 4.0 slave
got LOAD DATA INFILE replication from 3.23 master to 4.0 slave to work
for some reason query_cache now fails - will push anyway and document the
failure if I can repeat it.


client/mysqltest.c:
  added require_version
mysql-test/mysql-test-run.sh:
  added --master-binary=,--slave-binary=,--old-master options
  sleep_until_file_exists -> sleep_until_file_created
sql/slave.cc:
  fixed bug in LOAD DATA INFILE replication from 3.23 master
2002-02-09 13:58:53 -07:00
unknown
f7c085efe3 Removed compiler warnings
Docs/manual.texi:
  Cleanup
myisam/myisampack.c:
  Removed warning
sql/handler.cc:
  cleanup
sql/slave.cc:
  Removed not used var
2002-02-09 04:00:24 +02:00
unknown
7380df3f84 small bug fix in max queries per hour 2002-02-08 17:44:50 +02:00
unknown
f5e6f0e7ca bugfix for max_user_connections 2002-02-08 10:18:32 +00:00
unknown
6259917372 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-02-08 09:44:41 +00:00
unknown
49266c90a2 merge
sql/mysql_priv.h:
  Auto merged
2002-02-08 03:29:29 +02:00
unknown
0f9932a162 Fix some bugs introduced with the new my_getopt
Added counting of rollback's and commits
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'


Docs/manual.texi:
  Changelog
configure.in:
  Cleanup
myisam/myisamchk.c:
  Fix some bugs introduced with the new my_getopt
mysql-test/r/limit.result:
  Test for bugfix
mysql-test/r/rpl000001.result:
  fix wrong result
mysql-test/r/select.result:
  Fix things after fixing ignore index()
mysql-test/r/select_found.result:
  Test of bug in SQL_CALC_FOUND_ROWS
mysql-test/t/limit.test:
  Test bug in LIMIT 0
mysql-test/t/rpl000001.test:
  fix wrong result
mysql-test/t/select_found.test:
  Test of bug in SQL_CALC_FOUND_ROWS
sql/handler.cc:
  Added counting of rollback's and commits
sql/mysql_priv.h:
  Added counting of rollback's and commits
sql/mysqld.cc:
  Added counting of rollback's and commits
sql/sql_select.cc:
  Fixed bug in 'SELECT 0 LIMIT 0'
  Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'
2002-02-08 03:21:34 +02:00
unknown
83d50c17b7 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-02-07 15:30:44 -07:00
unknown
0d87650934 fixes for slave backward compat
fixed bug in LOAD DATA FROM MASTER
fixed rpl000001.result
Slave now replicates 3.23 master, with the exception of LOAD DATA INFILE, 
which is still buggy. Will push this one after the pull/merge


mysql-test/r/rpl000001.result:
  fixed bug in result
sql/log_event.cc:
  fixes for slave backward compat
sql/log_event.h:
  fixes for slave backward compat
sql/mysql_priv.h:
  fixes for slave backward compat
sql/net_serv.cc:
  fixes for slave backward compat
sql/repl_failsafe.cc:
  fixed bug in LOAD DATA FROM MASTER
sql/slave.cc:
  fixes for slave backward compat
sql/slave.h:
  fixes for slave backward compat
sql/sql_load.cc:
  fixes for slave backward compat
2002-02-07 15:29:46 -07:00
unknown
007470d8c5 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
sql/ha_innobase.cc:
  Auto merged
2002-02-07 21:53:09 +02:00
unknown
3942e44524 Update to autoconf 2.52
Fix of InnoDB variables in SHOW VARIABLES
Fix for ALTER TABLE and InnoDB


BUILD/FINISH.sh:
  Update to autoconf 2.52
BUILD/SETUP.sh:
  Update to autoconf 2.52
BUILD/compile-alpha:
  Update to autoconf 2.52
BUILD/compile-pentium-gcov:
  Update to autoconf 2.52
BUILD/compile-pentium-gprof:
  Update to autoconf 2.52
BUILD/compile-pentium:
  Update to autoconf 2.52
Docs/manual.texi:
  Changelog
acconfig.h:
  Update to autoconf 2.52
acinclude.m4:
  Update to autoconf 2.52
bdb/dist/configure.in:
  Update to autoconf 2.52
client/Makefile.am:
  Update to autoconf 2.52
configure.in:
  Update to autoconf 2.52
mysql-test/r/innodb.result:
  Update of InnoDB Cardinality values
mysys/Makefile.am:
  Update to autoconf 2.52
scripts/Makefile.am:
  Update to autoconf 2.52
sql/ha_innobase.cc:
  Fix of InnoDB variables in SHOW VARIABLES
sql/ha_innobase.h:
  Fix of InnoDB variables in SHOW VARIABLES
sql/sql_table.cc:
  Fix for ALTER TABLE and InnoDB
support-files/my-huge.cnf.sh:
  Fixed typo
support-files/my-large.cnf.sh:
  Fixed typo
support-files/my-medium.cnf.sh:
  Fixed typo
support-files/my-small.cnf.sh:
  Fixed typo
2002-02-07 21:34:35 +02:00
unknown
70634523d4 ha_innobase.cc:
Remove use of prebuilt->trx, better play safe since we do not know MySQL call order of external_lock


sql/ha_innobase.cc:
  Remove use of prebuilt->trx, better play safe since we do not know MySQL call order of external_lock
2002-02-05 00:16:38 +02:00
unknown
9871a6d080 Many files:
Small improvements
row0mysql.c:
  Small improvements + fix the ALTER TABLE problem by introducing a lazy drop table it can use
ha_innobase.cc:
  Some fine-tuning of optimization


sql/ha_innobase.cc:
  Some fine-tuning of optimization
innobase/include/log0recv.h:
  Small improvements
innobase/include/mem0mem.h:
  Small improvements
innobase/include/mem0pool.h:
  Small improvements
innobase/include/row0mysql.h:
  Small improvements
innobase/include/srv0srv.h:
  Small improvements
innobase/include/trx0trx.h:
  Small improvements
innobase/buf/buf0lru.c:
  Small improvements
innobase/fil/fil0fil.c:
  Small improvements
innobase/log/log0recv.c:
  Small improvements
innobase/mem/mem0mem.c:
  Small improvements
innobase/mem/mem0pool.c:
  Small improvements
innobase/row/row0mysql.c:
  Small improvements + fix the ALTER TABLE problem by introducing a lazy drop table it can use
innobase/srv/srv0srv.c:
  Small improvements
innobase/srv/srv0start.c:
  Small improvements
innobase/trx/trx0purge.c:
  Small improvements
innobase/trx/trx0trx.c:
  Small improvements
2002-02-04 23:55:41 +02:00
unknown
3518de828d ha_innobase.cc:
Fix the crashes reported by Peter; SHOW CREATE does not call external_lock before calling ::info, and consequently the trx struct in prebuilt is obsolete; setting trx->op_info caused erratic memory corruption in mysqldump


sql/ha_innobase.cc:
  Fix the crashes reported by Peter; SHOW CREATE does not call external_lock before calling ::info, and consequently the trx struct in prebuilt is obsolete; setting trx->op_info caused erratic memory corruption in mysqldump
2002-02-03 15:21:15 +02:00
unknown
9855a07b4a Merge heikki@work.mysql.com:/home/my/mysql
into donna.mysql.fi:/home/heikki/mysqln
2002-02-03 15:15:13 +02:00