Commits · b66ab278aa2d5a02383083127508a0eb54d554f0 · nexedi / 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)

b66ab278

item_sum.cc: · cd85c400

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

cd85c400

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

d33ff475

25 Feb, 2003 20 commits

Merge with 4.0.11 · d7802546

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

d7802546

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

e9ba6bb4

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

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)

86355b53

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

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

aad47c90

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

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

0e3fc000

Merge work:/home/bk/mysql-4.0 · 61bb8818
unknown authored Feb 25, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
61bb8818
fixed again · 3f058075
unknown authored Feb 25, 2003

3f058075
Portability fix · b85c67fe
unknown authored Feb 25, 2003

b85c67fe
Merge work:/home/bk/mysql-4.0 · 2d61de19
unknown authored Feb 25, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
2d61de19

Ignore some automaticly generated files · 5a0977df

unknown authored Feb 25, 2003


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

5a0977df

Portability fix for HPUX10.20 · 951d87ad

unknown authored Feb 25, 2003


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

951d87ad

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

e30a4bd9

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

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

3c2f6dbb

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

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

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.

0c205c94

Indentation cleanup · bf207b5f
unknown authored Feb 25, 2003

bf207b5f
Forbid NULL geometry fields · bf6615cf
unknown authored Feb 25, 2003

bf6615cf
Fix for the prepared statement access checks · a5240693
unknown authored Feb 24, 2003

a5240693

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

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

d0d212a8

24 Feb, 2003 11 commits
- Merge work:/home/bk/mysql-4.0 · 24cd3d3c
  unknown authored Feb 24, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
  24cd3d3c
- test updated · c554ad44
  unknown authored Feb 24, 2003
  
  c554ad44
- Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1 · 4ed14be5
  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
```
  4ed14be5
- Merge work:/home/bk/mysql-4.0 · 0629c4ee
  unknown authored Feb 24, 2003
```
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
```
  0629c4ee
- Applied a patch which fixes a quoting problem with · 2cbdd900
  unknown authored Feb 24, 2003
```
mysql_hot_copy when --checkpoint or --record-log-pos was used.
```
  2cbdd900
- ut0mem.c: · 79f49220
  unknown authored Feb 24, 2003
```
  Correct printf format


innobase/ut/ut0mem.c:
  Correct printf format
```
  79f49220
- ut0mem.c: · 2f01d9d3
  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
```
  2f01d9d3
- Merge work:/home/bk/mysql-4.1 · 6292533b
  unknown authored Feb 24, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
```
  6292533b
- Merge work:/home/bk/mysql-4.0 · aad1c4ba
  unknown authored Feb 24, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
  aad1c4ba
- allow --without-extra-charsets · 8cf0c3c9
  unknown authored Feb 24, 2003
  
  8cf0c3c9
- - re-added missing reservedwords.texi (disappeared after last merge with · 80a3f7a0
  unknown authored Feb 24, 2003
```
   3.23.x) and removed mirrors.texi again
```
  80a3f7a0
23 Feb, 2003 1 commit

opt_sum.cc: · 322f7d37

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

322f7d37

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