Commit graph

8520 commits

Author SHA1 Message Date
unknown
c6257d207b Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-03 09:46:52 +03:00
unknown
9f5a4955d0 Merge mysql.com:/home/jimw/my/mysql-4.1-9947
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:12:27 -07:00
unknown
5df9135be7 Merge mysql.com:/home/jimw/my/mysql-4.1-9761
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:12:03 -07:00
unknown
465ba81afa Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
2005-05-02 08:05:58 -07:00
unknown
391c84238f Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-02 07:30:17 +03:00
unknown
7ecca388af Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9228
2005-05-01 19:03:49 +04:00
unknown
3b6043870d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
2005-04-30 03:45:12 +03:00
unknown
9319613191 Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions about
relative sizes of int/long/longlong.
2005-04-30 01:05:15 +04:00
unknown
f8e45de365 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/usr/src/mysql-4.1
2005-04-29 22:20:16 +04:00
unknown
27fa1254dc Fix bug #9703 "Error 1032 with GROUP BY query and large tables"
Reset old error if tmp table was successfully created.

Test data is large and can be found in bug report along with test query.


sql/sql_select.cc:
  Fix bug #9703
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-04-29 21:19:39 +04:00
unknown
65d0de3b7b Manually resolve merge
mysql-test/r/query_cache.result:
  Resolve merge
mysql-test/t/query_cache.test:
  Resolve merge
2005-04-29 08:46:03 -07:00
unknown
97b0821462 CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036)
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)


