mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36101 commits 2784 branches 343 tags 1.6 GiB
Commit graph

36101 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
196a8ac758 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  vajra.(none):/opt/local/work/mysql-5.0-runtime
 2007-04-14 18:23:48 -04:00
unknown
ccdf807f3b Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-14 14:55:33 +05:00
unknown
7863d715cf Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-14 14:54:59 +05:00
unknown
78c734b013 Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
 2007-04-14 14:54:28 +05:00
unknown
2276ca1aef Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-13 16:14:43 +02:00
unknown
0ab74abc63 Merge pilot.blaudden:/home/msvensson/mysql/bug27783/my50-bug27783 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-13 15:06:52 +02:00
unknown
59c4bf4217 Add option manual-ddd 
Change syntax for starting manual ddd or gdb to avoid having to
change working dir
 2007-04-13 15:06:05 +02:00
unknown
80e53fb139 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  f
  Use local
 2007-04-13 15:02:10 +02:00
unknown
e3a24797fd Add missing option --manual-ddd 
Change syntax to start manual gdb/ddd to avoid having to
cd to the mysql-test directory before calling the command
 2007-04-13 14:40:52 +02:00
unknown
21dafaa226 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-13 08:15:49 +02:00
unknown
f036fbcd45 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-4.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel


heap/hp_write.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/table.cc:
  Auto merged
 2007-04-13 09:14:47 +03:00
unknown
465270ebe6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-13 08:14:05 +02:00
unknown
3df21225b8 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
 2007-04-13 09:04:34 +03:00
unknown
50bd6eed0c Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-4.1-main
 2007-04-13 09:02:14 +03:00
unknown
40dc6be623 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b20095
 2007-04-13 10:06:50 +05:00
unknown
2a4ab288fd Bug#20095 Changing length of VARCHAR field with UTF8 collation does not truncate values 
Problem: single byte do_varstring1() function was called, which didn't
check limit on "number of character", and checked only "number of bytes".
Fix: adding a multi-byte aware function do_varstring1_mb(),
to limit on "number of characters"


mysql-test/r/ctype_utf8.result:
  Adding test case
mysql-test/t/ctype_utf8.test:
  Adding test case
sql/field_conv.cc:
  Adding missing function to copy VARCHAR strings
  having one length byte.
 2007-04-13 10:05:55 +05:00
unknown
53fa178cb9 Bug#27775 mediumint auto_increment with ndb_restore 
- autoincrement column of size medium int not handled in ndb_restore
- added testcase also for other types, tiny, small... etc
 2007-04-13 01:37:24 +02:00
unknown
53f73da286 Bug #27322 failure to allocate transaction_prealloc_size causes crash 
Fix for when memory pre-allocation fails.


mysys/my_alloc.c:
  Added code to null-out the pre-alloc pointer if allocation fails. This is necessary for the next time this procedure is called.
mysql-test/r/variables-big.result:
  Added "big" test for bug fix Bug #27322.
mysql-test/t/variables-big.test:
  Added "big" test for bug fix Bug #27322.
 2007-04-12 18:03:26 -04:00
unknown
a1626c6627 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gshchepa.localdomain:/home/uchum/work/bk-trees/5507-ci
 2007-04-13 00:38:45 +05:00
unknown
011e3a26f0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-12 21:38:44 +02:00
unknown
dc3c54706f remove inline NdbRecAttr functions for medium int as not to depend in my_global 2007-04-12 21:34:25 +02:00
unknown
0b54001b21 Bug#5507: TRUNCATE does not work with views. 
Support of views wasn't implemented for the TRUNCATE statement.
Now TRUNCATE on views has the same semantics as DELETE FROM view:
mysql_truncate() checks whether the table is a view and falls back
to delete if so.
In order to initialize properly the LEX::updatable for a view
st_lex::can_use_merged() now allows usage of merged views for the
TRUNCATE statement.


mysql-test/r/truncate.result:
  Added a test case for the Bug#5507: TRUNCATE does not work with views.
mysql-test/t/truncate.test:
  Added a test case for the Bug#5507: TRUNCATE does not work with views.
sql/sql_lex.cc:
  Bug#5507: TRUNCATE does not work with views.
  can_use_merged() was denying of usage of merged views for a
  TRUNCATE statement. This results in improper initialization
  of view LEX::updatable. Fixed.
sql/sql_delete.cc:
  Bug#5507: TRUNCATE does not work with views.
  1.mysql_truncate() was lacking of check whether the table is view. Added.
  2.mysql_truncate() calls mysql_delete(), but mysql_delete() always reports
  errors as "DELETE" errors. Fixed.
mysql-test/t/view.test:
  Updated test case for Bug#14540: OPTIMIZE, ANALYZE, REPAIR applied 
  to not a view.
