Commit graph

19821 commits

Author SHA1 Message Date
unknown
fe90e5677c Imported fix from 5.0. 2005-10-26 16:12:41 +03:00
unknown
dd1dc7def9 mysql-test-run.pl:
Added MTR_BUILD_THREAD to control the port range


mysql-test/mysql-test-run.pl:
  Added MTR_BUILD_THREAD to control the port range
2005-10-26 01:24:03 +02:00
unknown
8023bda59b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-25 23:56:08 +02:00
unknown
5a9dc44dac Merge mysql.com:/home/jimw/my/mysql-4.1-12925
into  mysql.com:/home/jimw/my/mysql-4.1-clean


tests/mysql_client_test.c:
  Auto merged
2005-10-25 10:11:47 -07:00
unknown
b5dc243e3d Fix incorrect casts in my_getopt code that capped the maximum of longlong
options to the wrong value. (Bug #12925)


mysql-test/t/mysql_client_test.test:
  Add parameter for testing getopt bug
mysys/my_getopt.c:
  Remove incorrect and unnecessary casts
tests/mysql_client_test.c:
  Add test case for Bug #12925 (my_getopt bug)
2005-10-25 10:10:53 -07:00
unknown
947de78a36 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14016-bug-4.1-mysql
2005-10-25 20:37:45 +04:00
unknown
b96dbef6fd Fix bug #14016 date_format() 2nd parameter was compared using case insensitive
collation

By default constant strings in second parameter of date_time() have case
insensitive collation. Because of this expressions date_format(f,'%m') and 
date_format(f,'%M') wrongly becomes equal, which results in choosing wrong 
column to sort by.

Now if second parameter of date_format() is constant then it's collation is 
changed to case sensitive.


sql/item_timefunc.cc:
  Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation.
  If second parameter of date_format() is constant then it's collation is changed to case sensitive.
mysql-test/r/date_formats.result:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation
mysql-test/t/date_formats.test:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation
2005-10-25 20:37:26 +04:00
unknown
d58f2bdfd7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13392-bug-4.1-mysql
2005-10-25 20:04:44 +04:00
unknown
45369edf57 Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATE
VALUES() can only refer to table insert going to. 
But Item_insert_value::fix_fields() were passing to it's arg full table list,
This results in finding second column which shouldn't be found, and
failing with error about ambiguous field.

Item_insert_value::fix_fields() now passes only first table of full table
list.


sql/item.cc:
  Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation.
  If second parameter of date_format() is constant then it's collation is changed to case sensitive.
mysql-test/r/insert_select.result:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation
mysql-test/t/insert_select.test:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation
2005-10-25 20:04:12 +04:00
unknown
b4e8705bdc Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-10-25 13:59:25 +02:00
unknown
6e49a48a25 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


myisam/mi_check.c:
  Auto merged
2005-10-25 12:12:10 +03:00
unknown
b31dd53c85 Changed some dbug print options.
myisam/mi_check.c:
  Changed print style for keyoffset.
myisam/mi_delete.c:
  Changed print style for keypos.
2005-10-25 12:11:31 +03:00
unknown
133ea93bc4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-25 02:36:51 +02:00
unknown
e17b176e9b Makefile.am:
Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num


Makefile.am:
  Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num
2005-10-25 02:27:55 +02:00
unknown
8d6634c9e0 Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization
heap/_check.c:
  Change arguments to ha_key_cmp
heap/hp_create.c:
  Change arguments to ha_key_cmp
include/my_base.h:
  Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument
myisam/mi_check.c:
  Change arguments to ha_key_cmp
myisam/mi_rnext_same.c:
  Change arguments to ha_key_cmp
myisam/mi_search.c:
  Change arguments to ha_key_cmp
myisam/mi_write.c:
  Change arguments to ha_key_cmp
myisammrg/myrg_queue.c:
  Change arguments to ha_key_cmp
mysys/my_handler.c:
  Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument
  (This removes an if in a loop at the expensive of an int on the stack)
sql/records.cc:
  Simplify new rr_index() code
  Create common error handling function for rr_() functions.
  Remove loop from rr_index() as handler::index_next() can never return HA_ERR_RECORD_DELETED
sql/sql_load.cc:
  Simplify
sql/sql_update.cc:
  Simplify code
  Fixed bug when one is updating an index column that could be used with ORDER BY
sql/structs.h:
  Removed not needed structure element
2005-10-25 02:27:40 +03:00
unknown
3c02a0534d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2


sql/mysqld.cc:
  Auto merged
2005-10-23 02:49:57 +04:00
unknown
02dc7bfb1a BUG#9622: post-review-fixes: better comments 2005-10-23 02:46:10 +04:00
unknown
1c9783e854 Fix merge of test that left out a drop table.
mysql-test/r/loaddata.result:
  Update esults
mysql-test/t/loaddata.test:
  Add missing drop table
2005-10-21 19:54:34 -07:00
unknown
2750dc8766 Merge mysql.com:/home/jimw/my/mysql-4.1-11203
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  Resolve conflict
mysql-test/t/loaddata.test:
  Resolve conflict
2005-10-21 17:57:51 -07:00
unknown
07fa475e26 compilation failure fixed 2005-10-21 14:56:59 +02:00
unknown
c9978d8bcb Bug#13233
select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
  Adding test case
sql_yacc.yy:
  Adding new syntax.
item_strfunc.h:
  Fixing wrong max_length calculation.
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0,
  according to Monty's suggestion.


sql/item_strfunc.h:
  Bug#13233
  select distinct char(column) fails with utf8
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0.
sql/sql_yacc.yy:
  Adding new syntax.
mysql-test/t/ctype_utf8.test:
  Adding test case
mysql-test/r/ctype_utf8.result:
  Adding test case
2005-10-21 14:41:56 +05:00
unknown
571d9cdd0b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-10-21 06:43:33 +02:00
unknown
740123a457 bug#14199 - ndb leak of index opertaions in TC leading to error 288
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  New dump for index operation count
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  New dump for index operation count
  Fix leak on index ops
2005-10-21 06:41:49 +02:00
unknown
71fdef4d10 BUG#9622, stage 2, work together with fix for BUG#12232:
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).


