Commits · 84b296e24230f43bff0129ff06d33efd7db33f2c · nexedi / MariaDB

03 Sep, 2003 14 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 84b296e2
unknown authored Sep 04, 2003
```
into mashka.mysql.fi:/home/my/mysql-tmp


sql/sql_parse.cc:
  Auto merged
```
84b296e2
fixed bug - check_user shall not be included into the · 7efa0ee1
unknown authored Sep 03, 2003
```
embedded library.
```
7efa0ee1

merge · 35af1442

unknown authored Sep 03, 2003


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/open.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/handler.cc:
  Merge
sql/sql_acl.cc:
  Merge and code cleanup of acl_getroot()

35af1442

Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f6daa5c3
unknown authored Sep 03, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.1-root
```
f6daa5c3
C cleanups · d8572f24
unknown authored Sep 03, 2003

d8572f24
Monty explanation for net_store_length(uint) put to the comment · ff458939
unknown authored Sep 03, 2003

ff458939

Merge bk-internal:/home/bk/mysql-4.1/ · 1ef5dce8

unknown authored Sep 03, 2003

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1ef5dce8

fixed after-merge bug in CHANG_USER command · b74332ec
unknown authored Sep 03, 2003
```
sql/sql_parse.cc:
  fixed after-merge bug in CHANGE_USER command
```
b74332ec
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 15c0fe47
unknown authored Sep 03, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.1-root


BitKeeper/etc/ignore:
  auto-union
```
15c0fe47

post-merge fixes · d42b4eeb

unknown authored Sep 03, 2003


mysql-test/r/func_crypt.result:
  _dig_vec converted lowercase
sql/slave.cc:
  post-merge fix

d42b4eeb

merge commit, hope that none of bar and dlenev changes were · 49b0312d

unknown authored Sep 03, 2003

lost.


BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  merge commit: new error message added
sql-common/client.c:
  merge commit
sql/mysql_priv.h:
  merge commit: autoremerge
sql/set_var.h:
  merge commit
sql/share/czech/errmsg.txt:
  merge commit
sql/share/danish/errmsg.txt:
  merge commit
sql/share/dutch/errmsg.txt:
  merge commit
sql/share/english/errmsg.txt:
  merge commit
sql/share/estonian/errmsg.txt:
  merge commit
sql/share/french/errmsg.txt:
  merge commit
sql/share/german/errmsg.txt:
  merge commit
sql/share/greek/errmsg.txt:
  merge commit
sql/share/hungarian/errmsg.txt:
  merge commit
sql/share/italian/errmsg.txt:
  merge commit
sql/share/japanese/errmsg.txt:
  merge commit
sql/share/korean/errmsg.txt:
  merge commit
sql/share/norwegian-ny/errmsg.txt:
  merge commit
sql/share/norwegian/errmsg.txt:
  merge commit
sql/share/polish/errmsg.txt:
  merge commit
sql/share/portuguese/errmsg.txt:
  merge commit
sql/share/romanian/errmsg.txt:
  merge commit
sql/share/russian/errmsg.txt:
  merge commit
sql/share/serbian/errmsg.txt:
  merge commit
sql/share/slovak/errmsg.txt:
  merge commit
sql/share/spanish/errmsg.txt:
  merge commit
sql/share/swedish/errmsg.txt:
  merge commit
sql/share/ukrainian/errmsg.txt:
  merge commit
sql/slave.cc:
  merge commit
sql/slave.h:
  merge commit
sql/sql_acl.cc:
  merge commit
sql/sql_parse.cc:
  merge commit
sql/sql_repl.h:
  merge commit

49b0312d

merged · cf578b26

unknown authored Sep 03, 2003


include/my_sys.h:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

cf578b26

CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] · 4a21b30e

unknown authored Sep 03, 2003


myisam/mi_checksum.c:
  workaround for zlib's crc32 glitch
mysql-test/r/show_check.result:
  results updated
mysys/checksum.c:
  switching to crc32 as a checksum algorithm

4a21b30e

Added automatically created SSL certificates from mysql-test/std_data · 93c9f9c6
unknown authored Sep 03, 2003
```
to ignore list.
```
93c9f9c6

01 Sep, 2003 4 commits

Updated various tests results which were missed during auto-merge · 651898ad

