Commits · 12749eaf8701a437bfb47925c1d06624b258644c · Kirill Smelkov / mariadb

26 Feb, 2003 4 commits

unknown authored Feb 26, 2003

  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)

12749eaf

item_sum.cc: · 99effd31

unknown authored Feb 26, 2003

  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

99effd31

Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · e618de17
unknown authored Feb 26, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
e618de17
Fix for MIX and MAX. Item must be checked against binary(). · 33c8d992
unknown authored Feb 26, 2003

33c8d992

25 Feb, 2003 20 commits

Merge with 4.0.11 · a7e3ba1d

unknown authored Feb 26, 2003


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

a7e3ba1d

Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 · bebafeba
unknown authored Feb 26, 2003

bebafeba

merge with 3.23 to get corrected error message files and rename of files in mysql-test · b9c69c16

unknown authored Feb 26, 2003


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)

b9c69c16

Safety fix (caused a core dump on slave during shutdown when shutting down replication on some OS) · 6e2ee187

unknown authored Feb 26, 2003


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

6e2ee187

change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS · 21f2382b

unknown authored Feb 26, 2003

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

21f2382b

Merge work:/home/bk/mysql-4.0 · e0ba590f
unknown authored Feb 25, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
e0ba590f
fixed again · 49ecdaec
unknown authored Feb 25, 2003

49ecdaec
Portability fix · 0a1af051
unknown authored Feb 25, 2003

0a1af051
Merge work:/home/bk/mysql-4.0 · 01664260
unknown authored Feb 25, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
01664260

Ignore some automaticly generated files · 01e32fd0

unknown authored Feb 25, 2003


BitKeeper/etc/ignore:
  added support-files/MacOSX/StartupParameters.plist support-files/MacOSX/postinstall support-files/MacOSX/preinstall

01e32fd0

Portability fix for HPUX10.20 · a54c17ce

unknown authored Feb 25, 2003


BUILD/compile-pentium-debug-max:
  Added -DBIG_TABLES
sql/mysqld.cc:
  Simple code cleanup

a54c17ce

Merge work:/home/bk/mysql-4.0 · 1f4fed8a
unknown authored Feb 25, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
1f4fed8a
fix a bug in the test · 11139d6f
unknown authored Feb 25, 2003

11139d6f

- Heavily reworked the Do-pkg script to use functions from logger.pm · baa0238c

unknown authored Feb 25, 2003

 - 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

baa0238c

- bumped up version number from 4.0.11-gamma -> 4.0.12-gamma in configure.in · c7c6abee
unknown authored Feb 25, 2003
```
 - tagged ChangeSet 1.1594 as "mysql-4.0.11"
```
c7c6abee

Fixed "syntax" errors in text message files. · 0d3b0c39

unknown authored Feb 25, 2003

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.

0d3b0c39

Indentation cleanup · cf417ede
unknown authored Feb 25, 2003

cf417ede
Forbid NULL geometry fields · 829af501
unknown authored Feb 25, 2003

829af501
Fix for the prepared statement access checks · 6957a85c
unknown authored Feb 24, 2003

6957a85c

1. Fix for the crash in debug mode when the .frm is corrupted and SHOW TABLE... · cf00101b

unknown authored Feb 24, 2003

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

cf00101b

24 Feb, 2003 11 commits
- Merge work:/home/bk/mysql-4.0 · a7cb587b
  unknown authored Feb 24, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
  a7cb587b
- test updated · d28eb772
  unknown authored Feb 24, 2003
  
  d28eb772
- Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1 · 2842e601
  unknown authored Feb 24, 2003
```
into mysql.com:/home/wax/mysql-4n


sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
```
  2842e601
- Merge work:/home/bk/mysql-4.0 · d36b060f
  unknown authored Feb 24, 2003
```
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
```
  d36b060f
- Applied a patch which fixes a quoting problem with · c994c661
  unknown authored Feb 24, 2003
```
mysql_hot_copy when --checkpoint or --record-log-pos was used.
```
  c994c661
- ut0mem.c: · ae25006a
  unknown authored Feb 24, 2003
```
  Correct printf format


innobase/ut/ut0mem.c:
  Correct printf format
```
  ae25006a
- ut0mem.c: · b5679828
  unknown authored Feb 24, 2003
```
  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
```
  b5679828
- Merge work:/home/bk/mysql-4.1 · 6f5ea702
  unknown authored Feb 24, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
```
  6f5ea702
- Merge work:/home/bk/mysql-4.0 · 13626f52
  unknown authored Feb 24, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
  13626f52
- allow --without-extra-charsets · ad144e30
  unknown authored Feb 24, 2003
  
  ad144e30
- - re-added missing reservedwords.texi (disappeared after last merge with · b4b2ce04
  unknown authored Feb 24, 2003
```
   3.23.x) and removed mirrors.texi again
```
  b4b2ce04
23 Feb, 2003 1 commit

opt_sum.cc: · 0463b01d

unknown authored Feb 23, 2003

  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

0463b01d

22 Feb, 2003 4 commits
- tests updated · 87ee470d
  unknown authored Feb 22, 2003
  
  87ee470d
- ALTER TABLE closes all open HANDLER's for the table in question · feb8dc9e
  unknown authored Feb 22, 2003
```
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
```
  feb8dc9e
- merge fix · 17a76b00
  unknown authored Feb 22, 2003
```
client/mysql.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
```
  17a76b00
- Allowing NULL values in UNION's with first SELECT having only NOT NULL · 72065f34
  unknown authored Feb 22, 2003
```
columns.
```
  72065f34