Commit graph

7194 commits

Author SHA1 Message Date
unknown
9b7ebb928c All segments of SPATIAL keys MUST be NOT NULL.
Allow NULL geometry fields.


include/mysqld_error.h:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/czech/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/danish/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/dutch/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/english/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/estonian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/french/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/german/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/greek/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/hungarian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/italian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/japanese/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/korean/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/norwegian-ny/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/norwegian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/polish/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/portuguese/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/romanian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/russian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/serbian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/slovak/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/spanish/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/swedish/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/ukrainian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
2003-02-26 20:25:48 +04:00
unknown
29a99fa0be Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1


sql/spatial.cc:
  Auto merged
2003-02-26 19:23:11 +04:00
unknown
d2b0d3fa88 Added num_geometries() and geometry_n() methods for MultiX geometry objects. 2003-02-26 19:13:01 +04:00
unknown
e0100ed886 sql_yacc.yy, lex.h:
SET NAMES is now working


sql/lex.h:
  SET NAMES is now working
sql/sql_yacc.yy:
  SET NAMES is now working
2003-02-26 17:02:36 +04:00
unknown
61bd855623 set_var.cc, set_var.h:
New thread variable client_character_set


sql/set_var.h:
  New thread variable client_character_set
sql/set_var.cc:
  New thread variable client_character_set
2003-02-26 16:37:41 +04:00
unknown
2667f61b76 sql_show.cc:
Less default_charset_info


sql/sql_show.cc:
  Less default_charset_info
2003-02-26 14:54:57 +04:00
unknown
605ddcebc2 sql_class.h:
New method to simplify access to thd charset


sql/sql_class.h:
  New method to simplify access to thd charset
2003-02-26 14:50:59 +04:00
unknown
3ba2916b24 sql_test.cc:
Less default_charset_info


sql/sql_test.cc:
  Less default_charset_info
2003-02-26 14:30:39 +04:00
unknown
5bc80ff890 sql_udf.cc, protocol.cc:
Less default_charset_info


sql/protocol.cc:
  Less default_charset_info
sql/sql_udf.cc:
  Less default_charset_info
2003-02-26 14:08:31 +04:00
unknown
6d53503087 set_var.cc, sql_table.cc, handler.cc, field.cc:
Less default_charset_info


sql/field.cc:
  Less default_charset_info
sql/handler.cc:
  Less default_charset_info
sql/sql_table.cc:
  Less default_charset_info
sql/set_var.cc:
  Less default_charset_info
2003-02-26 13:34:35 +04:00
unknown
8a7d862c91 sql_analyse.cc, spatial.cc:
Some default_charset_info were removed
sql_select.cc:
  Some default_charset_info were removed.


sql/spatial.cc:
  Some default_charset_info were removed
sql/sql_select.cc:
  Some default_charset_info were removed.
sql/sql_analyse.cc:
  Some default_charset_info were removed
2003-02-26 13:16:02 +04:00
unknown
12749eaf87 item_func.cc:
Some reoganization
  Fixed that binary arguments do not affect result charset
  anymore
  For example, the second argument doesn't affect charset of result in LEFT(string,10)
sql_string.h:
  Strings are binary by default now


sql/sql_string.h:
  Strings are binary by default now
sql/item_func.cc:
  Some reoganization
  Fixed that binary arguments do not affect result charset
  anymore
  For example, the second argument doesn't affect charset of result in LEFT(string,10)
2003-02-26 12:29:17 +04:00
unknown
99effd31fa item_sum.cc:
Fixed that MIN() didn't return proper charset for CREATE from SELECT


sql/item_sum.cc:
  Fixed that MIN() didn't return proper charset for CREATE from SELECT
2003-02-26 11:00:36 +04:00
unknown
e618de1764 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-02-26 10:47:34 +04:00
unknown
33c8d99258 Fix for MIX and MAX. Item must be checked against binary(). 2003-02-26 10:33:45 +04:00
unknown
a7e3ba1df5 Merge with 4.0.11
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/FINISH.sh:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_pthread.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/handler.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/innodb_handler.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/table.h:
  Auto merged
