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

19274 Commits

Author SHA1 Message Date
unknown
51076279af Merge
Docs/manual.texi:
  SCCS merged
2002-03-22 06:58:07 +02:00
unknown
a333c33f7e Fix for load data infile when no active database
Fix for Solaris and gethostbyname_r


Docs/manual.texi:
  Changelog
client/mysql.cc:
  Cleanup
configure.in:
  Fix for Solaris and gethostbyname_r
sql/log_event.h:
  Fix for load data infile when no active database
sql/sql_load.cc:
  Fix for load data infile when no active database
2002-03-22 01:03:34 +02:00
unknown
c0a5e47071 Quote names to SHOW CREATE for mysqldump
Fix thread-related bug when doing DROP TABLE
Fix bug in RENAME TABLE on windows


Docs/manual.texi:
  Changelog
client/mysqldump.c:
  Quote names to SHOW CREATE
mysql-test/t/range.test:
  Test case for range bug
sql/lock.cc:
  Fix thread-related bug when doing DROP TABLE
sql/sql_base.cc:
  Fix thread-related bug when doing DROP TABLE
sql/sql_rename.cc:
  Fix bug in RENAME TABLE on windows
2002-03-21 23:06:48 +02:00
unknown
6ecd34e6ab merged
sql/sql_yacc.yy:
  Auto merged
2002-03-21 18:18:53 +00:00
unknown
a1e774d277 ha_innodb.cc:
Change the default innodb_data_file_path to create a 16M file and define it as auto-extending


sql/ha_innodb.cc:
  Change the default innodb_data_file_path to create a 16M file and define it as auto-extending
2002-03-21 19:52:13 +02:00
unknown
b7ee7877e7 commit to pull 2002-03-21 17:32:37 +00:00
unknown
b83d55d9c5 sql_show.cc, handler.h, handler.cc:
Add foreign key defs to SHOW CREATE TABLE


sql/handler.cc:
  Add foreign key defs to SHOW CREATE TABLE
sql/handler.h:
  Add foreign key defs to SHOW CREATE TABLE
sql/sql_show.cc:
  Add foreign key defs to SHOW CREATE TABLE
2002-03-21 18:05:46 +02:00
unknown
d3c0752b6a Many files:
Merge InnoDB-3.23.50


innobase/btr/btr0btr.c:
  Merge InnoDB-3.23.50
innobase/btr/btr0cur.c:
  Merge InnoDB-3.23.50
innobase/btr/btr0sea.c:
  Merge InnoDB-3.23.50
innobase/buf/buf0buf.c:
  Merge InnoDB-3.23.50
innobase/buf/buf0flu.c:
  Merge InnoDB-3.23.50
innobase/dict/dict0dict.c:
  Merge InnoDB-3.23.50
innobase/dict/dict0load.c:
  Merge InnoDB-3.23.50
innobase/fil/fil0fil.c:
  Merge InnoDB-3.23.50
innobase/fsp/fsp0fsp.c:
  Merge InnoDB-3.23.50
innobase/include/buf0flu.h:
  Merge InnoDB-3.23.50
innobase/include/dict0dict.h:
  Merge InnoDB-3.23.50
innobase/include/fil0fil.h:
  Merge InnoDB-3.23.50
innobase/include/fsp0fsp.h:
  Merge InnoDB-3.23.50
innobase/include/log0log.h:
  Merge InnoDB-3.23.50
innobase/include/log0recv.h:
  Merge InnoDB-3.23.50
innobase/include/mem0mem.h:
  Merge InnoDB-3.23.50
innobase/include/os0file.h:
  Merge InnoDB-3.23.50
innobase/include/row0mysql.h:
  Merge InnoDB-3.23.50
innobase/include/srv0srv.h:
  Merge InnoDB-3.23.50
innobase/include/srv0start.h:
  Merge InnoDB-3.23.50
innobase/include/trx0sys.h:
  Merge InnoDB-3.23.50
innobase/include/ut0byte.h:
  Merge InnoDB-3.23.50
innobase/include/ut0rnd.h:
  Merge InnoDB-3.23.50
innobase/include/ut0ut.h:
  Merge InnoDB-3.23.50
innobase/log/log0log.c:
  Merge InnoDB-3.23.50
innobase/log/log0recv.c:
  Merge InnoDB-3.23.50
innobase/mem/mem0mem.c:
  Merge InnoDB-3.23.50