unknown authored Sep 01, 2003

with replication over SSL patch.


mysql-test/r/rpl_error_ignored_table.result:
  New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
  New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_max_relay_size.result:
  New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_openssl.result:
  Post merge update of SHOW SLAVE STATUS result
mysql-test/r/rpl_reset_slave.result:
  New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
  Fixed bad manual merge result

651898ad

Manual merge fixes · b4d59a8d

unknown authored Sep 01, 2003


sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.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/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/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/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  Mabual merge
mysql-test/r/rpl_flush_log_loop.result:
  Mabual merge
mysql-test/r/rpl_log.result:
  Mabual merge
mysql-test/r/rpl_log_pos.result:
  Mabual merge
mysql-test/r/rpl_replicate_do.result:
  Mabual merge
mysql-test/r/rpl_rotate_logs.result:
  Mabual merge
sql/slave.cc:
  Mabual merge
sql/slave.h:
  Mabual merge

b4d59a8d

Implemented replication over SSL · 8a548ffd

unknown authored Sep 01, 2003

 Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file


include/mysqld_error.h:
  Added error code for "slave without SSL ignored SSL params warning"
mysql-test/Makefile.am:
  Copy files required for rpl_openssl test during the make process
mysql-test/r/rpl000015.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_empty_master_crash.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_flush_log_loop.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_log.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_log_pos.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_redirect.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_replicate_do.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_rotate_logs.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
sql/lex.h:
  Added MASTER_SSL lexems for CHANGE MASTER
sql/mysqld.cc:
  Added --master-ssl-ca parameter. Fixed description of other master-ssl parameters
sql/repl_failsafe.cc:
  Added SSL support to connect_to_master()
sql/share/czech/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/danish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/dutch/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/english/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/estonian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/french/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/german/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/greek/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/hungarian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/italian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/japanese/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/korean/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/norwegian-ny/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/norwegian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/polish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/portuguese/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/romanian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/russian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/serbian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/slovak/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/spanish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/swedish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/ukrainian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/slave.cc:
  Introduced new format of master.info file
  Added support of SSL params in master.info and SHOW SLAVE STATUS
  Added support of SSL connections
sql/slave.h:
  Added SSL parameters to MASTER_INFO
sql/sql_lex.h:
  Added SSL parameters for CHANGE MASTER TO
sql/sql_repl.cc:
  Added SSL parameters for CHANGE MASTER TO
sql/sql_yacc.yy:
  Added SSL parameters for CHANGE MASTER TO

8a548ffd

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ba91207f
unknown authored Sep 01, 2003
```
into mysql.r18.ru:/usr/home/ram/work/4.1
```
ba91207f

30 Aug, 2003 6 commits
- Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 37474a61
  unknown authored Aug 30, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
  37474a61
- Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 · e4116780
  unknown authored Aug 30, 2003
```
into hegel.local:/home/miguel/bk/mysql-4.1
```
  e4116780
- Two small fixes · 674f3881
  unknown authored Aug 30, 2003
```
mysql-test/r/isam.result:
  Fixing results to match test changes
sql/sql_union.cc:
  Better fix for VC++
```
  674f3881
- Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · fd7bc726
  unknown authored Aug 30, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
  fd7bc726
- Fix for a compilation problem with VC++ · 83099205
  unknown authored Aug 30, 2003
  
  83099205
- Fix VC++ compiler error with redifinition return type · e9183c74
  unknown authored Aug 29, 2003
```
include/thr_alarm.h:
  Fix VC++ compiler error with redefinition return type
```
  e9183c74
29 Aug, 2003 7 commits

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · e515e4dc
unknown authored Aug 29, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-tmp_field-4.1
```
e515e4dc

tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of... · 4ca3bee9

unknown authored Aug 29, 2003

tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg)

sql/item_timefunc.h:
no need redefine tmp_table_field(), it will be inherited

4ca3bee9

comment left after merge was moved to correct · 06b4c4bc
unknown authored Aug 29, 2003
```
place


sql/sql_class.h:
  comment moved to correct place
