Commits · 76091b9135d990587520eb21602d46a2a7a0fc31 · nexedi / MariaDB

13 Apr, 2007 6 commits

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 76091b91
unknown authored Apr 13, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
76091b91

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 5a8405c0

unknown authored Apr 13, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysql_system_tables.sql:
  Manual merge
scripts/mysql_system_tables_data.sql:
  Manual merge

5a8405c0

Merge pilot.blaudden:/home/msvensson/mysql/bug27783/my50-bug27783 · f0d323d3
unknown authored Apr 13, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
f0d323d3

Add option manual-ddd · ba09b5f8

unknown authored Apr 13, 2007

Change syntax for starting manual ddd or gdb to avoid having to
change working dir

ba09b5f8

Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 0a5bda10

unknown authored Apr 13, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  f
  Use local

0a5bda10

Add missing option --manual-ddd · 02441231

unknown authored Apr 13, 2007

Change syntax to start manual gdb/ddd to avoid having to
cd to the mysql-test directory before calling the command

02441231

12 Apr, 2007 8 commits

Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint · 2588061c

unknown authored Apr 12, 2007

into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint


support-files/mysql.server.sh:
  Auto merged

2588061c

BUG#27367 mysql.server should be LSB init script compliant · f3c40d14

unknown authored Apr 12, 2007

Moved cd $basedir to live in the start section, as it only applies to the start
functionality and breaks the restart task

f3c40d14

Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus · df56c72b
unknown authored Apr 12, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
```
df56c72b
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus · 636308de
unknown authored Apr 12, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
```
636308de

Bug#27783 mysql_install_db should be able to install again, preserving existing files. · 14bb1b02

unknown authored Apr 12, 2007

 - 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.

14bb1b02

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 0b9d9424
unknown authored Apr 12, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
0b9d9424
Merge bk-internal:/home/bk/mysql-5.0-maint · 6d673afb
unknown authored Apr 12, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
6d673afb
Update result file to 5.1 format of SHOW CREATE · fa176565
unknown authored Apr 12, 2007

fa176565

11 Apr, 2007 14 commits

Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint-debian · f664fbd5

unknown authored Apr 11, 2007

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint-debian


BitKeeper/deleted/.del-configure.in.rej:
  Auto merged
Makefile.am:
  Added debian dir to the DIST_SUBDIRS.
configure.in:
  Merged changes from 5.0 for adding debian dir.

f664fbd5

Adding files to support building for debian. · 083f0820

unknown authored Apr 11, 2007

```yaml
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.

083f0820

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 195ba1c7

unknown authored Apr 11, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/openssl_1.result:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged

195ba1c7

Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to connect · c4e10d7b

unknown authored Apr 11, 2007

 - 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

c4e10d7b

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · cabfa25a
unknown authored Apr 11, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
cabfa25a
Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import · 9f1d713d
unknown authored Apr 11, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
9f1d713d

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 5394708e

unknown authored Apr 11, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/r/openssl_1.result:
  Manual merge
mysql-test/t/openssl_1.test:
  Manual merge

5394708e

Bug#21765 Illegal Instruction crash on pre-pentium when using YASSL · ad8946ac

unknown authored Apr 11, 2007

 - Import patch with different method of detecting if machine has
   cpuid instruction


extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff

ad8946ac

Print warning to log when SSL setup fails · 2d07a11d
unknown authored Apr 11, 2007

2d07a11d

Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611 · 896012d4

unknown authored Apr 11, 2007

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

896012d4

Add test for connect using different ssl ciphers · f90898ab
unknown authored Apr 11, 2007
```
mysql-test/r/openssl_1.result:
  Update result
```
f90898ab

Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 · 6848d4f1

unknown authored Apr 11, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/Makefile.am:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
client/Makefile.am:
  Merge
netware/Makefile.am:
  Merge
sql/Makefile.am:
  Merge

6848d4f1

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 08cffb7c

unknown authored Apr 11, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/rpl_ssl.result:
  Auto merged
mysql-test/t/rpl_ssl.test:
  Auto merged

08cffb7c

Add replace_result for things that are not tested · 1cc9d90c
unknown authored Apr 11, 2007

1cc9d90c

10 Apr, 2007 12 commits
- Merge pilot.blaudden:/home/msvensson/mysql/bug25337/my51-bug25337 · 9c7d78a1
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  9c7d78a1
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 598a2db9
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysqltest.result:
  Auto merged
```
  598a2db9
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · d5c68d28
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged
```
  d5c68d28
- Update result(which mysterioulsy got lost) · b7069c27
  unknown authored Apr 10, 2007
  
  b7069c27
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 2f5245b3
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
```
  2f5245b3
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · f5039e1f
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
  f5039e1f
- Take into account wether vertical_results are in effect · a18fcdbf
  unknown authored Apr 10, 2007
  
  a18fcdbf
- Init dying to 1 just after passing the guard · c7abe519
  unknown authored Apr 10, 2007
  
  c7abe519
- Add OPT_LOG_DIR · 6a7c5b71
  unknown authored Apr 10, 2007
  
  6a7c5b71
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 97974b6a
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  97974b6a
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 09eb82b5
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  09eb82b5
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · cf6f5039
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  cf6f5039