Commits · 8d7d38262a773ed1dc14a7b2179496a5e985633b · nexedi / MariaDB

25 Aug, 2001 2 commits

Merge tonu@work.mysql.com:/home/bk/mysql-4.0 · 8d7d3826
unknown authored Aug 26, 2001
```
into x153.internalnet:/home/tonu/mysql-4.0
```
8d7d3826

Some warning fixes and some SSL testprograms check-in · fd5dd8f6

unknown authored Aug 26, 2001


extra/resolveip.c:
  Removed warnings about implicit declarations
myisam/mi_open.c:
  Removed warning about unused symbol
mysys/my_compress.c:
  Removed warnings about implicit declaration
mysys/string.c:
  Removed warning about uninitialized variable
strings/ctype.c:
  Removed warning about implicit declaration
vio/test-sslclient.c:
  Testprogram heavy modify
vio/test-sslserver.c:
  Testprogram heavy modify

fd5dd8f6

24 Aug, 2001 1 commit

EXPLAIN on UNION"s · 9fc66454

unknown authored Aug 24, 2001


mysql-test/r/union.result:
  New result for EXPLAIN UNION's
mysql-test/t/union.test:
  No error when EXPLAIN is done on UNION's

9fc66454

22 Aug, 2001 2 commits

Warning fixes · fa11d587

unknown authored Aug 23, 2001


client/thread_test.c:
  Removed unused variables warnings
sql/mysqld.cc:
  Fixed freeing null ptr warnings
vio/Makefile.am:
  Make more test programs to compile

fa11d587

Some new files added for SSL stuff · 765709da
unknown authored Aug 22, 2001

765709da

21 Aug, 2001 4 commits

Merge work.mysql.com:/home/bk/mysql-4.0 into white.box:/home/tim/my/4 · 55117fbf
unknown authored Aug 21, 2001

55117fbf

Fix some libmysqld problems. · 0a62959d

unknown authored Aug 21, 2001


BitKeeper/etc/ignore:
  Added libmysqld/ha_innobase.cc to the ignore list
libmysqld/Makefile.am:
  Add ha_innobase.cc to libmysqld.
libmysqld/lib_sql.cc:
  Hack to get shutdown working properly in libmysqld.  Probably
  this is not quite correct.
sql/mini_client.cc:
  Remove name collision in embedded libmysqld.

0a62959d

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · 1c89dc27
unknown authored Aug 21, 2001

1c89dc27

Remove usage of my_dup(), as this casued error 127 when reading MyISAM tables · 6777e2e3

unknown authored Aug 21, 2001

New definition of WEEK().


Docs/manual.texi:
  Changelog
myisam/mi_cache.c:
  Better logging on error
myisam/mi_open.c:
  Remove usage of my_dup(), as this casued error 127 when reading tables
mysql-test/r/func_time.result:
  More tests for the WEEK/YEARWEEK function
mysql-test/t/func_time.test:
  More tests for the WEEK/YEARWEEK function
sql/time.cc:
  New definition of WEEK

6777e2e3

20 Aug, 2001 2 commits

Merge work:/home/bk/mysql-4.0 · 803f0d1f
unknown authored Aug 20, 2001
```
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
```
803f0d1f

fixes in mysqltest and mysqlbinlog · dc3971fa

unknown authored Aug 20, 2001

trying to understand why --bootstrap option does not create tables
on disk, hope the problem will be fixed when I pull, if not will
debug, but need to commit in order to pull


client/mysqltest.c:
  added safe_connect() and chaned all calls to mysql_real_connect() to
  safe_connect()
mysql-test/install_test_db.sh:
  more diagnostic
sql/log_event.cc:
  fixed compile error in mysqlbinlog

dc3971fa

19 Aug, 2001 4 commits

Add my_dup.c · 51af0d39
unknown authored Aug 19, 2001
```
sql/sql_parse.cc:
  cleanup
```
51af0d39

Fix of UNION code · 46ba1eef

unknown authored Aug 19, 2001

Added heap_delete_table
Added HA_EXTRA_PREPARE_FOR_DELETE
Added and use my_dup() for faster open of tables.
Removed not working no-mix-table-type


BitKeeper/deleted/.del-=6~33f33b0a159dc5d5:
  Delete: =6
heap/hp_clear.c:
  Cleanup
heap/hp_close.c:
  Added delayed delete
heap/hp_create.c:
  Added heap_delete_table
heap/hp_delete.c:
  cleanup
heap/hp_test2.c:
  Added heap_delete_table
include/heap.h:
  Added heap_delete_table
include/my_base.h:
  Added HA_EXTRA_PREPARE_FOR_DELETE
include/my_sys.h:
  Adde my_dup and set_prealloc_root