2003-02-26 01:03:47 +02:00
unknown
bebafeba44 Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-02-26 00:23:22 +02:00
unknown
b9c69c1609 merge with 3.23 to get corrected error message files and rename of files in mysql-test
innobase/ibuf/ibuf0ibuf.c:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_analyse.h:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
mysql-test/t/rpl000015.slave-mi:
  Auto merged
mysql-test/t/rpl_rotate_logs.slave-mi:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge with 3.23
scripts/make_binary_distribution.sh:
  merge with 3.23
sql/share/czech/errmsg.txt:
  merge with 3.23
sql/share/danish/errmsg.txt:
  merge with 3.23
sql/share/dutch/errmsg.txt:
  merge with 3.23
sql/share/estonian/errmsg.txt:
  merge with 3.23
sql/share/swedish/errmsg.txt:
  merge with 3.23
sql/sql_class.cc:
  merge with 3.23 (Keep local copy)
2003-02-26 00:22:35 +02:00
unknown
6e2ee18779 Safety fix (caused a core dump on slave during shutdown when shutting down replication on some OS)
mysql-test/t/rpl_rotate_logs-slave-master-info.opt:
  Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/t/rpl_rotate_logs-slave-master-info.opt
mysql-test/t/rpl000015-slave-master-info.opt:
  Rename: mysql-test/t/rpl000015.slave-mi -> mysql-test/t/rpl000015-slave-master-info.opt
mysql-test/r/bigint.result:
  New bigint test
mysql-test/t/bigint.test:
  New bigint test
netware/mysql_test_run.c:
  slave-master-info.opt -> .slave-mi
2003-02-26 00:13:18 +02:00
unknown
21f2382b28 change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS
mysql-test/t/rpl_rotate_logs.slave-mi:
  Rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi
mysql-test/t/rpl000015.slave-mi:
  Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi
2003-02-26 00:04:13 +02:00
unknown
e0ba590fc9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-25 21:31:17 +01:00
unknown
49ecdaec0b fixed again 2003-02-25 21:20:22 +01:00
unknown
0a1af05100 Portability fix 2003-02-25 22:20:17 +02:00
unknown
0166426067 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-25 20:44:16 +01:00
unknown
01e32fd06b Ignore some automaticly generated files
BitKeeper/etc/ignore:
  added support-files/MacOSX/StartupParameters.plist support-files/MacOSX/postinstall support-files/MacOSX/preinstall
2003-02-25 21:44:13 +02:00
unknown
a54c17cef3 Portability fix for HPUX10.20
BUILD/compile-pentium-debug-max:
  Added -DBIG_TABLES
sql/mysqld.cc:
  Simple code cleanup
2003-02-25 21:43:24 +02:00
unknown
1f4fed8aad Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-25 20:38:08 +01:00
unknown
11139d6f31 fix a bug in the test 2003-02-25 20:37:49 +01:00
unknown
c20de06645 rtree_find_X functions speed-up: we don't need to store whole key buffer for next search.
Code clean-up.
2003-02-25 19:07:59 +04:00
unknown
baa0238c94 - Heavily reworked the Do-pkg script to use functions from logger.pm
- moved helper functions from Bootstrap script to logger.pm 


Build-tools/Bootstrap:
   - renamed logfile -> LOGFILE
   - moved functions abort() and run_command() to logger.pm for better
     reusability
Build-tools/Do-pkg:
   - heavily reworked: now make use of the logger.pm helper functions
   - added new options: --dry-run, --log, --mail, --verbose
Build-tools/logger.pm:
   - added functions run_command() and abort() from Bootstrap script for
     better code reusability
support-files/MacOSX/postinstall.sh:
   - made script more robust
2003-02-25 15:20:07 +01:00
unknown
c7c6abeece - bumped up version number from 4.0.11-gamma -> 4.0.12-gamma in configure.in
- tagged ChangeSet 1.1594 as "mysql-4.0.11"
2003-02-25 13:10:16 +01:00
unknown
0d3b0c3950 Fixed "syntax" errors in text message files.
Ensured that all errors messages ends with: ",


sql/share/czech/errmsg.txt:
  Fixed new line terminations
