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
c7e72e8d55 Fix to use Monty's changes in frm format
Enable latin1 by default


configure.in:
  Always compile latin1
sql/ha_myisam.cc:
  Fix for "SHOW KEYS FROM table" and various key types
sql/sql_show.cc:
  Fix to use Monty's changes in frm format
sql/sql_table.cc:
  Fix to use Monty's changes in frm format
sql/structs.h:
  Fix to use Monty's changes in frm format
sql/table.cc:
  Fix to use Monty's changes in frm format
2002-04-18 14:08:38 +05:00
unknown
e8b6c9646e Fix for AsText() spatial function
sql/item_strfunc.cc:
  Fix for the case when argument args[0] and result str are the same strings
2002-04-18 11:53:59 +05:00
unknown
c995b39757 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-04-17 16:15:46 +03:00
unknown
03e5b55fab Fixed typo
Removed some files from the bitkeeper delete tree.
(To fix problem with duplicate filenames on MacOS X)


BitKeeper/deleted/.del-ha_hash.h~27e36916116beb3e:
  Delete: sql/ha_hash.h
Docs/manual.texi:
  Fixed typo
2002-04-17 16:06:19 +03:00
unknown
08665a17e0 New win1250ch charset 2002-04-17 14:16:26 +05:00
unknown
7c8525dfba Abort if 'listen()' on TCP/IP fails. 2002-04-17 11:45:26 +03:00
unknown
667da1396b Fixed pthread_cond_timedwait() for HPUX and DCE threads
Cleanup of LIBWRAP handling


Docs/manual.texi:
  Changelog
include/my_pthread.h:
  Fixed pthread_cond_timedwait() for HPUX and DCE threads
mysys/my_pthread.c:
  Fixed pthread_cond_timedwait() for HPUX and DCE threads
sql/item_func.cc:
  Fixed the GET_LOCK() works with HPUX and DCE threads
sql/mysqld.cc:
  Cleanup of LIBWRAP handling
sql/sql_parse.cc:
  Safety fix
2002-04-16 16:29:14 +03:00
unknown
32ac1ef044 Some fixes after merging changes from 4.0
include/hash.h:
  Monty forgot to add H in left part of macros
mysys/hash.c:
  I wonder how it happened that my_bool disappeared
sql/sql_acl.cc:
  Somebody forgot )
sql/sql_class.h:
  I wonder how it happened that this line disappeared
sql/sql_table.cc:
  small typo
sql/sql_yacc.yy:
  Having ; is more compatible
2002-04-16 18:21:53 +05:00
unknown
668ddf17e4 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0


sql/mysqld.cc:
  Auto merged
2002-04-15 17:12:02 -06:00
unknown
74fccd1801 reckless slave option
bison 1.34 yacc rule compliance
more robust handling of relay log corruption


mysql-test/r/rpl000014.result:
  updated result
mysql-test/r/rpl_log.result:
  updated result
sql/mysqld.cc:
  reckless slave option
sql/slave.cc:
  reckless slave + more robust handling of relay log corruption
sql/slave.h:
  reckless slave
sql/sql_yacc.yy:
  brought the rules into compliance with bison 1.34 by adding ';' at the end of each rule
2002-04-15 17:09:30 -06:00
unknown
02ebecfc23 query cache code can be excluded from server
sql/mysqld.cc:
  fake query_cache_size parameter if query cache code excluded from server
2002-04-15 16:00:05 +03:00
unknown
fdc446d0c6 merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-pentium-debug:
  Auto merged
acconfig.h:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
heap/hp_rfirst.c:
  Auto merged
heap/hp_rnext.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/my_vsnprintf.c:
  Auto merged
sql/convert.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
strings/Makefile.am:
  Auto merged
2002-04-13 15:34:39 +03:00
unknown
b421cc8757 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/home/Sinisa/mysql/mysql
2002-04-13 13:45:23 +03:00
unknown
ca1b6de3c9 libwrap bug fix for Linux only
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-04-13 13:44:08 +03:00
unknown
caf41c9e43 merge
client/mysql.cc:
  Auto merged
2002-04-12 21:53:41 +03:00
unknown
6326ec9944 Update for BTREE keys in HEAP tables
Split handler->option_flag() to handler->table_flags() and handler->index_flags()


Docs/manual.texi:
  Updated standard binary options
include/my_base.h:
  Update for BTREE keys in HEAP tables
