Commit graph

5850 commits

Author SHA1 Message Date
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
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
469c998b75 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql


sql/share/polish/errmsg.txt:
  Auto merged
2003-02-25 16:09:47 +02: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
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
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
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
unknown
850daeea33 make myisamchk -R to work, if the table contains fulltext indexes 2003-02-22 15:51:21 +01:00
unknown
3e4c276693 do not accept -R (sort by index) for FULLTEXT indexes 2003-02-22 11:44:26 +01:00
unknown
d5d69b9ccf Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-22 01:07:47 +01:00
unknown
eec10a01cb do not allow COLUMN and AFTER/FIRST in
ALTER TABLE ... ADD KEY
2003-02-22 01:07:17 +01:00
unknown
283a8a16f6 ibuf0ibuf.c:
Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records


innobase/ibuf/ibuf0ibuf.c:
  Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records
2003-02-21 23:11:31 +02:00
unknown
86efca41ac - removed +DD64 compile option from the HPUX11 default CFLAGS in
configure.in - there are 32bit installations of HPUX11 out there
   and compiling for these by manually adding +DAportable to CFLAGS
   did not work. Better add +DD64 manually, if you need it.
2003-02-21 17:42:48 +01:00
unknown
ed47a1da5c Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-21 16:23:44 +02:00
unknown
857e77a160 - temporarily removed netware from AC_OUTPUT to be able to perform the
builds and until I've found a way on how to add this conditionally
2003-02-20 15:13:47 +01:00
unknown
dda92b4b28 - autom4te.cache is a directory - remove it recursively 2003-02-20 10:20:26 +01:00
unknown
1184164aa5 - removed leading slashes (thanks Jim!) 2003-02-19 21:52:38 +01:00
unknown
c2e9867b19 - remove "autom4te.cache" directories, too 2003-02-19 21:41:01 +01:00
unknown
9158140a24 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-02-19 21:22:29 +01:00
unknown
68ee31cf6c - added more files to support-files/MacOSX and added them to the
distribution
 - added Bootstrap, logger.pm and Do-pkg to Build-tools:
   Bootstrap is used to build the source distribution for the binary builds
   logger.pm includes some helper functions
   Do-pkg converts a binary distribution into a Mac OS X PKG (still needs
   some polishing)


support-files/MacOSX/Description.plist.sh:
   - Shortened IFPkgDescriptionDescription a bit
support-files/MacOSX/Makefile.am:
   - Added more files (StartupParameters.plist, postinstall, preinstall) to
     distribution
2003-02-19 21:02:05 +01:00
unknown
f8862eaafa Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-patches
2003-02-19 19:41:57 +01:00
unknown
b56b25c78c nwbootstrap:
Change mode to -rwxrwxr-x


netware/nwbootstrap:
  Change mode to -rwxrwxr-x
2003-02-19 12:49:12 -05:00
unknown
fe673a80b1 row0sel.c:
Print a warning if MySQL uses a partial-field key value prefix in a search; that would not work if the search flag would happen to be HA_READ_PREFIX_LAST


innobase/row/row0sel.c:
  Print a warning if MySQL uses a partial-field key value prefix in a search; that would not work if the search flag would happen to be HA_READ_PREFIX_LAST
2003-02-19 19:38:38 +02:00
unknown
5fae3c25e2 Reverted Sinisa's patch "Fixing the error messages returned on GRANT
commands" again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)


sql/share/english/errmsg.txt:
  Reverted Sinisa's patch again, since this problem had been fixed differently
  already (Thanks to Serg for spotting this)
sql/sql_acl.cc:
  Reverted Sinisa's patch again, since this problem had been fixed differently
  already (Thanks to Serg for spotting this)
2003-02-19 16:16:27 +01:00
unknown
f4d93af14d Applied Sinisa's patch:
"A fix for non-releasing locks for multi table updates and multi
table deletes with InnoDB tables."
2003-02-19 15:08:29 +01:00
unknown
ea3e5a5c0f Applying Sinisa's patch:
"Cleaning the code of the remaining OLAP code.
This code is unnecessary in 4.1/5.0"
2003-02-19 14:58:44 +01:00
unknown
22815476c0 - Applying Sinisa's Patch "Fixing the error messages returned on
GRANT commands"
2003-02-19 14:50:40 +01:00
unknown
35391c733e Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-19 10:41:21 +01:00