Commit graph

18552 commits

Author SHA1 Message Date
unknown
8dad75b2d1 Merge mysql.com:/home/jimw/my/mysql-4.1-8572
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:03:13 -07:00
unknown
be80410947 Merge mysql.com:/home/jimw/my/mysql-4.1-9660
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
2005-06-01 13:02:26 -07:00
unknown
61bb1f34db Merge mysql.com:/home/jimw/my/mysql-4.1-10944
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:00:32 -07:00
unknown
dd1168a34f Merge mysql.com:/home/jimw/my/mysql-4.1-8135
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
2005-06-01 12:59:11 -07:00
unknown
f20c56a9e7 Fix handling of NULL fields in FIELD(). (Bug #10944)
mysql-test/r/func_str.result:
  Update results
mysql-test/t/func_str.test:
  Add regression tests
sql/item_func.cc:
  Handle NULL as first argument to FIELD()
2005-06-01 09:48:25 -07:00
unknown
2855192e02 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-06-01 15:25:13 +02:00
unknown
6d397aae1a Bug#10602 - LOAD INDEX INTO CACHE deadlocks
Fixed two deadlocks.
Made minor changes.


mysys/mf_keycache.c:
  Bug#10602 - LOAD INDEX INTO CACHE deadlocks
  Fixed two deadlocks.
  Made keycache traces line buffered.
  Removed unused macro and function.
  Added comments and trace messages.
  Fixed two compiler warnings.
  Fixed some coding style issues.
2005-06-01 14:20:16 +02:00
unknown
853a55ad21 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
2005-06-01 13:06:15 +02:00
unknown
0d4b118455 - removed references to some obsolete files (BUG#10824)
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)


BitKeeper/deleted/.del-mysql-max.spec.sh~ca055d86585c1010:
  Delete: support-files/mysql-max.spec.sh
configure.in:
  - removed references to some obsolete files
scripts/make_binary_distribution.sh:
  - removed references to some obsolete files
2005-06-01 12:59:10 +02:00
unknown
a0affca7c9 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-06-01 12:24:00 +02:00
unknown
10481cd036 Merge
mysql-test/r/create.result:
  SCCS merged
mysql-test/t/create.test:
  SCCS merged
2005-05-31 20:55:42 +02:00
unknown
601b5bca66 Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
After merge fix.
2005-05-31 20:45:41 +02:00
unknown
e0fbac1931 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into xiphis.org:/usr/home/antony/work2/p4-bug10413.2
2005-05-31 19:21:08 +01:00
unknown
57d4adf60c Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
Hand merged from 4.0.


sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-05-31 19:37:24 +02:00
unknown
2b548fe935 Bug#10413 - Invalid column name is not rejected
Stop ignoring name parts and check for validity


mysql-test/r/create.result:
  Test for bug#10413
mysql-test/t/create.test:
  Test for bug#10413
sql/sql_yacc.yy:
  Bug#10413
    Stop ignoring parts of fully qualified names.
2005-05-31 18:06:54 +01:00
unknown
cf2188ca39 Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.


mysql-test/r/create.result:
  Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
  Added test results.
mysql-test/t/create.test:
  Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
  Added tests which do not require concurrency.
sql/lock.cc:
  Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
  Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
  Changed the parameter list.
  Removed two unnecessary functions. Their functionality is included in
  wait_if_global_read_lock() and start_waiting_global_read_lock().
sql/mysql_priv.h:
  Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
  Changed the declaration of mysql_lock_tables().
  Added definitions for the new options.
sql/sql_acl.cc:
  Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
  Adjusted mysql_lock_tables() calls to the new argument list.
sql/sql_base.cc:
  Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
  Adjusted mysql_lock_tables() calls to the new argument list.
sql/sql_handler.cc:
  Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
  Adjusted mysql_lock_tables() calls to the new argument list.
sql/sql_insert.cc:
  Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
  Replaced set_protect_against_global_read_lock() and
  unset_protect_against_global_read_lock() by
  wait_if_global_read_lock() and start_waiting_global_read_lock()
  in the INSERT DELAYED handling.
  Adjusted mysql_lock_tables() calls to the new argument list.
sql/sql_parse.cc:
  Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
  Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
  against a global read lock. This prevents a deadlock in
  CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
  and avoids the creation of new tables during a global read lock.
sql/sql_table.cc:
  Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
  Adjusted mysql_lock_tables() calls to the new argument list.
  Used the new option in create_table_from_items().
2005-05-31 11:08:14 +02:00
unknown
970d3e1a82 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-05-31 09:07:11 +02:00
unknown
7b4385f472 a fix (bug #7405: group_concat with distinct and rollup => ignores distinct in some rows).
sql/item_sum.cc:
  a fix (bug #7405: group_concat with distinct and rollup => ignores distinct in some rows).
  Code changed in order to work with rollup extension.
2005-05-31 10:54:33 +05:00
unknown
0aab5f01f8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-05-30 19:17:42 +02:00
unknown
25841aa9ad sql_select.cc:
Post-review modifications for the fix of bug #7894.


sql/sql_select.cc:
  Post-review modifications for the fix of bug #7894.
2005-05-30 05:25:12 -07:00
unknown
5a54820003 olap.result, olap.test:
Added test cases for bug #7894.
sql_select.cc:
  Fixed bug #7894: GROUP BY queries with ROLLUP returned
  wrong results for expressions containing group by columns.
  The fix ensured correct results by replacement of all
  occurrences of group by fields in non-aggregate expressions
  for corresponding ref objects and preventing creation of
  fields in temporary tables for expression containing group
  by fields.


sql/sql_select.cc:
  Fixed bug #7894: GROUP BY queries with ROLLUP returned
  wrong results for expressions containing group by columns.
  The fix ensured correct results by replacement of all
  occurrences of group by fields in non-aggregate expressions
  for corresponding ref objects and preventing creation of
  fields in temporary tables for expression containing group
  by fields.
mysql-test/t/olap.test:
  Added test cases for bug #7894.
mysql-test/r/olap.result:
  Added test cases for bug #7894.
2005-05-30 03:01:51 -07:00
unknown
c41c29a654 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-05-27 18:18:07 +02:00
unknown
755d2018ad forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliures 2005-05-27 14:15:08 +02:00
unknown
8dcb03f7a2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
2005-05-27 12:48:36 +02:00
unknown
360d1cd06d don't downgrade the lock for CREATE ... SELECT (bug#6678) 2005-05-27 12:38:29 +02:00
unknown
cc78467d3a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1


sql/ha_myisammrg.cc:
  Auto merged
2005-05-27 09:52:03 +02:00
unknown
5f767b11e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/item.cc:
  Auto merged
2005-05-26 20:02:21 +02:00
unknown
e547fbea68 Cleanups to patch for bug #9660 after review by Monty.
sql/sql_table.cc:
  Make return value of build_table_path() useful
  Eliminate some unnecessary casts
2005-05-26 10:01:26 -07:00
unknown
7c06649645 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-05-26 19:32:58 +03:00
unknown
e1e1e3a849 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
2005-05-26 18:24:17 +02:00
unknown
4a91ed1376 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-05-26 18:20:17 +02:00
unknown
604799534a merge
sql/item.cc:
  Auto merged
2005-05-26 18:33:57 +03:00
unknown
80b0baa740 fixed problem with long string results of expressions in UNIONS (BUG#10025)
mysql-test/r/union.result:
  test for Bug #10025
mysql-test/t/union.test:
  test for Bug #10025
sql/item.cc:
  set HA_OPTION_PACK_RECORD and change type to MYSQL_TYPE_STRING, to allow correct field creation in case of length more then 255 (creation STRING field with length more then 255)
2005-05-26 17:30:12 +03:00
unknown
91427f2434 Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1


innobase/row/row0mysql.c:
  Auto merged
2005-05-26 15:57:24 +03:00
unknown
9181c17c14 InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335).
innobase/row/row0mysql.c:
  row_drop_table_for_mysql(): Check all referencing tables
  when drop_db==TRUE (Bug #10335)
2005-05-26 15:42:24 +03:00
unknown
ab88a1d25a Fix icc compiler warning
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Removed second forward declaration of "struct DescEnt"
2005-05-26 12:12:36 +02:00
unknown
7d7b5dbcae Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


include/my_global.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/item.cc:
  Auto merged
2005-05-26 12:10:05 +02:00
unknown
22944a9563 Add ifdefs to control when "#pragma implementation" should be used
Added some more ifdefs for "#pragma interface"


client/sql_string.cc:
  USE_PRAGMA_IMPLEMENTATION
client/sql_string.h:
  USE_PRAGMA_INTERFACE
include/my_global.h:
  Use pragma implementation for gcc pre version 3
mysys/raid.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/field.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_berkeley.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_blackhole.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_heap.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_innodb.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_isam.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_isammrg.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_myisam.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_myisammrg.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/ha_ndbcluster.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/handler.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/hash_filo.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_cmpfunc.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_func.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_geofunc.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_strfunc.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_subselect.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_sum.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_timefunc.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_uniq.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/item_uniq.h:
  USE_PRAGMA_INTERFACE
sql/log_event.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/log_event.h:
  USE_PRAGMA_INTERFACE
sql/opt_range.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/procedure.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/protocol.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/protocol_cursor.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/set_var.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_analyse.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_analyse.h:
  USE_PRAGMA_INTERFACE
sql/sql_class.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_crypt.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_crypt.h:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_list.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_map.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_map.h:
  USE_PRAGMA_INTERFACE
sql/sql_olap.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_select.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_string.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/sql_udf.cc:
  USE_PRAGMA_IMPLEMENTATION
sql/tztime.cc:
  USE_PRAGMA_IMPLEMENTATION
2005-05-26 12:09:14 +02:00
unknown
f30b7ed416 - merged the 4.1.12a Changes back into the main tree
myisammrg/myrg_open.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
configure.in:
  - manual merge (corrected version number)
2005-05-26 11:43:47 +02:00
unknown
8ac75806e2 Fix table renaming to not lowercase table names for all storage
engines when lower_case_table_names == 2, as it did previously
for InnoDB and MEMORY. (Bug #9660)


mysql-test/r/lowercase_table2.result:
  Fix results
sql/sql_table.cc:
  Add build_table_path() function to construct the path to
  a table, and use it to replace nearly all of the places
  where this was done with similar code.
  
  Fix mysql_rename_table() to not lowercase the .frm file
  name when lower_case_table_names == 2 and the storage
  engine does not set the HA_FILE_BASED flag (such as InnoDB).
2005-05-25 20:26:40 -07:00
unknown
7e5651ca17 Manual merge. 2005-05-25 18:11:03 +02:00
unknown
ce11270fc1 Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
(bug#10674, bug#10681)


support-files/mysql.spec.sh:
  Added a missing "make clean" which had caused the original 4.1.12 RPMs to be broken.
  (bug#10674, bug#10681)
2005-05-25 16:24:07 +02:00
unknown
aa3a934b9d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2005-05-25 12:57:29 +03:00
unknown
549f56dc3d Cleanup during code review
Faster detection of wrong table names (like PRN) on windows


include/my_sys.h:
  Added check_if_legal_filename()
mysys/my_access.c:
  Added check_if_legal_filename()
  Set errno if my_access() fails
mysys/my_fopen.c:
  USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows
mysys/my_open.c:
  USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows
sql/sql_lex.cc:
  Portability fix
sql/sql_parse.cc:
  Simple cleanup
sql/sql_repl.cc:
  Cleanup during code review
2005-05-25 12:56:47 +03:00
unknown
827db5e40c Use one err file for each master
mysql-test/mysql-test-run.sh:
  Add master id to end of MASTER_MY_ERR  so that both masters doesnt write to the same file.
2005-05-25 11:10:10 +02:00
unknown
1794eb3e2b - one more build fix for zlib.lib - added libpath to the
mysql_test_run_new project files


VC++Files/mysql-test/mysql_test_run_new.dsp:
  - added libpath option so that zlib.lib will be found
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
  - added libpath option so that zlib.lib will be found
2005-05-25 10:55:21 +02:00
unknown
605f7061dc BUG#10831 ndb mgmd LogDestination maxfiles does not rotate logs properly
ndb/src/common/util/File.cpp:
  my_stat returns NULL on failure, not non-zero.
  
  i.e. exactly the opposite of stat(2).
  
  providing confusion for unix programmers, who expect errors to be non-zero.
  
  Clean up File_class::exists(char*) to use the my_stat interface properly.
2005-05-25 15:35:51 +10:00
unknown
5b77d9b8f3 BUG#10796 Incorrect check-cpu result for ppc linux gcc
BUILD/check-cpu:
  Add no_march variable to indicate that this architecture doesn't support the -march flag to GCC
2005-05-25 12:18:18 +10:00
unknown
e9cf191ce0 - applied more changes to enable the CP932 charset on Windows
- fixed linking with zlib


VC++Files/client/mysql.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysql_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlclient.dsp:
  - added ctype-cp932.c to the file list
VC++Files/client/mysqlclient_ia64.dsp:
  - added ctype-cp932.c to the file list
VC++Files/client/mysqldump.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqldump_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqltest.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqltest_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/libmysql/libmysql.dsp:
  - added ctype-cp932.c to the file list
VC++Files/libmysql/libmysql_ia64.dsp:
  - added ctype-cp932.c to the file list
VC++Files/mysql-test/mysql_test_run_new.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck_ia64.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlmanager/mysqlmanager.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/strings/strings_ia64.dsp:
  - added ctype-cp932.c to the file list
2005-05-24 22:42:43 +02:00
unknown
e07f6ebf7f Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-24 22:44:18 +03:00