Commit graph

17908 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
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
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
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
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
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
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
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
unknown
181205f032 Fixed so no merge conflict with 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fixed so no merge conflict with
2005-03-31 19:18:50 +02:00
unknown
26bb934313 Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 2005-03-31 20:23:10 +04:00
unknown
00a549a57b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-03-31 08:41:22 -06:00
unknown
5b3549e64c Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent'
mysqldump.c:
  Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned


client/mysqldump.c:
  Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned
2005-03-31 08:37:18 -06:00
unknown
11b64a4ec9 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 14:33:51 +02:00
unknown
b75aa53e61 Removed warnings 2005-03-31 14:31:06 +02:00
unknown
60dcf73959 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/cps/mysql/trees/mysql-4.1
2005-03-31 14:36:56 +04:00
unknown
dbbe069019 Bug #9507 /etc/init.d/mysql script does not stop mysqld correctly
wait_for_pid function is fixed to wait for pid removal in "stop".
recomitted with post-review fix  


support-files/mysql.server.sh:
  wait_for_pid function corrected to work properly with start/stop
2005-03-31 14:25:03 +04:00
unknown
6ae390fd5d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
2005-03-31 10:47:32 +02:00
unknown
e5cddec6c5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-03-31 05:01:22 +02:00
unknown
f0148b21c3 Remove result.es files and support for them, which requires splitting
up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508).


BitKeeper/deleted/.del-drop_temp_table.result.es~bc4cfb1ee1257458:
  Delete: mysql-test/r/drop_temp_table.result.es
BitKeeper/deleted/.del-insert_select.result.es~ae7eb9891d6c07c4:
  Delete: mysql-test/r/insert_select.result.es
BitKeeper/deleted/.del-myisam-blob.result.es~d498dae7d9f1a6d4:
  Delete: mysql-test/r/myisam-blob.result.es
BitKeeper/deleted/.del-packet.result.es~6e71c3b634806185:
  Delete: mysql-test/r/packet.result.es
BitKeeper/deleted/.del-query_cache.result.es~246ad731a517d9ab:
  Delete: mysql-test/r/query_cache.result.es
BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079:
  Delete: mysql-test/r/select.result.es
BitKeeper/deleted/.del-type_blob.result.es~a4a0d4454b2d0218:
  Delete: mysql-test/r/type_blob.result.es
BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04:
  Delete: mysql-test/r/type_float.result.es
BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978:
  Delete: mysql-test/r/type_ranges.result.es
mysql-test/mysql-test-run.sh:
  Remove support for special result extension -- bad idea!
mysql-test/t/ps_1general.test:
  Explain --replace_result
mysql-test/r/insert_select.result:
  Update results
mysql-test/r/select.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_float.result:
  Update results
mysql-test/r/type_ranges.result:
  Update results
mysql-test/t/drop_temp_table.test:
  Skip this test with embedded server
mysql-test/t/insert_select.test:
  Move binlog test to new file
mysql-test/t/select.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_blob.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_float.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_ranges.test:
  Replace grants column from 'show full columns'
sql/sql_select.cc:
  Fix conditional around query_cache_abort() call.
2005-03-30 17:32:44 -08:00
unknown
f485db429a A fix for Bug#9443 "mysql_client_test fails on linux and some solaris
platforms": yet another issue with floating pointer comparisons.
The fix uses the workaround with volatiles.


sql/item_cmpfunc.cc:
  A fix for the failing mysql_client_test on some Intel platforms
  when compiled with optimization.
  We don't use -ffloat-store compileation as it may slow all
  floating point operations.
2005-03-31 03:44:51 +04:00
unknown
e12f1a4453 ndb - CSC#4927: ordered index + long pk, second half
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  ACC_LOCKREQ - element may have moved after lock request was made
2005-03-30 22:17:11 +02:00
unknown
30c8512954 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-4.1
2005-03-30 23:09:19 +03:00
unknown
56b2de98f3 postmerge fixes
mysql-test/r/metadata.result:
  postmerge change
sql/item.cc:
  work around about varchar in 4.1
2005-03-30 23:08:03 +03:00
unknown
3d03f0ae1b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-30 21:16:13 +02:00
unknown
504ab8d4f4 merge
sql/sql_parse.cc:
  Auto merged
2005-03-30 22:11:08 +03:00