mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35873 commits 2781 branches 343 tags 1.6 GiB
Commit graph

35873 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
561cd328a3 Add replace_result for things that are not tested 2007-04-11 09:06:27 +02:00
unknown
bfe25fb20c Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged
 2007-04-10 17:33:21 +02:00
unknown
247c3a81a1 Update result(which mysterioulsy got lost) 2007-04-10 17:33:04 +02:00
unknown
30606c38ca Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
 2007-04-10 17:17:08 +02:00
unknown
da43360e1f Take into account wether vertical_results are in effect 2007-04-10 17:09:35 +02:00
unknown
3120134a0a Init dying to 1 just after passing the guard 2007-04-10 17:06:36 +02:00
unknown
3f96702b06 Add OPT_LOG_DIR 2007-04-10 17:05:22 +02:00
unknown
4d324e0379 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 15:03:22 +02:00
unknown
d76e2592a0 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 14:59:16 +02:00
unknown
76f5c73bc2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-04-10 14:58:55 +02:00
unknown
06ed2ddce2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Manual merge
 2007-04-10 14:46:57 +02:00
unknown
5565d32936 Add --logdir option ot mysqltest 2007-04-10 14:45:13 +02:00
unknown
4788e6dfe3 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  SCCS merged
 2007-04-10 14:29:22 +02:00
unknown
8163d5ec6e Merge 192.168.0.4:mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
 2007-04-10 13:51:32 +02:00
unknown
9f5e640d30 Give the "sync_slave_with_master" something to do 2007-04-10 12:19:00 +02:00
unknown
ca33c6673f Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 12:13:47 +02:00
unknown
d2667d1a6e Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-09 11:45:14 +05:00
unknown
6d9a796944 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/sql_table.cc:
  Auto merged
 2007-04-09 11:06:28 +05:00
unknown
ddaeead8fc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2007-04-08 20:46:40 +02:00
unknown
1f8dbdaf3a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql


sql/sql_load.cc:
  Auto merged
 2007-04-07 23:09:09 +04:00
unknown
a978d84cbc Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-07 11:37:09 +05:00
unknown
b3f9c88826 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/field.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2007-04-07 11:36:02 +05:00
unknown
2911bcd8e3 Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
 2007-04-07 11:35:14 +05:00
unknown
b5cf43c902 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
 2007-04-07 00:56:35 +04:00
unknown
35a0f47234 Bug#27586: Wrong autoinc value assigned by LOAD DATA in the 
NO_AUTO_VALUE_ON_ZERO mode.

The table->auto_increment_field_not_null variable wasn't reset after
reading a row which may lead to inserting a wrong value to the auto-increment
field to the following row.

The table->auto_increment_field_not_null variable is reset now right after a
row is being written in the read_fixed_length() and the read_sep_field()
functions.
Removed wrong setting of the table->auto_increment_field_not_null variable in
the read_sep_field() function.


mysql-test/t/loaddata.test:
  Added a test case for the bug#27586: Wrong autoinc value assigned by LOAD DATA in the
  NO_AUTO_VALUE_ON_ZERO mode.
mysql-test/r/loaddata.result:
  Added a test case for the bug#27586: Wrong autoinc value assigned by LOAD DATA in the
  NO_AUTO_VALUE_ON_ZERO mode.
sql/sql_load.cc:
  Bug#27586: Wrong autoinc value assigned by LOAD DATA in the
  NO_AUTO_VALUE_ON_ZERO mode.
  The table->auto_increment_field_not_null variable is reset now right after a
  row is being written in the read_fixed_length() and the read_sep_field()
  functions.
  Remove wrong setting of the table->auto_increment_field_not_null variable in
  the read_sep_field() function.
 2007-04-07 00:13:27 +04:00
unknown
d6a78be9f2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-06 20:47:28 +02:00
unknown
e8a8d5df60 Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2007-04-06 18:07:02 +00:00
unknown
52b86a6e0a Polishing: note added. 2007-04-06 20:21:30 +04:00
unknown
9bc5135f81 Polishing: add comments. 
sql/parse_file.cc:
  Add comments.
 2007-04-06 18:56:39 +04:00
unknown
e3e600bcf1 Add "query_sorted" command to mysqltest 
Usage:
  query_sorted <query>;


client/mysqltest.c:
  Add query_sorted command to mysqltest
mysql-test/r/mysqltest.result:
  Update result
mysql-test/t/mysqltest.test:
  Add tests for query_sorted
 2007-04-05 20:12:56 +02:00
unknown
fd14e73c26 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
 2007-04-05 13:54:24 +02:00
unknown
390a0ede48 Protect against dying twice 
Cleanup exit handling
 2007-04-05 13:53:44 +02:00
unknown
23e92aca5a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/item_func.cc:
  Auto merged
 2007-04-05 10:24:37 +02:00
unknown
8f21b31d67 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-05 10:20:56 +02:00
unknown
9170a3c184 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
 2007-04-05 09:18:37 +02:00
unknown
f6a9b254af Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-05 09:18:36 +02:00
unknown
a3d8d943b9 set name for ndb tools 2007-04-05 09:16:16 +02:00
unknown
e8a0ac29a7 Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld 
- test case workaround to avoid random failures
 2007-04-05 09:12:30 +02:00
unknown
499d058c2d Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


include/my_base.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
 2007-04-05 08:39:12 +02:00
unknown
865cd0108a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/item_func.cc:
  Auto merged
 2007-04-05 08:24:03 +02:00
unknown
cfe2d1da88 Removed compiler warnings 2007-04-05 07:28:09 +02:00
unknown
4c0f3c50f8 Fixed compilation error on Windows 2007-04-05 06:49:43 +02:00
unknown
bb8fb9e9e6 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2007-04-05 11:30:19 +08:00
unknown
b651aa038c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-04 23:05:59 +02:00