mysql-test/r/view.result:
  Updated test case for Bug#14540: OPTIMIZE, ANALYZE, REPAIR applied 
  to not a view.
 2007-04-12 23:21:37 +05:00
unknown
44c001234d BUG#27367 mysql.server should be LSB init script compliant 
Moved cd $basedir to live in the start section, as it only applies to the start
functionality and breaks the restart task
 2007-04-12 11:16:07 -07:00
unknown
49e9743d1a Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
 2007-04-12 11:01:32 -07:00
unknown
1aee966523 Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
 2007-04-12 11:00:54 -07:00
unknown
2eaf8ac837 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-12 19:49:46 +02:00
unknown
70d753c67a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
 2007-04-12 19:49:21 +02:00
unknown
795d8583a6 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-12 18:41:55 +02:00
unknown
4e84edc9da Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-12 18:29:24 +02:00
unknown
87a99ed780 Bug#27783 mysql_install_db should be able to install again, preserving existing files. 
- Allow mysql_install_db to be run a second time in the same
   datadir to create and fill any missing system tables


scripts/mysql_install_db.sh:
  Remove check that dissallowed running mysql_install_db a second time
  in same directory
scripts/mysql_system_tables.sql:
  Save information about if tables db and user already existed
scripts/mysql_system_tables_data.sql:
  Fill tables db and user with initial data if tables
  didn't already exist.
 2007-04-12 17:48:28 +02:00
unknown
dc98df13b6 Test case for BUG#5274: Stored procedure crash if length 
of CHAR variable too great.


mysql-test/r/sp.result:
  Update result file.
mysql-test/t/sp.test:
  Add test case for BUG#5274.
 2007-04-12 19:42:45 +04:00
unknown
f4c619baf0 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-12 14:56:52 +02:00
unknown
461729e087 Merge romeo.(none):/home/bkroot/mysql-5.0-rpl 
into  romeo.(none):/home/bk/b26551-mysql-5.0-rpl
 2007-04-12 14:32:37 +02:00
unknown
d4dfe7664e BUG#26551 (Aborted query for non-transactional table breaks replication): 
Added error code ER_QUERY_INTERRUPTED to the list of special errors
that prevent the slave from starting to execute a query.


sql/slave.cc:
  Added ER_QUERY_INTERRUPTED to special error code that prevents statement
  from being executed on slave.
mysql-test/r/rpl_critical_errors.result.txt:
  New BitKeeper file ``mysql-test/r/rpl_critical_errors.result.txt''
mysql-test/t/rpl_critical_errors.test:
  New BitKeeper file ``mysql-test/t/rpl_critical_errors.test''
 2007-04-12 14:00:45 +02:00
unknown
239b385933 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel


client/mysqldump.c:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_malloc.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/r/sp.result:
  Merged from main 5.0
sql/sql_load.cc:
  Merged from main 5.0
 2007-04-12 12:50:02 +03:00
unknown
d7dadcd7c7 Bug #27758 Restoring NDB backups makes table usable in SQL nodes 
- parse indexname using "split" instead of sscanf, as not to break at space
- test case with space in key
- enclose names in printout


mysql-test/r/ndb_restore.result:
  Bug #27758 Restoring NDB backups makes table usable in SQL nodes
  - change to using an index with space to reproduce bug
mysql-test/t/ndb_restore.test:
  Bug #27758 Restoring NDB backups makes table usable in SQL nodes
  - change to using an index with space to reproduce bug
ndb/tools/restore/consumer_restore.cpp:
  Bug #27758 Restoring NDB backups makes table usable in SQL nodes
  - parse indexname using "split" instead of sscanf, as not to break at space
  - enclose names in printout
ndb/tools/restore/restore_main.cpp:
  Bug #27758 Restoring NDB backups makes table usable in SQL nodes
  - enclose names in printout
sql/ha_ndbcluster.cc:
  Bug #27758 Restoring NDB backups makes table usable in SQL nodes
  - correct error message
 2007-04-12 11:07:30 +02:00
unknown
aeb896d601 Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c 
- Rely only on HAVE_ISINF to determine if 'isinf' can be used.


include/my_global.h:
  The test in configure.in determines if we can use "'isinf' after
  having inluded math.h". If the test works HAVE_ISINF will be defined
  and isinf can be used in the code.
  When the configure test fails it's not possible to use 'isinf' only
  by including math.h and thus 'isinf' will be defined to never return
  that X is inifinite.
 2007-04-12 10:29:22 +02:00
unknown
1992907b45 mysqld.cc: 
Removing wrong MYF(0) argument.


sql/mysqld.cc:
  Removing wrong MYF(0) argument.
 2007-04-12 11:29:43 +05:00