libmysql/net.c:
  merge with net_serv.cc
mysql-test/r/func_misc.result:
  Update for new behaviour of inet_ntoa
sql/field.cc:
  Update for BTREE keys in HEAP tables
sql/field.h:
  Update for BTREE keys in HEAP tables
sql/filesort.cc:
  Update for BTREE keys in HEAP tables
sql/ha_berkeley.h:
  Update for BTREE keys in HEAP tables
sql/ha_heap.h:
  Update for BTREE keys in HEAP tables
sql/ha_innodb.h:
  Update for BTREE keys in HEAP tables
sql/ha_isam.cc:
  Update for BTREE keys in HEAP tables
sql/ha_isam.h:
  Update for BTREE keys in HEAP tables
sql/ha_isammrg.h:
  Update for BTREE keys in HEAP tables
sql/ha_myisam.cc:
  Update for BTREE keys in HEAP tables
sql/ha_myisam.h:
  Update for BTREE keys in HEAP tables
sql/ha_myisammrg.h:
  Update for BTREE keys in HEAP tables
sql/handler.cc:
  Update for BTREE keys in HEAP tables
sql/handler.h:
  Update for BTREE keys in HEAP tables
sql/log.cc:
  Update for BTREE keys in HEAP tables
sql/net_serv.cc:
  Update for BTREE keys in HEAP tables
sql/opt_range.cc:
  Update for BTREE keys in HEAP tables
sql/opt_sum.cc:
  Update for BTREE keys in HEAP tables
sql/records.cc:
  Update for BTREE keys in HEAP tables
sql/sql_class.h:
  Update for BTREE keys in HEAP tables
sql/sql_handler.cc:
  Update for BTREE keys in HEAP tables
sql/sql_insert.cc:
  Update for BTREE keys in HEAP tables
sql/sql_select.cc:
  Update for BTREE keys in HEAP tables
sql/sql_show.cc:
  Update for BTREE keys in HEAP tables
sql/sql_table.cc:
  Update for BTREE keys in HEAP tables
sql/structs.h:
  Update for BTREE keys in HEAP tables
sql/table.cc:
  Update for BTREE keys in HEAP tables
sql/unireg.cc:
  Update for BTREE keys in HEAP tables
2002-04-12 21:35:46 +03:00
unknown
b0bd0c047d Adding some things according to Monty's correct observations 2002-04-12 16:01:09 +03:00
unknown
4fadbd9ce7 errmsg.txt:
Translated new error message to Dutch.


sql/share/dutch/errmsg.txt:
  Translated new error message to Dutch.
2002-04-11 14:27:41 +10:00
unknown
fc79f8e68a fixed bug in truncating temp tables
fixed compilation problem on FreeBSD
added test for truncating temporary tables


mysql-test/r/truncate.result:
  truncate test
mysql-test/t/truncate.test:
  truncate test update
mysys/safemalloc.c:
  fixed FreeBSD compilation problem
sql/sql_delete.cc:
  fixed bug in truncating temporary tables
2002-04-08 18:20:24 -06:00
unknown
40a2774087 Fix for INET_NTOA(N) when N >= 2^32
Docs/manual.texi:
  SCO updates
client/mysql.cc:
  Don't die on SIGQUIT
2002-04-06 18:47:54 +03:00
unknown
a28f2ca67d safemalloc cleanup. Maybe it will now compile on FreeBSD. I still not have
access to a FreeBSD box, though.


mysys/my_static.h:
  cleanup
mysys/safemalloc.c:
  cleanup
sql/mysqld.cc:
  initialize some safemalloc variables in main()
2002-04-05 23:07:25 -07:00
unknown
36701f1840 fix for SQL_CALC_FOUND_ROWS in UNION's 2002-04-03 17:52:31 +03:00
unknown
576530f771 Merged some sslopt-* include files, that will be removed in the near
future, in mysqld.cc.


sql/mysqld.cc:
  Added support for SSL. This is just temporary solution
  and will be fixed to use my_getopt, when mysqld.cc is changed.
2002-04-03 16:09:02 +03:00
unknown
38cd4fdeb2 Merged in some changes made to MySQL clients by other
developers before pushing my_getopt.


client/mysqladmin.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/client_priv.h:
  Merged in previous changes for new client_priv.h (my_getopt)