isam/extra.c:
  Added HA_EXTRA_PREPARE_FOR_DELETE
myisam/mi_check.c:
  use my_dup
myisam/mi_extra.c:
  use my_dup
myisam/mi_open.c:
  use my_dup
myisam/myisamchk.c:
  use my_dup
myisam/myisamdef.h:
  use my_dup
mysys/Makefile.am:
  my_dup
mysys/hash.c:
  Add hash_replace
mysys/mf_pack.c:
  cleanup
mysys/my_alloc.c:
  Add set_prealloc_root
mysys/my_fstream.c:
  cleanup
mysys/my_lib.c:
  cleanup
mysys/my_seek.c:
  cleanup
sql/ha_heap.cc:
  Uses heap_delete_table()
sql/mysqld.cc:
  Fix SIGHUP usage
  Remove no-mix-table-types
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/sql_base.cc:
  remove no-mix-table-type
sql/sql_parse.cc:
  Fix UNION code

46ba1eef

Merge work:/home/bk/mysql-4.0 · 3b9a1109
unknown authored Aug 18, 2001
```
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
```
3b9a1109

make LOAD DATA INFILE replication work with multi-character · 76ff6cf8

unknown authored Aug 18, 2001

delimiters/starters/terminators

started work on server management daemon


mysql-test/r/rpl_log.result:
  fixed result
sql/log_event.cc:
  make LOAD DATA INFILE replication
  work with multi-character delimiters/starters/terminators
sql/log_event.h:
  make LOAD DATA INFILE replication
  work with multi-character delimiters/starters/terminators

76ff6cf8

18 Aug, 2001 1 commit

New startup options and some cleanups · 97744810

unknown authored Aug 18, 2001


BitKeeper/etc/ignore:
  Added =6 to the ignore list
include/mysqld_error.h:
  Error message for no-mixing of table types..
sql/mysql_priv.h:
  New option
sql/mysqld.cc:
  New option
sql/share/english/errmsg.txt:
  Error message for no-mixing of table types..
sql/sql_base.cc:
  Checking of the mixing of table types
sql/sql_parse.cc:
  some fixes

97744810

15 Aug, 2001 8 commits

Merge work:/home/bk/mysql-4.0 · 90ab0b8e

unknown authored Aug 15, 2001

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

90ab0b8e

merged replication fixes from 3.23 · 63cb769a

unknown authored Aug 15, 2001


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  merged
sql/mini_client.cc:
  merged
sql/mysqld.cc:
  merged
sql/sql_repl.cc:
  merged

63cb769a

Merge work:/home/bk/mysql · 169b74e6
unknown authored Aug 15, 2001
```
into mysql.sashanet.com:/home/sasha/src/bk/mysql
```
169b74e6

improvements for stopping the slave in SLAVE STOP and on shutdown · 2ddd23f6

unknown authored Aug 15, 2001


sql/mini_client.cc:
  alarm around mc_mysql_connect()
sql/mysqld.cc:
  move end_slave() to the earlier part of shutdown
sql/sql_repl.cc:
  retry thr_alarm_kill() in case slave thread missed the signal in SLAVE STOP

2ddd23f6

Fix problem with not getting 'No Database Selected' error · e62d1358
unknown authored Aug 15, 2001
```
Docs/manual.texi:
  Changelog
```
e62d1358

manual.texi: · ec4f0880

unknown authored Aug 15, 2001

  Fixed contributed software link


Docs/manual.texi:
  Fixed contributed software link

ec4f0880

manual.texi: · 4578b70c

unknown authored Aug 15, 2001

  Added mirror in Hong Kong


Docs/manual.texi:
  Added mirror in Hong Kong
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

4578b70c

sync0sync.c This inline assmebly does not compile on gcc-2.96 and Intel: remove it · 364a9c2d
unknown authored Aug 15, 2001
```
innobase/sync/sync0sync.c:
  This inline assmebly does not compile on gcc-2.96 and Intel: remove it
```
364a9c2d

14 Aug, 2001 6 commits

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · b441f1ed
unknown authored Aug 14, 2001

b441f1ed

Remove warnings and portability fixes · 2e1b37af

unknown authored Aug 14, 2001

New global read lock code
Fixed bug in DATETIME with WHERE optimization
Made UNION code more general.


include/global.h:
  Remove warning on Linux Alpha
include/mysql_com.h:
  Move some C variables inside extern "C" block.
include/mysqld_error.h:
  New error mesages
myisam/mi_write.c:
  cleanup
mysql-test/r/select.result:
  Fix because of table lists now always has a database argument.
mysql-test/r/type_datetime.result:
  Test for bug with datetime and where optimization
mysql-test/r/union.result:
  Updated result
