mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50603 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1288 commits

Author SHA1 Message Date
mskold/marty@linux.site
6f0e7a2631 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-01 21:12:13 +01:00
mskold/marty@mysql.com/linux.site
cde79e4f79 Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
msvensson@neptunus.(none)
dc88e57744 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-30 13:04:24 +01:00
msvensson@neptunus.(none)
af5882a175 Merge neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-30 11:40:13 +01:00
monty@mysql.com/narttu.mysql.fi
23263db66e Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations 
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
 2006-11-29 22:51:09 +02:00
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 15:44:09 +01:00
msvensson@neptunus.(none)
dcf0f346cf Bug#20589 Missing some table level privileges after upgrade 
- The table_priv column of table_privs table was altered to a enum type
   with fewer enums causing the SHOW/CREATE VIEW grants to be truncated.
 - Improved comments and moved all declarations for table_privs, column_privs
   and proc_privs to one section for each table making it easy to see hat alterations
   are performed on each table
 - Reduced the number of ALTER's slightly, but as this is an upgrade script we need
   to take all possibilites into account.
 2006-11-29 12:04:29 +01:00
msvensson@neptunus.(none)
86f0d1bb03 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-24 12:12:25 +01:00
msvensson@neptunus.(none)
0e4d97edf0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-23 18:38:27 +01:00
msvensson@neptunus.(none)
c76adf6021 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
88d2c9d130 Merge neptunus.(none):/home/msvensson/mysql/bug20589/my41-bug20589 
into  neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589
 2006-11-22 09:52:56 +01:00
msvensson@neptunus.(none)
0a27881be5 Bug #20589 Missing some table level privileges after upgrade 
- Update comments to reflect correct version
 2006-11-22 09:52:31 +01:00
monty@nosik.monty.fi
38a92caeb7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-21 23:12:45 +02:00
msvensson@neptunus.(none)
d89db5edf8 When runnig from binary dist the .sql files are found in share/ directory 2006-11-21 21:39:37 +01:00
monty@mysql.com/nosik.monty.fi
f6682e2743 Added --debug-info to most clients to detect memory leaks in mysql-test-run 
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
 2006-11-21 22:32:58 +02:00
msvensson@neptunus.(none)
7673a2d415 Update mysql_fix_privilege_tables.sql to handle upgrade from 5.0 while retaining 
old upgrade behaviour.
Add test for upgrade from 5.0.30
 2006-11-21 17:44:43 +01:00
msvensson@neptunus.(none)
30088b9d23 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-21 16:51:47 +01:00
msvensson@neptunus.(none)
13b5e6275a Add ALTER TABLE MODIFY statements in addition to the ALTER TABLE ADD for new 
columns to make sure they both exist and have the intended type
 2006-11-21 16:31:44 +01:00
cmiller@zippy.cornsilk.net
b24d39c9e7 Change collation for ALTER-omitted ENUMs from utf8_bin (where "y" and 
"Y" are different) to utf8_general_ci (where same).
 2006-11-20 15:37:22 -05:00
cmiller@zippy.cornsilk.net
a70b94281c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my41-bug17700 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-11-15 10:03:54 -05:00
cmiller@zippy.cornsilk.net
07ff53ea2f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-15 10:01:50 -05:00
cmiller@zippy.cornsilk.net
17a4cb2b93 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my51-bug17700
 2006-11-15 09:56:01 -05:00
cmiller@zippy.cornsilk.net
2b3a69eb42 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my41-bug17700 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700
 2006-11-15 09:55:24 -05:00
cmiller@zippy.cornsilk.net
3ebd031e00 Bug#17700: mysql_fix_privilege_tables cannot handle a password \ 
with embedded spaces
  
Problem:  Original code written assuming password contains no spaces.
Further, because of how sh interprets characters in variables, you
cannot do the "simple solution".
  
Solution:  Move the "was a password provided" check to the end. This
allows us to correctly quote the password argument when passed to the
mysql client program.  Addendum:  Put this check inside of a shell fn
to simplify the code.
 2006-11-15 09:54:54 -05:00
df@kahlann.erinye.com
a3d8fdbeb9 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/51
 2006-11-14 14:49:45 +01:00
df@kahlann.erinye.com
4dd2d7062a Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-14 14:48:29 +01:00
df@kahlann.erinye.com
5d8525c6f7 make_binary_distribution should of course also copy .test files from mysql-test/include 2006-11-14 14:44:20 +01:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e209edaa32 Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic
 2006-11-07 23:01:38 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1d932b992c Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic
 2006-11-07 22:55:19 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
7364bc113e Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic
 2006-11-07 22:49:46 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
3d7a9bdd6b make_binary_distribution.sh: 
Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt
 2006-11-07 22:26:37 +01:00
msvensson@neptunus.(none)
2459dd55f5 Copy *.cnf file from std_data/ when doing a binary distribution 2006-10-23 10:56:13 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f97fe50dbb Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-10-21 01:13:50 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
08d47a3b81 make_win_bin_dist: 
Copy udf examples and raid.h
  Create target "include" directory before copying files to it
CMakeLists.txt:
  Only compile in bdb if configured
configure.in:
  Raised version number to 5.0.27
 2006-10-21 00:57:08 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
60104e1132 make_win_bin_dist: 
Aligned script with updated 5.0 version
 2006-10-20 20:18:44 +02:00
jonas@perch.ndb.mysql.com
2f7b2611f7 ndb - remove duplicate solution to ndb_restore_compat make_binary_distribution problem 2006-10-17 15:05:31 +02:00
jonas@perch.ndb.mysql.com
44e0587486 ndb - ndb_restore_compat 
Update make_binary_distribution.sh
  Make sure all files needed for testing are included
 2006-10-17 13:34:00 +02:00
