Commit graph

10407 commits

Author SHA1 Message Date
unknown
b567fdd4f3 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into mysql.com:/home/kostja/mysql/mysql-4.1-wl519


sql-common/client.c:
  Auto merged
2003-11-28 13:12:16 +03:00
unknown
506572b69e Second part of WL #519:
Client option secure-auth deployed on all possible layers:
- mysql client command-line and config file option
- mysql_options option MYSQL_SECURE_AUTH
- mysql_real_connect will automatically take into account that option if
  mysql->options.my_cnf_file/my_cnf_group is set


client/client_priv.h:
  added OPT_SECURE_AUTH to enum of all my_read_default_options options.
client/mysql.cc:
  added support for mysql command-line option --secure-auth
include/errmsg.h:
  added return code for option --secure-auth
include/mysql.h:
  added MYSQL_SECURE_AUTH to enum of all mysql_options options.
  added secure_auth flag to MYSQL handle
libmysql/errmsg.c:
  Error messages for option --secure-auth
sql-common/client.c:
  added check for secure-auth in mysql_real_connect:
  if password is provided, and secure-auth is on, then client will
  refuse connecting to pre-4.1.1 server
2003-11-28 13:11:44 +03:00
unknown
03092d0c24 fix:
2 forgotten 'break;' statements added
2003-11-28 02:50:58 +03:00
unknown
3fcd465575 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/kostja/mysql/mysql-4.0-root
2003-11-28 02:03:57 +03:00
unknown
047f646770 no need to zero-initialize mysql->master->{rpl_pivot, options.rpl_parse,
options.rpl_probe} as they are zero-initialized in spawn_init()
2003-11-28 01:57:05 +03:00
unknown
b5907ec192 cleanup:
no need to set rpl_parse, rpl_probe and rpl_pivot to zero as whole mysql
structure is bzeroed in mysql_init(0) few lines before
2003-11-28 01:54:34 +03:00
unknown
94387d4be3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-11-27 19:48:04 +02:00
unknown
8c430b22fa code coverage for UNIONs
mysql-test/r/subselect.result:
  independent subquery with union
mysql-test/r/union.result:
  converting temporary table from HEAP to MyISAM
mysql-test/t/subselect.test:
  independent subquery with union
mysql-test/t/union.test:
  converting temporary table from HEAP to MyISAM
2003-11-27 19:45:28 +02:00
unknown
48ea56a553 memory leak (no delete for query= new String) fixed 2003-11-27 19:14:16 +03:00
unknown
443a157c6a removed unused variable 2003-11-27 09:34:41 +02:00
unknown
a43114ac70 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-11-26 20:13:00 +02:00
unknown
358799ecf7 avoiding coping tmptable_param
sql/sql_union.cc:
  fixed layout
2003-11-26 20:12:26 +02:00
unknown
09f95e71d2 cleanup 2003-11-26 20:23:28 +03:00
unknown
a189daf7be cleanup 2003-11-26 20:18:55 +03:00
unknown
4f19b5776b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1


sql/sql_union.cc:
  Auto merged
2003-11-26 19:13:05 +02:00
unknown
6491cc5e8b avoiding coping tmp_table_param 2003-11-26 19:10:30 +02:00
unknown
0b0a79e371 Fix for BUG#1960 "date_format() returns spurious '-' for valid dates".
It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
I scanned field.cc for other places where we would forget to set neg, found none.
A test for the bug.


mysql-test/r/date_formats.result:
  result update
mysql-test/t/date_formats.test:
  a test for BUG#1960 "date_format() returns spurious '-' for valid dates"
sql/field.cc:
  When preparing ltime from the 3-byte date, don't forget to set ltime->neg to 0
  (otherwise it remains unitialized).
  Dates are not allowed to be negative (only times can be, when they mean a time interval),
  so it's ok to always set neg to 0.
2003-11-26 17:06:24 +01:00
unknown
e503dc2850 - fixed compile error in tests/client_test.c
(declarations should be on top of a block)


tests/client_test.c:
   - fixed compile error (declarations should be on top of a block)
