Commit graph

4574 commits

Author SHA1 Message Date
unknown
514e60480d merge with 3.23.52
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_no_pthread.h:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
mysql-test/r/bigint.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_net.c:
  Auto merged
mysys/mysys_priv.h:
  Auto merged
mysys/thr_rwlock.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
include/my_sys.h:
  merge with 3.23
libmysql/Makefile.shared:
  merge with 3.23
mysql-test/mysql-test-run.sh:
  merge with 3.23
mysql-test/r/func_if.result:
  merge with 3.23
mysys/Makefile.am:
  merge with 3.23
mysys/my_gethostbyname.c:
  merge with 3.23
sql/ha_innodb.cc:
  merge with 3.23
sql/item_cmpfunc.cc:
  merge with 3.23
sql/mysqld.cc:
  merge with 3.23
sql/sql_show.cc:
  merge with 3.23
2002-08-12 04:04:43 +03:00
unknown
071994ba36 merge
sql/ha_innobase.cc:
  merge (kept my changes to ha_innobase.cc to not use sprintf())
2002-08-12 03:40:36 +03:00
unknown
9b1930152d Changed IF(expr, column, NULL) to take type from column
Fixed some windows portability problems and removed some compiler warnings
 Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.


Docs/manual.texi:
  Changelog
  Added information about new IF() behaviour.
libmysql/libmysql.def:
  Removed mysql_ssl_clear
myisam/mi_dynrec.c:
  Minor cleanup
mysql-test/r/func_str.result:
  Added more tests for QUOTE
mysql-test/t/func_str.test:
  Added more tests for QUOTE
mysys/mf_iocache.c:
  Removed compiler warnings
sql/ha_innodb.cc:
  Added missing null to generated string.
sql/item_cmpfunc.cc:
  Changed IF(expr, column, NULL) to take type from column
sql/item_strfunc.cc:
  Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
sql/log.cc:
  Minor cleanup
sql/mysql_priv.h:
  Fixed problem with opt_enable_named_pipe
sql/mysqld.cc:
  Fixed problem with opt_enable_named_pipe
  Fixed some syntax errors in windows code
sql/set_var.cc:
  Removed compiler warnings
sql/slave.cc:
  Removed compiler warnings
sql/sql_show.cc:
  Removed compiler warnings
2002-08-12 03:33:46 +03:00
unknown
b2e946136d Fixed problem with BIGINT and shutdown on AIX
Moved IF(test,column,NULL) code to 4.0
Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h.
Removed some CR's in os2 files.


Docs/manual.texi:
  Changelog
include/global.h:
  Fix for BIGINT problem on AIX
include/my_no_pthread.h:
  Fixed typo
libmysql/Makefile.shared:
  Fix for BIGINT problem on AIX
mysql-test/mysql-test-run.sh:
  Fix to find xterm on AIX 4.3
mysql-test/r/bigint.result:
  Fix for BIGINT problem on AIX
mysql-test/r/func_if.result:
  Change results for IF() after reverting change.
mysql-test/t/bigint.test:
  Fix for BIGINT problem on AIX
mysys/Makefile.am:
  Fix for BIGINT problem on AIX
mysys/my_gethostbyname.c:
  Cleanup
mysys/my_init.c:
  Cleanup
mysys/my_net.c:
  Cleanup
mysys/my_os2cond.c:
  Space & CRLF cleanup
mysys/my_os2dirsrch.c:
  Space & CRLF cleanup
mysys/my_os2dirsrch.h:
  Space & CRLF cleanup
mysys/my_os2dlfcn.c:
  Space & CRLF cleanup
mysys/my_os2file64.c:
  Space & CRLF cleanup
mysys/my_os2mutex.c:
  Space & CRLF cleanup
mysys/my_os2thread.c:
  Space & CRLF cleanup
mysys/my_os2tls.c:
  Space & CRLF cleanup
mysys/mysys_priv.h:
  cleanup
mysys/thr_rwlock.c:
  cleanup
sql/ha_innobase.cc:
  Removed usage of sprintf()
  Fixed missing end \0 which caused control characters to appear in SHOW INNODB STATUS
sql/item_cmpfunc.cc:
  Reverted change for IF()
sql/mysqld.cc:
  Fix for shutdown on AIX
2002-08-12 03:28:02 +03:00
unknown
714f2b0f8b trx0trx.h, trx0trx.c, ha_innobase.cc, ha_innobase.h:
Add tentative code which can be used in HANDLER implementation for InnoDB


sql/ha_innobase.h:
  Add tentative code which can be used in HANDLER implementation for InnoDB
sql/ha_innobase.cc:
  Add tentative code which can be used in HANDLER implementation for InnoDB