innobase/os/os0file.c:
  Merge InnoDB-3.23.50
innobase/rem/rem0cmp.c:
  Merge InnoDB-3.23.50
innobase/row/row0ins.c:
  Merge InnoDB-3.23.50
innobase/row/row0mysql.c:
  Merge InnoDB-3.23.50
innobase/row/row0sel.c:
  Merge InnoDB-3.23.50
innobase/row/row0upd.c:
  Merge InnoDB-3.23.50
innobase/srv/srv0srv.c:
  Merge InnoDB-3.23.50
innobase/srv/srv0start.c:
  Merge InnoDB-3.23.50
innobase/trx/trx0sys.c:
  Merge InnoDB-3.23.50
innobase/ut/ut0mem.c:
  Merge InnoDB-3.23.50
innobase/ut/ut0ut.c:
  Merge InnoDB-3.23.50
sql/ha_innobase.cc:
  Merge InnoDB-3.23.50
sql/ha_innobase.h:
  Merge InnoDB-3.23.50
2002-03-21 18:03:09 +02:00
unknown
9f09ae660b Added new method to set string's charset
sql/item_cmpfunc.cc:
  Fix for IN, when String->charset is empty
2002-03-20 20:52:23 +04:00
unknown
bbde41e9f7 Fix for crash in the case of non-string fields 2002-03-20 17:33:10 +04:00
unknown
1fd84d3477 Configure.in/Makefile.in charset related things are now earier to maintain
Fixes in charset related C++ code


configure.in:
  Make things to be easier managable
include/m_ctype.h:
  Hide some functions under conditional compilation
libmysql/Makefile.shared:
  Make things to be easier managable
sql/item_func.cc:
  Fixed that private member is not available in this context
sql/item_strfunc.cc:
  Fixed that private member is not available in this context
strings/Makefile.am:
  Make charset things to be easier managable
  Some fixes in charset C++ code
strings/ctype-big5.c:
  Hide some functions under conditional compilation
strings/ctype-czech.c:
  Hide some functions under conditional compilation
strings/ctype-euc_kr.c:
  Hide some functions under conditional compilation
strings/ctype-gb2312.c:
  Hide some functions under conditional compilation
strings/ctype-gbk.c:
  Hide some functions under conditional compilation
strings/ctype-latin1_de.c:
  Hide some functions under conditional compilation
strings/ctype-mb.c:
  Hide some functions under conditional compilation
strings/ctype-sjis.c:
  Hide some functions under conditional compilation
strings/ctype-tis620.c:
  Hide some functions under conditional compilation
strings/ctype-ujis.c:
  Hide some functions under conditional compilation
2002-03-19 20:03:10 +04:00
unknown
af87d92aa2 Some changes from 4.0.
Take a look their for details
2002-03-19 14:23:11 +02:00
unknown
7fc36355bc fix for the limit bug in UNION's and some additional syntax
checkings


mysql-test/r/union.result:
  fix for the limit bug in UNION's
mysql-test/t/union.test:
  fix for the limit bug in UNION's
sql/sql_union.cc:
  fix for the limit bug in UNION's
sql/sql_yacc.yy:
  Syntax checking for options that should appear in main select only.
2002-03-19 14:07:52 +02:00
unknown
e8cc84628b Merge sanja.is.com.ua:/home/bell/mysql/mysql-4
into sanja.is.com.ua:/home/bell/mysql/work.etalon


sql/sql_class.h:
  Auto merged
sql/table.h:
  Auto merged
2002-03-16 10:38:35 +02:00
unknown
5c6902a495 added some comments 2002-03-16 10:36:27 +02:00
unknown
9c435716a9 replication updates and bugfixes. Still not perfect - there is some strange
memory corruption I can only repeat on one system.


mysql-test/r/multi_update.result:
  extended test trying to find why the old one was failing
mysql-test/r/rpl000015.result:
  result update
mysql-test/t/multi_update.test:
  updated test to do more intermediate result checks
mysql-test/t/rpl000014.test:
  cosmetic change
mysql-test/t/rpl000015-slave-master-info.opt:
  reduce connect retry trying to simulate a bug
mysql-test/t/rpl000015.test:
  cosmetic change
sql/lex.h:
  added RELAY_LOG_FILE and RELAY_LOG_POS to CHANGE MASTER TO
