mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35136 commits 2784 branches 343 tags 1.6 GiB
Commit graph

891 commits

Author SHA1 Message Date
igor@rurik.mysql.com
70ee1c2c6e Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-06-09 00:23:59 -07:00
igor@rurik.mysql.com
0585e50599 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-05-31 18:10:02 -07:00
jani@ua141d10.elisa.omakaista.fi
04441d04b1 Merge from 5.0 to 5.1. Third part with fixes. 2006-05-31 14:55:28 +03:00
kent@mysql.com
4f2e784ac2 make_win_src_distribution.sh: 
Convert to DOS EOL if dsp/dsw is in package
 2006-05-29 20:09:22 +02:00
andrey@lmy004.
ea20259aac Merge lmy004.:/work/mysql-5.1-new-vanilla 
into lmy004.:/work/mysql-5.1-runtime
 2006-05-29 15:16:07 +02:00
andrey@lmy004.
b4752351f2 Fix for bug #17394 - Events namespace is wrong 2006-05-29 10:39:45 +02:00
brian@zim.(none)
ca63edc88b Removing mysql_explain_log from 5.1 2006-05-23 17:26:56 -07:00
kent@mysql.com
e9d96153e1 make_sharedlib_distribution.sh: 
Solaris sh don't like {..} in file matching
 2006-05-23 00:50:39 +02:00
tim@siva.hindu.god
bc89c92c37 Bug #6061 mysql-log-rotate script - error logging doesn't use new file 
- Fix mysqld_safe so that it always passes correct --log-error argument to mysqld
- A few other minor clean-ups to mysqld_safe
 2006-05-10 11:33:36 -06:00
jimw@mysql.com
c104ea0960 Delete unused (and unmaintained) scripts. 2006-04-17 20:01:07 -07:00
jimw@mysql.com
55727ef6d0 Remove sql-bench from the server repository -- it is being maintained 
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.
 2006-04-13 10:34:46 -07:00
jimw@mysql.com
c490aff57e Merge mysql.com:/home/jimw/my/mysql-5.1-refactor 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-12 08:24:20 -07:00
holyfoot@deer.(none)
aa80bf659b mysql_upgrade.sh removed. 
client/mysql_upgrade bunary should be used instead
 2006-04-12 16:54:00 +05:00
jimw@mysql.com
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new, 
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
 2006-04-11 18:54:24 -07:00
kent@mysql.com
41923d3bb1 mysql-test-run.pl: 
Added --ndbcluster_port for backward compatibility
make_win_src_distribution.sh:
  Updated to reflect 5.1 changes
 2006-04-10 14:15:02 +02:00
kent@mysql.com
f957d8e282 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
 2006-04-08 04:29:17 +02:00
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
kent@mysql.com
0298bfaac6 Merge 2006-04-03 03:52:22 +02:00
kent@mysql.com
6ba1a85726 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-04-03 03:40:54 +02:00
kent@mysql.com
e1d6c31984 mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c: 
Changed web address order.mysql.com to shop.mysql.com
 2006-04-03 03:37:43 +02:00
konstantin@mysql.com
5c99b8b83f Merge mysql.com:/opt/local/work/tmp_merge 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-03-30 18:43:42 +04:00
kent@mysql.com
6ce9c90db9 mysqld_safe.sh: 
Added --help option, bug#16392
acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332
 2006-03-29 23:51:23 +02:00
kent@mysql.com
0d332aef39 Merge 2006-03-29 15:05:06 +02:00
kent@mysql.com
67f2b0f3bc mysql_config.sh: 
If installed, search built in lib path first, bug#13158
 2006-03-29 14:59:53 +02:00
ian@zim.(none)
9caff206c2 Merge zim.(none):/home/ian/workspace/mysql-5.0 
into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian
 2006-03-27 19:48:44 -08:00
kent@mysql.com
6b51a2c69f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-03-27 23:08:25 +02:00
kent@mysql.com
04f059c5bf mysql_config.sh: 
Remove Solaris -xc99=none C option as C++ compiler can't handle it
 2006-03-27 23:04:44 +02:00
kent@mysql.com
898db8b053 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-03-27 19:37:29 +02:00
kent@mysql.com
35ae639477 mysql_config.sh: 
We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
 2006-03-27 19:25:25 +02:00
kent@mysql.com
5ff0851d4e make_binary_distribution.sh: 
Split cp operations, to avoid shell limit on number of args
mysql-test-run.pl:
  Removed obsolete way of cleaning up after test failure
.del-drop-on-restart.inc~ef1715ddbebc3102:
  Delete: mysql-test/include/drop-on-restart.inc
 2006-03-27 06:44:45 +02:00
andrey@lmy004.
531ad766ed fix for bug#16415 Events names are case sensitive 2006-03-24 17:45:52 +01:00
msvensson@neptunus.(none)
e2827d97ea Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-03 13:33:01 +01:00
kent@mysql.com
550e73cc6e mysql-test-run.pl: 
Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
mysqld_safe.sh:
  Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861
 2006-03-02 22:53:38 +01:00
msvensson@neptunus.(none)
d8153d4449 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-02 18:37:08 +01:00
joerg@mysql.com
6838660267 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1 2006-03-02 10:48:46 +01:00
msvensson@neptunus.(none)
24e959f348 Bug#17368 General log and slow query log don't work 
- Add "storage/csv" to directories to be copied
 2006-03-01 21:10:30 +01:00
tomas@poseidon.ndb.mysql.com
df6bb1994b Bug #17805 Cluster_replication database should be renamed to just cluster 2006-03-01 13:31:21 +01:00
kent@mysql.com
5d722a8491 Merge 2006-02-28 23:29:58 +01:00
monty@mysql.com
1e2e9e2856 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-02-25 21:54:34 +02:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it 
(Needed for "list of pushes" web page and autopush)
 2006-02-24 18:34:15 +02:00
andrey@lmy004.
5ac46bb961 fix for bug #16400 2006-02-24 00:29:50 +01:00
holyfoot@mysql.com
32da648789 Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into mysql.com:/home/hf/work/mysql-5.1.clean
 2006-02-22 10:53:44 +04:00
holyfoot@mysql.com
a94943df0c Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into mysql.com:/home/hf/work/mysql-5.1.clean
 2006-02-22 10:33:42 +04:00
holyfoot@deer.(none)
796489ea1e Messgges corrected in mysql_upgrade script 2006-02-20 14:26:32 +04:00
holyfoot@deer.(none)
70fdbff94f --help option added to mysql_upgrade script 2006-02-18 14:55:31 +04:00
kent@mysql.com
a50023d772 mysqlimport.c: 
Handle case where there is no snprintf()
libmysql.vcproj, mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
dbug.vcproj:
  Changed __WIN32__ to __WIN__
dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug.vcproj:
  Define __WIN__ for all targets
 2006-02-18 08:46:18 +01:00
kent@mysql.com
9aca849da1 Makefile.am: 
Add an extra -lpthread before first -lc, to solve link
  problems when statically linking with glibc 2.2.5
make_win_src_distribution.sh:
  Added copying of the include/mysql directory
 2006-02-18 04:23:24 +01:00
joerg@mysql.com
0611ea3222 Surprising change: "mysqld-max" is resurrected in 5.1, but in a common package. 2006-02-17 14:14:56 +01:00
holyfoot@mysql.com
be02944df6 Merging 5.0->5.1 2006-02-17 11:26:03 +04:00
holyfoot@deer.(none)
053d90a234 WL#2645 (CHECK TABLE FOR UPGRADE) 
necessary implementation in the server
mysql_upgrade script added
 2006-02-17 10:52:32 +04:00