innobase/trx/trx0trx.c:
  Add tentative code which can be used in HANDLER implementation for InnoDB
innobase/include/trx0trx.h:
  Add tentative code which can be used in HANDLER implementation for InnoDB
2002-08-12 00:17:39 +03:00
unknown
86dc608c34 ha_innobase.cc, ut0ut.c, univ.i, ut0ut.h:
Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
lock0lock.c:
  Add safety against buffer overruns in latest deadlock info
srv0srv.c:
  Add safety against buffer overruns in SHOW INNODB STATUS
os0thread.h, os0thread.c:
  Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t


innobase/os/os0thread.c:
  Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t
innobase/include/os0thread.h:
  Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t
innobase/srv/srv0srv.c:
  Add safety against buffer overruns in SHOW INNODB STATUS
innobase/lock/lock0lock.c:
  Add safety against buffer overruns in latest deadlock info
innobase/include/ut0ut.h:
  Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
innobase/include/univ.i:
  Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
innobase/ut/ut0ut.c:
  Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
sql/ha_innobase.cc:
  Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
2002-08-11 18:49:47 +03:00
unknown
49e4fea6c9 A small fix for last_insert_id with multi-row inserts 2002-08-10 22:08:00 +03:00
unknown
72edf480ec Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql


Docs/manual.texi:
  Auto merged
2002-08-10 16:40:20 +03:00
unknown
cdd3be6ab1 removal of lines that make problems with texi
Docs/manual.texi:
  removing lines that do not follow texi rules correctly.
  Hope Arjen can put this together properly ...
2002-08-10 16:38:30 +03:00
unknown
6148e5a42f QUOTE() code cleanup
mysql-test/r/func_str.result:
  cleanup
sql/item_strfunc.cc:
  cleanup
2002-08-10 15:13:05 +05:00
unknown
18c48aa951 Moved a News entry from the 3.23.53 section into the 3.23.52 section
and removed the 3.23.53 News section for now until 3.23.52 is officially
tagged.


Docs/manual.texi:
  Moved this changelog entry into the 3.23.52 section and removed the
  3.23.53 News section for now until 3.23.52 is officially tagged.
2002-08-10 02:08:41 +02:00
unknown
c2b4a3049f After discussing it with Monty by phone once more:
- Only define alloca as a compiler builtin, if we use GCC and there
   is no alloca.h installed


include/my_sys.h:
   - Only define alloca as a compiler builtin, if we use GCC and there
     is no alloca.h installed
2002-08-10 01:47:51 +02:00
unknown
46f5b2674f A change in IF behaviour that several users asked for ... 2002-08-09 23:14:02 +03:00
unknown
9b1d739ea1 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0
into ram.(none):/home/ram/work/mysql-4.0
2002-08-09 19:37:47 +05:00
unknown
f86ed73a48 added NULLs check to the QUOTE() function 2002-08-09 19:36:36 +05:00
unknown
bfdf798676 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_yacc.yy:
  Auto merged
2002-08-09 16:50:24 +03:00
unknown
6974c3d07a Fix for SSL and new my_getopt
Fix for syntax error bug in SET TRANSACTION ISOLATION



BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
  Delete: include/sslopt-case.h
client/mysql.cc:
  Fix for SSL and new my_getopt
client/mysqladmin.c:
  Fix for SSL and new my_getopt
client/mysqlcheck.c:
  Fix for SSL and new my_getopt
client/mysqldump.c:
  Fix for SSL and new my_getopt
client/mysqlimport.c:
  Fix for SSL and new my_getopt
client/mysqlshow.c:
  Fix for SSL and new my_getopt
include/Makefile.am:
  Fix for SSL and new my_getopt
include/sslopt-longopts.h:
  Fix for SSL and new my_getopt
libmysql/libmysql.c:
  Fix for SSL and new my_getopt
mysql-test/r/innodb.result:
  Simple test of transaction isolations
mysql-test/t/innodb.test:
  Simple test of transaction isolations
sql/mini_client.cc:
  Merge of mysql_real_connect() with libmysql.c
sql/mysqld.cc:
  Simple test of transaction isolations
  Remove use of current_thd in get_options()
sql/slave.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fix for SET TRANSACTION ...
2002-08-09 16:47:16 +03:00
unknown
4b0ce2a163 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-08-09 16:06:00 +03:00
unknown
addf8304a7 reverting a fix
sql/sql_acl.cc:
  I revert my last change, as this requires further elaboration.
  For the moment we should document it in the manual.
  
  If MySQL 4.0.2 or higher is used with pre-4.0.2 user privilege table, 
  then user with no global privs at all will have privileges to:
  
  * LOCK TABLES
  * CREATE TEMPORARY TABLES
  * run commsnd SHOW DATABASES