sql/log.cc:
  fixed replication bug
sql/log_event.cc:
  properly ignore replication errors according to error mask
sql/mysqld.cc:
  handle SIGFPE in the coredump handler
sql/slave.cc:
  do not kick slave if it has already exited and freed the structures
sql/sql_lex.cc:
  fixed initialization bug in CHANGE MASTER TO
sql/sql_lex.h:
  CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
sql/sql_repl.cc:
  CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
sql/sql_yacc.yy:
  CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
2002-03-15 18:44:44 -07:00
unknown
dad9a12b3d Merge sanja.is.com.ua:/home/bell/mysql/mysql-4
into sanja.is.com.ua:/home/bell/mysql/work-qc


Docs/manual.texi:
  Auto merged
sql/handler.cc:
  Auto merged
sql/table.h:
  Auto merged
2002-03-15 23:59:51 +02:00
unknown
0510e98e11 processing trunsactional tables in query cache
mysql-test/r/innodb_cache.result:
  new test for query cache with transactions
mysql-test/t/innodb_cache.test:
  new test for query cache with transactions
sql/sql_cache.cc:
  processing trunsactional tables in query cache & removing strlen
sql/sql_class.cc:
  processing trunsactional tables in query cache & added transaction-live memory
sql/sql_class.h:
  processing trunsactional tables in query cache & added transaction-live memory
sql/sql_parse.cc:
  processing trunsactional tables in query cache & added transaction-live memory
sql/table.h:
  removing strlen operation from query cache
2002-03-15 23:57:31 +02:00
unknown
38e14c0371 Fixed problem with WHERE key=const ORDER BY key DESC
Docs/manual.texi:
  Changelog
myisam/ft_boolean_search.c:
  Portability fix
sql/ha_myisam.cc:
  Cleanup
sql/sql_union.cc:
  cleanup
2002-03-15 21:30:50 +02:00
unknown
b509821d51 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-03-15 18:15:42 +02:00
unknown
7070f6ef7a Do chroot() after changing user. 2002-03-15 18:15:41 +02:00
unknown
8e1ab145b3 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-03-15 14:21:43 +02:00
unknown
53bd33c676 making full-text working with UNION's 2002-03-15 14:21:06 +02:00
unknown
3b2e1fd276 Making full-text queries working with UNION's 2002-03-15 14:11:11 +02:00
unknown
1b7471a431 remove default_charset_info
sql/field.h:
  New function to get charset
2002-03-14 23:03:15 +04:00
unknown
8959b690fe Hash now supports several charsets 2002-03-14 21:44:42 +04:00
unknown
ee1ef8c58c use String->charset instead of default_charset_info
client/mysql.cc:
  default_charset_info -> system_charset_info
include/m_ctype.h:
  Remove old ctype
mysys/charset.c:
  Initialize fields after dynamic charset loading
sql/sql_parse.cc:
  default_charset_info -> system_charset_info
2002-03-14 20:52:48 +04:00
unknown
226169b10b merged
sql/ha_myisam.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-03-13 17:27:45 +00:00
unknown
d556096f73 mi_check flags cleanup
CHECK/REPAIR syntax cleanup
REPAIR ... USE_FRM syntax


include/myisam.h:
  mi_check flags cleanup
myisam/mi_check.c:
  mi_check flags cleanup
myisam/myisamchk.c:
  mi_check flags cleanup
mysql-test/r/check.result:
  CHECK/REPAIR syntax cleanup
mysql-test/r/show_check.result:
  CHECK/REPAIR syntax cleanup
mysql-test/t/check.test:
  CHECK/REPAIR syntax cleanup
mysql-test/t/show_check.test:
  CHECK/REPAIR syntax cleanup
sql/ha_myisam.cc:
  mi_check flags cleanup
sql/handler.h:
  mi_check flags cleanup
sql/lex.h:
  REPAIR ... USE_FRM syntax
sql/slave.cc:
  mi_check flags cleanup
2002-03-13 17:20:17 +00:00
unknown
68375e0f00 New ctype functions/macros to support many charsets at a time
client/mysql.cc:
  new ctypes
client/mysqldump.c:
  new ctypes
client/mysqltest.c:
  new ctypes
client/sql_string.cc:
  new ctypes
client/sql_string.h:
  new ctypes
extra/mysql_install.c:
  new ctypes
extra/replace.c:
  new ctypes