kent@mysql.com/c-794072d5.010-2112-6f72651.cust.bredbandsbolaget.se
8692bb53a3 make_binary_distribution.sh: 
Split copy of result files to avoid shell limit.
  Added copy of mysql-test/std_data/ndb_backup5{0,1}.
configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
 2006-10-16 02:07:50 +02:00
msvensson@neptunus.(none)
ed250c1763 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-10-11 10:01:43 +02:00
msvensson@shellback.(none)
9a8bc01f8c Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 09:05:34 +02:00
tsmith/tim@siva.hindu.god
1d5d5a1c4a Merge siva.hindu.god:/usr/home/tim/m/bk/40 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-10-02 16:18:42 -06:00
kent@c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
3a65bd1616 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
 2006-09-25 01:36:14 +02:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
bf29b9db98 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-09-25 01:32:55 +02:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
878416e054 mysql_config.sh: 
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
  Filter out icc specific options from cflags/libs(_r)
 2006-09-25 00:54:46 +02:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e826f7490e mysql.spec.sh: 
Added "test" RPM package
  Install all binaries "make install" would
make_binary_distribution.sh:
  Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
 2006-09-24 00:41:20 +02:00
cmiller@zippy.cornsilk.net
895bf0555b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-15 11:25:02 -04:00
hartmut@mysql.com/linux.site
871eeadc94 Add SSL specific linker flags to --libmysqld-libs (Bug #21239) 2006-09-15 16:35:50 +02:00
cmiller@zippy.cornsilk.net
c3984c71b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.0-maint
 2006-09-06 14:50:53 -04:00
georg@lmy002.wdf.sap.corp
66133b7f74 included make_win_bin_dist (required for pushbuild) into distribution (make dist) 2006-09-01 16:55:35 +02:00
georg@lmy002.wdf.sap.corp
5686da41ac Fixes for crashes and test failures 2006-09-01 14:34:37 +02:00
brian@zim.(none)
41f920b013 Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-14 21:26:33 -07:00
brian@zim.(none)
8deb5beb9c Merge zim.(none):/home/brian/mysql/dep-5.0 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-08-14 15:24:29 -07:00
joerg@trift2.
a560c3ee1f scripts/make_binary_distribution.sh : Drop the "max" server from 5.1 packages. 2006-08-14 19:56:41 +02:00
brian@zim.(none)
af443c2dd8 Fixed warning message breakage. 
Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references.
 2006-08-13 22:28:41 -07:00
cmiller@zippy.cornsilk.net
543fcde9b9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
 2006-08-09 22:23:41 -04:00
kroki/tomash@moonlight.intranet
5c272816ca Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-09 13:37:20 +04:00
cmiller@zippy.cornsilk.net
dd5eeaf676 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ
 2006-08-02 14:57:12 -04:00
evgen@moonbone.local
7f0a080660 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-08-02 16:46:55 +04:00
msvensson@neptunus.(none)
f1a262bcd5 Merge bk-internal:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-07-31 16:07:28 +02:00
kroki/tomash@moonlight.intranet
5c90b6f810 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
 2006-07-29 13:43:34 +04:00
jimw@rama.(none)
f7e19b40f3 Merge rama.(none):/home/jimw/my/tmp_merge 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-07-28 15:51:48 -07:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-07-28 23:40:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c188a3bf0a make_binary_distribution.sh: 
Man page for "mysqld" command move to section 8 (bug#21220)
 2006-07-28 23:06:49 +02:00
iggy@rolltop.ignatz42.dyndns.org
b146324946 Bug #18777: Mysqlhotcopy does not copy all the direcories. 2006-07-26 12:36:10 -04:00
msvensson@neptunus.(none)
d89f177377 Bug#21125 mysqldump: Problem with non-standard table names 
- The mysql-test/std_data/bug15328.cnf file was not copied to install or dist dir.
 2006-07-24 14:31:37 +02:00
evgen@moonbone.local
b7a55b9b5c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-07-18 23:45:17 +04:00
igor@rurik.mysql.com
6e75a11b01 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-14 14:45:23 -07:00
iggy@rolltop.ignatz42.dyndns.org
bd791a15ae Bug #20721: mysql_install_db first line is blank. 
Minor script changes for uniformity.
 2006-07-14 15:22:16 -04:00
cmiller@zippy.(none)
87dd9b978c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
 2006-07-13 11:12:41 -04:00
cmiller@zippy.(none)
2c5308a703 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
 2006-07-13 11:11:20 -04:00
iggy@rolltop.ignatz42.dyndns.org
d3eab1ca35 Bug #19779: mysql_explain_log documentation is outdated. 2006-07-13 10:48:34 -04:00
joerg@trift2.
dcf85ebec4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 
into trift2.:/M51/bug20216-5.1
 2006-07-06 17:58:31 +02:00
joerg@trift2.
1746d41862 Merge mysql.com:/M50/tmp_merge_kent into mysql.com:/M51/merge-kent-5.1 2006-07-05 16:30:13 +02:00
igor@rurik.mysql.com
ce57588434 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-01 15:31:28 -07:00
knielsen@rt.int.sifira.dk
dcd9132fe7 Merge mysql.com:/usr/local/mysql/mysql-5.1-bindist 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-06-30 15:21:45 +02:00
knielsen@mysql.com
5b1c92244c Add a script scripts/make_win_bin_dist, used to generate a Windows 
binary disctribution for Falcon.
 2006-06-30 15:15:20 +02:00
elliot@mysql.com
68db32613b Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
 2006-06-30 00:14:25 -04:00
cmiller@zippy.(none)
244bdc96c3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
 2006-06-29 13:49:40 -04:00
joerg@mysql.com
dcc67c0080 Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516). 2006-06-29 11:59:05 +02:00
igreenhoe@mysql.com
1d8e1ba3a6 Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/greenman/workspace-mysql/mysql/pending/bug-5.0-17353
 2006-06-28 08:32:41 -07:00
iggy@mysql.com
578fee6990 Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter 2006-06-27 18:07:23 -04:00
joerg@mysql.com
d6038ede17 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/autopush20216-5.0
 2006-06-27 22:45:21 +02:00
kent@mysql.com
b1d3bd5a7a Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-06-27 00:13:45 +02:00
kent@mysql.com
748b287cad Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-06-26 23:47:14 +02:00
kent@mysql.com
c36dd28676 make_sharedlib_distribution.sh: 
For compatibility, don't use {..,..} in pattern matching
make_binary_distribution.sh:
  Added .dylib and .sl as shared library extensions
 2006-06-26 23:44:17 +02:00
kent@mysql.com
b6e89c2b1e .del-make_win_src_distribution.sh~f80d8fca44e4e5f1: 
Delete: scripts/make_win_src_distribution.sh
Makefile.am:
  Unix and Windows now shares source package
 2006-06-25 10:25:00 +02:00
igor@rurik.mysql.com
b5bdc178af Fixed some dsp files. 
Fixed make_win_src_distribution.sh to return back dsp files
for yassl.
 2006-06-23 18:21:34 -07:00
joerg@mysql.com
671a1be31b The binary "mysql_upgrade" must be included in the distribution. (bug#18516 + 19353) 2006-06-23 12:17:11 +02:00
joerg@mysql.com
7d83b7e48a Improved fix for bug#18516 (also 19353): 
1) Rename the old shell tool "mysql_upgrade", to avoid a name collision.
2) Improve the spec file, to explicitly use a temporary socket.
 2006-06-22 14:28:05 +02:00