2002-08-09 16:05:02 +03:00
unknown
ea984d0229 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0
into ram.(none):/home/ram/work/mysql-4.0
2002-08-09 17:59:45 +05:00
unknown
726ca26b8c test case for the QUOTE() function 2002-08-09 17:58:30 +05:00
unknown
38e811fdb4 bk resolve 2002-08-09 15:55:02 +03:00
unknown
b9b404b1ce ha_innobase.cc, trx0trx.h, lock0lock.c, trx0trx.c:
Add some more safety margin to buffer sizes in prints


innobase/trx/trx0trx.c:
  Add some more safety margin to buffer sizes in prints
innobase/lock/lock0lock.c:
  Add some more safety margin to buffer sizes in prints
innobase/include/trx0trx.h:
  Add some more safety margin to buffer sizes in prints
sql/ha_innobase.cc:
  Add some more safety margin to buffer sizes in prints
2002-08-09 15:34:23 +03:00
unknown
6a246376dc ha_innobase.cc:
Found the bug in modified innobase_mysqld_print_thd; the person who modifies code should test that his change works


sql/ha_innobase.cc:
  Found the bug in modified innobase_mysqld_print_thd; the person who modifies code should test that his change works
2002-08-09 15:06:59 +03:00
unknown
b84a4f2fe7 fixed mi_comp_unique to use _mi_compare_text() 2002-08-09 13:22:23 +02:00
unknown
66eb6db755 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0
into ram.(none):/home/ram/work/mysql-4.0


sql/item_strfunc.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-08-09 15:46:01 +05:00
unknown
8c1d8eb4f7 QUOTE() func changes according to monty's suggestions
sql/item_strfunc.cc:
  added bitmap for QUOTE() func
sql/item_strfunc.h:
  moved fix_length_and_dec code to .h file
sql/sql_yacc.yy:
  removed QUOTE stuff
2002-08-09 15:42:38 +05:00
unknown
5dc118f479 Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2002-08-09 11:44:24 +02:00
unknown
1c92372dad - RPM spec file adjustments for the features of the Max binary (disabled
OpenSSL, enabled RAID)
 - added compatibility link safe_mysqld -> mysqld_safe


support-files/mysql.spec.sh:
   - Turn off OpenSSL in MySQL-Max for now until it works properly again
   - enable RAID for the Max binary instead
   - added compatibility link: safe_mysqld -> mysqld_safe to ease the
     transition from 3.23
2002-08-09 11:39:34 +02:00
unknown
035b78d120 decode_montyspeak();
sql/share/dutch/errmsg.txt:
  Fix wrongly placed comma.
2002-08-09 19:33:13 +10:00
unknown
6fd5f345c9 ha_innobase.cc:
Revert changes to sprintf until we know why control characters scrambled the output


sql/ha_innobase.cc:
  Revert changes to sprintf until we know why control characters scrambled the output
2002-08-09 10:17:54 +03:00
unknown
47733b486a Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-08-09 00:06:16 +03:00
unknown
94c99b9ab2 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-08-09 00:06:15 +03:00
unknown
dc5cca26e9 server-key.pem regenerated
server-cert.pem	regenerated
client-key.pem	Regenerated
client-cert.pem	Regenerated
cacert.pem	Regenerated (previous exprired)


SSL/cacert.pem:
  Regenerated (previous exprired)
SSL/client-cert.pem:
  Regenerated
SSL/client-key.pem:
  Regenerated
SSL/server-cert.pem:
  regenerated
SSL/server-key.pem:
  regenerated
2002-08-08 23:06:15 +02:00
unknown
0f3c24e348 Merge mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/akishkin/mysql-4.0
2002-08-08 23:06:14 +02:00
unknown
69d174c547 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.00
2002-08-08 21:06:13 +00:00
unknown
e9db181b91 Merge serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.00
2002-08-08 21:05:17 +00:00
unknown
f0171a924a A very small security fix 2002-08-08 23:18:33 +03:00
unknown
2fbc5c4ebc sslopt-case.h changed optarg to argument, decomment ssl-key option
include/sslopt-case.h:
  changed optarg to argument, decomment ssl-key option
2002-08-08 21:27:17 +02:00
unknown
c4f1bec23d Portability fix for AIX 2002-08-08 22:12:03 +03:00
unknown
e295dd2974 Portability fix for AIX
include/my_sys.h:
  Removed redefine of alloca with GCC
2002-08-08 22:09:25 +03:00
unknown
c530371bdc Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-08-08 21:45:49 +03:00
unknown
d483ea2be6 Reverted Heikkis patch as his was not portable.
Remove not needed locks in SHOW OPEN TABLES


sql/ha_innobase.cc:
  Reverted Heikkis patch as his was not portable.