extra/resolve_stack_dump.c:
  new ctypes
extra/resolveip.c:
  new ctypes
heap/hp_hash.c:
  new ctypes
include/m_ctype.h:
  new ctypes
include/my_sys.h:
  new ctypes
isam/_key.c:
  new ctypes
isam/_search.c:
  new ctypes
libmysql/Makefile.shared:
  new ctypes
libmysql/libmysql.c:
  new ctypes
myisam/ft_dump.c:
  new ctypes
myisam/ft_parser.c:
  new ctypes
myisam/mi_test1.c:
  new ctypes
mysys/charset.c:
  new ctypes
mysys/default.c:
  new ctypes
mysys/getvar.c:
  new ctypes
mysys/hash.c:
  new ctypes
mysys/mf_casecnv.c:
  new ctypes
mysys/mf_dirname.c:
  new ctypes
mysys/mf_format.c:
  new ctypes
mysys/mf_iocache2.c:
  new ctypes
mysys/mf_soundex.c:
  new ctypes
mysys/mf_wfile.c:
  new ctypes
mysys/my_error.c:
  new ctypes
mysys/my_getwd.c:
  new ctypes
mysys/my_init.c:
  new ctypes
mysys/my_vsnprintf.c:
  new ctypes
mysys/typelib.c:
  new ctypes
sql/convert.cc:
  new ctypes
sql/des_key_file.cc:
  new ctypes
sql/field.cc:
  new ctypes
sql/field.h:
  new ctypes
sql/field_conv.cc:
  new ctypes
sql/filesort.cc:
  new ctypes
sql/ha_innodb.cc:
  new ctypes
sql/hostname.cc:
  new ctypes
sql/init.cc:
  new ctypes
sql/item.cc:
  new ctypes
sql/item_func.cc:
  new ctypes
sql/item_strfunc.cc:
  new ctypes
sql/item_sum.cc:
  new ctypes
sql/item_timefunc.cc:
  new ctypes
sql/key.cc:
  new ctypes
sql/log.cc:
  new ctypes
sql/mysql_priv.h:
  new ctypes
sql/mysqld.cc:
  new ctypes
sql/opt_range.cc:
  new ctypes
sql/procedure.cc:
  new ctypes
sql/slave.cc:
  new ctypes
sql/sql_acl.cc:
  new ctypes
sql/sql_analyse.cc:
  new ctypes
sql/sql_base.cc:
  new ctypes
sql/sql_cache.cc:
  new ctypes
sql/sql_db.cc:
  new ctypes
sql/sql_handler.cc:
  new ctypes
sql/sql_lex.cc:
  new ctypes
sql/sql_parse.cc:
  new ctypes
sql/sql_show.cc:
  new ctypes
sql/sql_string.cc:
  new ctypes
sql/sql_string.h:
  new ctypes
sql/sql_table.cc:
  new ctypes
sql/sql_yacc.yy:
  new ctypes
sql/table.cc:
  new ctypes
sql/time.cc:
  new ctypes
strings/Makefile.am:
  new ctypes
strings/ctype-big5.c:
  new ctypes
strings/ctype-czech.c:
  new ctypes
strings/ctype-gbk.c:
  new ctypes
strings/ctype-latin1_de.c:
  new ctypes
strings/ctype-sjis.c:
  new ctypes
strings/ctype-tis620.c:
  new ctypes
strings/ctype.c:
  new ctypes
strings/str2int.c:
  new ctypes
strings/strto.c:
  new ctypes
tools/mysqlmanager.c:
  new ctypes
2002-03-12 21:37:58 +04:00
unknown
6288ebb699 merge
configure.in:
  Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
client/mysqlimport.c:
  Auto merged
sql/ha_isam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
2002-03-12 12:21:51 +02:00
unknown
6e37987c51 Fixed mysqldumpslow for new dump format.
Fix for HEAP tables with many rows deleted.
Add '' arround database names in SHOW GRANT


Docs/manual.texi:
  Fixed symlink examples.
heap/hp_rfirst.c:
  Remove not needed patch.
mysql-test/r/heap.result:
  Added test case for HEAP + many deletes
mysql-test/t/heap.test:
  Added test case for HEAP + many deletes
mysys/mf_loadpath.c:
  Resolve path's even if they don't end in '/'
scripts/mysqldumpslow.sh:
  Fix for new dump format.