kent@mysql.com
34d82f0bc6 make_win_src_distribution.sh: 
Removed reference to missing "tools" directory
mysql.spec.sh:
  Changed flag --with-yassl => --with-ssl
  Reverted accidental removal of the "make" call :-)
  Configure --with-embedded-server
  Corrected path to "libtool" command
  Corrected path to "libmysqld.a"
  Removed references to "safe_mysqld"
 2006-06-20 12:24:12 +02:00
kent@mysql.com
8f0aa436ed Merge 2006-06-20 11:11:18 +02:00
kent@mysql.com
cae47f4b20 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-06-17 11:38:16 +02:00
kent@mysql.com
6783fc830f make_win_src_distribution.sh: 
Make output less verbose
  Make temporary directory name unique
  Remove temporary directory on interrupt
 2006-06-17 11:33:34 +02:00
kent@mysql.com
1b7d4cacfb make_win_src_distribution.sh: 
Don't try copy non existing extra/{sql_state,mysqld_error}.h
 2006-06-17 10:44:52 +02:00
kent@mysql.com
10833287ef Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-06-17 03:13:22 +02:00
kent@mysql.com
eadd351031 make_win_src_distribution.sh: 
Include "sql_yacc.yy" for completeness (bug#20387)
 2006-06-17 03:04:43 +02:00
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
igreenhoe@mysql.com
ed2432494f Fix for bug #17353. 2006-04-17 19:57:50 -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
brian@zim.tangent.org
0c487a79c9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/dep-5.1
 2006-02-12 13:27:56 -08:00
brian@zim.tangent.org
0a5a30bef3 This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 2006-02-12 13:26:30 -08:00
kent@mysql.com
eb9683442d Merge 2006-02-12 20:45:03 +01:00
kent@mysql.com
73de951abc Merge 2006-02-12 04:48:52 +01:00
kent@mysql.com
f9a23667b2 Merge 2006-02-12 04:33:50 +01:00
kent@mysql.com
1fe9126dc2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-02-12 01:35:30 +01:00
kent@mysql.com
eec5726806 make_binary_distribution.sh: 
print => echo in shell script
 2006-02-12 01:33:43 +01:00
joerg@mysql.com
181235d03b scripts/make_binary_distribution.sh : Care about the debug server in the 5.1 packages. 2006-02-07 19:06:55 +01:00
joerg@mysql.com
9f243de9c9 scripts/make_binary_distribution.sh : 
Adaption of the 5.1.6 build clone to the new "storage" directory layer,
already done in the general tree by Jani.
 2006-02-07 17:42:04 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
d955abd292 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2006-02-05 11:06:29 +02:00
jani@ua141d10.elisa.omakaista.fi
2dcc483e6c Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
dlenev@mysql.com
5845476009 Yet another addition to the fix for BUG#9412 "Triggers: should have trigger 
privilege".

Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.
 2006-02-02 13:36:07 +03:00
anozdrin@mysql.com
0a1f7e921b Fix for BUG#9412: Triggers: should have trigger privilege. 
Implement table-level TRIGGER privilege to control access to triggers.
Before this path global SUPER privilege was used for this purpose, that
was the big security problem.

In details, before this patch SUPER privilege was required:
  - for the user at CREATE TRIGGER time to create a new trigger;
  - for the user at DROP TRIGGER time to drop the existing trigger;
  - for the definer at trigger activation time to execute the trigger (if the
    definer loses SUPER privilege, all its triggers become unavailable);

This patch changes the behaviour in the following way:
  - TRIGGER privilege on the subject table for trigger is required:
    - for the user at CREATE TRIGGER time to create a new trigger;
    - for the user at DROP TRIGGER time to drop the existing trigger;
    - for the definer at trigger activation time to execute the trigger
      (if the definer loses TRIGGER privilege on the subject table, all its
      triggers on this table become unavailable).
  - SUPER privilege is still required:
    - for the user at CREATE TRIGGER time to explicitly set the trigger
      definer to the user other than CURRENT_USER().

When the server works with database of the previous version (w/o TRIGGER
privilege), or if the database is being upgraded from the previous versions,
TRIGGER privilege is granted to whose users, who have CREATE privilege.
 2006-02-01 13:28:45 +03:00
andrey@lmy004.
64e09bad66 sql_mode should be after on_completion and before comment 
partial fix for bug #16407
WL#1034 (Internal CRON)
 2006-01-31 23:29:03 +01:00
andrey@lmy004.
edf0185e4b post-push fix 2006-01-31 17:10:44 +01:00
andrey@lmy004.
2a60c11fef partial fix for bug#16407 (sql_mode not regarded) 
add sql_mode to mysql.event
WL#1034 (Internal CRON)
 2006-01-31 16:01:27 +01:00
knielsen@mysql.com
2472ffc41b Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/x/mysql-5.1-new
 2006-01-30 22:35:46 +01:00
jimw@mysql.com
7065c420e2 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-01-30 09:47:55 -08:00
knielsen@mysql.com
56d44ff1f9 Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes 
into  mysql.com:/usr/local/mysql/x/mysql-5.1-new
 2006-01-30 17:57:20 +01:00
andrey@lmy004.
9d7d8767dd post-commit merge 2006-01-30 14:28:48 +01:00
andrey@lmy004.
d847ac54ca fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table) 
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
 This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
  EVENT_CATALOG  - MYSQL_TYPE_STRING  (Always NULL)
  EVENT_SCHEMA   - MYSQL_TYPE_STRING  (the database)
  EVENT_NAME     - MYSQL_TYPE_STRING  (the name)
  DEFINER        - MYSQL_TYPE_STRING  (user@host)
  EVENT_BODY     - MYSQL_TYPE_STRING  (the body from mysql.event)
  EVENT_TYPE     - MYSQL_TYPE_STRING  ("ONE TIME" | "RECURRING")
  EXECUTE_AT     - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
  INTERVAL_VALUE - MYSQL_TYPE_LONG    (set for RECURRING otherwise NULL)
  INTERVAL_FIELD - MYSQL_TYPE_STRING  (set for RECURRING otherwise NULL)
  SQL_MODE       - MYSQL_TYPE_STRING  (for now NULL)
  STARTS         - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
  ENDS           - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
  STATUS         - MYSQL_TYPE_STRING  (ENABLED | DISABLED)
  ON_COMPLETION  - MYSQL_TYPE_STRING  (NOT PRESERVE | PRESERVE)
  CREATED        - MYSQL_TYPE_TIMESTAMP
  LAST_ALTERED   - MYSQL_TYPE_TIMESTAMP
  LAST_EXECUTED  - MYSQL_TYPE_TIMESTAMP
  EVENT_COMMENT  - MYSQL_TYPE_STRING

  SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.

 This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
   because the PK of mysql.event is (definer, db, name) several 
   users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
   of all users. The user has to have PROCESS privilege, if not then
   SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
  SHOW EVENTS returns table with the following columns, which are subset of
  the data which is returned by SELECT * FROM I_S.EVENTS
   Db
   Name
   Definer 
   Type
   Execute at
   Interval value
   Interval field 
   Starts 
   Ends
   Status
 2006-01-30 13:15:23 +01:00
