1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-09 11:41:36 +03:00
Commit Graph

928 Commits

Author SHA1 Message Date
unknown
c96bf55b9c Merge with 3.23.42
configure.in:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
heap/hp_test2.c:
  Auto merged
include/global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/net.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
Docs/manual.texi:
  merge
myisam/myisampack.c:
  merge
2001-09-13 09:52:35 +02:00
unknown
c88dd9b291 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-09-12 23:54:22 +03:00
unknown
76989cf55c OS2 patch
Docs/manual.texi:
  Updated section of how to change the socket file.
  Changelog for 3.23.43
include/merge.h:
  Fixed typo
include/my_pthread.h:
  Fixed bug for WIN32
include/myisam.h:
  Fixed typo
include/nisam.h:
  Fixed typo
sql/handler.h:
  Fixed typo
sql/sql_table.cc:
  Fixed typo
sql/unireg.cc:
  F
2001-09-12 23:53:31 +03:00
unknown
93a15f452e Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-09-10 17:31:33 -06:00
unknown
8cfd4949c2 fixed IDENTITY crisis 2001-09-10 17:30:29 -06:00
unknown
34925f8d82 Fixes for German sorting order.
Docs/manual.texi:
  Update for German sorting
configure.in:
  Don't make the German sort order default
myisam/mi_delete_all.c:
  Truncate files on DELETE FROM table_name to not get warnings when checking files
myisam/mi_search.c:
  Fix for multi-byte character sets.
sql/item_cmpfunc.cc:
  Use current character set when using STRCMP()
strings/ctype-latin1_de.c:
  F
2001-09-11 01:40:52 +03:00
unknown
341504b3c9 handler.cc If CREATE TABLE fails for an InnoDB table, do not put the OS error number to the error message, because it is not the cause
sql/handler.cc:
  If CREATE TABLE fails for an InnoDB table, do not put the OS error number to the error message, because it is not the cause
2001-09-10 17:36:42 +03:00
unknown
1c404ff9e3 ha_innobase.cc mean_rec_length was set to a too small value for > 4 GB tables because of a wrong typecast
sql/ha_innobase.cc:
  mean_rec_length was set to a too small value for > 4 GB tables because of a wrong typecast
2001-09-09 17:41:29 +03:00
unknown
354882c8ce Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2001-09-09 03:53:35 +03:00
unknown
851bea0e88 Fix bugs when using LOCK TABLES with BDB tables
Optimized remove of key when using internal cursor in BDB tables.


mysql-test/r/bdb.result:
  Test for LOCK bug
mysql-test/t/bdb.test:
  Test for LOCK bug
sql/ha_berkeley.cc:
  Fix bugs when using LOCK TABLES
  Optimized remove of key when using internal cursor
sql/ha_berkeley.h:
  Initilize of changed_rows
sql/lock.cc:
  Fix for BDB tables
2001-09-08 20:45:53 +03:00
unknown
8e9c21de2b More debug info
Fix DBUG_ASSERT()
Optimization for BDB tables
Fix for BDB under Win98


Docs/manual.texi:
  Removed wrong info
bdb/os_win32/os_rename.c:
  Fix for windows 98
configure.in:
  Better options for MAC OS X
include/dbug.h:
  Fix DBUG_ASSERT()
mysys/thr_lock.c:
  More DBUG messages
sql/ha_berkeley.cc:
  Use cursor in remove_key
sql/lock.cc:
  Fix possible problem when pre-unlocking tables in SELECT
sql/sql_select.cc:
  More DBUG messages
sql/violite.c:
  Fix DBUG messages
2001-09-08 11:47:34 +03:00
unknown
66cc095efb merge
sql/mysqld.cc:
  Auto merged
2001-09-08 03:53:04 +03:00
unknown
0ce7e16ef3 Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql
Docs/manual.texi:
  Auto merged
2001-09-08 01:04:18 +03:00
unknown
0edad3cb96 Fix for LOCK TABLES and BDB tables
Docs/manual.texi:
  Added more information to MySQL comparison
