1. 28 Oct, 2005 1 commit
  2. 27 Oct, 2005 8 commits
  3. 26 Oct, 2005 2 commits
    • unknown's avatar
      Removed innobase/my_cnf, innobase/include/makefilewin.i, · d1d49ce1
      unknown authored
       and innobase/*/makefilewin (which are unused now).
      
      
      BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2:
        Delete: innobase/include/makefilewin.i
      BitKeeper/deleted/.del-makefilewin~78000390c783b1c5:
        Delete: innobase/btr/makefilewin
      BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995:
        Delete: innobase/buf/makefilewin
      BitKeeper/deleted/.del-makefilewin~d37b6b303348c871:
        Delete: innobase/data/makefilewin
      BitKeeper/deleted/.del-makefilewin~5104767c73775697:
        Delete: innobase/dict/makefilewin
      BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f:
        Delete: innobase/dyn/makefilewin
      BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95:
        Delete: innobase/eval/makefilewin
      BitKeeper/deleted/.del-makefilewin~4d139e182457e553:
        Delete: innobase/fil/makefilewin
      BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73:
        Delete: innobase/fsp/makefilewin
      BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db:
        Delete: innobase/fut/makefilewin
      BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3:
        Delete: innobase/ha/makefilewin
      BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e:
        Delete: innobase/ibuf/makefilewin
      BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5:
        Delete: innobase/lock/makefilewin
      BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac:
        Delete: innobase/log/makefilewin
      BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0:
        Delete: innobase/mach/makefilewin
      BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db:
        Delete: innobase/mem/makefilewin
      BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8:
        Delete: innobase/mtr/makefilewin
      BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b:
        Delete: innobase/os/makefilewin
      BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5:
        Delete: innobase/page/makefilewin
      BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be:
        Delete: innobase/pars/makefilewin
      BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7:
        Delete: innobase/que/makefilewin
      BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365:
        Delete: innobase/read/makefilewin
      BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34:
        Delete: innobase/rem/makefilewin
      BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd:
        Delete: innobase/row/makefilewin
      BitKeeper/deleted/.del-makefilewin~63acd666293282a:
        Delete: innobase/srv/makefilewin
      BitKeeper/deleted/.del-makefilewin~13888739357b3025:
        Delete: innobase/sync/makefilewin
      BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb:
        Delete: innobase/thr/makefilewin
      BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de:
        Delete: innobase/trx/makefilewin
      BitKeeper/deleted/.del-makefilewin~72a64128bacce71b:
        Delete: innobase/usr/makefilewin
      BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79:
        Delete: innobase/ut/makefilewin
      BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd:
        Delete: innobase/makefilewin
      BitKeeper/deleted/.del-my_cnf~977f69858affc57b:
        Delete: innobase/my_cnf
      innobase/include/Makefile.am:
        Removed ref to Makefilewin.i (it is unused now).
      d1d49ce1
    • unknown's avatar
      Imported fix from 5.0. · fe90e567
      unknown authored
      fe90e567
  4. 25 Oct, 2005 17 commits
    • unknown's avatar
      mysql-test-run.pl: · dd1dc7de
      unknown authored
        Added MTR_BUILD_THREAD to control the port range
      
      
      mysql-test/mysql-test-run.pl:
        Added MTR_BUILD_THREAD to control the port range
      dd1dc7de
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8023bda5
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      8023bda5
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0 · a1d92b8a
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.0
      
      
      a1d92b8a
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12925 · 5a9dc44d
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      tests/mysql_client_test.c:
        Auto merged
      5a9dc44d
    • unknown's avatar
      Fix incorrect casts in my_getopt code that capped the maximum of longlong · b5dc243e
      unknown authored
      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)
      b5dc243e
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 947de78a
      unknown authored
      into moonbone.local:/work/14016-bug-4.1-mysql
      
      
      947de78a
    • unknown's avatar
      Fix bug #14016 date_format() 2nd parameter was compared using case insensitive · b96dbef6
      unknown authored
      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
      b96dbef6
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d58f2bdf
      unknown authored
      into moonbone.local:/work/13392-bug-4.1-mysql
      
      
      d58f2bdf
    • unknown's avatar
      Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATE · 45369edf
      unknown authored
      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
      45369edf
    • unknown's avatar
      Imported fixes from 4.1 and 5.0 to 4.0. · a345629a
      unknown authored
      a345629a
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · b4e8705b
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      b4e8705b
    • unknown's avatar
      Bug#13347: empty result from query with like and cp1250 charset · cabb72f2
      unknown authored
      ctype-win1250ch.c:
        Like range prefix tables were wrong.
      ctype_cp1250_ch.result, ctype_cp1250_ch.test:
        Adding test case.
      
      
      strings/ctype-win1250ch.c:
        Bug#13347: empty result from query with like and cp1250 charset
        Like range prefix tables were wrong.
      mysql-test/t/ctype_cp1250_ch.test:
        Adding test case.
      mysql-test/r/ctype_cp1250_ch.result:
        Adding test case.
      cabb72f2
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6e49a48a
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
      
      
      myisam/mi_check.c:
        Auto merged
      6e49a48a
    • unknown's avatar
      Changed some dbug print options. · b31dd53c
      unknown authored
      
      myisam/mi_check.c:
        Changed print style for keyoffset.
      myisam/mi_delete.c:
        Changed print style for keypos.
      b31dd53c
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread · 133ea93b
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      133ea93b
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread · 2937201b
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.0
      
      
      2937201b
    • unknown's avatar
      Makefile.am: · e17b176e
      unknown authored
        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
      e17b176e
  5. 24 Oct, 2005 1 commit
    • unknown's avatar
      Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization · 8d6634c9
      unknown authored
      
      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
      8d6634c9
  6. 22 Oct, 2005 4 commits
  7. 21 Oct, 2005 5 commits
    • unknown's avatar
      compilation failure fixed · 07fa475e
      unknown authored
      07fa475e
    • unknown's avatar
      Bug#13233 · c9978d8b
      unknown authored
        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
      c9978d8b
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 571d9cdd
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      571d9cdd
    • unknown's avatar
      bug#14199 - ndb leak of index opertaions in TC leading to error 288 · 740123a4
      unknown authored
      
      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
      740123a4
    • unknown's avatar
      BUG#9622, stage 2, work together with fix for BUG#12232: · 71fdef4d
      unknown authored
      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.
      71fdef4d
  8. 20 Oct, 2005 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 65ef7cc2
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      65ef7cc2
    • unknown's avatar
      charset.c: · f4911002
      unknown authored
        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)
      f4911002