1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-10 02:01:19 +03:00

1062 Commits

Author SHA1 Message Date
msvensson@pilot.blaudden
c2bbf3c05e Add back the look for exe_mysql 2007-03-28 15:56:57 +02:00
msvensson@pilot.blaudden
6969acd293 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 11:17:08 +02:00
msvensson@pilot.blaudden
1577caab52 Turn off im if extern
Remove strange comment
Add run_query function
2007-03-28 11:16:50 +02:00
msvensson@pilot.blaudden
a1a664ebf7 Use mtr_verbose instead of "if ($opt_verbose)" 2007-03-28 10:08:26 +02:00
baker@bk-internal.mysql.com
2bfa1aa3d6 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-27 18:44:02 +02:00
baker@bk-internal.mysql.com
503d7b20cb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-23 20:25:36 +01:00
msvensson@pilot.blaudden
fae5868936 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-23 11:19:57 +01:00
msvensson@pilot.blaudden
cd5e553267 Bug#27070 server logs are created unrequested and in wrong directory
- Add output path for slow queries as well
2007-03-23 11:18:59 +01:00
joerg@trift2.
4ab912c92a Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-03-23 11:10:27 +01:00
joerg@trift2.
2e5e79cf37 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-03-23 10:57:17 +01:00
omer@linux.site
cbdd03c5d5 Merge linux.site:/home/omer/source/bld50_0321
into  linux.site:/home/omer/source/bld51_0322
2007-03-22 14:49:25 -07:00
tsmith@quadxeon.mysql.com
54e7bc8daa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-22 01:04:39 +01:00
omer@linux.site
c21a5bc8b1 Modifying mysql-test-run.pl to allow steeing of --secure-file-priv to 'mysql-test' when
running suites other tha the main one
2007-03-21 11:05:43 -07:00
kent@kent-amd64.(none)
a149769b2d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-20 17:58:30 +01:00
kostja@bodhi.local
bdb10baec1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-20 00:42:11 +03:00
msvensson@pilot.blaudden
709f066948 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-19 11:15:59 +01:00
brian@zim.(none)
e246cb3d80 The pthread() support was not working. Once I fixed use-thread in a previous push I realized that the pthread/windows code was not working. I've replaced the fork/thread design with a pure pthread design using condition timers and broadcast.
Ramification, UNIX now uses thread, support for slaves had to be dropped and there is no need for the --use-threads flag.
Added --concurrency=0 option so that it will start at 1 and keep going up until something bad happens :)
2007-03-16 15:20:22 -07:00
joerg@trift2.
66960bd1e7 Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Build sql files for netware from the mysql_system_tables*.sq files
 - Fix comments about mysql_create_system_tables.sh
 - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
 - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files

Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.
2007-03-16 20:56:16 +01:00
msvensson@pilot.blaudden
88b4c86e09 Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Build sql files for netware from the mysql_system_tables*.sq files
 - Fix comments about mysql_create_system_tables.sh
 - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
 - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
2007-03-16 17:28:32 +01:00
kostja@bodhi.local
7d84ef0e11 Bug#26765 "typo when running mysql-test-run"
Fix a typo (togheter -> together)
2007-03-15 23:17:44 +03:00
msvensson@pilot.blaudden
1011b0c366 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-15 09:59:52 +01:00
msvensson@pilot.blaudden
d729858b2e Pass pointer to current mysqld to mysqld_arguments in order to make the
code eaiser and more extensible
2007-03-15 09:58:39 +01:00
msvensson@pilot.blaudden
dd16b217c7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-08 14:56:08 +01:00
msvensson@pilot.blaudden
433d3e6cf7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-08 14:55:39 +01:00
tsmith@quadxeon.mysql.com
79191807ff Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
2007-03-07 07:21:24 +01:00
tsmith@quadxeon.mysql.com
a15fe85de2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
2007-03-07 06:54:35 +01:00
msvensson@pilot.blaudden
94c616d186 Bug #26792 Add DBX debugger support to mysql-test-run.pl
- Add --debugger=dbx
 - Fix --debugger=devenv, --debugger=DevEnv and --debugger=/path/devenv
2007-03-05 09:52:40 +01:00
malff/marcsql@weblab.(none)
df5c5aea23 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-03-01 14:06:57 -07:00
msvensson@pilot.blaudden
d1d64ba50f Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 19:10:07 +01:00
msvensson@pilot.blaudden
86625d711f Fix bug in mtr.pl where slave wes using same query log file as master 2007-03-01 18:31:09 +01:00
msvensson@pilot.blaudden
f5778fc73e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 18:12:56 +01:00
msvensson@pilot.blaudden
51a71fb667 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-01 14:53:32 +01:00
malff/marcsql@weblab.(none)
dc98aa82ab Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-02-28 18:14:56 -07:00
msvensson@pilot.blaudden
162f0803bb Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint-bug20166
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 16:40:50 +01:00
msvensson@pilot.blaudden
05ed84a3d2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
2007-02-28 15:04:20 +01:00
msvensson@pilot.blaudden
9cfd569174 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-28 14:41:57 +01:00
msvensson@pilot.blaudden
e391b86fb0 Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Split out initial data in mysql_system_tables.sql to  it's own file
 - Use file from mysql_install_db and mysql-test-run
2007-02-28 14:26:58 +01:00
msvensson@pilot.blaudden
f63240f901 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 13:48:43 +01:00
msvensson@pilot.blaudden
6ea41f355c Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 13:47:59 +01:00
msvensson@pilot.blaudden
c0da93cd97 When using a --mem=<dir> the memdir must be removed to assure
afresh start
2007-02-28 13:47:41 +01:00
msvensson@pilot.blaudden
780d434cb5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 10:07:37 +01:00
monty@mysql.com/narttu.mysql.fi
cfef5d04b3 Remove compiler warnings 2007-02-27 19:31:49 +02:00
msvensson@pilot.blaudden
2f36118018 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-27 15:29:44 +01:00
msvensson@pilot.blaudden
14cfc7e1ba Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-27 14:54:33 +01:00
msvensson@pilot.blaudden
eb135547eb Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-26 14:56:23 +01:00
msvensson@pilot.blaudden
23b6b4a565 Only allow a version number to be read from "/etc/debian_version" 2007-02-26 14:52:51 +01:00
msvensson@pilot.blaudden
f6e31a2cd1 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
2007-02-26 14:25:59 +01:00
msvensson@pilot.blaudden
c550a45522 Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Use mysql_system_tables.sql to create MySQL system tables in
   all places where we create them(mysql_install_db, mysql-test-run-pl
   and mysql_fix_privilege_tables.sql)
2007-02-26 11:49:24 +01:00
anozdrin/alik@booka.opbmk
77079d385d Fix shutdown delay option name according to The Manual. 2007-02-24 13:10:04 +03:00
anozdrin/alik@alik.opbmk
50e5958f28 Fix merge & update result file. 2007-02-23 23:36:25 +03:00