knielsen@mysql.com
899fc2653d Windows compile fixes in preparation for 5.1.6 beta. 2006-01-30 13:09:08 +01:00
jimw@mysql.com
dd31eac9f8 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-01-27 16:01:52 -08:00
andrey@lmy004.
48668d7cc4 fix for bug #16401 Events: mysql.event.comment is varchar(64) 
missed that one in the previos commit
 2006-01-26 20:30:12 +01:00
andrey@lmy004.
10e9da5243 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-new
 2006-01-26 20:23:19 +01:00
jimw@mysql.com
e25c4f37c6 Add storage/example to make_win_src_distribution 2006-01-25 18:21:22 -08:00
guilhem@mysql.com
781820c028 excess space caused "../scripts/mysql_create_system_tables: line 46: : command not found" 
when I ran mysql-test-run
 2006-01-24 15:50:04 +01:00
andrey@lmy004.
de24c22289 fix for bug #16401 Events: mysql.event.comment is varchar(64) 2006-01-23 22:09:53 +01:00
andrey@lmy004.
91ff153dcb Merge 2006-01-23 13:07:31 +01:00
knielsen@mysql.com
8de62c574b Merge mysql.com:/usr/local/mysql/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmp5.1
 2006-01-20 13:24:18 +01:00
joerg@mysql.com
5788197dfc Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/mysql-5.1 2006-01-20 10:45:30 +01:00
knielsen@mysql.com
113b1e4e6c Merge mysql.com:/usr/local/mysql/ab/mirrors/pullers/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmp5.1
 2006-01-19 21:50:57 +01:00
cps@outpost.site
ce2eb6d8cb WL1019: complete patch. Reapplied patch to the clean 
tree to get rid of multiple typos in CS comments and
unify the patch.
 2006-01-19 05:56:06 +03:00
knielsen@mysql.com
2ad568d421 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/mysql-5.1-relmerge
 2006-01-17 18:35:16 +01:00
joerg@mysql.com
b2f6d4f574 Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 2006-01-16 20:21:42 +01:00
joerg@mysql.com
fa91e05bf5 Manual merge of the fix for bug#16106. 
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
 2006-01-16 16:48:05 +01:00