include/my_base.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method:
  Added SEARCH_RETURN_B_POS flag for ha_key_cmp()
include/my_handler.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method: added ha_find_null()
include/myisam.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
myisam/mi_check.c:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method, added 
   mi_collect_stats_*(), updated update_key_parts() to deal with all 3 methods.
myisam/myisamchk.c:
  BUG#9622: Added nulls_ignored index statistics collection method for MyISAM
myisam/myisamdef.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
myisam/sort.c:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
mysql-test/r/myisam.result:
  Testcase for BUG9622
mysql-test/t/myisam.test:
  Testcase for BUG9622
mysys/my_handler.c:
  BUG#9622: ha_key_cmp() now supports new SEARCH_RETURN_B_POS flag, added ha_find_null()
sql/ha_myisam.cc:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
sql/mysqld.cc:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
2005-10-21 06:29:17 +04:00
unknown
65ef7cc2f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-10-20 10:28:52 +02:00
unknown
f491100272 charset.c:
Bug#13238 mysqldump and mysqladmin hangs
  Avoid recursion into init_available_charsets.
  Serg's version didn't work for me: I got 
  double mutex locking.
  Pushing this version instead
  (It was approved by Serg anyway)


mysys/charset.c:
  Bug#13238 mysqldump and mysqladmin hangs
  Avoid recursion into init_available_charsets.
  Serg's version didn't work for me: I got 
  double mutex locking.
  Pushing this version instead
  (It was approved by Serg anyway)
2005-10-20 10:30:51 +05:00
unknown
28421fe8ed Merge mysql.com:/home/alexi/mysql-4.1
into  mysql.com:/home/alexi/dev/mysql-4.1-4375
2005-10-19 21:07:08 +04:00
unknown
b59d565605 Fix for BUG#4375: Windows specific directories are copied
during replication.
 Modified my_dir(). Now this function skips hidden and system
 files which sometimes are created by Windows.
 NOTE. The fix is similar to the previuos one (05 July 2004)
 except for correct setting of the 'attrib' variable value
 (within the previous fix this variable was left uninitialized
 when my_dir() was called with My_flags & MY_WANT_STAT == 0).