unknown
359594ccd2 Adding files to support building for debian. 
---
Removed reference to debian svn location of debian dir. 
Changed verbage of comment to appease Timothy. 
---
Removed added manpages that aren't appropriate for our build. 
---
Added debian dir to list of dist targets. 
Added list of files needed to be distributed in debian dir.
---
Added semi-colons to fix syntax error.
---
BUG#27769 MySQL should include debian packaing dir
Added debian/Makefile to configure.in to support make dist.


BitKeeper/deleted/.del-configure.in.rej:
  Delete: configure.in.rej
Makefile.am:
  Added debian dir to list of dist targets.
configure.in:
  Added debian/Makefile to configure.in to support make dist
BitKeeper/deleted/.del-comp_err.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-msql2mysql.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-my_print_defaults.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-myisam_ftdump.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-myisamchk.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-myisamlog.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-myisampack.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_config.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_convert_table_format.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_explain_log.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_find_rows.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_fix_extensions.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_install_db.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_secure_installation.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_setpermission.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_tableinfo.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_waitpid.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlbinlog.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlbug.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlcheck.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysqldumpslow.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlimport.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlmanager.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-mysqltest.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-pack_isam.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-resolve_stack_dump.1:
  Adding files to support building for debian.
BitKeeper/deleted/.del-resolveip.1:
  Adding files to support building for debian.
debian/Makefile.am:
  Added list of files needed to be distributed in debian dir.
debian/README.Maintainer:
  Adding files to support building for debian.
  ---
  Removed reference to debian svn location of debian dir. 
  Changed verbage of comment to appease Timothy.
debian/changelog:
  Adding files to support building for debian.
debian/compat:
  Adding files to support building for debian.
debian/control.in:
  Adding files to support building for debian.
debian/copyright.more:
  Adding files to support building for debian.
debian/copyright:
  Adding files to support building for debian.
debian/defs.mk:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.README.Maintainer.in:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.dirs.in:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.docs.in:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.examples.in:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.files.in:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.links.in:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER.README.Debian.in:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER.dirs.in:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER.docs.in:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER.files.in:
  Adding files to support building for debian.
debian/libmysqlclientMYSOVER.postinst.in:
  Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.dirs.in:
  Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.files.in:
  Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.links.in:
  Adding files to support building for debian.
debian/libndbclientNDBSOVER.README.Debian.in:
  Adding files to support building for debian.
debian/libndbclientNDBSOVER.dirs.in:
  Adding files to support building for debian.
debian/libndbclientNDBSOVER.files.in:
  Adding files to support building for debian.
debian/libndbclientNDBSOVER.postinst.in:
  Adding files to support building for debian.
debian/mysql-client-MYVER.NEWS.in:
  Adding files to support building for debian.
debian/mysql-client-MYVER.README.Debian.in:
  Adding files to support building for debian.
debian/mysql-client-MYVER.dirs.in:
  Adding files to support building for debian.
debian/mysql-client-MYVER.docs.in:
  Adding files to support building for debian.
debian/mysql-client-MYVER.files.in:
  Adding files to support building for debian.
debian/mysql-client-MYVER.lintian-overrides.in:
  Adding files to support building for debian.
debian/mysql-common.README.Debian.in:
  Adding files to support building for debian.
debian/mysql-common.dirs.in:
  Adding files to support building for debian.
debian/mysql-common.files.in:
  Adding files to support building for debian.
debian/mysql-common.postrm.in:
  Adding files to support building for debian.
debian/mysql-common.preinst.in:
  Adding files to support building for debian.
debian/mysql-extra-MYVER.dirs.in:
  Adding files to support building for debian.
debian/mysql-extra-MYVER.files.in:
  Adding files to support building for debian.
debian/mysql-management-MYVER.dirs.in:
  Adding files to support building for debian.
debian/mysql-management-MYVER.files.in:
  Adding files to support building for debian.
debian/mysql-management-MYVER.mysql-management.init.in:
  Adding files to support building for debian.
debian/mysql-server-MYOLDVER.preinst.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.NEWS.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.README.Debian.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.config.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.dirs.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.docs.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.files.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.links.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.lintian-overrides.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.paranoid.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.server.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.workstation.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.mysql-server.logrotate.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.postinst.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.postrm.in:
  Adding files to support building for debian.
debian/additions/my.cnf:
  Adding files to support building for debian.
debian/additions/mysql-server.lintian-overrides:
  Adding files to support building for debian.
debian/additions/ndb_mgmd.cnf:
  Adding files to support building for debian.
debian/mysql-server-MYVER.preinst.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.prerm.in:
  Adding files to support building for debian.
debian/mysql-server-MYVER.templates.in:
  Adding files to support building for debian.
debian/mysql-server.preinst.in:
  Adding files to support building for debian.
debian/mysql-storage-MYVER.dirs.in:
  Adding files to support building for debian.
