Commit graph

18231 commits

Author SHA1 Message Date
unknown
e0216a7e31 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 13:07:46 +02:00
unknown
bc18ca4a66 Fix swedish error message
sql/share/swedish/errmsg.txt:
  Fix length of swedish error message for "unknown table"
2005-04-05 13:01:16 +02:00
unknown
632f8c197e A fix for Netware. 2005-04-05 13:15:04 +03:00
unknown
9c6d24e6e4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-05 11:25:42 +02:00
unknown
fccf177b15 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-05 11:23:17 +02:00
unknown
fee508a430 dict0dict.c:
Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints


innobase/dict/dict0dict.c:
  Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints
2005-04-05 11:35:03 +03:00
unknown
7cb0a8e794 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-04-05 09:06:57 +02:00
unknown
682baee231 Merge new tests
mysql-test/r/join_outer.result:
  Update results
mysql-test/t/join_outer.test:
  Merge
2005-04-04 18:29:18 -07:00
unknown
52781a484c Merge mysql.com:/home/jimw/my/mysql-4.1-9472b
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:27:27 -07:00
unknown
fe02ce98af Merge mysql.com:/home/jimw/my/mysql-4.1-8866
into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqltest.c:
  Auto merged
sql-common/client.c:
  Auto merged
2005-04-04 18:26:39 -07:00
unknown
6d2e510a30 Removed extra comment 2005-04-05 03:34:39 +04:00
unknown
31f2f9bcf8 Fix for BUG#8877: Implementation of
"Early NULL-values filtering for ref access" (attempt2+post-review fixes)
1. update_ref_and_keys() accumulates info about null-rejecting
predicates in in KEY_FIELD::null_rejecting, add_key_part saves
these to KEYUSE.
2. create_ref_for_key copies them to TABLE_REF.
3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond of
appropiate JOIN_TAB members.

Includes code cleanups: 
* add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
passed to it)
* add_key_fields() params: JOIN_TAB *stat removed (wasn't used)


sql/sql_select.cc:
  Fix for BUG#8877: Implementation of 
  "Early NULL-values filtering for ref access"
  1. update_ref_and_keys() accumulates info about null-rejecting
  predicates in in KEY_FIELD::null_rejecting, add_key_part saves
  these to KEYUSE.
  2. create_ref_for_key copies them to TABLE_REF.
  3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond
  of appropiate JOIN_TAB members.
  
  Includes code cleanups: 
  * add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
  passed to it)
  * add_key_fields() params: JOIN_TAB *stat removed (wasn't used)
sql/sql_select.h:
  Fix for BUG#8877: Implementation of 
  "Early NULL-values filtering for ref access" (attempt2)
2005-04-05 02:42:23 +04:00
unknown
a1112ca056 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 12:46:43 -07:00
unknown
e31062a23f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


sql/share/english/errmsg.txt:
  Auto merged
2005-04-04 19:00:40 +02:00
unknown
a64487fcd5 ha_innodb.cc:
Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables


sql/ha_innodb.cc:
  Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables
2005-04-04 19:41:52 +03:00
unknown
9ce74a800e ha_innodb.cc:
Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string


sql/ha_innodb.cc:
  Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string
2005-04-04 19:27:28 +03:00
unknown
9176a1f442 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 08:42:30 -07:00
unknown
2f01567ad6 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug6762


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-04 17:09:53 +02:00
unknown
07182f5aca ctype_uca.result:
fixing test results accordingly.
ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.


strings/ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.
mysql-test/r/ctype_uca.result:
  fixing test results accordingly.
2005-04-04 17:55:12 +05:00
unknown
f65e9210ee BUG#6762 ALTER TABLE gives weird results and error message
- Better error message when table definition has changed


mysql-test/r/ndb_alter_table.result:
  New error message and code when table definition has changed.
mysql-test/r/ndb_multi.result:
  Safety, drop tables in second server as well
mysql-test/t/ndb_alter_table.test:
  New error message and code when table definition has changed.
mysql-test/t/ndb_multi.test:
  Safety, drop tables in second server as well
sql/ha_ndbcluster.cc:
  When error 284 is returned from NDB a check must be made to see what the error really means.
   - if table does not exists any more, return 709 -> No such table exists
   - if table still exists, table has most likely been altered and table id and version has 
     changed, print  hardcoded  errormessage indicating that transaction should retried
    (this error message should be translated to a langauge dependent error message in 5.0)
    
  Remove mapping from 284 to HA_ERR_NO_SUCH_TABLE
2005-04-04 12:26:05 +02:00
unknown
98e615ba35 Manual merge of fix for bug #8894 "TIMESTAMP values scrambled/misaligned
when using --new" into 4.1 tree.


mysql-test/r/type_timestamp.result:
  Manual merge.
mysql-test/t/type_timestamp.test:
  Manual merge.
sql/field.cc:
  Manual merge.
sql/field.h:
  Manual merge.
2005-04-03 10:05:01 +04:00
unknown
64978db186 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg8894
2005-04-03 09:48:09 +04:00
unknown
ecf8732c22 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-02 21:45:02 +02:00
unknown
a77a2c8354 results updated 2005-04-02 21:36:50 +02:00
unknown
5f8c654a0a merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2005-04-02 20:28:58 +02:00
unknown
7d865e0b12 bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)


