Commit graph

45295 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
76285bdf31 Update mysql_upgrade tests for 5.1
Add "two liner" to mysqld --bootstrap that allows
wo write scripts that can be run both by mysql and mysqld --bootstrap
Remove duplicate create of MySQL system tables
2007-04-18 16:23:19 +02:00
msvensson@pilot.blaudden
01133f8e6f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-18 14:18:55 +02:00
msvensson@pilot.blaudden
dd0d2146c3 Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3 Bug#25452 mysql_upgrade access denied
- 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
2007-04-18 13:21:39 +02:00
msvensson@pilot.blaudden
f1776dc551 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-13 16:14:54 +02:00
msvensson@pilot.blaudden
8fdf9c5f64 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
msvensson@pilot.blaudden
2aef31fa51 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-13 15:13:12 +02:00
msvensson@pilot.blaudden
9abaacca9c 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
msvensson@pilot.blaudden
86a364319d 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
msvensson@pilot.blaudden
197a2677ad Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-13 15:02:10 +02:00
msvensson@pilot.blaudden
7df5e05b4d 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
mtaylor@qualinost.(none)
729a6fd02a Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
2007-04-12 11:35:16 -07:00
mtaylor@qualinost.(none)
99c5f418af 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
mtaylor@qualinost.(none)
7caf1843ee 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
mtaylor@qualinost.(none)
0af87ed83a 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
msvensson@pilot.blaudden
74dfba96e7 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
2007-04-12 17:48:28 +02:00
msvensson@pilot.blaudden
85695a3d19 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-12 16:20:14 +02:00
msvensson@pilot.blaudden
3a7821014a 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
msvensson@pilot.blaudden
9a53086995 Update result file to 5.1 format of SHOW CREATE 2007-04-12 14:29:10 +02:00
mtaylor@qualinost.(none)
48739d15f1 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint-debian
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint-debian
2007-04-11 16:38:37 -07:00
mtaylor@qualinost.(none)
6547960e28 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.
2007-04-11 16:13:09 -07:00
msvensson@pilot.blaudden
3a8b0edcb5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 23:43:58 +02:00
msvensson@pilot.blaudden
cd2f78fdd8 Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to connect
- Add testcase for SSL connection from mysqldump to mysqld
2007-04-11 23:42:53 +02:00
msvensson@pilot.blaudden
61a3fdd782 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 22:12:32 +02:00
msvensson@pilot.blaudden
05c0e928a9 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
msvensson@pilot.blaudden
4774c40089 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 22:08:00 +02:00
msvensson@pilot.blaudden
941c411dd0 Bug#21765 Illegal Instruction crash on pre-pentium when using YASSL
- Import patch with different method of detecting if machine has
   cpuid instruction
2007-04-11 22:07:24 +02:00
msvensson@pilot.blaudden
d631f11972 Print warning to log when SSL setup fails 2007-04-11 21:38:43 +02:00
msvensson@pilot.blaudden
900e0d685d Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-11 21:03:29 +02:00
msvensson@pilot.blaudden
e81cb86952 Add test for connect using different ssl ciphers 2007-04-11 21:01:10 +02:00
msvensson@pilot.blaudden
2218fafa1f Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
msvensson@pilot.blaudden
bbed143483 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:06:56 +02:00
msvensson@pilot.blaudden
4e17e06a5b Add replace_result for things that are not tested 2007-04-11 09:06:27 +02:00
msvensson@pilot.blaudden
8abdae6b6c Merge pilot.blaudden:/home/msvensson/mysql/bug25337/my51-bug25337
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 18:53:36 +02:00
msvensson@pilot.blaudden
6015d28386 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 18:20:27 +02:00
msvensson@pilot.blaudden
610ff38ed9 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 17:33:21 +02:00
msvensson@pilot.blaudden
8d0755ba47 Update result(which mysterioulsy got lost) 2007-04-10 17:33:04 +02:00
msvensson@pilot.blaudden
19f379b807 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 17:17:53 +02:00
msvensson@pilot.blaudden
3d847358de Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 17:17:08 +02:00
msvensson@pilot.blaudden
9917d018a6 Take into account wether vertical_results are in effect 2007-04-10 17:09:35 +02:00
msvensson@pilot.blaudden
73c6cde9d4 Init dying to 1 just after passing the guard 2007-04-10 17:06:36 +02:00
msvensson@pilot.blaudden
da2a216895 Add OPT_LOG_DIR 2007-04-10 17:05:22 +02:00
msvensson@pilot.blaudden
a5ef5c93c3 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 15:06:25 +02:00
msvensson@pilot.blaudden
c30b68805c 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
msvensson@pilot.blaudden
1834530549 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 15:03:14 +02:00
msvensson@pilot.blaudden
448a6778cb Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 14:59:46 +02:00
msvensson@pilot.blaudden
d549e4803a 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
msvensson@pilot.blaudden
f194cbe62a 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
msvensson@pilot.blaudden
d4f01284bd Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-10 14:47:53 +02:00
msvensson@pilot.blaudden
829ca34daf Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:46:57 +02:00