sql/sql_show.cc:
  Remove not needed locks in SHOW OPEN TABLES
2002-08-08 21:43:46 +03:00
unknown
b1d7d293f1 Fixed syntax error 2002-08-08 21:38:12 +03:00
unknown
2603dd1336 - portability fix for AIX in include/my_sys.h: define alloca as a
compiler builtin when using gcc


include/my_sys.h:
   - Portability fix: define alloca as a compiler builtin on systems
     that have gcc but no alloca.h (e.g. some IBM AIX flavors), use
     "#pragma alloca" when using IBMs compiler (xlr_C)
2002-08-08 20:09:57 +02:00
unknown
c02f92a127 Reverted wrong patch for CREATE TABLE .. SELECT
sql/item_timefunc.h:
  Auto merged
Docs/manual.texi:
  Merge
2002-08-08 21:09:31 +03:00
unknown
33dab613c7 Added nety_retry_count as a changeable variable
Make safe_mysqld a symlink to mysqld_safe in binary distribution
Fixed problem with CTRL-C when using mysqld --bootstrap


Docs/manual.texi:
  Added nety_retry_count as a changeable variables
include/mysql_com.h:
  Added nety_retry_count as a changeable variables
libmysql/libmysql.c:
  Added nety_retry_count as a changeable variables
mysql-test/r/olap.result:
  Fixed wrong error message
mysql-test/r/variables.result:
  Update for freebsd
mysql-test/t/variables.test:
  Update for freebsd
scripts/make_binary_distribution.sh:
  Make safe_mysqld a symlink to mysqld_safe in binary distribution.
sql/item_func.cc:
  Cleaned up tmp_table_field() handling.
sql/item_func.h:
  Cleaned up tmp_table_field() handling.
sql/item_strfunc.h:
  Cleaned up tmp_table_field() handling.
sql/item_timefunc.h:
  Cleaned up tmp_table_field() handling.
sql/mysql_priv.h:
  Added nety_retry_count as a changeable variables
sql/mysqld.cc:
  Added nety_retry_count as a changeable variables
  Allow one to specify a defaults file to be read when installing MySQL as a service.
sql/net_pkg.cc:
  Added nety_retry_count as a changeable variables
sql/net_serv.cc:
  Added nety_retry_count as a changeable variables
sql/set_var.cc:
  Added nety_retry_count as a changeable variables
sql/share/czech/errmsg.txt:
  Fixed wrong error message
sql/share/danish/errmsg.txt:
  Fixed wrong error message
sql/share/english/errmsg.txt:
  Fixed wrong error message
sql/share/estonian/errmsg.txt:
  Fixed wrong error message
sql/share/french/errmsg.txt:
  Fixed wrong error message
sql/share/german/errmsg.txt:
  Fixed wrong error message
sql/share/greek/errmsg.txt:
  Fixed wrong error message
sql/share/hungarian/errmsg.txt:
  Fixed wrong error message
sql/share/italian/errmsg.txt:
  Fixed wrong error message
sql/share/japanese/errmsg.txt:
  Fixed wrong error message
sql/share/korean/errmsg.txt:
  Fixed wrong error message
sql/share/norwegian-ny/errmsg.txt:
  Fixed wrong error message
sql/share/norwegian/errmsg.txt:
  Fixed wrong error message
sql/share/polish/errmsg.txt:
  Fixed wrong error message
sql/share/portuguese/errmsg.txt:
  Fixed wrong error message
sql/share/romanian/errmsg.txt:
  Fixed wrong error message
sql/share/russian/errmsg.txt:
  Fixed wrong error message
sql/share/slovak/errmsg.txt:
  Fixed wrong error message
sql/share/spanish/errmsg.txt:
  Fixed wrong error message
sql/share/swedish/errmsg.txt:
  Fixed wrong error message
sql/share/ukrainian/errmsg.txt:
  Fixed wrong error message
sql/sql_class.cc:
  Indentaion cleanup
sql/sql_class.h:
  Fixed wrong error message
sql/sql_parse.cc:
  Fixed problem with CTRL-C when using mysqld --bootstrap
sql/sql_select.cc:
  Ensure that select terminates if create_myisam_from_heap() fails.
sql/sql_yacc.yy:
  Portability fix
2002-08-08 20:49:06 +03:00
unknown
b9b3f46723 Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pz/mysql/mysql-4.0-root
2002-08-08 19:41:06 +04:00
unknown
0fdc49bf58 Some comments added to function
mysys/mf_casecnv.c:
  Add doccumentation for some functions.
2002-08-08 19:34:15 +04:00
unknown
744a4f95d9 new QUOTE() fuction has been added
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-08-08 20:25:53 +05:00