2001-09-08 01:02:41 +03:00
unknown
a41b148e47 Unlock tables on BEGIN
sql-bench/test-create.sh:
  Made --small-test a bit faster
sql/ha_innobase.cc:
  Cleanup memory at exit
sql/mysqld.cc:
  Remove debug notes at shutdown
2001-09-08 01:01:10 +03:00
unknown
fd6fea462f Cleanups
configure.in:
  Only allow --with-pstack on Linux x86
mysql-test/t/merge.test:
  Add test of using db.tablename in UNION()
mysys/mf_qsort.c:
  Fix when using purify
mysys/my_dup.c:
  Cleanup
mysys/raid.cc:
  Cleanup
sql/gen_lex_hash.cc:
  Smaller array
sql/ha_innobase.cc:
  Remove warnings
sql/mysqld.cc:
  Remove not used option from --help
sql/sql_class.h:
  Cleanup
2001-09-07 22:38:45 +03:00
unknown
222a0254c6 Add latin1_de character set, and make it the default.
sql/share/charsets/Index:
  Add latin1_de character set.
2001-09-06 17:18:36 -04:00
unknown
44e61cdad7 Fixed a problem using LOCK TABLES and BDB tables
Docs/manual.texi:
  Added description of C thread functions
sql-bench/test-create.sh:
  Faster --fast option
2001-09-06 23:57:32 +03:00
unknown
d77f9f3642 handler.cc Change the parameter name of default-table-type from INNOBASE to INNODB
sql/handler.cc:
  Change the parameter name of default-table-type from INNOBASE to INNODB
2001-09-06 16:48:32 +03:00
unknown
515f7ceab1 Don't modify innobase_data_file_path
Docs/manual.texi:
  cleanup
mysql-test/mysql-test-run.sh:
  Move traces to 'log' with other log files
2001-09-06 15:15:38 +03:00
unknown
07a887b383 Portability fixes
libmysql/libmysql.c:
  Remove duplicated define
sql/log_event.cc:
  Portability fix
2001-09-06 01:23:01 +02:00
unknown
7565ba73bc Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql
include/my_pthread.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-09-04 16:21:53 +03:00
unknown
f736e3e1d2 Portability fix 2001-09-04 16:17:31 +03:00
unknown
54e33e272d Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
client/mysqldump.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2001-09-04 01:04:32 +02:00
unknown
8efe675def Ensure that libmysqlclient doesn't use raid
Fix problem with MyISAM and rows of length 65517-65520


Docs/manual.texi:
  Changelog
include/raid.h:
  Ensure that libmysqlclient doesn't use raid
libmysql/Makefile.am:
  Ensure that libmysqlclient doesn't use raid
libmysql_r/Makefile.am:
  Ensure that libmysqlclient doesn't use raid
myisam/mi_check.c:
  Fix problem with rows of length 65517-65520
myisam/mi_dynrec.c:
  Fix problem with rows of length 65517-65520
mysql-test/r/myisam.result:
  Test for myisam tables with problematic row lengths
mysql-test/t/myisam.test:
  Test for myisam tables with problematic row lengths
sql/log_event.cc:
  Portability fix
strings/ctype-euc_kr.c:
  Portability fix
strings/ctype-sjis.c:
  Portability fix
2001-09-04 01:25:34 +03:00
unknown
5160501770 Update of manual with 4.0 changes
Create innodb table space if configuring with InnoDB and not using --skip-innodb
Fixes for TRUNCATE TABLE and DROP DATABASE.


Docs/manual.texi:
  Update of manual with 4.0 changes.
mysql-test/mysql-test-run.sh:
  Fixed option --mysqld
mysql-test/r/innodb.result:
  More test cases
mysql-test/r/truncate.result:
  More test cases
mysql-test/t/drop.test:
  More test cases
mysql-test/t/innodb.test:
  More test cases
mysql-test/t/truncate.test:
  More test cases
sql/gen_lex_hash.cc:
  Smaller array
sql/ha_innobase.cc:
  Create innodb table space if not using --skip-innodb
sql/lock.cc:
  Fixed wrong mutex handling in global read lock.
