Commit graph

10283 commits

Author SHA1 Message Date
unknown
a189daf7be cleanup 2003-11-26 20:18:55 +03: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
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
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
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
unknown
aef0b9a7c7 fix for bug #1946:
"You can always mysql_real_query a query with placeholders 
after mysql_prepare()"


sql/sql_class.cc:
  prepare_command removed
sql/sql_class.h:
  prepare_command removed
sql/sql_prepare.cc:
  prepare_command removed
sql/sql_yacc.yy:
  prepare_command removed
tests/client_test.c:
  added test for bug #1946: "You can always
  mysql_real_query a query with placeholders after mysql_prepare()"
2003-11-25 17:41:12 +03:00
unknown
271502ffbf mysql-test-run fixes:
libexec support in install_test_db
--start-from in mysql-test-run


mysql-test/install_test_db.sh:
  libexec support in install_test_db
mysql-test/mysql-test-run.sh:
  --start-from in mysql-test-run
2003-11-25 14:43:15 +01:00
unknown
7d6479cc28 dict0boot.c:
Marko's patch: check the position of some system table columns already at C compile time


innobase/dict/dict0boot.c:
  Marko's patch: check the position of some system table columns already at C compile time
2003-11-25 15:11:01 +02:00
unknown
534ea9689f - Rephrased two option help texts to not start with "use the ..." as this
confuses RPM's Perl module dependency checking (it adds a bogus
   requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)


scripts/mysqlaccess.sh:
   - Rephrased option help text so it does not start with "use" as this 
     confuses RPM's Perl module dependency checking (it adds a bogus
     requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)
sql-bench/bench-init.pl.sh:
   - Rephrased option help text so it does not start with "use" as this 
     confuses RPM's Perl module dependency checking (it adds a bogus
     requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)
2003-11-24 17:05:24 +01:00
unknown
cbf2558b30 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-11-24 16:02:18 +01:00
unknown
fbe6f32ae2 WL#1172 optimization reverted
(see fulltext.test)
2003-11-24 14:49:03 +01:00
unknown
e433590cb2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-24 15:04:50 +02:00
unknown
8b0ba59c41 Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
did not call get_one_option().
2003-11-24 13:25:23 +02:00
unknown
5281f34e64 Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
did not call get_one_option().
2003-11-24 13:25:08 +02:00
unknown
e67cb86ab9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-24 09:46:11 +02:00
unknown
c6311f8673 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-23 21:27:48 +02:00
unknown
381a8db6a6 after review fixes
mysql-test/r/union.result:
  new tests, more correct results for old one
mysql-test/t/union.test:
  new tests, more correct results for old one
sql/field.cc:
  new way to make field types csting
sql/field.h:
  new way to make field types csting
sql/item.cc:
  new way to make field types csting
sql/sql_derived.cc:
  fixed typo
sql/sql_lex.h:
  comment added
2003-11-23 21:26:43 +02:00
unknown
c61d96d5ba Fix test for binary builds
mysql-test/r/rpl_change_master.result:
  Updated results
2003-11-23 21:03:10 +02:00
unknown
382fd752c2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-11-23 17:05:03 +01:00
unknown
bd6a70019e Replication:
Now the I/O thread (in flush_master_info()) flushes the relay log to disk
after reading every event. Slower but provides additionnal safety in case
of brutal crash.
I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
because sometimes flush_master_info() is called when there is no usable
relay log (the relay log's IO_CACHE is not initialized so can't be flushed).


mysql-test/r/rpl_loaddata_rule_m.result:
  avoid a harmless error in the .err file; we don't need a slave in this test
  (even though it's called 'rpl' because it's testing binlog-ignore-db).
mysql-test/t/rpl_loaddata_rule_m.test:
  result update
sql/repl_failsafe.cc:
  update call to flush_master_info() according to new prototype.
sql/slave.cc:
  - Now the I/O thread (in flush_master_info()) flushes the relay log to disk
  after reading every event. Slower but provides additionnal safety in case
  of brutal crash.
  I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
  because sometimes flush_master_info() is called when there is no usable
  relay log (the relay log's IO_CACHE is not initialized so can't be flushed).
  - Update version in message.
  - Remove warning about bug as it's not true anymore (since this changeset).
sql/slave.h:
  new prototype
sql/sql_repl.cc:
  update call to flush_master_info() according to new prototype.
2003-11-23 17:02:59 +01:00
unknown
105087127e 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/item.cc:
  Auto merged
sql/item.h:
  Auto merged
2003-11-23 17:59:28 +02:00
unknown
88d103aaa4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1


sql/item_func.cc:
  Auto merged
2003-11-23 15:35:43 +02:00
unknown
51591cad39 merge with 4.0
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/fulltext_left_join.test:
  Auto merged