mysql-test/t/type_datetime.test:
  New test for datetime
mysql-test/t/union.test:
  More testing of error conditions
sql/item_sum.cc:
  Remove warnings on Linux Alpha
sql/item_sum.h:
  Cleanup
sql/lock.cc:
  Cleaned up global lock handling
sql/log_event.cc:
  Removed default arguments from declarations (not allowed in cxx)
sql/mysql_priv.h:
  New prototypes
sql/mysqld.cc:
  Fix for global locks
sql/opt_range.cc:
  Cleanup
sql/share/czech/errmsg.txt:
  New errors
sql/share/danish/errmsg.txt:
  New errors
sql/share/dutch/errmsg.txt:
  New errors
sql/share/english/errmsg.txt:
  New errors
sql/share/estonian/errmsg.txt:
  New errors
sql/share/french/errmsg.txt:
  New errors
sql/share/german/errmsg.txt:
  New errors
sql/share/greek/errmsg.txt:
  New errors
sql/share/hungarian/errmsg.txt:
  New errors
sql/share/italian/errmsg.txt:
  New errors
sql/share/japanese/errmsg.txt:
  New errors
sql/share/korean/errmsg.txt:
  New errors
sql/share/norwegian-ny/errmsg.txt:
  New errors
sql/share/norwegian/errmsg.txt:
  New errors
sql/share/polish/errmsg.txt:
  New errors
sql/share/portuguese/errmsg.txt:
  New errors
sql/share/romanian/errmsg.txt:
  New errors
sql/share/russian/errmsg.txt:
  New errors
sql/share/slovak/errmsg.txt:
  New errors
sql/share/spanish/errmsg.txt:
  New errors
sql/share/swedish/errmsg.OLD:
  New errors
sql/share/swedish/errmsg.txt:
  New errors
sql/sql_acl.cc:
  Use thd->host_or_ip
sql/sql_class.cc:
  Use new global lock code
sql/sql_class.h:
  host_or_ip
sql/sql_db.cc:
  host_or_ip
sql/sql_delete.cc:
  Use now global lock code
sql/sql_lex.h:
  Cleanup of not used states and variables
sql/sql_parse.cc:
  Use now global locks.
  Made UNION code more general.
  Change to use thd->hosts_or_ip.
  TABLE_LIST now always has 'db' set.
sql/sql_repl.cc:
  Portability fixes.
  Changed wrong usage of my_vsnprintf -> my_snprintf
sql/sql_select.cc:
  Changes for UNION
sql/sql_show.cc:
  Cleanup
sql/sql_union.cc:
  Handle 'select_result' outside of mysql_union().
sql/sql_yacc.yy:
  Fixes for union

2e1b37af

mysqlbinlog.cc #include <my_pthread.h> before thr_alarm.h · 832ddfdf
unknown authored Aug 14, 2001
```
client/mysqlbinlog.cc:
  #include <my_pthread.h> before thr_alarm.h
```
832ddfdf
manual.texi Updated InnoDB section to reflect rel. .41 · 7f7dc001
unknown authored Aug 14, 2001
```
Docs/manual.texi:
  Updated InnoDB section to reflect rel. .41
```
7f7dc001
audio completion notification · be5c7e27
unknown authored Aug 13, 2001

be5c7e27
fixed HUP bug, last fix was not complete · 48656d8b
unknown authored Aug 13, 2001

48656d8b

13 Aug, 2001 5 commits

Merge work:/home/bk/mysql · c22d3cae
unknown authored Aug 13, 2001
```
into mysql.sashanet.com:/home/sasha/src/bk/mysql
```
c22d3cae
Replaced @strong{MySQL} with MySQL · ee1f6de2
unknown authored Aug 13, 2001
```
Replaced @strong{MySQL AB} with MySQL AB
```
ee1f6de2

row0sel.c Fix a memory freeing bug when a row which contains an externally... · ea4b1063

unknown authored Aug 13, 2001

row0sel.c Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT
srv0start.c Allow drive name followed by a ':' in a data file path
ha_innobase.cc Allow drive name followed by a ':' in a data file path

sql/ha_innobase.cc:
Allow drive name followed by a ':' in a data file path
innobase/srv/srv0start.c:
Allow drive name followed by a ':' in a data file path
innobase/row/row0sel.c:
Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT

ea4b1063

Cleanups · d80e4b43

unknown authored Aug 13, 2001


client/mysqltest.c:
  Made mysqltest compatible with 3.23
sql/slave.cc:
  Marked removable code
vio/viossl.c:
  change to use DBUG_ASSERT

d80e4b43

Fix error messages after merge from 3.23 · 75ddf338

unknown authored Aug 13, 2001


include/mysqld_error.h:
  Fix error messages