debian/mysql-storage-MYVER.files.in:
  Adding files to support building for debian.
debian/mysql-storage-MYVER.mysql-storage.init.in:
  Adding files to support building for debian.
debian/mysql-test-MYVER.dirs.in:
  Adding files to support building for debian.
debian/mysql-test-MYVER.files.in:
  Adding files to support building for debian.
debian/mysql-tools-MYVER.dirs.in:
  Adding files to support building for debian.
debian/mysql-tools-MYVER.files.in:
  Adding files to support building for debian.
debian/po/POTFILES.in.in:
  Adding files to support building for debian.
debian/po/ca.po:
  Adding files to support building for debian.
debian/po/cs.po:
  Adding files to support building for debian.
debian/po/da.po:
  Adding files to support building for debian.
debian/po/de.po:
  Adding files to support building for debian.
debian/po/es.po:
  Adding files to support building for debian.
debian/po/eu.po:
  Adding files to support building for debian.
debian/po/fr.po:
  Adding files to support building for debian.
debian/po/gl.po:
  Adding files to support building for debian.
debian/po/it.po:
  Adding files to support building for debian.
debian/po/ja.po:
  Adding files to support building for debian.
debian/po/nb.po:
  Adding files to support building for debian.
debian/po/nl.po:
  Adding files to support building for debian.
debian/po/pt.po:
  Adding files to support building for debian.
debian/po/pt_BR.po:
  Adding files to support building for debian.
debian/po/ro.po:
  Adding files to support building for debian.
debian/po/ru.po:
  Adding files to support building for debian.
debian/po/sv.po:
  Adding files to support building for debian.
debian/po/templates.pot:
  Adding files to support building for debian.
debian/po/tr.po:
  Adding files to support building for debian.
debian/rules:
  Adding files to support building for debian.
  ---
  Added semi-colons to fix syntax error.
debian/source.lintian-overrides.in:
  Adding files to support building for debian.
debian/watch:
  Adding files to support building for debian.
 2007-04-11 16:13:09 -07:00
unknown
bf5833bde8 Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h 
- Move marcos for __attribute__ usage to my_attribute.h and
   include that file where needed


include/Makefile.am:
  Add new header file my_attribute.h
include/m_ctype.h:
  Include my_attribute.h in order to use ATTRIBUTE_* macros
include/my_global.h:
  Move the ATTRIBUTE_* macros to my_attribute.h 
  Include my_attribute.h
include/my_sys.h:
  No need to protect the inclusion of header file, it will
  protect itself
include/my_attribute.h:
  New BitKeeper file ``include/my_attribute.h''
 2007-04-12 00:43:25 +02:00
unknown
35c10cca21 Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to connect 
- Add testcase for SSL connection from mysqldump to mysqld


mysql-test/r/openssl_1.result:
  Add test result
mysql-test/t/openssl_1.test:
  Add test case for mysqldump with SSL connection to mysqld
 2007-04-11 23:42:53 +02:00
unknown
7c4db88a92 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-04-11 13:48:02 -07:00
unknown
15050080f1 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-11 22:08:19 +02:00
unknown
c6b0cff186 Bug#21765 Illegal Instruction crash on pre-pentium when using YASSL 
- Import patch with different method of detecting if machine has
   cpuid instruction


extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff
 2007-04-11 22:07:24 +02:00
unknown
8d40fa58ed Post-merge fix. 2007-04-11 12:45:27 -07:00
unknown
d25a540dca Print warning to log when SSL setup fails 2007-04-11 21:38:43 +02:00
unknown
2b6cd45734 Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


vio/viosslfactories.c:
  Auto merged
mysql-test/r/openssl_1.result:
  Manual merge
mysql-test/t/openssl_1.test:
  Manual merge
 2007-04-11 21:03:29 +02:00
unknown
d032b0e56c Add test for connect using different ssl ciphers 
mysql-test/r/openssl_1.result:
  Update result
 2007-04-11 21:01:10 +02:00
unknown
0ec3c2212e Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27484 
into  olga.mysql.com:/home/igor/mysql-5.0-opt


mysql-test/t/row.test:
  Auto merged
mysql-test/r/row.result:
  Manual merge
sql/item_cmpfunc.cc:
  Manual merge
 2007-04-11 11:57:40 -07:00
unknown
aa051961c9 Fixed bug #27484: a crash when incompatible row expressions with nested rows 
are used as arguments of the IN predicate.
Added a function to check compatibility of row expressions. Made sure that this
function to be called for Item_func_in objects by fix_length_and_dec().


mysql-test/r/row.result:
  Added a test case for bug #27484.
mysql-test/t/row.test:
  Added a test case for bug #27484.
 2007-04-11 11:41:12 -07:00