2003-11-23 14:52:02 +02:00
unknown
ce44db9fb1 Fixed compiler warnings from Intel compiler in Win64
Added option --max-record-length=# to myisamchk
Don't try repair twice if doing myisamchk --repair --force
Shared memory handler didn't clean up things on errors or shutdown


VC++Files/libmysqltest/mytest.c:
  Fixed compiler warnings from Intel compiler
include/myisam.h:
  Added option --max-record-length=# to myisamchk
include/mysql_com.h:
  Fixed compiler warnings from Intel compiler
innobase/btr/btr0btr.c:
  Fixed compiler warnings from Intel compiler
innobase/btr/btr0cur.c:
  Fixed compiler warnings from Intel compiler
innobase/include/btr0btr.ic:
  Fixed compiler warnings from Intel compiler
innobase/include/buf0buf.ic:
  Fixed compiler warnings from Intel compiler
innobase/include/row0sel.ic:
  Fixed compiler warnings from Intel compiler
innobase/include/row0upd.ic:
  Fixed compiler warnings from Intel compiler
innobase/include/trx0rseg.ic:
  Fixed compiler warnings from Intel compiler
innobase/pars/pars0opt.c:
  Fixed compiler warnings from Intel compiler
innobase/que/que0que.c:
  Fixed compiler warnings from Intel compiler
myisam/mi_check.c:
  Added option --max-record-length=# to myisamchk
  Better error messages
myisam/myisamchk.c:
  Added option --max-record-length=# to myisamchk
  Don't try repair twice if doing myisamchk --repair --force
mysql-test/r/create.result:
  Updated test results
mysql-test/t/create.test:
  Better initialization
sql/ha_innodb.cc:
  Fixed compiler warnings from Intel compiler
sql/item_func.cc:
  Fixed compiler warnings from Intel compiler
sql/mysqld.cc:
  Fixed compiler warnings from Intel compiler
  Cleaned up handle_connections_shared_memory
  Shared memory handler didn't clean up things on errors or shutdown
strings/bmove512.c:
  Fixed compiler warnings from Intel compiler
2003-11-23 14:36:41 +02:00
unknown
3e21b667bc Fixed UNION fields type/length detecting
mysql-test/r/union.result:
  new results with max union field length detecting
  type conversion tests
mysql-test/t/union.test:
  type conversion tests
sql/field.h:
  field converion support
sql/item.cc:
  fixed printing field of internal temporary table of SELECT (reference from HAVING clause)
  layout fix
  new item for storing field type
sql/item.h:
  new item for storing field type
sql/item_subselect.cc:
  new subquery item length/dec detecting
sql/mysql_priv.h:
  we do not need pre-inited tables and fields
sql/sql_base.cc:
  we do not need double fix_fielding
sql/sql_class.h:
  we do not need double fix_fielding
sql/sql_derived.cc:
  preparing moved before temporary table creation
sql/sql_lex.h:
  we do not need pre-inited tables and fields
  new lists to store fields types and fields of temporary table
sql/sql_parse.cc:
  we do not need pre-inited tables and fields
sql/sql_prepare.cc:
  we do not need pre-inited tables and fields
sql/sql_select.cc:
  we do not need pre-inited tables and fields
  support mysql_select call from derived tables after it preparing (in derived table routing)
  support of crreating temporary table fields from Item_type_holder
sql/sql_select.h:
  we do not need pre-inited tables and fields
sql/sql_union.cc:
  we do not need pre-inited tables and fields
  check of columns number in union moved to prepare()
  prepering of SELECTS moved before temporary table creation, fixed union columns type/length detecting
sql/sql_update.cc:
  we do not need pre-inited tables and fields
2003-11-23 02:01:15 +02:00
unknown
c1dd9540a4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg1500-2


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
2003-11-23 00:48:59 +03:00
unknown
00ddd4e56a Fix for bug #1500 "Server crash with mysql_prepare"
We treat Item_param whose value is not set as non-const.
This allows us to avoid use of Item_param's value (not yet existing) in 
those fix_fields and fix_length_and_dec that do calculations if their 
Items arguments are const. So we can call fix_fields for such items from
mysql_prepare safely.


sql/item.cc:
  Now Item_param is non-constant (const_item()==FALSE) until its value is set.
sql/item.h:
  Added Item::const_during_execution() method which indicates constants that will be known 
  during execution phase (but they may be not known during preparing phase for example parameters 
  of prep. statements.)
  Made Item_param non-constant until its is value set, so its value won't be requested during 
  prepare statement step.
sql/item_func.cc:
  Fulltext search AGAINST clause now allows prepared statement parameter as its argument.
  Removed duplicate used_tables_cache update in Item_func_match::fix_fields()
  (it is set during Item_func::fix_fields).
tests/client_test.c:
  Added test for bug #1500 "Server crash with mysql_prepare"
2003-11-23 00:48:18 +03:00