mysys/my_lib.c:
  Modified my_dir().
   Now this function skips hidden and system files
   which sometimes are created by Windows.
2005-10-19 18:01:23 +04:00
unknown
c3ac502ab1 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 10:49:28 -07:00
unknown
6c8c4fdace Merge mysql.com:/home/jimw/my/mysql-4.1-13334
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
2005-10-18 09:45:12 -07:00
unknown
1b05f7daa9 Merge mysql.com:/home/jimw/my/mysql-4.1-13064
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:44:29 -07:00
unknown
019b973212 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-18 18:04:00 +03:00
unknown
c0eae8f0a1 Some fixes to avoid compiler warnings.
mysql-test/my_manage.c:
  Avoid warning: i not used in case of Windows.
mysql-test/mysql_test_run_new.c:
  Removed unused variable.
sql/item_func.cc:
  Removed unused variables.
strings/ctype-simple.c:
  Added cast.
strings/ctype-ucs2.c:
  Added cast.
2005-10-18 18:03:26 +03:00
unknown
7d81acb5e9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2


sql/sql_update.cc:
  Auto merged
2005-10-18 14:08:50 +04:00
unknown
8ff8fac53d BUG#12915: post-review fixes 2005-10-18 14:04:14 +04:00
unknown
3867a5db37 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-10-17 09:56:56 +02:00
unknown
e893703cee Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-10-17 09:55:30 +02:00
unknown
1f844d35ef ndb - hugo
Disable tests of lock upgrade paths that are currently unsupported


ndb/test/ndbapi/testOperations.cpp:
  Disable lock upgrade paths that currently unsupported
2005-10-17 09:51:16 +02:00
unknown
326544b8ed Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/mysql_src/mysql-4.1
2005-10-14 15:35:57 +02:00
unknown
5dfd72a038 fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
because they are used by net_printf() and push_warning(), which can be called if check_connection() fails.


sql/mysqld.cc:
  not needed anymore
sql/repl_failsafe.cc:
  not needed anymore
sql/slave.cc:
  not needed anymore
sql/sql_class.cc:
  query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
  because they are used by net_printf() and push_warning(), which may be called if check_connection() fails.
2005-10-14 15:34:52 +02:00
unknown
81766b9ab7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-10-14 11:52:52 +02:00
unknown
e2cd597dca Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values into table (clean version) 2005-10-14 11:23:02 +02:00
unknown
08bf55c71f Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
into  mysql.com:/usr/home/bar/mysql-4.1


client/mysql.cc:
  Auto merged
2005-10-14 14:07:22 +05:00
unknown
05414133af Merge mysql.com:/usr/home/bar/mysql-4.1.b13145
into  mysql.com:/usr/home/bar/mysql-4.1


mysql-test/r/ctype_latin1.result:
  Auto merged
mysql-test/t/ctype_latin1.test:
  Auto merged
2005-10-14 13:57:38 +05:00
unknown
9cc7d75ea3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 11:54:10 +05:00
unknown
1e11d278c3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 09:09:25 +05:00
unknown
0dc3105ada Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2005-10-14 00:04:40 +03:00
unknown
0069549021 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236)
- fixed test


mysql-test/r/rpl_multi_update2.result:
  fixed setting/reseting environment
  multi-update with subquery added
mysql-test/t/rpl_multi_update2.test:
  fixed setting/reseting environment
  multi-update with subquery added
sql/sql_update.cc:
  set 'updating' in both tables list if we have two of them (because of subquery)
2005-10-14 00:02:38 +03:00
unknown
eb8be3261d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-10-13 22:29:50 +02:00
unknown
507dc62acc Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
support-files/mysql.spec.sh:
  Auto merged
2005-10-13 22:11:49 +02:00