knielsen@mysql.com
12cb3f4c5e Windows/Visual Studio 2003 fixes for the 5.1.5 release. 2006-01-13 22:09:48 +01:00
joerg@mysql.com
1155bf20d9 Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1 2006-01-13 17:45:01 +01:00
joerg@mysql.com
9d4562e5fe extra/comp_err.c + scripts/mysqld_multi.sh : 
Copyright string fixes (bug#16106)
 2006-01-13 16:25:20 +01:00
andrey@lmy004.
3eba9695d0 WL #1034 (Internal CRON) 
- initialize a variable in a shell scrip
 2006-01-13 12:44:15 +01:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4 wl2325 wl2324 2006-01-12 19:51:02 +01:00
andrey@lmy004.
570db08105 WL #1034 (Internal CRON) post-push fixes. 
fix INSERT/REPLACE statements so test suite runs again.
The question is why we have 2 parallel universes - 2 different
ways to start the test suite, a shell and perl version. One more case
where redundancy makes life nightmare.
 2006-01-12 14:17:00 +01:00
andrey@lmy004.
9f82755b81 WL #1034 (Internal CRON) post-push fix 
- add Event_priv to db and host tables
 2006-01-12 12:06:13 +01:00
andrey@lmy004.
71eb7d7ec9 WL #1034 (Internal CRON) pre-push updates 
- various fixes of test cases
(hopefully the last pre-push update before the push)
 2006-01-11 18:09:05 +01:00
andrey@lmy004.
7c049782fa WL #1034 (Internal CRON) 
merge before push
 2006-01-10 21:02:19 +01:00
serg@serg.mylan
923e7cfd73 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-01-07 14:50:03 +01:00
serg@serg.mylan
8241a5a8e8 cleanup 2006-01-04 10:36:49 +01:00
joerg@mysql.com
2a29c32908 Test files in new subdirectory "mysql-test/extra" need to be propagated into binary distribution. 2006-01-03 14:36:31 +01:00
kent@mysql.com
2205d1b8d5 mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln: 
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
  new file
 2005-12-19 01:12:11 +01:00
andrey@lmy004.
5ec6c5f2c6 WL #1034 update 
- varchar -> char
- transient_expression -> interval_value
- interval_type -> interval_field
 2005-12-16 13:01:46 +01:00
andrey@lmy004.
533180d76c WL#1034 update 
- fix EVENT_ACL problem that GRANT ALL on some_db.* to someone@somewhere did not get to mysql.db
- fix crash when the following is executed :
  CREATE EVENT P() CREATE EVENT E ON SCHEDULER 1 SECOND DO ROLLBACK;
  (creation works as well as calling P() which creates the event).
 2005-12-15 14:12:28 +01:00
kent@mysql.com
28a59073b0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-12-15 00:43:41 +01:00
kent@mysql.com
c11b35d9bf Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-12-14 13:18:24 +01:00
andrey@lmy004.
fd0613f59e Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl1034 
into lmy004.:/work/mysql-5.1-tt-copy-works
 2005-12-14 12:15:48 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
7ded800078 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-12-13 19:46:35 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
13d7abe06f Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-12-13 18:44:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
32466b14fb Minor Netware specific changes. 2005-12-13 18:30:10 +02:00
kent@mysql.com
a6849a9238 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-12-12 16:12:36 +01:00
kent@mysql.com
43252fa1bb Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-12-11 09:23:38 +01:00
kent@mysql.com
cf57f12407 make_win_src_distribution.sh: 
Removed Visual Studio 6 project files, as they are not maintained
 2005-12-11 09:21:13 +01:00
andrey@lmy004.
7120d43c36 WL#1034 updated 
- split into several files
- forbid parallel execution (before analyse is done how to make it possible)
  because the same sp_head instance cannot be executed in parallel
- added GPL headers
- changed EVENT_ACL to be per DB variable
- fixed minor problems
 2005-12-05 11:45:04 +01:00
jimw@mysql.com
b3ba66495c Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-11-30 13:12:35 -08:00
jimw@mysql.com
085e7784b0 Merge mysql.com:/home/jimw/my/mysql-5.0-14610 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-30 13:10:50 -08:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-11-23 14:57:00 +02:00
joerg@mysql.com
3a7d81258c Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1 2005-11-23 11:24:52 +01:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-19 11:11:09 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
joerg@mysql.com
ebb6552b1c scripts/make_binary_distribution.sh 
Adapt to the directory hierarchy change in 5.1, "ndb" -> "storage/ndb".
 2005-11-11 18:48:53 +01:00
jimw@mysql.com
bb742ae0fa Don't try to mysqlhotcopy the INFORMATION_SCHEMA database. (Bug #14610) 2005-11-10 17:05:36 -08:00
jimw@mysql.com
3506e1e58b Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-10 11:24:57 -08:00
jimw@mysql.com
56a56a789a Merge mysql.com:/home/jimw/my/mysql-4.1-14469 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-10 11:23:52 -08:00
svoj@poseidon.ndb.mysql.com
3791197f0d WL#2575 - Fulltext: Parser plugin for FTS 
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
 2005-11-06 13:13:06 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-05 01:32:55 +02:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-04 01:15:35 +01:00
jimw@mysql.com
bb34222087 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-01 12:15:08 -08:00
jimw@mysql.com
6894cbc9eb Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469) 2005-10-31 15:56:52 -08:00
jimw@mysql.com
1d9bfbf7d2 Handle decision to use mysqld-max over mysqld within mysqld_safe 
even when --ledir option is specified. (Bug #13774)
 2005-10-31 11:15:44 -08:00
kent@mysql.com
85ab53357b thread_registry.h, thread_registry.cc: 
Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files
 2005-10-16 06:49:19 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
63ac3040a8 Small fixes for Netware. 2005-10-14 08:45:41 +03:00
bar@mysql.com
fee9c13568 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 22:18:35 +05:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-13 18:23:53 +03:00
jani@ua141d10.elisa.omakaista.fi
5dad171618 Some Netware related fixes and fixes for Metrowerks compiler. 2005-10-13 17:21:14 +03:00
bar@mysql.com
c229567887 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 19:19:05 +05:00
bar@mysql.com
39b0712cf7 type_binary.result, type_binary.test: 
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.
 2005-10-13 19:16:19 +05:00
kent@mysql.com
94ea4f188a make_binary_distribution.sh: 
Copy *.cnf files in mysql-test/std_data/
Makefile.am:
  Added std_data/*.cnf to copy ndb config
 2005-10-12 22:49:33 +02:00
lenz@mysql.com
c0aa09884a Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-10-11 21:54:23 +02:00
lenz@mysql.com
9b4ab5931a Merge mysql.com:/space/my/mysql-4.0-build 
into mysql.com:/space/my/mysql-4.1-build
 2005-10-11 21:24:01 +02:00
lenz@mysql.com
8782f5a0e3 - added Docs/manual.chm to the windows source distribution (BUG#13899) 2005-10-11 21:16:08 +02:00
lars@mysql.com
57f36732ca Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2005-10-10 17:50:19 +02:00
serg@serg.mylan
2e2d18b7cf Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2005-10-09 19:10:19 +02:00
kent@mysql.com
33f38f7ed8 make_binary_distribution.sh: 
Copy zlib.a and valgrind.supp if exists
  Copy disabled.def
 2005-10-07 13:08:07 +02:00
kent@mysql.com
c68c4f3cb7 Merge 2005-10-07 12:55:00 +02:00
kent@mysql.com
ae62a58817 make_binary_distribution.sh: 
Corrected platform name output
Services.cpp:
  Dont print null address (back port from 5.0)
 2005-10-07 01:56:11 +02:00
kent@mysql.com
87016b438c make_binary_distribution.sh: 
Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable
 2005-10-06 22:57:13 +02:00
kent@mysql.com
52181cc810 make_binary_distribution.sh: 
Replaced --machine with --platform
  General code cleanup
 2005-10-06 18:00:23 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
anozdrin@mysql.com
95327abcc2 Make mysql_fix_privilege_tables.sh not dependent on the current directory. 2005-10-05 01:08:22 +04:00
kent@mysql.com
21cf818a8d Many files: 
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
 2005-09-30 14:03:55 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b97a77e824 Fix for Bug#12629, "mysqld_multi produces syntax error". 
Quote here is unneccessary as it should all be handled in
quote_opt_arg().
 2005-09-30 14:02:31 +03:00
serg@serg.mylan
69909c460a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-30 09:40:49 +02:00
msvensson@neptunus.(none)
13161c2a84 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 15:32:05 +02:00
kent@mysql.com
5b79dbb2eb mysql_config.sh: 
Added -lz to link using libmysqld
 2005-09-28 13:39:28 +02:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 11:34:53 +02:00
serg@serg.mylan
c794383e09 mysql.user.password doesn't need utf8 2005-09-27 12:10:22 +02:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in: 
Enable "make distcheck" to work
 2005-09-24 15:51:45 +02:00
kent@mysql.com
0cfed79ea5 Makefile.am: 
Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
 2005-09-24 02:42:38 +02:00
kent@mysql.com
d859573bcf make_binary_distribution.sh: 
Include libz.a in distribution if built bundled
 2005-09-20 19:26:00 +02:00
msvensson@neptunus.(none)
fb63290635 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
 2005-09-14 09:43:56 +02:00
reggie@linux.site
eced05c3cd A few changes to fix compiling on Windows 2005-09-06 18:06:06 -06:00
ndbdev@dl145c.mysql.com
f40c1576b0 Merge 2005-09-06 09:20:15 +02:00
jimw@mysql.com
0e323e566d Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-02 12:42:00 -07:00
jimw@mysql.com
9dc0da7c46 Merge mysql.com:/home/jimw/my/mysql-4.1-11280 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-09-02 12:12:36 -07:00
joerg@mysql.com
d636c34689 Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M51/merge-5.1 2005-09-01 22:02:28 +02:00
joerg@mysql.com
4b677dfa59 Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M50/merge-5.0 2005-09-01 21:54:18 +02:00
joerg@mysql.com
163ead846e Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1 2005-09-01 21:36:16 +02:00
joerg@mysql.com
0a2e013c9d Add "MYSQL_BASE_VERSION" to the list of substituted variables in the "scripts" subdirectory. 2005-09-01 20:01:21 +02:00
ndbdev@dl145b.mysql.com
583979d949 merge 2005-08-31 20:45:48 +02:00
jimw@mysql.com
2ef8b1e7de Fix quoting of options passed to external commands by mysqld_multi. (Bug #11280) 2005-08-31 10:23:29 -07:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-25 13:11:38 -04:00
joerg@mysql.com
c070251abd Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1 2005-08-24 13:56:54 +02:00
jimw@mysql.com
c2cb759003 Fix typo in mysql_fix_privilege_tables.sql (Bug #12705) 2005-08-23 16:37:21 -07:00
kent@mysql.com
94722a3801 make_win_src_distribution.sh: 
Added missing backslashes
 2005-08-06 03:10:35 +02:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-05 18:01:34 -04:00
reggie@fedora.(none)
d146cc9e2f add support for vcproj and sln files (Visual Studio 2003) 2005-08-04 10:08:55 -05:00
jimw@mysql.com
de46ae18c2 Merge mysql.com:/home/jimw/my/mysql-5.0-11602 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-02 16:50:12 -07:00
jimw@mysql.com
0536bd6679 Increase allowed size of stored procedure bodies to 4GB, and 
produce a sensible error when that limit is exceeded. (Bug #11602)
 2005-07-26 18:08:49 -07:00
lenz@mysql.com
bbd06a333a Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-5.0-build
 2005-07-25 15:04:28 +02:00
lenz@mysql.com
0c30acae32 - merge from 4.0: updated scripts/Makefile.am to properly create but not install 
make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh
 2005-07-25 14:39:23 +02:00
lenz@mysql.com
d9bacfa236 - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and 
make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated
 2005-07-25 14:14:24 +02:00
joerg@mysql.com
16bfcd3c75 File / directory structure change from 5.0 to 5.1: 
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".

This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.
 2005-07-21 21:47:46 +02:00
lenz@mysql.com
ca9087a82c - don't install the Mac OS X support files when running "make install" - 
they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way
 2005-07-20 19:15:48 +02:00
tulin@dl145b.mysql.com
bf6e3f9aa8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-20 07:53:10 +02:00
jimw@mysql.com
80c1c6b33f Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 11:05:49 -07:00
jimw@mysql.com
bb6918e312 Merge mysql.com:/home/jimw/my/mysql-4.1-7249 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-19 10:35:15 -07:00
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00
lenz@mysql.com
611ae59245 - reverted adding mysql-test/t/*.def to the distribution (it is not supported in 4.1 
at all)
 2005-07-08 21:04:54 +02:00
pem@mysql.com
5ce9198f20 Fixed BUG#11365: Stored Procedure: Crash on Procedure operation 
Two separate problems. A key buffer was too small in sp.cc for multi-byte
  fields, and the creation and fixing of mysql.proc in the scripts hadn't been
  updated with the correct character sets and collations (like the other
  system tables had).
  Note: No special test case, as the use of utf8 for mysql.proc will make
  any existing crash (if the buffer overrrun wasn't fixed).
 2005-07-08 16:33:15 +02:00
lenz@mysql.com
79f43c864a - manual merge of the addition of including mysqlt-test/t/*.def 2005-07-08 11:27:08 +02:00
lenz@mysql.com
780d699b86 - added mysql-test/t/*.def to the source and binary distributions 2005-07-08 11:07:05 +02:00
lenz@mysql.com
a9e1b8756d - manual merge of the make_binary_distribution.sh ChangeSet propagation 2005-07-06 14:30:51 +02:00
lenz@mysql.com
68e5693096 Merge mysql.com:/space/my/mysql-4.0-build 
into mysql.com:/space/my/mysql-4.1-build
 2005-07-06 14:00:24 +02:00
lenz@mysql.com
49986c7e05 - backported a change for make_binary_distribution.sh from 5.0 for easier building of 
all versions: added an option "--machine" that allows to override the autodetected
  architecture string (e.g. "i386") that becomes part of the binary package name with 
  a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
  script
 2005-07-06 13:58:29 +02:00
jimw@mysql.com
2669b86612 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-05 15:23:13 -07:00
jimw@mysql.com
c45f86a265 Merge mysql.com:/home/jimw/my/mysql-4.1-10986 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-05 12:56:47 -07:00
bell@sanja.is.com.ua
4bc6bd38ec Merge 2005-07-05 13:42:19 +03:00
bell@sanja.is.com.ua
bfbd0e241b added processing of view grants to table grants (BUG#9795) 2005-07-05 13:36:36 +03:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
kent@mysql.com
d16e1cafa7 make_win_src_distribution.sh: 
Bug#11009, some more cleanup of unneded files from bootstrap
 2005-06-28 05:25:29 +02:00
jimw@mysql.com
13773acc1b If mysql_config is a symlink, resolve it before trying to find the lib and 
include directories relative to where it is located. (Bug #10986)
 2005-06-24 17:59:19 -07:00
jimw@mysql.com
9f4c796922 Fix handling of datadir by mysqld_safe to support specifying a 
different DATADIR via the command line or during ./configure and
still starting up mysqld_safe via a relative path. (Bug #7249)
 2005-06-24 17:14:16 -07:00
tulin@dl145b.mysql.com
6a0a577335 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-08 17:12:09 +02:00
lenz@mysql.com
024010e562 - make sure to include mysql-test/t/*.sql files in the binary distributions and when 
"make install" is called (mysql_delimiter.sql was missing)
 2005-06-08 11:49:24 +02:00
tulin@dl145b.mysql.com
b1a3d74f20 merge 2005-06-07 19:38:28 +02:00
igor@rurik.mysql.com
c963b12fd3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-07 06:38:05 -07:00
ndbdev@dl145b.mysql.com
723173c0f3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-07 12:50:45 +02:00
lenz@mysql.com
a411763dae Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-06-07 11:41:55 +02:00
lenz@mysql.com
6e5818e977 - manual merge of mysql.spec.sh 2005-06-07 11:40:56 +02:00
lenz@mysql.com
1c21f84afb - BUG#10676: don't install "make_win_src_distribution" and "make_win_binary_distribution" 
when doing "make install" (they are not needed/useful) outside the build tree. Added
  "mysql_client_test" to the "MySQL-bench" RPM.
- some small RPM spec file improvements (more variables than hard-coded values, cleanups)
 2005-06-07 10:25:51 +02:00
elliot@mysql.com
b906f31388 BUG#7967 Fix mysqlhotcopy --record-log-position 2005-06-06 22:17:16 -04:00
tomas@poseidon.ndb.mysql.com
925548d349 Merge 2005-06-02 00:51:30 +02:00
lenz@mysql.com
9afd2563e9 Merge of 4.1 -> 5.0 2005-06-01 15:11:14 +02:00
lenz@mysql.com
e877e71b17 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-06-01 13:06:15 +02:00
lenz@mysql.com
7bd3dd7cb3 - removed references to some obsolete files (BUG#10824) 
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)
 2005-06-01 12:59:10 +02:00
tomas@poseidon.ndb.mysql.com
a8bad15b64 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
 2005-06-01 07:13:01 +02:00
tim@siva.hindu.god
8a77c6f741 scripts/mysqld_safe.sh 
Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable.
 2005-05-27 12:44:06 +12:00
tulin@dl145c.mysql.com
be861a7ccf merge 2005-05-19 09:04:24 +02:00
jimw@mysql.com
6757a04e4c Merge mysql.com:/home/jimw/my/mysql-5.0-build 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-18 17:13:31 -07:00
tulin@dl145c.mysql.com
03590c20bd merge 2005-05-18 22:26:23 +02:00
kent@mysql.com
2b5f9fad81 make_win_src_distribution.sh: 
Add YASSL to Windows source distribution
  Skip .deps, and remove .o files from source dist
 2005-05-18 16:04:44 +02:00
ramil@mysql.com
8add105ff5 Merge mysql.com:/usr/home/ram/work/mysql-5.0-build 
into mysql.com:/usr/home/ram/work/mysql-5.0
 2005-05-18 18:15:14 +05:00
kent@mysql.com
f81e6248d2 make_binary_distribution.sh: 
To be safe, put "..." around variables to the test command
 2005-05-18 12:49:43 +02:00
matt@mysql.com
4dca62401c make_binary_distribution.sh: 
Use portable check for empty string.
 2005-05-18 03:45:01 +02:00
tulin@dl145c.mysql.com
4a1d6f6a18 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-17 23:25:13 +02:00
acurtis@xiphis.org
8df5887ad5 Bug#10246 - Parser: bad syntax for GRANT EXECUTE 
Rename some functions
  more fine-grained sp privileges
  make grant/revoke sp grammar less ambigious
 2005-05-17 19:54:20 +01:00
gbichot@quadita2.mysql.com
43d9b1d8c9 mysql_tableinfo removed (replaced by information schema; put a warning in the 5.0 version of the script about removal in 5.1). 
Sad to say good bye to my contribution - this is hara-kiri, but that's for the sake of not confusing our users with a now useless script.
 2005-05-12 22:28:26 +02:00
ndbdev@dl145b.mysql.com
58aa78e32d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-09 20:28:54 +02:00
dlenev@mysql.com
fa8bf7bc09 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-05-09 17:26:59 +04:00
mwagner@ultrafly.mysql.com
58409db4c9 make_binary_distribution.sh: 
- Add --machine override
 2005-05-09 14:57:45 +02:00
dlenev@mysql.com
e7f29e1904 Manual merge of fix for bug #9913 into 5.0 tree. 2005-05-09 16:21:57 +04:00
mwagner@ultrafly.mysql.com
f5ba5ab024 make_binary_distribution.sh: 
- Print the platform name for the build logs.
 2005-05-09 12:05:13 +02:00
lars@mysql.com
e76c641190 Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1 2005-05-09 11:45:59 +02:00
serg@sergbook.mylan
b1edf49952 don't use tmp file for such a triviality 2005-05-09 09:24:05 +02:00
mwagner@ultrafly.mysql.com
c5cb8a2bfa make_binary_distribution.sh: 
- Remove vendor tag from package names.
  - Map standard OS names to user-friendly versions.
 2005-05-08 23:02:50 +02:00
tomas@poseidon.ndb.mysql.com
4f1e27ed00 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
 2005-05-03 00:10:52 +02:00
jimw@mysql.com
36869043ec Resolve merge of fix for #8166. 2005-05-02 10:25:47 -07:00
tomas@poseidon.ndb.mysql.com
145ae3c6f5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
 2005-05-02 13:18:26 +02:00
joerg@mysql.com
a0cac19e6e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-04-26 19:11:54 +02:00
jani@ua141d10.elisa.omakaista.fi
005c447183 Added a check for config-file. 2005-04-26 17:57:14 +03:00
jani@ua141d10.elisa.omakaista.fi
c98b90bbfb Fixed Bug#9834, "mysqld_multi --config-file parameter requires 
absolute path".
 2005-04-26 17:46:43 +03:00
jani@ua141d10.elisa.omakaista.fi
d4d0f9c126 Fixed Bug#6221, "mysqld_multi doesn't read the init_connect 
option in my.cnf correctly"
 2005-04-26 16:16:38 +03:00
jani@ua141d10.elisa.omakaista.fi
7810721f40 Fixed Bug#9835: mysqld_multi --help won't output help if there are 
parameter problems.
 2005-04-26 14:28:22 +03:00
joerg@mysql.com
49ac2dac3e Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497). 
Post-merge fix will follow.
 2005-04-26 12:03:37 +02:00
tomas@poseidon.ndb.mysql.com
033988f014 Merge 2005-04-25 22:21:25 +02:00
guilhem@mysql.com
3022cbc60c Informing of deprecation of mysql_tableinfo by INFORMATION_SCHEMA (and 
I'm thinking of removing the script in 5.1).
 2005-04-24 22:37:43 +02:00
joerg@mysql.com
48ba5e4956 Step 1 of the switch to support configuration with NPTL: 
Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
 2005-04-20 20:10:28 +02:00
lars@mysql.com
1bd55e471e Merging 5.0->5.1 2005-04-19 11:09:54 +02:00
acurtis@xiphis.org
1ef7bbc74b Update for VARCHAR and remove 4.1-specific actions. 
by Philip Antoniades
 2005-04-18 22:01:18 +01:00
monty@mishka.local
de1b1fe54d Added more rows to test to get predictable results 2005-04-16 10:53:30 +03:00
monty@mishka.local
c8170b349f Merge with 4.1 2005-04-16 04:35:54 +03:00
monty@mishka.local
2b322f36d8 Ensure that all privilege tables are created in MyISAM 2005-04-16 04:12:30 +03:00
lenz@mysql.com
a88acf4a9f Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-04-13 20:14:45 +02:00