mysql-test/t/fulltext.test:
  Fixed wrong error numbers
mysql-test/t/union.test:
  Update error numbers after merge with 3.23
sql/share/czech/errmsg.txt:
  Fix of merge
sql/share/danish/errmsg.txt:
  Updated error messages from 3.23
sql/share/dutch/errmsg.txt:
  Updated error messages from 3.23
sql/share/english/errmsg.txt:
  Updated error messages
sql/share/estonian/errmsg.txt:
  Fix of merge
sql/share/french/errmsg.txt:
  Fix of merge
sql/share/german/errmsg.txt:
  Fix of merge
sql/share/greek/errmsg.txt:
  Fix of merge
sql/share/hungarian/errmsg.txt:
  Fix of merge
sql/share/italian/errmsg.txt:
  Fix of merge
sql/share/japanese/errmsg.txt:
  Fix of merge
sql/share/korean/errmsg.txt:
  Fix of merge
sql/share/norwegian-ny/errmsg.txt:
  Fix of merge
sql/share/norwegian/errmsg.txt:
  Fix of merge
sql/share/polish/errmsg.txt:
  Fix of merge
sql/share/portuguese/errmsg.txt:
  Updated error messages
sql/share/romanian/errmsg.txt:
  Fix of merge
sql/share/russian/errmsg.txt:
  Fix of merge
sql/share/slovak/errmsg.txt:
  Fix of merge
sql/share/spanish/errmsg.txt:
  Fix of merge
sql/share/swedish/errmsg.txt:
  Fix of merge

75ddf338

12 Aug, 2001 4 commits

Monty, your comments ?? · 5d33bf3e

unknown authored Aug 12, 2001


mysql-test/t/union.test:
  A test case for :
  
  CREATE TABLE .. SELECT .... UNION SELECT ... UNION SELECT .....
  
  and
  
  INSERT INTO ... SELECT .... UNION SELECT ... UNION SELECT ....
  
  Monty, please let me know what changes do you want me to make. 
  I could not make both in the same function, as insert requires
  that table is open.
  
  Let me know what changes to make before I plunge into:
  
  EXPLAIN SELECT ... UNION ... SELECT ......

5d33bf3e

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 4fbea5da

unknown authored Aug 12, 2001

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

4fbea5da

Changes so that CREATE and INSERT work from UNION's · 958815b5

unknown authored Aug 12, 2001


BitKeeper/etc/ignore:
  Added innobase/conftest.s1 innobase/conftest.subs sql/sql_select.cc.orig to the ignore list

958815b5

post-merge fixes to make it compile. It still fails the fulltext test, · d07fa9a7

unknown authored Aug 11, 2001

 (wrong error code) but I'll push it so that Sergei could clean up
 my merge


include/mysqld_error.h:
  fixed typo
mysql-test/r/order_by.result:
  updated result for merged test
sql/Makefile.am:
  put back sql_union.cc lost during merge
sql/mysql_priv.h:
  restored variables lost in the merge
sql/mysqld.cc:
  put back lost variable declarations
sql/share/czech/errmsg.txt:
  merge fix
sql/share/danish/errmsg.txt:
  merge fix
sql/share/dutch/errmsg.txt:
  merge fix
sql/share/english/errmsg.txt:
  merge fix
sql/share/estonian/errmsg.txt:
  merge fix
sql/share/french/errmsg.txt:
  merge fix
sql/share/german/errmsg.txt:
  merge fix
sql/share/greek/errmsg.txt:
  merge fix
sql/share/hungarian/errmsg.txt:
  merge fix
sql/share/italian/errmsg.txt:
  merge fix
sql/share/japanese/errmsg.txt:
  merge fix
sql/share/korean/errmsg.txt:
  merge fix
sql/share/norwegian-ny/errmsg.txt:
  merge fix
sql/share/norwegian/errmsg.txt:
  merge fix
sql/share/polish/errmsg.txt:
  merge fix
sql/share/portuguese/errmsg.txt:
  merge fix
sql/share/romanian/errmsg.txt:
  merge fix
sql/share/russian/errmsg.txt:
  merge fix
sql/share/slovak/errmsg.txt:
  merge fix
sql/share/spanish/errmsg.txt:
  merge fix
sql/share/swedish/errmsg.txt:
  merge fix
sql/sql_acl.cc:
  merge fix

d07fa9a7

11 Aug, 2001 1 commit

merged · a7f78045

unknown authored Aug 11, 2001


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql-bench/Makefile.am:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
Docs/manual.texi:
  merge
include/mysql_com.h:
  merge
include/mysqld_error.h:
  merge
mysql-test/install_test_db.sh:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  merge
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/sql_base.cc:
  merge
sql/sql_table.cc:
  merge

a7f78045