Commit graph

30524 commits

Author SHA1 Message Date
unknown
eecb7c944f configure.in:
Update NDB version as well


configure.in:
  Update NDB version as well
2006-05-24 12:30:34 +02:00
unknown
5ec9cff715 configure.in:
Stepped up to 5.0.23


configure.in:
  Stepped up to 5.0.23
2006-05-24 12:28:34 +02:00
unknown
172ad3dea7 configure.in:
Stepped up to 4.1.22


configure.in:
  Stepped up to 4.1.22
2006-05-24 12:20:17 +02:00
unknown
3ebf191662 Merge april.(none):/home/svoj/devel/mysql/BUG12873/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
2006-05-24 15:19:48 +05:00
unknown
e1227d2bd1 Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release
into  mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release


tests/mysql_client_test.c:
  Auto merged
configure.in:
  merged
sql/sql_lex.cc:
  merged
2006-05-24 12:19:39 +02:00
unknown
c06d757e8e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0


sql/sql_table.cc:
  Auto merged
2006-05-24 15:13:49 +05:00
unknown
9972f4bf5d configure.in:
Changed version to 5.0.22


configure.in:
  Changed version to 5.0.22
2006-05-24 11:33:17 +02:00
unknown
d5df934288 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-24 12:09:16 +03:00
unknown
83cd9eca30 Bug #16997 Table rename that changes database does not rename indexes: merge 2006-05-24 10:58:12 +02:00
unknown
12a0f4ff14 Remove dflt_field from field structure as this was only needed when createing temporary table and I found another soultion that doesn't increase the size of the field structure for all table instances. (Better fix for bug #19089)
Fixed compiler warnings
Fixed valgrind warning in Item_date_add_intervall::eq. (Recoding of bugfix #19490)


sql/field.cc:
  remove dflt_field from field structure (not needed)
  Simple cleanup of code that been copied elsewhere
sql/field.h:
  remove dflt_field from field structure (not needed)
sql/item.h:
  Removed compiler warnings
sql/item_timefunc.cc:
  Fixed Item_date_add_intervall::eq
  The problem was that when we call 'eq' 'this' is not fixed, which means we can't call const_item() or a value function.
  I fixed this so that we check eq for all arguments and that the sign and type are identical.
  (The original code gave a 'accessing uninitialized data' in valgrind.
sql/mysql_priv.h:
  Added default fields to create_tmp_field
sql/sql_insert.cc:
  New default_field parameter to create_tmp_field()
sql/sql_select.cc:
  New default_field parameter to create_tmp_field()
  Use this in create_tmp_table() to set right default value for a field
2006-05-24 11:56:59 +03:00
unknown
81dd2cd096 Merge neptunus.(none):/home/msvensson/mysql/bug15328/my41-bug15328
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge
2006-05-24 10:16:31 +02:00
unknown
9636f9eded Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
2006-05-24 10:08:26 +02:00
unknown
89fdbbeb36 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
2006-05-24 10:47:09 +05:00
unknown
f02b0d8afd configure.in:
Updated release number 4.1.16a


configure.in:
  Updated release number 4.1.16a
2006-05-24 01:05:20 +02:00
unknown
6a60accef2 don't let bugfix for bug#8303 break the bugfix for bug#8378
revert the fix for bug#8303
correct the test for bug#8378


mysql-test/r/ctype_sjis.result:
  updated
mysql-test/t/ctype_sjis.test:
  updated
sql/sql_lex.cc:
  revert the fix for bug#8303
tests/mysql_client_test.c:
  correct the test for bug#8378
2006-05-24 00:55:53 +02:00
unknown
f04b9f2473 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0--bug11151


sql/sp_head.cc:
  Auto merged
2006-05-23 15:01:05 -04:00
unknown
1d5999dc6d configure.in:
Changed version to 5.0.17c


configure.in:
  Changed version to 5.0.17c
2006-05-23 20:43:48 +02:00
unknown
6f42227f31 Bug#19938 Valgrind error (race) in handle_slave_sql()
sql/slave.cc:
  Read the value of rli->events_till_abort only in debug compile
2006-05-23 20:16:57 +02:00
unknown
1b32376ab8 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/t/information_schema.test:
  Auto merged
2006-05-23 17:05:37 +02:00
unknown
6df2a7d0ba Guilhelm suggested that the "load data infile" command should be flagged as
not transaction-safe for stored procedures.  Related to Bug#11151.


sql/sp_head.cc:
  Guilhelm suggested that the "load data infile" command should be flagged as
  not transaction-safe for stored procedures.
2006-05-23 10:29:58 -04:00
unknown
a6cc2de9f6 Bug #19938 Valgrind error (race) in handle_slave_sql()
sql/slave.cc:
  Read rli->events_till_abort to a temporary variable before unlocking the mutex
2006-05-23 16:20:03 +02:00
unknown
a2fb5dc56a Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060523082057|49143
sql/slave.cc:
  Exclude
2006-05-23 16:14:48 +02:00
unknown
54526d177f Make wait_timeout test not timing dependent
mysql-test/t/wait_timeout.test:
  Remove sleeps from wait_timeout in order to make it timing independent.
  Instead get the status variable "aborted_clients" in a seconds connection.
2006-05-23 15:45:16 +02:00
unknown
f112e407ea Bug #18742: Test 'group_min_max' fails if "classic" configuration in 5.0
Moved the InnoDB related tests to innodb_mysql


mysql-test/r/group_min_max.result:
  Moved innodb related tests out of group_min_max
mysql-test/r/innodb_mysql.result:
  Moved innodb related tests out of group_min_max
mysql-test/t/group_min_max.test:
  Moved innodb related tests out of group_min_max
mysql-test/t/innodb_mysql.test:
  Moved innodb related tests out of group_min_max
2006-05-23 16:43:01 +03:00
unknown
42bfdef07d Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
2006-05-23 17:30:55 +05:00
unknown
0324202514 Merge mysql.com:/usr/local/mysql/mysql-5.0-gcov
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-05-23 13:23:45 +02:00
unknown
81f1acc4bc Merge bk-internal:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-23 11:38:05 +02:00
unknown
d899c7ff5e Bug#16297 In memory grant tables not flushed when users's hostname is ""
- In function 'handle_grant_struct' when searching the memory structures for an 
   entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
   with the host passed in argument "user_from".
 - A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
   memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
   that "any host" can connect. Thus is's correct to turn on allow_all_hosts
   when such a user is found. 
 - Review and fix other places where host.hostname may be NULL.


mysql-test/init_db.sql:
  Rename: BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7 -> mysql-test/init_db.sql
mysql-test/r/grant.result:
  Add test cases for users with hostname ""
mysql-test/t/grant.test:
  Add test cases for users with hostname ""
   - Test create, grant and drop as well as connecting as the user with hostname "".
sql/sql_acl.cc:
  Convert places where host.hostname is NULL to "" before using it.
2006-05-23 11:35:14 +02:00
unknown
022e12d4ad Move the requirement for "not running as root" to information_schema_chmod 2006-05-23 10:52:53 +02:00
unknown
e6e74dc411 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/mysqld.cc:
  Auto merged
2006-05-23 10:36:06 +02:00
unknown
8a809e35a8 Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-23 10:34:59 +02:00
unknown
90b8e60103 Add comment for 'kill_server' function 2006-05-23 10:33:53 +02:00
unknown
fc2e96ee7b Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
transfer NO_DEFAULT_VALUE_FLAG flag to new field


mysql-test/r/strict.result:
  Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
  test case
mysql-test/r/type_ranges.result:
  Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
  result fix
mysql-test/t/strict.test:
  Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
  test case
2006-05-23 13:27:45 +05:00
unknown
4d3a78a26b Bug#19938 Valgrind error (race) in handle_slave_sql()
- Unlock the mutex after looking at rli->events_till_abort
 - Already fixed in 5.1 so it will be null merged.


sql/slave.cc:
  Unlock the mutex after looking at rli->events_till_abort
2006-05-23 10:20:57 +02:00
unknown
2d98d2438b Bug#16681 information_schema shows forbidden VIEW details
show view definition to users that have the needed privilleges


mysql-test/r/information_schema.result:
  Bug#16681 information_schema shows forbidden VIEW details
  test case
mysql-test/t/information_schema.test:
  Bug#16681 information_schema shows forbidden VIEW details
  test case
2006-05-23 12:45:25 +05:00
unknown
7ef9eb1c2c make_sharedlib_distribution.sh:
Solaris sh don't like {..} in file matching


scripts/make_sharedlib_distribution.sh:
  Solaris sh don't like {..} in file matching
2006-05-23 00:50:39 +02:00
unknown
0792cd92f6 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-05-22 12:55:28 -07:00
unknown
a1ff1c9774 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-22 20:45:19 +02:00
unknown
c32fd43bd3 Merge mysql.com:/home/kgeorge/mysql/5.0/clean
into  mysql.com:/home/kgeorge/mysql/5.0/B18745
2006-05-22 18:22:10 +03:00
unknown
bd578562f2 Fix BUILD/compile-pentium-gcov
BUILD/compile-pentium-gcov:
  Add -max options for gcov, fix yassl and BDB builds, disable ccache which
  is incompatible with gcc profiling output.
2006-05-22 17:15:49 +02:00
unknown
321708d36d Post-review fixes for bug #19089
mysql-test/r/view.result:
  Post-review fixes.
sql/field.cc:
  Post-review fixes.
sql/field.h:
  Post-review fixes.
sql/sql_select.cc:
  Post-review fixes.
2006-05-22 07:57:46 -07:00
unknown
9bce5261f6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-22 16:30:43 +02:00
unknown
282d904dd8 ndb: corrected option handeling to give correct help in ndbd 2006-05-22 16:27:37 +02:00
unknown
cc6483a4fe Merge jonas@perch:src/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-22 16:27:13 +02:00
unknown
b959d36bce Import from yaSSL
Fixes for HPUX etc. 
Don't define exceptions operator new on hpux as the linker will look for the function


extra/yassl/examples/echoserver/echoserver.cpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/include/socket_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/src/handshake.cpp:
  Import patch yassl.diff
extra/yassl/src/socket_wrapper.cpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/src/timer.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_error.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/block.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/md4.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/runtime.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/md4.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/taocrypt.dsp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/test.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/stdexcept.hpp:
  Don't define exceptions operator new on hpux as the linker will look for the function
extra/yassl/taocrypt/src/Makefile.am:
  Add md4.cpp to Makefile.am
2006-05-22 15:49:57 +02:00
unknown
98268bf057 Merge mysql.com:/home/marty/MySQL/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-5.0


ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  merge
2006-05-22 15:16:37 +02:00
unknown
48fe5a2d8f Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug13987
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2006-05-22 23:12:01 +10:00
unknown
af3b08c585 Bug#18745: Test case 'func_group' fails if "classic" 5.0 configuration
Moved the InnoDB related test from func_group.test to innodb_mysql.test


mysql-test/r/func_group.result:
  Moved a test to innodb_mysql
mysql-test/r/innodb_mysql.result:
  moved a test to innodb_mysql
mysql-test/t/func_group.test:
  Moved a test to innodb_mysql
mysql-test/t/innodb_mysql.test:
  Moved a test to innodb_mysql
2006-05-22 16:10:53 +03:00
unknown
39d07a22c3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b18536
2006-05-22 11:49:35 +05:00
unknown
07188950ae Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-21 18:22:13 +05:00