mysql-test/r/drop.result:
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
mysql-test/t/drop.test:
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
sql/share/english/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/share/russian/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/share/ukrainian/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/sql_table.cc:
  print an error with a function that respects width modifiers (%.64s)
2005-04-02 20:13:19 +02:00
unknown
ee7f73d453 Clean up merge of fix for Bug #9468.
mysql-test/t/lowercase_table_grant.test:
  Disable test with embedded server
mysql-test/t/skip_name_resolve.test:
  Disable test with embedded server
sql/sql_parse.cc:
  Reset server status after a single statement in a multistatement
  query is handled in embedded server so it is not logged twice to
  the slow query log.
2005-04-01 19:00:14 -08:00
unknown
dd882cfb64 Merge embedded-server testing changes.
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merge changes
mysql-test/t/ps_1general.test:
  Merge changes
2005-04-01 16:43:35 -08:00
unknown
c7c3f5bed8 Fix handling of max_allowed_packet and net_buffer_length in
embedded server when a size suffix (K, M, G) is added. (Bug #9472)


sql/mysqld.cc:
  Instead of (re)parsing max_allowed_packet and net_buffer_length
  for the embedded server, just set the global variables to what
  is set in global_system_variables within get_options().
2005-04-01 16:09:20 -08:00
unknown
0ac7d26b74 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-01 20:52:55 +02:00
unknown
f1ae21bf1e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-01 20:17:24 +02:00
unknown
3b82560b95 Fix the new ps_grant test to clean itself up properly.
mysql-test/r/ps_grant.result:
  Update results
mysql-test/t/ps_grant.test:
  Fix cleanup of test
2005-04-01 09:13:20 -08:00
unknown
b0b9d25aa2 Merge changesets constituting 4.1.10a back into main tree, including release label.
include/my_global.h:
  Auto merged
isam/create.c:
  Auto merged
merge/mrg_create.c:
  Auto merged
myisammrg/myrg_create.c:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  No change to main source when integrating 4.1.10a.
myisam/mi_create.c:
  No change to main source when integrating 4.1.10a.
scripts/mysql_create_system_tables.sh:
  No change to main source when integrating 4.1.10a.
sql/mysql_priv.h:
  No change to main source when integrating 4.1.10a.
sql/mysqld.cc:
  No change to main source when integrating 4.1.10a.
sql/share/english/errmsg.txt:
  No change to main source when integrating 4.1.10a.
2005-04-01 18:56:45 +02:00
unknown
390fe9d958 Last minor things to finish MySQL 4.1.10a:
- some wordings,
- RPM packaging improvements.


configure.in:
  Set the version string.
scripts/mysql_create_system_tables.sh:
  Security change: Reduce the risk caused by predefined anonymous logins.
sql/mysqld.cc:
  Correct a message text; align variable order with other versions.
sql/sql_udf.cc:
  Fix an erroneous takeover of 4.0 wording.
support-files/mysql.spec.sh:
  Fix date formatting, add missing change descriptions.
2005-04-01 18:38:19 +02:00
unknown
b6ae0c1fc5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-01 18:02:51 +02:00
unknown
163311138c Fix for bug#9435: TIMESTAMP columns don't update 2005-04-01 17:59:46 +02:00
unknown
d1b9ce83f5 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-01 08:18:49 -06:00
unknown
0344bf1665 Manual merge
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Manual merge, fix already applied to 4.1
2005-04-01 12:35:49 +02:00
unknown
ba51ba8642 BUG#6554 Problem Building MySql on Fedora Core 3
- Remove the local static var


sql/ha_berkeley.cc:
  Remove local static var, make it local in file instead.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-04-01 12:32:47 +02:00
unknown
8ef1afbaa4 Better comment 2005-04-01 11:05:17 +04:00
unknown
e7332e64ca Fix crash in embedded server due to incorrect storage of results
in the query cache. (Bug #9549)


libmysqld/emb_qcache.h:
  Fix Querycache_stream::use_next_block() to actually use the next
  block and mark blocks as used when it writes to them.
mysql-test/r/query_cache.result:
  Update results.
mysql-test/t/query_cache.test:
  Add new regression test.
libmysqld/emb_qcache.cc:
  Fix calls to use_next_block() to indicate whether we are writing
  to the next block or not.
sql/sql_cache.cc:
  Initialize the first block properly when storing a result in
  the embedded server.
2005-03-31 19:17:45 -08:00
unknown
6d0dd4297d Fix for a build bug.
Added a missing comma.

Originally contained in 2005/03/04 09:30:22+01:00 ingo@mysql.com;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


myisam/mi_create.c:
  Fix for a build bug.
  Added a missing comma.
2005-03-31 22:02:05 +02:00
unknown
32220745e0 after merge fixes
Originally contained in 2005/03/03 23:57:48+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


sql/sql_udf.cc:
  after merge fixes
2005-03-31 21:57:46 +02:00
unknown
b6a38fc7f7 typos fixed
Originally contained in 2005/03/03 23:10:23+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


sql/mysqld.cc:
  typos fixed
2005-03-31 21:47:18 +02:00
unknown
c750c41855 uninit variable fixed
Originally contained in 2005/03/03 21:13:33+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


sql/ha_myisam.cc:
  uninit variable fixed
2005-03-31 21:44:48 +02:00
unknown
30c7d20afb Fix segmentation fault in mysqlcheck when the last table
checked with --auto-repair mode returned an error (such
as being a merge table). (Bug #9492)


client/mysqlcheck.c:
  When testing whether the last table should be added to the list of tables to
  be repaired, we don't have a valid row[] to look at, so don't.
2005-03-31 11:43:39 -08:00
unknown
896e6e5653 Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
Originally contained in 2005/03/03 19:51:29+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


include/my_global.h:
  O_NOFOLLOW
isam/create.c:
  create table files with O_EXCL|O_NOFOLLOW
merge/mrg_create.c:
  create table files with O_EXCL|O_NOFOLLOW
myisam/mi_create.c:
  create files of temporary tables with O_EXCL|O_NOFOLLOW
myisammrg/myrg_create.c:
  create table files with O_EXCL|O_NOFOLLOW
mysys/mf_tempfile.c:
  create temporary files with O_EXCL|O_NOFOLLOW
sql/ha_myisam.cc:
  let mi_create know if the table is TEMPORARY
sql/mysql_priv.h:
  --allow_suspicious_udfs
sql/mysqld.cc:
  --allow_suspicious_udfs
sql/share/english/errmsg.txt:
  typo
sql/sql_udf.cc:
  --allow_suspicious_udfs
  don't allow xxx() udf without any of xxx_init/deinit/add/reset
  check paths when loading from mysql.func
sql/table.cc:
  create frm of temporary table with O_EXCL|O_NOFOLLOW
2005-03-31 21:41:07 +02:00
unknown
ab77d7d763 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-31 21:09:00 +02:00
unknown
2547464488 include sql/examples in the window source distribution 2005-03-31 20:27:29 +02:00
unknown
407d8d8743 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-31 19:59:55 +02:00