2003-11-26 15:22:30 +01:00
unknown
7d784b20ae Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1-w1284


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2003-11-26 13:39:18 +04:00
unknown
6943b3236b SCRUM
WL#1284 (warnings about --skip-name-resolve)
Messages corrected


sql/share/czech/errmsg.txt:
  Message corrected
sql/share/danish/errmsg.txt:
  Message corrected
sql/share/dutch/errmsg.txt:
  Message corrected
sql/share/english/errmsg.txt:
  Message corrected
sql/share/estonian/errmsg.txt:
  Message corrected
sql/share/french/errmsg.txt:
  Message corrected
sql/share/german/errmsg.txt:
  Message corrected
sql/share/greek/errmsg.txt:
  Message corrected
sql/share/hungarian/errmsg.txt:
  Message corrected
sql/share/italian/errmsg.txt:
  Message corrected
sql/share/japanese/errmsg.txt:
  Message corrected
sql/share/korean/errmsg.txt:
  Message corrected
sql/share/norwegian-ny/errmsg.txt:
  Message corrected
sql/share/norwegian/errmsg.txt:
  Message corrected
sql/share/polish/errmsg.txt:
  Message corrected
sql/share/portuguese/errmsg.txt:
  Message corrected
sql/share/romanian/errmsg.txt:
  Message corrected
sql/share/russian/errmsg.txt:
  Message corrected
sql/share/serbian/errmsg.txt:
  Message corrected
sql/share/slovak/errmsg.txt:
  Message corrected
sql/share/spanish/errmsg.txt:
  Message corrected
sql/share/swedish/errmsg.txt:
  Message corrected
sql/share/ukrainian/errmsg.txt:
  Message corrected
sql/sql_acl.cc:
  Messages corrected
2003-11-26 13:38:32 +04:00
unknown
ceb0ce5002 mi_keycache.c:
Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).
my_sys.h:
  Removed FLUSH_REMOVE flag.


include/my_sys.h:
  Removed FLUSH_REMOVE flag.
myisam/mi_keycache.c:
  Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).
2003-11-25 22:20:31 -08:00
unknown
292cb97e96 Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1
include/mysql_version.h.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2003-11-26 03:32:39 +02:00
unknown
e56d603a09 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-11-26 03:30:23 +02:00
unknown
fa9047e280 Added compilation comment to 'show variables'
This makes it possible to check origin of binary from the output of 'show variables'


include/mysql_version.h.in:
  Added MYSQL_COMPILATION_COMMENT
sql/mysqld.cc:
  Added compilation comment to mysqld --version
sql/set_var.cc:
  Added compilation comment to 'show variables'
2003-11-26 03:30:00 +02:00
unknown
345a84ca25 mf_keycache.c:
Fixed typo that caused blocking key cache usage after resize.
  Removed wrong re-initialization of resize queue in init_key_cache.


mysys/mf_keycache.c:
  Fixed typo that caused blocking key cache usage after resize.
  Removed wrong re-initialization of resize queue in init_key_cache.
2003-11-25 17:21:43 -08:00
unknown
7885184292 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-26 01:49:15 +02:00
unknown
7c59b8d5a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-26 01:00:52 +02:00
unknown
2f045bc44e sql_union.cc:
Fixed a bug: missing semicolon.


sql/sql_union.cc:
  Fixed a bug: missing semicolon.
2003-11-25 15:00:31 -08:00
unknown
7c952d7c7f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-11-25 14:33:10 -08:00
unknown
6307b8f660 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-11-25 14:09:38 -08:00
unknown
b254b55b2c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1


mysql-test/r/create.result:
  Auto merged
2003-11-25 23:56:54 +02:00
unknown
bb6ee17aae added collation processing in UNION merging
temporary table BLOB now is longblob


mysql-test/r/create.result:
  blob size changed for safety
mysql-test/r/type_blob.result:
  blob size changed for safety
mysql-test/r/type_ranges.result:
  blob size changed for safety
mysql-test/r/union.result:
  blob size changed for safety
  new tests of UNION types merging
mysql-test/t/union.test:
  new tests of UNION types merging
sql/field.h:
  blob size changed for safety
