1. 10 Dec, 2004 2 commits
    • unknown's avatar
      Makefile.am: · c2b85ea0
      unknown authored
        Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
        when linking. For -all-static linking libtool put -lc after the .la
        file and this put the libc regex functions before our regex functions
        when linking on Linux.
      
      
      client/Makefile.am:
        Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
        when linking, for static linking libtool put -lc after the .la
        and this put the libc regex functions before out regex functions
        in the link on Linux.
      c2b85ea0
    • unknown's avatar
      dict0dict.c: · f9c25fa9
      unknown authored
        Fix the bug that the character 0xA0 that EMS MySQL Manager in ALTER TABLE adds after a table name confuses the InnoDB FOREIGN KEY parser, causing an error 121 when we try to add a new constraint; a full fix would require the lexer to be aware of thd->charset_info() and UTF-8
      
      
      innobase/dict/dict0dict.c:
        Fix the bug that the character 0xA0 that EMS MySQL Manager in ALTER TABLE adds after a table name confuses the InnoDB FOREIGN KEY parser, causing an error 121 when we try to add a new constraint; a full fix would require the lexer to be aware of thd->charset_info() and UTF-8
      f9c25fa9
  2. 09 Dec, 2004 13 commits
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · bd31ac2f
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.1
      
      
      sql/item_strfunc.cc:
        Auto merged
      bd31ac2f
    • unknown's avatar
      A fix for a crashing bug #7101, which occures when the · 2d841bda
      unknown authored
      expression involving LEFT() function is used in GROUP BY
      field.
      
      
      mysql-test/r/func_str.result:
        A result for bug #7101 test case
      mysql-test/t/func_str.test:
        Test case for bug #7101
      2d841bda
    • unknown's avatar
      Do-compile: · 38d6c6aa
      unknown authored
        Added --with-csv and --with-example for CSV and Example storage engines
      
      
      Build-tools/Do-compile:
        Added --with-csv and --with-example for CSV and Example storage engines
      38d6c6aa
    • unknown's avatar
      ndb: sunfire100c: fix aligment when 32-bit pointers and 64-bit ha_rows · 7ca892f6
      unknown authored
      
      ndb/src/ndbapi/DictCache.cpp:
        fix aligment when 32-bit pointers and 64-bit ha_rows
      ndb/src/ndbapi/DictCache.hpp:
        fix aligment when 32-bit pointers and 64-bit ha_rows
      7ca892f6
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · bc759a61
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      ndb/src/kernel/blocks/backup/Backup.hpp:
        Auto merged
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Auto merged
      ndb/tools/restore/restore_main.cpp:
        Auto merged
      bc759a61
    • unknown's avatar
      bug#6995 - fixed so that ndb_restore 4.1.8 can read files · f64d3d93
      unknown authored
        created by 4.1.7 as bugfix changed binary format
      
      
      ndb/tools/restore/Restore.cpp:
        Fixed so that version 4.1.8 of restore can read
          files created by 4.1.7
      ndb/tools/restore/Restore.hpp:
        Fixed so that version 4.1.8 of restore can read
          files created by 4.1.7
      ndb/tools/restore/main.cpp:
        Fixed so that version 4.1.8 of restore can read
          files created by 4.1.7
      f64d3d93
    • unknown's avatar
      Bugs: #7111: server crashes when regexp is used · ad7b15ce
      unknown authored
      ad7b15ce
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 98a13532
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
      
      
      sql/set_var.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      98a13532
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · eecfd690
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      client/mysqldump.c:
        Auto merged
      eecfd690
    • unknown's avatar
      Ensure that we free memory used with --order-by-primary (in mysqldump) · 84f2d119
      unknown authored
      Simple, non critical, fix to mysql_fix_privilege_tables
      
      
      client/mysqldump.c:
        Ensure that we free memory used with --order-by-primary
      mysql-test/t/system_mysql_db_fix.test:
        Remove warnings when compiled with support for ISAM
      scripts/mysql_fix_privilege_tables.sh:
        Ensure that 'my_print_defaults' is called correctly
      sql/set_var.cc:
        Code style cleanups
      sql/sql_db.cc:
        Fixed comments
      sql/udf_example.cc:
        Fixed comments
      84f2d119
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5b03e03f
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
      
      
      sql/item_strfunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      5b03e03f
    • unknown's avatar
      Fix for bug #6765 "Implicit access to time zone description · 7b96bc55
      unknown authored
      tables requires privileges for them if some table or column level grants
      present" (with after-review fixes).
      
      We should set SELECT_ACL for implicitly opened tables in 
      my_tz_check_n_skip_implicit_tables() to be able to bypass privilege
      checking in check_grant(). Also we should exclude those tables from
      privilege checking in multi-update.
      
      
      mysql-test/r/timezone2.result:
        Extended test for bug #6116 "SET time_zone := ... requires access to
        mysql.time_zone tables"
        Added test for bug #6765 "Implicit access to time zone description 
        tables requires privileges for them if some table or column level grants
        present"
      mysql-test/t/timezone2.test:
        Extended test for bug #6116 "SET time_zone := ... requires access to
        mysql.time_zone tables"
        Added test for bug #6765 "Implicit access to time zone description 
        tables requires privileges for them if some table or column level grants
        present"
      sql/item_geofunc.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/item_strfunc.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/log.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/mysql_priv.h:
        Now we have to include sql_acl.h before tztime.h, since 
        my_tz_check_n_skip_implicit_tables() defined there requires
        SELECT_ACL constant defined in sql_acl.h.
      sql/mysqld.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/repl_failsafe.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/set_var.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_acl.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_base.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_cache.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_class.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_db.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_derived.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_do.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_insert.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_parse.cc:
        check_one_table_access(): Tweaked comments.
        multi_update_precheck(): Added skipping of implicitly opened tables
          during privilege checking.
      sql/sql_prepare.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_repl.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_show.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_update.cc:
        sql_acl.h is now included via mysql_priv.h
      sql/sql_yacc.yy:
        sql_acl.h is now included via mysql_priv.h
      sql/tztime.h:
        my_tz_check_n_skip_implicit_tables():
          We should set SELECT_ACL for implictly opened tables to be able to
          bypass privilege checking in check_grant().
      7b96bc55
    • unknown's avatar
      bug#6995 - ndb · 674faf53
      unknown authored
      don't store keys in normalized form
      instead save everythings as normal attributes               
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Remove special handling of keys, that was build to support
         tables where keys was only stored in ACC
      ndb/src/kernel/blocks/backup/Backup.hpp:
        Remove special handling of keys, that was build to support
         tables where keys was only stored in ACC
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Remove special handling of keys, that was build to support
         tables where keys was only stored in ACC
      ndb/tools/restore/Restore.cpp:
        Remove special handling of keys, that was build to support
         tables where keys was only stored in ACC
      ndb/tools/restore/Restore.hpp:
        Remove special handling of keys, that was build to support
         tables where keys was only stored in ACC
      674faf53
  3. 08 Dec, 2004 12 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 30e67ddd
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      30e67ddd
    • unknown's avatar
      added possibility for comment into management client · 8ade1b08
      unknown authored
      added sleep command to management client
      all for testing purposes
      
      8ade1b08
    • unknown's avatar
      ndbcluster.sh: · 07a9baad
      unknown authored
        made compare of logs possible in ndb test
      restart_log.result, restart.test, restart.result:
        new file
      
      
      mysql-test/ndb/ndbcluster.sh:
        made compare of logs possible in ndb test
      07a9baad
    • unknown's avatar
      ndbcluster.sh: · 8ede0fbf
      unknown authored
        added test switch
      basic_log.result, basic.test, basic.result:
        new file
      
      
      mysql-test/ndb/ndbcluster.sh:
        added test switch
      8ede0fbf
    • unknown's avatar
      A fix and test case for Bug#6873 "PS, having with subquery, crash · d134e085
      unknown authored
      during execute"
      
      
      mysql-test/r/ps.result:
        Test results updated (Bug#6873)
      mysql-test/t/ps.test:
        A test case for Bug#6873 "PS, having with subquery, crash during execute".
      sql/item_subselect.cc:
        If we transform having subtree, modify SELECT_LEX::having pointer 
        to point to the new having tree root.
      d134e085
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 312132a9
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      312132a9
    • unknown's avatar
      - added two new options to Do-compile: · db8c5c10
      unknown authored
        --ps-test: run the test suite using prepared statements
        --embedded-test: run the test suite against the embedded server
      
      
      Build-tools/Do-compile:
        - added two new options:
          --ps-test: run the test suite using prepared statements
          --embedded-test: run the test suite against the embedded server
      db8c5c10
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 54b90e13
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      54b90e13
    • unknown's avatar
      os0file.c: · 0dbe00d1
      unknown authored
        Print a better error message to the .err log if InnoDB's advisory file locking fails
      
      
      innobase/os/os0file.c:
        Print a better error message to the .err log if InnoDB's advisory file locking fails
      0dbe00d1
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6019dd18
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      6019dd18
    • unknown's avatar
      bug #7104 · 8fac323b
      unknown authored
      + some extra debug printouts
      
      
      mysql-test/ndb/ndbcluster.sh:
        fixed debug flag in ndbcluster start script
      ndb/include/debugger/EventLogger.hpp:
        bug #7104
      ndb/include/kernel/LogLevel.hpp:
        bug #7104
      ndb/src/common/debugger/EventLogger.cpp:
        bug #7104
      ndb/src/common/portlib/NdbTCP.cpp:
        removed debug printout in Ndb_getInAddr
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        bug #7104
      ndb/src/mgmapi/mgmapi.cpp:
        bug #7104
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        bug #7104
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        bug #7104
      ndb/src/mgmsrv/Services.cpp:
        bug #7104
      ndb/src/ndbapi/TransporterFacade.cpp:
        bug #7104
      8fac323b
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 3f9753d7
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb-pristine
      
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      3f9753d7
  4. 07 Dec, 2004 13 commits