sql/md5.c:
  Fixed bug from merge
sql/sql_base.cc:
  cleanup
sql/sql_db.cc:
  Use new global lock functions.
  Fixed new bug that database wasn't always dropped.
sql/sql_delete.cc:
  Fixed problem with mysql_truncate() when called from restore_table
sql/sql_parse.cc:
  Fixed error message handling.
sql/sql_table.cc:
  cleanup
2001-09-03 05:16:15 +03:00
unknown
e6088385c5 Fix test that all merge tables comes from same database 2001-09-03 04:48:07 +03:00
unknown
3719b87396 merge
configure.in:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2001-09-02 19:58:08 +03:00
unknown
ddee00a6ed merge with 3.23.42
config.guess:
  Auto merged
config.sub:
  Auto merged
ltconfig:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
include/errmsg.h:
  Auto merged
include/global.h:
  Auto merged
include/heap.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/isamlog.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
merge/open.c:
  Auto merged
myisam/ft_search.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_test_all.sh:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
myisam/sort.c:
  Auto merged
myisammrg/myrg_open.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_casecnv.c:
  Auto merged
mysys/mf_format.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/tree.c:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/err000001.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/overflow.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype.c:
  Auto merged
Docs/manual.texi:
  Change to 3.23 manual.
  (I will later add the changes for 4.0 to this copy)
client/mysql.cc:
  merge
client/mysqlbinlog.cc:
  merge
client/mysqldump.c:
  merge
client/mysqltest.c:
  merge
client/thread_test.c:
  merge
configure.in:
  merge
include/my_pthread.h:
  merge
include/mysqld_error.h:
  merge
libmysql/net.c:
  merge
myisam/mi_cache.c:
  merge
myisam/mi_check.c:
  merge
mysql-test/t/fulltext.test:
  merge
mysys/mf_qsort.c:
  merge
sql/lock.cc:
  merge
sql/md5.c:
  merge
sql/mini_client.cc:
  merge
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/sql_load.cc:
  merge
sql/sql_repl.cc:
  merge
2001-09-02 18:38:33 +02:00
unknown
992e7da03a Added testing of IN(value-list)
Portability fixes


Build-tools/Do-compile:
  Fix for Linux ia64
sql-bench/bench-init.pl.sh:
  Added help function time_fetch_all_rows
sql-bench/test-insert.sh:
  Added testing of IN(value-list)
sql/item_func.cc:
  Cleanup
sql/mysqld.cc:
  Portability fix
sql/stacktrace.c:
  Portability fix
2001-09-02 16:03:37 +03:00
unknown
fa7b17e904 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_yacc.yy:
  Auto merged
2001-09-02 13:47:27 +03:00
unknown
b67d11e17c Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
Fix that DROP DATABASE works with all table types
Use BULK_INSERT when inserting more than one row
Better TRUNCATE TABLE


BitKeeper/deleted/.del-compilation_finished.au.gz~70bd14095a918139:
  Delete: sounds/compilation_finished.au.gz
BUILD/FINISH.sh:
  Removed 'finished' sound as this isn't a general solution.
Docs/manual.texi:
  Added upgrading from 3.23
configure.in:
  Fixed version number
sql/ha_innobase.cc:
  Default creation of InnoDB tables.
sql/ha_myisam.cc:
  Disable BULK_INSERT of using safe mode
sql/handler.cc:
  Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
sql/handler.h:
  Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
sql/lock.cc:
  Added lock_and_wait_for_table_name
sql/mysql_priv.h:
  Better TRUNCATE TABLE
sql/sql_db.cc:
  Fix that DROP DATABASE works with all table types
sql/sql_delete.cc:
  Better TRUNCATE TABLE
sql/sql_insert.cc:
  Use BULK_INSERT when inserting more than one row
sql/sql_load.cc:
  Small bug fix.
sql/sql_parse.cc:
  Better TRUNCATE TABLE
sql/sql_select.cc:
  Change INNOBASE -> INNODB
sql/sql_table.cc:
  Better TRUNCATE TABLE
sql/sql_yacc.yy:
  INNOBASE -> INNODB
