1. 07 Apr, 2004 2 commits
    • unknown's avatar
      Cleanup/optimizations of structures and key usage to make it easier to move... · 3cb13f79
      unknown authored
      Cleanup/optimizations of structures and key usage to make it easier to move key-range-search to handler
      
      
      sql/field.cc:
        Use 'HA_KEY_BLOB_LENGTH' instead of '2' for 'packed-length'
        Changed 'get_key_image' and 'set_key_image' to take length data part of key (without length-store bytes). This makes the interface easier to use from opt_range.cc
      sql/field.h:
        Indentation fix
      sql/opt_range.cc:
        Changed KEY_PART to use KEY_PART_INFO->store_length (which includes null-byte if needed)
        This makes some functions easier and allowed us to easier use the new get_key_image/set_key_image interfaces
        Simple loop optimization.
      sql/opt_range.h:
        Changed part_length -> store_length and added length to KEY_PART.
        This make this structure more like KEY_PART_INFO
        Added 'sorted' to QUICK_SELECT for NDB
      sql/sql_class.cc:
        Fixed compiler warning
      sql/sql_select.cc:
        Set 'quick->sorted' if keys should be sorted (for NDB)
      sql/table.cc:
        GEOMETRY KEYS doesn't have length prefix in keys
      3cb13f79
    • unknown's avatar
      Portability fixes · e9447881
      unknown authored
      Fixed problems with group_concat() and HAVING
      Updated crash-me values
      
      
      sql-bench/limits/mysql-4.0.cfg:
        Rename: sql-bench/limits/mysql.cfg -> sql-bench/limits/mysql-4.0.cfg
      include/my_global.h:
        Safety fix
      libmysqld/Makefile.am:
        Portability fix (For AIX 64 bit)
      mysql-test/r/func_gconcat.result:
        More tests
      mysql-test/t/func_gconcat.test:
        More tests
      sql/field.cc:
        Cleanups
      sql/init.cc:
        moved thread_stack_min to right place
      sql/item_sum.cc:
        Fixed problems with group_concat() and HAVING
        Removed some not needed variables
      sql/item_sum.h:
        Fixed problems with group_concat() and HAVING
        Removed some not needed variables
      sql/mysqld.cc:
        Moved thread_stack_min to right place to handle case where we didn't get as much stack space as we asked for
      sql/sql_parse.cc:
        More debugging
      sql/sql_select.cc:
        Cleanup
      sql/sql_yacc.yy:
        Fixed handling of Item_group_concat() in having. (Arguments should not be handled as refs)
      e9447881
  2. 06 Apr, 2004 11 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2d5635e3
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      2d5635e3
    • unknown's avatar
      Fixed charsetnr sent to the client · 815c23f1
      unknown authored
      815c23f1
    • unknown's avatar
      Fixed a problem with mysqld_multi log file. The default is now datadir/mysqld_multi.log, · ae3d2266
      unknown authored
      if doesn't exists or is not writable, then /var/log/mysqld_multi.log, if does not exists
      or is not writable, then /tmp/mysqld_multi.log, but only in case the file does not yet
      exists in /tmp. Otherwise log will be disabled, unless user explicitely sets it with an
      option.
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      ae3d2266
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 79926634
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_table.cc:
        Auto merged
      79926634
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · f4638489
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      f4638489
    • unknown's avatar
      fixed the tests mysql-test/t/synchronization.test · 315f5d27
      unknown authored
      for Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
      
      
      BitKeeper/deleted/.del-synchronization-master.opt~265be23ead00949:
        Delete: mysql-test/t/synchronization-master.opt
      BitKeeper/deleted/.del-have_debug.require~d981522532c711b2:
        Delete: mysql-test/r/have_debug.require
      BitKeeper/deleted/.del-have_debug.inc~f4dc5160b9912226:
        Delete: mysql-test/include/have_debug.inc
      mysql-test/r/synchronization.result:
        fixed the test for 
        Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
      mysql-test/t/synchronization.test:
        fixed the test for 
        Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
      sql/sql_table.cc:
        deleted test sleep from mysql_create_like_table
      315f5d27
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · ca37588f
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      ca37588f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 34e60984
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/sql_prepare.cc:
        Auto merged
      34e60984
    • unknown's avatar
      don't modify constant strings · e78208e5
      unknown authored
      
      sql/sql_prepare.cc:
        use static variable
      e78208e5
    • unknown's avatar
      Previous patch was wrong :( · e7a85e36
      unknown authored
      Here is 2nd version.
      'reduce/reduce conflicts' issue is fixed
      
      
      sql/sql_yacc.yy:
        'reduce/reduce conflicts' issue is fixed
      e7a85e36
    • unknown's avatar
      Fixed warnings from valgrind (not a bug) · 6a868cca
      unknown authored
      Don't add -debug to server version if MYSQL_SERVER_PREFIX is used
      Indentation cleanups
      
      
      myisam/mi_write.c:
        Indentation cleanup
      mysql-test/r/lowercase_table2.result:
        Fixed test results
      sql/filesort.cc:
        Fixed warnings from valgrind (not a bug)
      sql/ha_myisam.cc:
        Indentation cleanup
      sql/mysqld.cc:
        Don't add -debug to server if MYSQL_SERVER_PREFIX is used
      sql/sql_base.cc:
        Indentation cleanup
      sql/sql_show.cc:
        Fixed typo in comment
      sql/sql_table.cc:
        Indentation cleanup
      6a868cca
  3. 05 Apr, 2004 8 commits
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 66de3135
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.curr
      
      
      sql/sql_yacc.yy:
        Auto merged
      66de3135
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 829902b0
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      829902b0
    • unknown's avatar
      fe64a716
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9d016636
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      9d016636
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 73d0a991
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
      
      
      73d0a991
    • unknown's avatar
      corrected wrong checking of DBUG_OFF in mysql-test/t/synchronization.test · b5d93e4e
      unknown authored
      
      mysql-test/r/have_debug.require:
        corrected mistake
      mysql-test/t/synchronization.test:
        corrected wrong test
      b5d93e4e
    • unknown's avatar
      WL1368: SHOW GRANTS FOR CURRENT USER · 8c06c8c0
      unknown authored
        'SHOW GRANTS' syntax is added 
        'SHOW GRANTS FOR CURRENT_USER' syntax is added
        'SHOW GRANTS FOR CURRENT_USER()' syntax is added
       CURRENT_USER without parens in expressions(SELECT CURRENT_USER;) 
      
      
      mysql-test/r/grant2.result:
        WL1368: SHOW GRANTS FOR CURRENT USER
      mysql-test/r/grant_cache.result:
        WL1368: SHOW GRANTS FOR CURRENT USER
      mysql-test/t/grant2.test:
        WL1368: SHOW GRANTS FOR CURRENT USER
      mysql-test/t/grant_cache.test:
        WL1368: SHOW GRANTS FOR CURRENT USER
      sql/lex.h:
        WL1368: SHOW GRANTS FOR CURRENT USER
      sql/sql_yacc.yy:
        WL1368: SHOW GRANTS FOR CURRENT USER
      8c06c8c0
    • unknown's avatar
      Fixed many compiler warnings · 7873b89f
      unknown authored
      Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319)
      Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
      Set locked_in_memory properly
      
      
      include/mysql_com.h:
        Fixed compiler warning
      libmysqld/emb_qcache.cc:
        Removed not used variable
      libmysqld/lib_sql.cc:
        Removed not used variable
      myisam/mi_locking.c:
        Added comment
      myisam/mi_rnext.c:
        Fixed bug in concurrent insert
      myisam/mi_rprev.c:
        Simple optimization
      mysql-test/r/func_gconcat.result:
        New tests
      mysql-test/t/func_gconcat.test:
        New tests
      mysql-test/t/func_group.test:
        Cleanup
      sql-common/client.c:
        Removed compiler warning
      sql/derror.cc:
        Better comments
      sql/field.cc:
        Removed not used function/variable
      sql/field.h:
        Removed not needed variable
      sql/ha_innodb.cc:
        Removed not used function
      sql/item.cc:
        Fixed compiler warning
      sql/item_cmpfunc.cc:
        Fixed compiler warning
      sql/item_func.cc:
        Fixed compiler warning
      sql/item_geofunc.cc:
        Fixed compiler warning
      sql/item_sum.cc:
        Fixed bugs in group_concat and added more comments
        (Bugs #2695, #3381 and #3319)
        - field->abs_offset was not needed
        - Wrong assumption of field order in temporary table
        - Some not used variables removed
        - Added ORDER BY fields after argument fields so that code in sql_select.cc can move all fields to point to temporary tables, if needed.
        - Optimized loops
      sql/item_sum.h:
        Bug fixing and cleanup of group_concat()
      sql/log.cc:
        Removed wrong comment
      sql/log_event.cc:
        Removed compiler warning
      sql/mysqld.cc:
        Set locked_in_memory properly
      sql/protocol.cc:
        Removed compiler warning
      sql/set_var.cc:
        Code cleanup
      sql/slave.cc:
        Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
      sql/sql_cache.cc:
        Removed compiler warnings
      sql/sql_derived.cc:
        Removed not used variable
      sql/sql_insert.cc:
        Removed compiler warnings
      sql/sql_lex.cc:
        Removed not used lable
      sql/sql_lex.h:
        Removed compiler warnings
      sql/sql_parse.cc:
        Removed compiler warnings
      sql/sql_prepare.cc:
        Removed compiler warnings
      sql/sql_select.cc:
        Removed not used variables
        Added function comments
      sql/sql_show.cc:
        Removed compiler warnings
      sql/sql_yacc.yy:
        Fix for ORDER BY handling in GROUP_CONCAT()
      7873b89f
  4. 04 Apr, 2004 2 commits
  5. 03 Apr, 2004 2 commits
    • unknown's avatar
      Spanish and Portuguese translation. · 605872d5
      unknown authored
      
      sql/share/portuguese/errmsg.txt:
        Translation from English
      sql/share/spanish/errmsg.txt:
        Translation from English
      605872d5
    • unknown's avatar
      BUG#3328 · 27668046
      unknown authored
      I can't see group_concat_max_len in a list of variables
      
      
      sql/set_var.cc:
        add sys_group_concat_max_len.name
      27668046
  6. 02 Apr, 2004 15 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 6b433f99
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/ha_myisam.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/table.h:
        Auto merged
      6b433f99
    • unknown's avatar
      8abda715
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · cdd20d72
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
      
      
      cdd20d72
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · bf4849e8
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      bf4849e8
    • unknown's avatar
      made some optimization of last patch for · cee153b8
      unknown authored
      Bug #2385 "CREATE TABLE LIKE lacks locking on source and destination table" 
      (in sql_table.cc and mysql-test/t/synchronization.test)
      
      
      mysql-test/t/synchronization.test:
        added sleep to more reliable work
      sql/sql_table.cc:
        made some optimization of last patch for 
        Bug #2385 "CREATE TABLE LIKE lacks locking on source and destination table" 
        in mysql_create_like_table
      cee153b8
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 7a56a9a0
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_2397/mysql-4.1
      
      
      7a56a9a0
    • unknown's avatar
      correct test in trigger · b2cf48ab
      unknown authored
      b2cf48ab
    • unknown's avatar
      trying pre-delta trigger · 8c465501
      unknown authored
      8c465501
    • unknown's avatar
      a66fe8dc
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 69942b13
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_system_db_test/mysql-4.1
      
      
      69942b13
    • unknown's avatar
      remove obsolete (hopefully) files from Docs/ · 7c27065c
      unknown authored
      
      BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41:
        Delete: Docs/manual_toc.html
      BitKeeper/deleted/.del-manual.ja.texi~bdf63728a7b03acf:
        Delete: Docs/manual.ja.texi
      BitKeeper/deleted/.del-section.Infolinks.texi~c237f2f9:
        Delete: Docs/section.Infolinks.texi
      BitKeeper/deleted/.del-section.Testimonials.texi~418f3f63:
        Delete: Docs/section.Testimonials.texi
      BitKeeper/deleted/.del-section.Users.texi~41da5f4c:
        Delete: Docs/section.Users.texi
      7c27065c
    • unknown's avatar
      added newline to the end of mysql-test/t/system_mysql_db_fix-master.opt · dfe03f40
      unknown authored
      for working on aix and so on..
      
      
      mysql-test/t/system_mysql_db_fix-master.opt:
        added newline for working aix and so on..
      dfe03f40
    • unknown's avatar
      Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6608ee4f
      unknown authored
      into hegel.local:/home/miguel/bk/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      6608ee4f
    • unknown's avatar
      Added missing error message and corrected another one. · 619c2666
      unknown authored
      
      sql/share/swedish/errmsg.txt:
        Added missing error message swedish/errmsg.txt and corrected another one.
      619c2666
    • unknown's avatar
      WL#1266 "Separate auto-set logic from TIMESTAMP type." · 32b28f92
      unknown authored
      Final version of patch.
      
      Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
      clauses for TIMESTAMP field definition.
      Current implementation allows only one such field per table and
      uses several unireg types for storing info about this properties of
      field. It should be replaced with better implementation when new
      .frm format is introduced.
      
      
      include/mysqld_error.h:
        Added error codes for case when we have more than one column with NOW()
        in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE
        clause with wrong type.
      mysql-test/r/create.result:
        Added tests for using of DEFAULT NOW() and ON UPDATE NOW() with
        non-TIMESTAMP fields.
      mysql-test/r/show_check.result:
        Updated test results to reflect new default look of TIMESTAMP fields
        in SHOW CREATE TABLE.
      mysql-test/r/system_mysql_db.result:
        Updated test results to reflect new default look of TIMESTAMP fields
        in SHOW CREATE TABLE.
      mysql-test/r/type_ranges.result:
        Updated test results to reflect new default look of TIMESTAMP fields
        in SHOW COLUMNS.
      mysql-test/r/type_timestamp.result:
        Added tests for various DEFAULT and ON UPDATE clauses for TIMESTAMP
        fields definitions.
      mysql-test/t/create.test:
        Added tests for using of DEFAULT NOW() and ON UPDATE NOW() with
        non-TIMESTAMP fields.
      mysql-test/t/type_timestamp.test:
        Added tests for various DEFAULT and ON UPDATE clauses for TIMESTAMP
        fields definitions.
      sql/field.cc:
        Added support for various combinations of DEFAULT and ON UPDATE clauses
        for TIMESTAMP field. 
        
        Setting TABLE::timestamp* members for TIMESTAMP fields with auto-set 
        option taking into account their unireg type (which corresponds to 
        various DEFAULT/ON UPDATE values combinations). Replaced 
        TABLE::time_stamp with TABLE::timestamp_default_now/on_update_now
        couple moved their setup to separate method set_timestamp_offsets(),
        which now is called from  open_table instead of Field_timestamp cons.
      sql/field.h:
        Added more unireg types for handling of DEFAULT NOW() and ON UPDATE
        NOW() for TIMESTAMP fields.
        Fixed value corresponding to DEFAULT item for TIMESTAMP field.
      sql/ha_berkeley.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_heap.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_innodb.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_isam.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_isammrg.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_myisam.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_myisammrg.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/item_func.h:
        We need to distinguish NOW() from other function for using in 
        DEFAULT and in ON UPDATE clauses.
      sql/item_timefunc.h:
        We need to distinguish NOW() from other function for using in 
        DEFAULT and in ON UPDATE clauses.
      sql/mysql_priv.h:
        Added parameter for ON UPDATE value to add_field_to_list() function.
      sql/share/czech/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/danish/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/dutch/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/english/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/estonian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/french/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/german/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/greek/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/hungarian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/italian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/japanese/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/korean/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/norwegian-ny/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/norwegian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/polish/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/portuguese/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/romanian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/russian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/serbian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/slovak/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/spanish/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/swedish/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/ukrainian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/sql_base.cc:
        Added setup of TABLE::timestamp_default_now/on_update_now pair
        for each statement to open_table().
      sql/sql_insert.cc:
        Using TABLE::timestamp_default_now/on_update_now pair instead of
        old TABLE::time_stamp. Added check for case then REPLACE could not
        be converted to UPDATE because of different DEFAULT/ON UPDATE values
        for TIMESTAMP field.
      sql/sql_lex.h:
        Added member for value used in ON UPDATE clause to st_lex.
      sql/sql_load.cc:
        Using TABLE::timestamp_default_now/on_update_now pair instead of
        old TABLE::time_stamp. We don't need to restore these members
        since they are set up for each statement in open_table().
      sql/sql_parse.cc:
        Added handling of DEFAULT NOW() and ON UPDATE NOW() clauses for
        TIMESTAMP fields to add_field_to_list() function.
      sql/sql_show.cc:
        Added support for DEFAULT CURRENT_TIMESTAMP (aka NOW() ) and 
        ON UPDATE CURRENT_TIMESTAMP to SHOW CREATE TABLE and SHOW COLUMNS.
      sql/sql_table.cc:
        mysql_create_table() function - added check for number of TIMESTAMP 
          fields with auto-set values and replacing of old style TIMESTAMPs
          with their newer analogs.
        mysql_alter_table(): Using TABLE::timestamp_default_now/on_update_now 
          pair instead of old TABLE::time_stamp. We don't need to restore these
          members since they are set up for each statement in open_table().
      sql/sql_update.cc:
        Left only setting of TABLE::timestamp_default_now/on_update_now
        to 0 since they should be already set up in open_table().
      sql/sql_yacc.yy:
        Added support for DEFAULT NOW() and ON UPDATE NOW() in field
        definitions.
      sql/table.h:
        Replaced TABLE::time_stamp withTABLE::timestamp_default_now/timestamp_on_update_now
        pair which allows to distinguish TIMESTAMP's with various DEFAULT/ON UPDATE
        clauses and optimize checks if TIMESTAMP field should be set to NOW()
        in handlers.
      sql/unireg.cc:
        Now we are marking only TIMESTAMP fields with NOW() as default or
        as on update value as special field for unireg.
      32b28f92