2002-04-03 13:33:25 +03:00
unknown
a2e75474b5 Changed mysql, mysqladmin, mysqlshow, mysqldump, mysqlimport,
mysqlcheck and myisamchk to use new my_getopt struct.


client/client_priv.h:
  Changes for my_getopt
client/mysql.cc:
  Uses new my_getopt
client/mysqladmin.c:
  Uses new my_getopt
client/mysqlcheck.c:
  Uses new my_getopt
client/mysqldump.c:
  Uses new my_getopt
client/mysqlimport.c:
  Uses new my_getopt
client/mysqlshow.c:
  Uses new my_getopt
include/my_getopt.h:
  Added GET_BOOL type
include/sslopt-case.h:
  This is shouldn't be needed anymore.
include/sslopt-longopts.h:
  Uses new my_getopt
myisam/myisamchk.c:
  Uses new my_getopt
mysys/my_getopt.c:
  Some bug fixes and small feature adds to my_getopt
sql/mysqld.cc:
  mysqld.cc will be changed next. sslopt-* had to be removed
  temporarily.
2002-04-02 20:29:53 +03:00
unknown
4bd34624b9 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-04-02 20:13:20 +03:00
unknown
95ac82521c Fix for a bug with EXPLAIN and (....) UNION (....) order by 2002-04-02 20:08:55 +03:00
unknown
6a5c6b171f Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
2002-04-02 19:52:58 +03:00
unknown
5560713590 Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
readline/Makefile.am:
  Auto merged
sql/convert.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
2002-04-02 19:46:26 +03:00
unknown
5ae86dca42 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-04-02 18:01:14 +03:00
unknown
d2771b82a4 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-04-02 14:59:40 +00:00
unknown
8bf63614de fts+const_tables bug fixed 2002-04-02 14:56:40 +00:00
unknown
c95270b8c4 Cleanups
Don't use DBUG library for struct st_my_thread_var to make code less complicated.


Docs/manual.texi:
  Cleanup
acinclude.m4:
  Search after openssl in /usr/local
client/mysql.cc:
  Fix prompt
client/mysqladmin.c:
  Cleanup
client/mysqltest.c:
  Cleanup
include/my_pthread.h:
  Move thread variables to the right location
include/my_sys.h:
  Move thread variables to the right location
include/mysql.h:
  Clean up client prototypes
libmysql/libmysql.c:
  Clean up client prototypes
mysys/my_static.h:
  Cleanup
mysys/my_thr_init.c:
  Don't use DBUG library for struct st_my_thread_var to make code less complicated
sql/item_cmpfunc.cc:
  Small optimization
sql/net_pkg.cc:
  Cleanup
sql/sql_parse.cc:
  Allow VARCHAR(0)
2002-04-02 17:54:57 +03:00
unknown
389e946182 Fixed help typos in mysql.cc
client/mysql.cc:
  Fixed typos
configure.in:
  Cleanup
sql/ha_innobase.cc:
  Safety patch
sql/item_strfunc.cc:
  cleanup
2002-04-02 17:42:01 +03:00
unknown
d7cfbff5b0 relay_log_space_limit
DBUG_ macro cleanup
buffer boundary cleanup
This changeset, although not fully tested, works for me better than 
anything I've had so far, including what is in the repository. I will 
push it unless something crashes while I am writing this :-)


mysql-test/r/rpl000014.result:
  updated result
mysql-test/r/rpl000015.result:
  updated result
mysql-test/r/rpl000016.result:
  updated result
mysql-test/r/rpl_log.result:
  new result
mysys/mf_iocache.c:
  DBUG_ cleanup
mysys/mf_iocache2.c:
  DBUG_ fix
sql/log.cc:
  added relay_log_space_limit
sql/mysqld.cc:
  relay_log_space_limit
sql/slave.cc:
  relay_log_space_limit
sql/slave.h:
  relay_log_space_limit
sql/sql_class.h:
  relay_log_space_limit
sql/sql_repl.cc:
  fixed buffer overrun bug
2002-04-01 21:46:23 -07:00
unknown
546b6a679f Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-03-31 18:12:25 +03:00
unknown
d2da68d259 Fix core dump bug in innodb after merge from 3.23 2002-03-31 18:12:24 +03:00
unknown
72f1fc7e36 replication fix
sql/log_event.cc:
  do not complain if the expected error was on the ignore list but we did not
  get it