sql/thr_malloc.cc:
  Fix for replication
2001-09-02 13:47:00 +03:00
unknown
3c951b6d99 Fixed compilation problems when HAVE_OPENSSL is not defined 2001-09-01 23:29:58 +08:00
unknown
39fdbbbb81 SSL parser change 2001-09-01 16:29:37 +08:00
unknown
62c3fe9b4b Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
sql/item_func.cc:
  Auto merged
2001-09-01 10:43:52 +03:00
unknown
9591abbd39 Make killing of threads safer
Docs/manual.texi:
  Changelog
sql/sql_insert.cc:
  Fix problem with INSERT DELAYED during shutdown
2001-09-01 10:38:16 +03:00
unknown
8c03a589db Yet another SSL fixes
mysql-test/t/openssl_1.test:
  SSL fix
mysql-test/t/openssl_2.test:
  SSL fix
sql/mysqld.cc:
  C
2001-09-01 06:57:08 +08:00
unknown
bf10717a71 OpenSSL fixes
SSL/NOTES:
  Comments added
2001-09-01 06:30:05 +08:00
unknown
09c35c6963 replicated get_lock() properly
sql/item_func.cc:
  log all lock releases to binary log for safe handling of get_lock()
  in updates
2001-08-31 15:55:58 -06:00
unknown
5fb52a1901 SSL fixes 2001-09-01 05:18:01 +08:00
unknown
4295917682 Fixed problem with INSERT DELAYED
Make killing threads safer


Docs/manual.texi:
  Portability fix
mysys/thr_lock.c:
  Fixed problem with INSERT DELAYED
sql/mysqld.cc:
  Make shutdown safer
sql/sql_class.cc:
  Make kill thread safer
sql/sql_insert.cc:
  Make kill thread safer
2001-08-31 23:02:09 +03:00
unknown
e19a292c56 ha_innobase.cc Add better error message if innodb_data_file_path is not set
ha_innobase.h	Remove HA_NOT_READ_AFTER_KEY from table han
ha_innobase.h	dler flags: it prevented the use of an index in MAX()


sql/ha_innobase.h:
  Remove HA_NOT_READ_AFTER_KEY from table han
  dler flags: it prevented the use of an index in MAX()
sql/ha_innobase.cc:
  Add better error message if innodb_data_file_path is not set
2001-08-31 16:50:57 +03:00
unknown
7a59325991 SSL stuff fix
sql/sql_acl.cc:
  SSL stuff
2001-08-31 18:30:49 +08:00
unknown
421e64ae35 ix compilition for computer in a previous timezone
Build-tools/Do-compile:
  Fix compilition for computer in a previous timezone
sql/net_serv.cc:
  Added comment
sql/sql_parse.cc:
  Cleanup
2001-08-31 10:30:38 +03:00
unknown
83c86c854a Portability fixes
Docs/manual.texi:
  Changelog
client/mysqlbinlog.cc:
  Portability fix
myisam/ft_test1.c:
  Portability fix
sql/log_event.cc:
  Portability fix
2001-08-30 21:16:39 +03:00
unknown
18cd5fe5e0 Increase version number
sql/ha_myisam.cc:
  Added comments
2001-08-30 20:38:46 +03:00
unknown
7d6644ad6f fixed coredump, and changed mngd->manager
sql/sql_acl.cc:
  fixed coredump when running without SSL
tools/Makefile.am:
  mysqlmngd -> mysqlmanager
tools/mysqlmanager.c:
  mngd->manager
BitKeeper/etc/ignore:
  Added tools/mysqlmanager to the ignore list
2001-08-29 16:52:50 -06:00
unknown
9a4aac7e23 Fix for OS2
Docs/manual.texi:
  Cleanup
2001-08-30 01:22:02 +03:00
unknown
6b6483ef6f OpenSSL work
readline/callback.c:
  warning removed
sql/mysqld.cc:
  Warning removed abut freeing zero pointer
2001-08-30 04:28:55 +08:00
unknown
a221315fa9 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-08-29 22:25:06 +03:00