Commits · 984d8e23d60cd03984afe9f119ad04fe20e4d0e6 · nexedi / MariaDB

23 Apr, 2007 2 commits
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 984d8e23
  unknown authored Apr 23, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
```
  984d8e23
- Protect against killing pid's that would "killall" or "kill self" · d19d4b3f
  unknown authored Apr 23, 2007
  
  d19d4b3f
20 Apr, 2007 1 commit
- Remove comment · 1f6c9a58
  unknown authored Apr 20, 2007
  
  1f6c9a58
19 Apr, 2007 5 commits

Add replace for varying errno · 45face8f
unknown authored Apr 19, 2007

45face8f

mysql_upgrade portability fixes · 36cd228a

unknown authored Apr 19, 2007


client/mysql_upgrade.c:
  Add defines for WEXITSTATUS
  Pass arguments on command line instead of --defaults-file=<temp file>
mysql-test/r/mysql_upgrade.result:
  When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
  is used on all platforms.
mysql-test/t/mysql_upgrade.test:
  When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
  is used on all platforms.
scripts/comp_sql.c:
  Some compilers have a max string length, insert a newline at
  every 512th char in long strings

36cd228a

mysql_upgrade depends on GenFixPrivs · ffd062f7
unknown authored Apr 19, 2007

ffd062f7
Build zlib before extra since extra/comp_err uses zlib · dea53d61
unknown authored Apr 19, 2007

dea53d61

mysql_upgrade win fixes · 4fff310e

unknown authored Apr 19, 2007


client/mysql_upgrade.c:
  Windows fix
scripts/CMakeLists.txt:
  Fix problems with CMakeList causing build to fail
scripts/comp_sql.c:
  Improve comp_sql.c to generate output file with shorter strings

4fff310e

18 Apr, 2007 11 commits

Add CMakeLists.txt to EXTRA_DIST · b4573eb4
unknown authored Apr 18, 2007

b4573eb4
Remove the check for value_start(if any it should be *value_start) · 1f949e08
unknown authored Apr 18, 2007

1f949e08
Use my_snprintf instead of snprintf · 87a05adf
unknown authored Apr 18, 2007

87a05adf
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 29b61191
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
29b61191
Use my_snprintf instead of snprintf · aa043d73
unknown authored Apr 18, 2007

aa043d73
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 1196531a
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
1196531a
Add mysql builtin $MYSQL_SERVER_VERSION and some function to make · 4dc441d3
unknown authored Apr 18, 2007
```
it easier to set a variable from string or int 
```
4dc441d3
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 1c6ed4bc
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
```
1c6ed4bc
Make it possible to define how many slaves to start by · 5c911775
unknown authored Apr 18, 2007
```
writing --slave-num=n in <testname>-master.opt file 
```
5c911775

Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade · 5eab19d7

unknown authored Apr 18, 2007

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


BitKeeper/etc/ignore:
  auto-union
CMakeLists.txt:
  Auto merged
Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged

5eab19d7

Bug#25452 mysql_upgrade access denied · 1d24597f

unknown authored Apr 18, 2007

 - Improve mysql_upgrade and add comments describing it's logic
 - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
  was started from
 - Don't look for mysql_fix_privilege_tables.sql randomly, compile
  in the mysql_fix_privilege_tables.sql file and use that to upgrade
  the system tables of MySQL
 - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
 - Fix bug#26639, bug#24248 and bug#25405


BitKeeper/etc/ignore:
  Added scripts/comp_sql scripts/mysql_fix_privilege_tables_sql.c to the ignore list
CMakeLists.txt:
  Build files also in scripts/
Makefile.am:
  Build scripts/ a little earlier to make
  the scripts/mysql_fix_privilege_tables_sql.c file available
  when client/ is built
client/mysql_upgrade.c:
  Updated version of mysql_upgrade with comments and logical functions
include/my_global.h:
  Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
mysql-test/r/mysql_upgrade.result:
  Update result
mysql-test/t/mysql_upgrade.test:
  Add more tests for different bugs related to mysql_upgrade
scripts/Makefile.am:
  Build comp_sql and mysql_fix_privilege_tables_sql.c
sql/mysql_priv.h:
  Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
scripts/CMakeLists.txt:
  New BitKeeper file ``scripts/CMakeLists.txt''
scripts/comp_sql.c:
  New BitKeeper file ``scripts/comp_sql.c''

1d24597f

13 Apr, 2007 5 commits
- Merge bk-internal:/home/bk/mysql-5.0-maint · 2276ca1a
  unknown authored Apr 13, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  2276ca1a
- Merge pilot.blaudden:/home/msvensson/mysql/bug27783/my50-bug27783 · 0ab74abc
  unknown authored Apr 13, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  0ab74abc
- Add option manual-ddd · 59c4bf42
  unknown authored Apr 13, 2007
```
Change syntax for starting manual ddd or gdb to avoid having to
change working dir 
```
  59c4bf42
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 80e53fb1
  unknown authored Apr 13, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  f
  Use local
```
  80e53fb1
- Add missing option --manual-ddd · e3a24797
  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
```
  e3a24797
12 Apr, 2007 5 commits

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

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

44c00123

Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus · 49e9743d
unknown authored Apr 12, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
```
49e9743d
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus · 1aee9665
unknown authored Apr 12, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
```
1aee9665

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

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.

87a99ed7

Merge bk-internal:/home/bk/mysql-5.0-maint · f4c619ba
unknown authored Apr 12, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
f4c619ba

11 Apr, 2007 8 commits

Adding files to support building for debian. · 359594cc

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.

359594cc

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

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

35c10cca

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

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

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

c6b0cff1

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

d25a540d

Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611 · 2b6cd457

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

2b6cd457

Add test for connect using different ssl ciphers · d032b0e5
unknown authored Apr 11, 2007
```
mysql-test/r/openssl_1.result:
  Update result
```
d032b0e5
Add replace_result for things that are not tested · 561cd328
unknown authored Apr 11, 2007

561cd328

10 Apr, 2007 3 commits
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · bfe25fb2
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged
```
  bfe25fb2
- Update result(which mysterioulsy got lost) · 247c3a81
  unknown authored Apr 10, 2007
  
  247c3a81
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 30606c38
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
  30606c38