2002-03-30 13:42:01 -07:00
unknown
af75d3914d Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-03-30 12:38:23 -07:00
unknown
5449b03bc8 replication updates. This changeset seems to be working fine on test systems.
If no problems are discovered in the next week, this will make the replication
code ready for 4.0.2 release.


dbug/dbug.c:
  cleanup of my previous fix
sql/mysqld.cc:
  fixed a REALLY NASTY BUG - slave threads were being launched before 
  initialization of global thread keys. Thus if the slave thread was slow
  to start everything worked fine, but if it started quickly, we would get
  into trouble using the unitinialized keys
sql/net_pkg.cc:
  make net_printf() work with 0 error code taking the third argument as 
  format string in that case
sql/slave.cc:
  misc fix-ups and debugging instrumentations
sql/slave.h:
  added skip_log_purge member
sql/sql_class.cc:
  debugging instrumentation to track down random memory corruption
sql/sql_class.h:
  added debugging sentry to THD to track down memory corruption
sql/sql_repl.cc:
  fixed bugs in CHANGE MASTER
2002-03-30 12:36:05 -07:00
unknown
ad494a211c item_strfunc.cc:
Fix for possible bug when string length is more than 64K


sql/item_strfunc.cc:
  Fix for possible bug when string length is more than 64K
2002-03-29 20:27:53 +04:00
unknown
b68daf5c83 Big5 conversion routines
include/m_ctype.h:
  Add conversion routines prototypes
sql/init.cc:
  Fix for small bug
2002-03-29 19:54:21 +04:00
unknown
4206cf1289 add sql_derived.cc into compilation 2002-03-29 19:27:21 +04:00
unknown
19bc62c865 Now this syntax works too: CONVERT(string,charset_to,charset_from)
where charset_to and charset_from are expressions. For example:

CONVERT('test','latin2','cp1250')


sql/item_strfunc.cc:
  Now this syntax works too:  CONVERT(string,charset_to,charset_from)
sql/item_strfunc.h:
  Now this syntax works too:  CONVERT(string,charset_to,charset_from)
sql/sql_yacc.yy:
  Now this syntax works too:  CONVERT(string,charset_to,charset_from)
2002-03-29 19:11:06 +04:00
unknown
f29e7f5726 Charset convertion operator CONVERT( string USING charset) 2002-03-29 18:22:21 +04:00
unknown
b344dbc2da Two bug fixes
Docs/manual.texi:
  Added text fof bug fixes
readline/Makefile.am:
  Bug fix for coredump of mysql program with some Ctrl+keys
sql/convert.cc:
  A bug fix for using SET CHAR... SET on columns > 64K
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-03-28 18:35:21 +02:00
unknown
c1291234c3 Bug fixes
Docs/manual.texi:
  I have to document my bug fixes ...
readline/Makefile.am:
  Fix for core dump in mysql monitor program when some Ctrl keys are
  pressed
sql/convert.cc:
  Fix of the bug with columns > 64 K when SET CHAR.. SET is used
2002-03-28 15:37:06 +02:00
unknown
437b0b0e87 New UTF8 charset
strings/ctype-big5.c:
  New format for mb char functions
strings/ctype-euc_kr.c:
  New format for mb char functions
strings/ctype-gb2312.c:
  New format for mb char functions
strings/ctype-gbk.c:
  New format for mb char functions
strings/ctype-sjis.c:
  New format for mb char functions
strings/ctype-ujis.c:
  New format for mb char functions
2002-03-28 17:31:46 +04:00
unknown
ef261914d3 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0


sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-03-26 22:23:51 -07:00
unknown
079a551ca7 coverted my_thread_init() /end to use my_malloc()/my_free() to help track
down replication corruption


dbug/dbug.c:
  fixed DBUG_ macros to not crash if my_thread_init() had not been called
include/my_sys.h:
  keep track of shutdown, main, and signal threads for safemalloc
mysys/my_static.h:
  keep track of thread in safemalloc blocks
mysys/my_thr_init.c:
  use my_malloc()/my_free() in my_thread_init()
mysys/safemalloc.c:
  keep track of threads
  do not fuss if main,signal, or shutdown thread still has allocated blocks 
   when we call TERMINATE() as some blocks are freed later and there is no
   easy way to make TERMINATE() wait for those threads
sql/mysqld.cc:
  keep track of signal, main, and shutdown threads
2002-03-26 22:19:23 -07:00