sql/share/danish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/dutch/errmsg.txt:
  Fixed "syntax" errors.
sql/share/english/errmsg.txt:
  Fixed "syntax" errors.
sql/share/estonian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/french/errmsg.txt:
  Fixed "syntax" errors.
sql/share/german/errmsg.txt:
  Fixed "syntax" errors.
sql/share/greek/errmsg.txt:
  Fixed "syntax" errors.
sql/share/hungarian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/italian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/japanese/errmsg.txt:
  Fixed "syntax" errors.
sql/share/korean/errmsg.txt:
  Fixed "syntax" errors.
sql/share/norwegian-ny/errmsg.txt:
  Fixed "syntax" errors.
sql/share/norwegian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/polish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/portuguese/errmsg.txt:
  Fixed "syntax" errors.
sql/share/romanian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/russian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/slovak/errmsg.txt:
  Fixed "syntax" errors.
sql/share/spanish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/swedish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/ukrainian/errmsg.txt:
  Fixed "syntax" errors.
2003-02-25 13:41:08 +02:00
unknown
cf417ede65 Indentation cleanup 2003-02-25 11:05:07 +02:00
unknown
829af50169 Forbid NULL geometry fields 2003-02-25 11:45:32 +04:00
unknown
6957a85c24 Fix for the prepared statement access checks 2003-02-24 17:22:02 -08:00
unknown
cf00101b23 1. Fix for the crash in debug mode when the .frm is corrupted and SHOW TABLE STATUS is executed.This also fixes to return the error message to comment field in SHOW TABLE STATUS when the .frm is corrupted
2. Test for corrupted .frm and the SHOW TABLE STATUS


sql/sql_show.cc:
  Fix for the crash in debug mode when the .frm is corrupted and SHOW TABLE STATUS is executed
  This also fixes to return the error message to comment field in SHOW TABLE STATUS when the .frm is corrupted
tests/client_test.c:
  test for corrupted .frm and the SHOW TABLE STATUS
2003-02-24 17:05:03 -08:00
unknown
a7cb587b3d Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-24 21:25:27 +01:00
unknown
d28eb77219 test updated 2003-02-24 21:25:09 +01:00
unknown
2842e601e0 Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/wax/mysql-4n


sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-02-24 23:54:58 +05:00
unknown
d36b060f15 Merge work:/home/bk/mysql-4.0
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
2003-02-24 16:58:21 +02:00
unknown
c994c661d2 Applied a patch which fixes a quoting problem with
mysql_hot_copy when --checkpoint or --record-log-pos was used.
2003-02-24 16:57:54 +02:00
unknown
ae25006afe ut0mem.c:
Correct printf format


innobase/ut/ut0mem.c:
  Correct printf format
2003-02-24 16:13:17 +02:00
unknown
b5679828cf ut0mem.c:
Print correct OS error number also on Windows if we run out of memory


innobase/ut/ut0mem.c:
  Print correct OS error number also on Windows if we run out of memory
2003-02-24 16:05:54 +02:00
unknown
6f5ea70226 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-02-24 11:58:31 +01:00
unknown
13626f52c3 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-24 11:47:56 +01:00
unknown
ad144e30fb allow --without-extra-charsets 2003-02-24 11:46:07 +01:00
unknown
b4b2ce0483 - re-added missing reservedwords.texi (disappeared after last merge with
3.23.x) and removed mirrors.texi again
2003-02-24 11:34:41 +01:00
unknown
0463b01dc8 opt_sum.cc:
Correction for min/max optimization of queries with outer joins


sql/opt_sum.cc:
  Correction for min/max optimization of queries with outer joins
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-02-23 04:27:03 +02:00
unknown
87ee470db0 tests updated 2003-02-22 18:22:39 +01:00
unknown
feb8dc9ee5 ALTER TABLE closes all open HANDLER's for the table in question
fixed error handling in HANDLER ... READ FIRST


sql/sql_handler.cc:
  fix error handling in HANDLER ... READ FIRST
sql/sql_table.cc:
  ALTER TABLE closes all open HANDLER's for the table in question
2003-02-22 18:00:34 +01:00