sql/handler.cc:
  Fix for HEAP tables with many rows deleted.
sql/sql_acl.cc:
  Add '' arround database names in SHOW GRANT
2002-03-12 11:52:41 +02:00
unknown
4c221321b6 Added help for --local-infile
Fix for bug on intel where (int32) 1 << 32 == 1, which gave problems when using 32 keys.
Allow SET PASSWORD for anonymous user


Docs/manual.texi:
  Changelog
client/mysql.cc:
  Added help for --local-infile
client/mysqlimport.c:
  Merge with 4.0.
  Patch for LOCAL INFILE handling
configure.in:
  cleanup
include/global.h:
  Fix for bug on intel where (int32) 1 << 32 == 1
mysql-test/r/create.result:
  Test of CREATE TABLE with 32 keys
mysql-test/t/create.test:
  Test of CREATE TABLE with 32 keys
scripts/mysqlhotcopy.sh:
  Patch for databasenames with space.
sql/ha_isam.cc:
  Fix for bug on intel where (int32) 1 << 32 == 1
sql/ha_myisam.cc:
  Fix for bug on intel where (int32) 1 << 32 == 1
sql/ha_myisammrg.cc:
  Fix for bug on intel where (int32) 1 << 32 == 1
sql/mysqld.cc:
  Added help for --local-infile
sql/sql_acl.cc:
  Allow SET PASSWORD of anonymous user
sql/table.cc:
  Fix for bug on intel where (int32) 1 << 32 == 1
2002-03-12 11:38:22 +02:00
unknown
016a6cd385 Merge hundin:/my/mysql-4.0 into tik.mysql.fi:/home/my/mysql-4.0 2002-03-10 20:13:07 +02:00
unknown
b8a9ea66ba slave start <options> to be able to do
slave start io_thread 
 slave start sql_thread
same for stop


sql/lex.h:
  slave start <options>
sql/sql_lex.cc:
  slave start <options>
sql/sql_lex.h:
  slave start <options>
sql/sql_repl.cc:
  slave start <options>
sql/sql_yacc.yy:
  slave start <options>
2002-03-09 21:48:06 -07:00
unknown
84888547a2 Merge work:/my/mysql-4.0/ into tik.mysql.fi:/home/my/mysql-4.0
sql/mysqld.cc:
  Auto merged
2002-03-10 04:35:10 +02:00
unknown
2240cd2fdd Abort if listen() fails 2002-03-10 04:28:50 +02:00
unknown
594ba4a270 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-03-09 13:50:44 -07:00
unknown
ea86f4fe77 fixed replication bug
not yet tested - will not be pushed for a few hours - need to commit in 
order to pull


BUILD/compile-pentium-debug:
  link statically
sql/slave.cc:
  properly seek the position when recovering from a partial read
2002-03-09 13:50:07 -07:00
unknown
c10827ba04 Take a look at comments in 4.0 2002-03-09 14:21:34 +02:00
unknown
c214769fe2 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-03-09 14:08:49 +02:00
unknown
dd95434e7c A fix for the --with-libwrap for Linux.
I have tested it with tcpd wrapper and it worked on Linux.
I did not change setttings in hosts.deny, as I did not dare too.
2002-03-09 14:07:28 +02:00
unknown
5bdc999b3a fixed replication assert failure ( found by Jeremy Zawodny)
sql/slave.cc:
  fixed wrong invocation of safe_sleep()
2002-03-08 15:02:11 -07:00
unknown
e92c075475 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0


include/my_sys.h:
  Auto merged
2002-03-08 09:33:15 -07:00
unknown
4873f9ab2f DBUG_ASSERT_LOCK
include/my_sys.h:
  added DBUG_ASSERT_LOCK()
sql/slave.cc:
  use DBUG_ASSERT_LOCK()
2002-03-08 09:26:56 -07:00
unknown
bb22c94698 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
2002-03-07 14:20:07 +02:00
unknown
6265e94c35 Same patches as for 4.0. See there for details 2002-03-07 14:19:18 +02:00
unknown
18a68a6208 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_yacc.yy:
  Auto merged
2002-03-07 14:01:18 +02:00
unknown
0d50a93fb7 better fix for a bug fix from yesterday 2002-03-07 13:57:52 +02:00
unknown
220eeadc3d Extend String class with CHARSET_INFO field 2002-03-07 15:23:24 +04:00