1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Commit Graph

18792 Commits

Author SHA1 Message Date
1c62941741 Merge mysql.com:/home/jimw/my/mysql-4.1-9634
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-29 08:47:03 -07:00
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
931389d5ac Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
2005-04-29 08:41:25 -07:00
ede028b063 Merge mysql.com:/home/jimw/my/mysql-4.0-9690
into mysql.com:/home/jimw/my/mysql-4.0-clean


configure.in:
  Auto merged
2005-04-29 08:26:33 -07:00
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
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
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
b6ad57e0a3 Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug 2005-04-29 11:37:47 +02:00
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
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
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
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
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
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
21d16ca707 Bug#8321 - myisampack bug in compression algorithm
Merge from 4.0.
2005-04-28 16:09:53 +02:00
994674c09b Bug#8321 - myisampack bug in compression algorithm
This is the second of three changesets. It contains the pure bug fix.
It also contains the second after-review fixes.
The problem was that with gcc on x86, shifts are done modulo word size. 
'value' is 32 bits wide and shifting it by 32 bits is a no-op.
This was triggered by an evil distribution of character incidences. 
A distribution of 2917027827 characters made of 202 distinct values led to
34 occurrences of 32-bit Huffman codes.
This might have been the first time ever that write_bits() had to write
32-bit values. Since it can be expected that one day even 32 bits might
be insufficient, the third changeset suggests to enlarge some variables
to 64 bits.
2005-04-28 15:27:42 +02:00
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
b411128fa5 After review fixes to check-cpu
BUILD/check-cpu:
  Remove the exit 0 from check-cpu
2005-04-28 13:30:45 +02:00
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
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
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
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
2ef10765dc Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes 2005-04-28 09:39:29 +02:00
e82d1e91ba Fix 'mysql_client_test' with embedded server. (Bug #9634)
mysql-test/mysql-test-run.sh:
  Set up arguments for mysql_client_test when testing
  the embedded server.
tests/mysql_client_test.c:
  Add -A switch for passing arguments to the embedded server.
2005-04-27 17:50:48 -07:00
7a8716d60e Backport fix from 4.1 for testing whether CXX is gcc. (Bug #9690)
configure.in:
  Use more flexible for test for CXX being gcc.
2005-04-27 17:14:53 -07:00
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
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
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
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
3238612840 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
After merge fix.
2005-04-27 20:54:19 +02:00
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
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
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
27a6a81464 Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
cd50bf9ae4 After review fix
BUILD/check-cpu:
  Remove defaul flag i386 and add a check to see wheter to set check_cpu_cflags or not.
2005-04-27 17:52:14 +02:00
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
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
167ce82394 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-04-27 15:38:58 +03:00
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
b00b2126de Fixed core dump bug when hot link list in key cache was empty. Bug #10167
mysql-test/r/drop.result:
  Fixed result
2005-04-27 14:31:04 +03:00
ffb4ff2454 Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
- Reverted removal of errorcheck mutex initialise, used in safe_mutex_init. 


include/my_pthread.h:
  Reverted the removal of errorcheck mutex initializer
mysys/my_thr_init.c:
  Reverted the removal of errorcheck mutex initializer
  Add destruction of mutex initializer
2005-04-27 13:29:37 +02:00
78f89a729a Bug#9263 GCC4: -mcpu is depricated, use -mtune or -march instead
- Made a script that selects the best compiler optimizations for the current cpu.
   - Use the script from BUILD/SETUP.sh 


BUILD/SETUP.sh:
  Run check-cpu and use the compiler optimization flags it outputs
2005-04-27 12:50:37 +02:00
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
abf4e93d82 Merge neptunus.(none):/home/msvensson/mysql/bug8162
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


configure.in:
  Auto merged
2005-04-27 12:24:17 +02:00
3ce2f6f40a Merge neptunus.(none):/home/msvensson/mysql/bug9954
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


configure.in:
  Auto merged
2005-04-27 12:19:18 +02:00
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
e9cf23d1fc Merge neptunus.(none):/home/msvensson/mysql/bug2596
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:10:19 +02:00
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
ecfae64d65 Bug #8162 MySQL cannot be compiled without readline
- Display error if system readline or libedit can't be found


configure.in:
  Display an error if user has selected not to use the bundled libedit or readline, AND the system readline or libedit can't be found
2005-04-27 11:19:00 +02:00
7e04d257eb Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
- Changed makelist.sh
  - Bump up required version of autoconf
  - Use new style to init mutex in my_thr_init


cmd-line-utils/libedit/makelist.sh:
  Changed file so it works also on windows cr/lf files.
configure.in:
  Bump up required AC version number so that correct version of aclocal and autoconf is selected.
include/my_pthread.h:
  Use PTHREAD_MUTEX_ADAPTIVE_NP to see if "fast" mutexes are available
  Remove "errorcheck" mutexes, since they are never used.
mysys/my_thr_init.c:
  Use new style functions to init mutex if PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP is defined
  Add comment what mutex "kind" means
2005-04-27 09:59:12 +02:00