```
06b4c4bc

merge with 4.0.15 · 0fa52795

unknown authored Aug 29, 2003


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-database.c~af098622e818ce0d:
  Auto merged
BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f:
  Auto merged
BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
SSL/cacert.pem:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
SSL/client-cert.pem:
  Auto merged
SSL/client-key.pem:
  Auto merged
SSL/server-cert.pem:
  Auto merged
SSL/server-key.pem:
  Auto merged
VC++Files/client/mysql.dsp:
  Auto merged
VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/isamchk/isamchk.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/libmysqltest/myTest.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisamlog/myisamlog.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqlmanager/MySqlManager.dsp:
  Auto merged
VC++Files/mysqlserver/mysqlserver.dsp:
  Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/pack_isam/pack_isam.dsp:
  Auto merged
VC++Files/perror/perror.dsp:
  Auto merged
VC++Files/replace/replace.dsp:
  Auto merged
VC++Files/test1/test1.dsp:
  Auto merged
VC++Files/thr_test/thr_test.dsp:
  Auto merged
VC++Files/vio/vio.dsp:
  Auto merged
VC++Files/zlib/zlib.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/m_string.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
isam/_search.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/openssl_1.result:
  Auto merged
mysql-test/r/packet.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select_safe.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/lock_tables_lost_commit-master.opt:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/select_safe.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_uniq.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
vio/Makefile.am:
  Auto merged
vio/vio.c:
  Auto merged
mysql-test/t/myisam.test:
  merge with 4.0.15
  Extra tests
mysys/mf_keycache.c:
  Keep local file

0fa52795

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f5558db1
unknown authored Aug 29, 2003
```
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix
```
f5558db1
Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · f2adc9f3
unknown authored Aug 29, 2003
```
into narttu.mysql.fi:/my/mysql-4.0
```
f2adc9f3

Revert change of lower-case-table handling as this breaks how alias works. · 6d17d7f5

unknown authored Aug 29, 2003

Changes like this should be done to 4.1, not to a stable release


mysql-test/r/lowercase_table.result:
  Revert change of lower-case-table handling
mysql-test/t/lowercase_table.test:
  Revert change of lower-case-table handling
sql/sql_class.cc:
  Revert change of lower-case-table handling
sql/sql_class.h:
  Revert change of lower-case-table handling
sql/sql_parse.cc:
  Revert change of lower-case-table handling
sql/sql_table.cc:
  Revert change of lower-case-table handling
sql/sql_yacc.yy:
  Revert change of lower-case-table handling

6d17d7f5

28 Aug, 2003 9 commits

Fixed problem with absence of gmtime_r under Windows. · fb3ab3c8

unknown authored Aug 29, 2003


include/my_pthread.h:
  HAVE_GMTIME_R should not be defined under Windows
  (it is ok for HAVE_LOCALTIME_R since there additional implementation 
  in my_windcond.c.

fb3ab3c8

Merge jcole@bk-internal.mysql.com:/home/bk/mysql-4.0 · e381dc98
unknown authored Aug 28, 2003
```
into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0
```
e381dc98
opt_range.cc: Fixes for out of memory conditions. · a41f8bc2
unknown authored Aug 28, 2003
```
sql/opt_range.cc:
  Fixes for out of memory conditions.
```
a41f8bc2

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 2db7d27f

unknown authored Aug 28, 2003

into narttu.mysql.fi:/my/mysql-4.0


myisam/mi_dynrec.c:
  Auto merged
mysql-test/r/isam.result:
  Auto merged

2db7d27f

Portability fixes · 6fd5403d

unknown authored Aug 28, 2003


client/mysqltest.c:
  Removed not used functions
myisam/mi_dynrec.c:
  Added assert to avoid compilation errors
mysql-test/r/isam.result:
  Updated results after merge
sql/log_event.cc:
  Cleanup
sql/mysql_priv.h:
  Cleanup
sql/sql_class.cc:
  Moved Table_ident functions to .cc file to allow them to use table_case_convert()
sql/sql_class.h:
  Moved Table_ident functions to .cc file to allow them to use table_case_convert()

6fd5403d

Removed restriction not to be able use non regular files. · 62c85c89
unknown authored Aug 28, 2003

62c85c89
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 82ace8f8
unknown authored Aug 28, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1


sql/sql_select.cc:
  Auto merged
```
82ace8f8
fixed typo · 0f57bb2e
unknown authored Aug 28, 2003

0f57bb2e
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 914bc868
unknown authored Aug 28, 2003
```
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
```
914bc868