sql/item.cc:
  processing of collation added
  added comment
sql/item.h:
  joining of UNION fields may failed now, because of incompatibility of collations
sql/sql_union.cc:
  joining of UNION fields may failed now, because of incompatibility of collations
2003-11-25 23:52:10 +02:00
unknown
0994f09c12 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1


mysql-test/r/rpl_change_master.result:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
2003-11-25 23:15:15 +02:00
unknown
78d3586b4d Change to use real_sleep to make test work in build environment
myisam/mi_extra.c:
  Fix comment
mysql-test/r/rpl_change_master.result:
  new results
2003-11-25 23:14:49 +02:00
unknown
75fa6a6a40 fork_big2.pl:
Added resize key cache test.


tests/fork_big2.pl:
  Added resize key cache test.
2003-11-25 13:06:46 -08:00
unknown
e7d6db5386 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-2
2003-11-25 12:00:16 -08:00
unknown
1daf856de5 fil0fil.h, fil0fil.c:
ibbackup --apply-log must be able to rename a table based only on the space id


innobase/fil/fil0fil.c:
  ibbackup --apply-log must be able to rename a table based only on the space id
innobase/include/fil0fil.h:
  ibbackup --apply-log must be able to rename a table based only on the space id
2003-11-25 21:52:22 +02:00
unknown
4400450178 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-11-25 22:07:11 +03:00
unknown
8e9d7bc6bc post-merge fixes
Makefile.am:
  spurious space (from a bad merge) deleted
mysql-test/r/rpl_change_master.result:
  test results updated
2003-11-25 20:06:41 +01:00
unknown
f2927d6202 Merge heikki@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2003-11-25 20:40:15 +02:00
unknown
bbcd1eccf7 mf_keycache.c, keycache.h:
Fix for the resize key cache operation.


include/keycache.h:
  Fix for the resize key cache operation.
mysys/mf_keycache.c:
  Fix for the resize key cache operation.
2003-11-25 10:40:14 -08:00
unknown
379d64958e os0file.h, os0file.c:
Changes needed for ibbackup directory scanning fault tolerance


innobase/os/os0file.c:
  Changes needed for ibbackup directory scanning fault tolerance
innobase/include/os0file.h:
  Changes needed for ibbackup directory scanning fault tolerance
2003-11-25 20:39:06 +02:00
unknown
64f730365b Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
Docs/Makefile.am:
  Auto merged
2003-11-25 19:20:07 +01:00
unknown
6413b0e945 - Fixed missing node name 2003-11-25 19:19:20 +01:00
unknown
ab563848cd Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
Docs/Makefile.am:
  Auto merged
2003-11-25 19:12:54 +01:00
unknown
89bb913bba - Removed COPYING.LIB from txt_files target in Docs/Makefile.am
Docs/Makefile.am:
   - Removed COPYING.LIB from txt_files target
2003-11-25 19:11:59 +01:00
unknown
a1c0636d08 merged
Docs/Makefile.am:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/rpl_change_master.result:
  merged - ul
2003-11-25 18:26:53 +01:00
unknown
ab57ede757 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-11-25 18:07:42 +01:00
unknown
ea280fd3ff - Removed COPYING.LIB from all source and binary distributions
after it was removed from manual.texi (where it was automatically
   generated from).


Docs/Makefile.am:
   - don't create COPYING.LIB anymore (was removed from manual.texi)
Makefile.am:
   - Removed COPYING.LIB from the source distribution
scripts/make_binary_distribution.sh:
   - Removed COPYING.LIB from the binary distribution
scripts/make_win_src_distribution.sh:
   - Removed COPYING.LIB from the windows source distribution
support-files/mysql.spec.sh:
   - Removed COPYING.LIB from the Server RPM
2003-11-25 17:52:12 +01:00
unknown
b9eb7a02b8 a script that fixes anti-GRANT'ness of privilege tables.
It can appear as a result of manual modifications with INSERT/UPDATE/DELETE

This script converts privilege table to the state that could be created
with GRANT commands only (with the exception of the short password)

This is necessary for 5.0
2003-11-25 16:08:55 +01:00