serg@serg.mylan
96729c62be
merged
2004-11-28 18:19:01 +01:00
monty@mysql.com
eb304bd49f
Fixes while reviewing code
...
(Cleanups and better bug fixes)
2004-11-26 02:31:22 +02:00
joreland@mysql.com
f63b126f7e
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/wl1744
2004-11-15 10:50:58 +01:00
monty@mysql.com
addd1a0da8
Merge with 4.1
2004-11-12 19:58:24 +02:00
monty@mysql.com
b56851fd7a
Merge on pull
2004-11-12 17:48:01 +02:00
paul@ice.snake.net
1288f453cc
fill_help_tables.sh:
...
Recognize another Texinfo tag.
2004-11-12 08:45:58 -06:00
monty@mysql.com
9252656d49
merge with 4.0
2004-11-12 11:17:53 +02:00
brian@avenger.(none)
f05daf02ba
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
2004-11-11 18:58:57 -08:00
joreland@mysql.com
37e92ab27a
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/wl1744
2004-11-11 22:02:17 +01:00
paul@ice.snake.net
9ee3bf9efa
fill_help_tables.sh:
...
Handle some additional Texinfo tags that were being missed.
2004-11-10 22:43:09 -06:00
joreland@mysql.com
5172eace09
wl1744 - nbd windoze port
2004-11-10 14:18:49 +01:00
joreland@mysql.com
32796b4860
wl1744 - ndb on windows
...
Add rules for creating dsp-files
2004-11-10 00:03:01 +01:00
monty@mysql.com
47bbf768d4
Fixes after merge with 4.1
...
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
2004-11-03 12:39:38 +02:00
tim@siva.hindu.god
b0510c7fd4
Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROC
...
for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself.
2004-11-02 17:53:25 -07:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03:00
joerg@mysql.com
5163c03bad
Fix for bug#5385 ("Text files have unix line break"):
...
Windows style line end \r\n on README, license, and similar essential plaintext files.
2004-10-27 21:59:34 +02:00
tomas@poseidon.ndb.mysql.com
009bf31915
use the right make in make_binary_distribution
2004-10-22 08:57:52 +00:00
ram@gw.mysql.r18.ru
307b7e85af
A fix (bug #6000 No "@%"-accounts after install).
2004-10-20 18:10:44 +05:00
monty@mysql.com
f9cd4a60e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-10-20 15:14:06 +03:00
pem@mysql.comhem.se
4043c0f3db
Implemented the stored procedure data access characteristics:
...
NO SQL
CONTAINS SQL (default)
READS SQL DATA
MODIFIES SQL DATA
These are needed as hints for the replication.
(Before this, we did have the default in the mysql.proc table, but no support in the parser.)
2004-10-14 18:07:09 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9001573040
Added documentation.
2004-10-11 23:59:37 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
4d55c4a321
Improved mysqld_multi documentation, especially the --example
...
section, which had gotten somewhat out-dated.
2004-10-11 20:54:48 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
26e34093c3
Added some extra information to output in case --verbose
...
was given.
2004-10-09 13:23:00 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
2450f4afa2
- Added --verbose
...
- Made some of the warnings under --verbose only
- Added possibility to add mysqladmin= under groups [mysqldN]
mysqladmin=... is no longer mandatory under [mysqld_multi]
- Made 'start', 'stop' and 'report' commands truly case-insensitive
- Some other common places code merge and cleanup
2004-10-09 12:33:24 +03:00
mwagner@here.mwagner.org
edc4b65d5c
mysql-test-run.sh:
...
Look for 'client_test' in tests/ not bin/
make_binary_distribution.sh:
Copy 'client_test' into the dist
2004-10-08 13:38:35 -05:00
jani@a193-229-222-2.elisa-laajakaista.fi
951e54df74
Changed a fatal error to a warning in case the default mysqld
...
binary for mysqld_multi was not found. This is because it is
possible to define one under each mysqldN group separately.
Bailing out if mysqld binary is not found at all.
Added option --silent to turn off warnings.
2004-10-08 20:18:25 +03:00
monty@mysql.com
73e4a41103
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-10-08 16:40:00 +03:00
monty@mysql.com
8d73628d88
Merge
2004-10-08 15:43:27 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
4ec44183e2
Fixed a bug in --log option.
2004-10-07 23:51:47 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
c73cd9ff8a
Fixed Bug#5575, mysqlhotcopy is broken when using --noindices
2004-10-07 20:30:30 +03:00
lenz@mysql.com
7c18f064e6
- removed the Docs/Flags and Docs/RawFlags directories
...
- Updated Docs/Makefile.am and scripts/make_win_src_distribution.sh
accordingly
2004-10-07 18:30:56 +02:00
lenz@mysql.com
5037b95f81
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2004-10-07 14:43:09 +02:00
monty@mysql.com
62f3cd6a31
Merge with 4.0 for 4.1 release
...
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
lenz@mysql.com
5db0d20b88
- Rename the *.cnf files to *.ini for the Windows source distribution
2004-10-05 14:42:15 +02:00
monty@mishka.local
be4ca46fbe
More fixes for strict mode:
...
More tests.
Better error messages.
Fixed bug when checking if we updated all needed columns for INSERT.
Give an error if we encounter a wrong float value during parsing.
Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS.
Fixed UPDATE IGNORE when using STRICT mode.
2004-10-02 22:20:08 +03:00
tomas@poseidon.(none)
5488f207db
mysql_install_db should do skip-ndbcluster
...
set a printout in SocketClient only for debug
2004-09-16 08:22:22 +00:00
patg@krsna.patg.net
78fa3aeff4
another small change for bug 5531
2004-09-14 14:10:29 -07:00
patg@krsna.patg.net
484d54b231
fixed bug 5531
2004-09-14 12:23:18 -07:00
bell@sanja.is.com.ua
3c239d0bec
fixed privilege system upgrade script, to allow VIEW privileges for used who have CREATE privilege (BUG#5329)
2004-09-11 18:46:06 +03:00
hf@deer.(none)
2eec5d460d
Fix for bug #5396(libmysql depends on SSL)
...
Since libmysqld has libmysql's capabilities it needs lssl to compile
2004-09-10 19:55:43 +05:00
serg@serg.mylan
413a8753e2
merged
2004-09-07 15:18:53 +02:00
serg@serg.mylan
707def6fd0
better fix for bug#5001
2004-09-07 13:48:38 +02:00
monty@mysql.com
31122efde7
Merge with 4.1
...
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
monty@mysql.com
9d8555c0f0
Merge with 4.0 to get latest bug fixes
2004-09-04 15:59:49 +03:00
serg@serg.mylan
9153fd2ae4
merged
2004-09-03 22:12:27 +02:00
serg@serg.mylan
e66d0fa7d8
add engine=MyISAM to all create table statements in
...
mysql_create_system_tables, just in case
2004-09-03 17:20:00 +02:00
bar@mysql.com
f37df2fdcc
Bug#4338 mysql-test-run fails if compiled with non-latin1 character set
2004-09-02 12:34:27 +05:00
patg@krsna.patg.net
54eac3b8d4
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into krsna.patg.net:/home/patg/mysql-4.0
2004-08-31 19:04:07 -07:00
patg@krsna.patg.net
e277145911
mysqld_safe.sh:
...
bug #5001 , added conditional if to test if port set, then only kill the processes
for this port, not all processes (in the case of this bug where multiple servers
are killed.)
The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's
discovery that mysqld_safe would get killed.
In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file"
was the case that evaluated as true, so in order to test, I had to comment that block
out.
2004-08-31 18:59:41 -07:00
bar@mysql.com
521643c85a
Bu#4526 building with utf8_bin collation causes help to be case sensitive
2004-08-27 21:12:53 +05:00