configure.in:
  Fix compiler problems with MinGW (Bug #8872)
include/config-win.h:
  Fix compiler problems with MinGW (Bug #8872)
include/my_global.h:
  Fix compiler problems with MinGW (Bug #8872)
mysql-test/r/cast.result:
  Test for cast to signed/unsigned outside of range (Bug #7036)
mysql-test/t/cast.test:
  Test for cast to signed/unsigned outside of range (Bug #7036)
mysys/default.c:
  Cleanup (combine identical code). 
  Done mainly by Jani
sql/field.h:
  Added cast_to_int_type() to ensure that enums are casted as numbers
sql/hostname.cc:
  Don't block not resolved IP's if DNS server is down (Bug #8467)
sql/item.h:
  Added cast_to_int_type() to ensure that enums are casted as numbers
sql/item_func.cc:
  CAST(string_argument AS UNSIGNED) didn't work for big integers above the
  signed range. (Bug #7036)
  Produce warnings of wrong cast of strings to signed/unsigned
sql/item_func.h:
  CAST(string_argument AS UNSIGNED) didn't work for big integers above the
  signed range. (Bug #7036)
2005-04-29 17:03:34 +03:00
unknown
8ebd64bb46 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-29 14:10:26 +02:00
unknown
d937adf967 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-29 11:56:38 +02:00
unknown
b6ad57e0a3 Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug 2005-04-29 11:37:47 +02:00
unknown
4c15ce3aec Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-04-29 10:07:03 +03:00
unknown
db58f75c6f Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-04-29 09:03:34 +02:00
unknown
ef3e9e1cff Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names
is set on case-sensitive file systems and the source table
was specified in something other than lowercase. (Bug #9761)


mysql-test/r/lowercase_table.result:
  Add results
mysql-test/t/lowercase_table.test:
  Regression test for Bug #9761
sql/sql_table.cc:
  When lower_case_table_names is set, make sure to look for
  the source table using a lowercase filename.
2005-04-28 15:30:42 -07:00
unknown
275c8e7790 Merge mysql.com:/home/mydev/mysql-4.1-bug5964
into mysql.com:/home/mydev/mysql-4.1-4100
2005-04-28 18:34:47 +02:00
unknown
f0e256efe4 BUG#5964 - 4.1 MERGE tables regression from 4.0
Changed the creation of the .MRG file so that only the table  name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.


include/my_sys.h:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Added declaration for a new function.
myisammrg/myrg_open.c:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Changed check for absolute path to check for any path.
mysys/my_getwd.c:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Added a new functions which checks for absolute _or_
  relative paths.
sql/ha_myisammrg.cc:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Changed the creation of the .MRG file so that only the table  name
  is written when the MyISAM table is in the same database as the
  MERGE table, a relative path is used in other cases in mysqld,
  and possibly an absolute path is used in an embedded server.
2005-04-28 18:28:50 +02:00
unknown
e26a93e999 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-28 19:58:52 +04:00
unknown
2a69f0049b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-04-28 16:00:09 +03:00
unknown
c53b0c4398 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-28 10:57:08 +02:00
unknown
67a7bc2d98 Merge neptunus.(none):/home/msvensson/mysql/bug9911
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-28 10:50:31 +02:00
unknown
2c8e261725 BUG#9911 After review fixes
- Remove ha_archive::rename_table and move the fix to handler::rename_table


sql/examples/ha_archive.cc:
  Remove ha_archive::rename_table
sql/examples/ha_archive.h:
  Remove ha_archive::rename_table
sql/handler.cc:
  Fix handler::rename_table so it does not care about if the file to rename is missing
2005-04-28 10:49:18 +02:00
unknown
c97859b300 Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes 2005-04-28 10:46:39 +02:00
unknown
2ef10765dc Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes 2005-04-28 09:39:29 +02:00
unknown
8c0f1e89c0 Clean up error message for connections-per-hour user limit
being exceeded. (Bug #9947)


sql/sql_parse.cc:
  Fix error message when connections per hour has been exceeded
2005-04-27 17:05:15 -07:00
unknown
df0a4ed64e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_insert.cc:
  Auto merged
2005-04-28 00:41:39 +03:00
unknown
57d9c6d077 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


configure.in:
  Auto merged
2005-04-27 21:40:11 +02:00
unknown
7183076dcf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-27 23:02:57 +04:00
unknown
3238612840 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
After merge fix.
2005-04-27 20:54:19 +02:00
unknown
66f9674613 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-27 22:52:54 +04:00
unknown
8d22538041 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-27 22:51:02 +04:00
unknown
f3a1bafa48 Merge from 4.0 needs fixes
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2005-04-27 18:59:31 +02:00
unknown
27a6a81464 Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
unknown
b580f8ddf5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-27 17:12:08 +02:00
unknown
a43bfdd289 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-27 15:50:11 +02:00
unknown
77d8d716b4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b9803
2005-04-27 17:20:29 +05:00
unknown
f63c8f53b0 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
Added protection against global read lock while creating and
initializing a delayed insert handler.
Allowed to ignore a global read lock when locking the table
inside the delayed insert handler.
Added some minor improvements.


sql/lock.cc:
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  Changed mysql_lock_tables() to allow for ignoring global read lock.
  Added functions to set/unset protection against global read lock.
sql/mysql_priv.h:
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  Changed existing and added new function declarations.
sql/sql_insert.cc:
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  Added and extended some comments.
  Added a protection against global read lock while a handler is
  created and initialized.
  Moved the unlock of the delayed insert object past its last usage
  in delayed_get_table().
  Changed the table locking in handle_delayed_insert() so that it
  does not wait for global read lock.
2005-04-27 12:40:37 +02:00
unknown
fc26e1c15b Merge neptunus.(none):/home/msvensson/mysql/bug9911
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:17:07 +02:00
unknown
2bd02714d2 Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200).
sql/ha_innodb.cc:
  Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200).
  Lock type must be stored when sql_command = SQLCOM_LOCK_TABLES and
  lock_type = TL_READ or TL_READ_INSERT even when 
  innobase_locks_unsafe_for_binlog is set.
2005-04-27 12:28:25 +03:00
unknown
bf17c826de Cleanups during review
mysys/default.c:
  Cleanup:
  - Just test once for recursion level
  - Don't test explicitely for \r or \n as my_isspace() already does that
sql/sql_insert.cc:
  Fix argument
sql/sql_select.cc:
  Fixed indentation
  added comment
2005-04-26 23:24:59 +03:00
unknown
d8871a117b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-04-26 21:09:42 +03:00
unknown
3b2964c5c4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
2005-04-26 19:26:51 +02:00
unknown
98b911d537 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/nptl-4.1 2005-04-26 19:22:43 +02:00
unknown
cf09e60632 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-04-26 16:03:20 +03:00
unknown
5444ad9400 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
- Implemented ha_archive::rename_table
 - Added testcases for rename


mysql-test/r/archive.result:
  Addd testcase for rename of archive table
mysql-test/t/archive.test:
  Addd testcase for rename of archive table
sql/examples/ha_archive.cc:
  Implement special version of rename table that does not care it the .arn file is missing
sql/examples/ha_archive.h:
  Implement special version of rename table that does not care it the .arn file is missing
2005-04-26 11:35:52 +02:00
unknown
ccfcfce6db Fix compile issues in Intel C/C++ compiler (Bug #9063)
acinclude.m4:
  Use AC_LANG_PUSH/POP instead of _SAVE/RESTORE
  Add test to get type of 'struct rlimit'
  Switch order of including stdlib.h and declaration being tested to
  match how it will be used in regular code.
configure.in:
  Call MYSQL_TYPE_STRUCT_RLIMIT macro
sql/mysqld.cc:
  Use STRUCT_RLIMIT for getting type of struct rlimit.
2005-04-25 18:02:03 -07:00
unknown
86c75663b4 Post review fix of ndbcluster_drop_database, typo 2005-04-25 11:54:00 +02:00