Commits · 410dd0779c32b1975eceeab92a1e62ff099f37db · Kirill Smelkov / mariadb

14 Aug, 2001 1 commit

Remove warnings and portability fixes · 410dd077

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

410dd077

13 Aug, 2001 2 commits

Cleanups · 97250b9c

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

97250b9c

Fix error messages after merge from 3.23 · 638a9678

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

638a9678

12 Aug, 2001 4 commits

Monty, your comments ?? · 91df9462

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 ......

91df9462

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 89b28ebd

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

89b28ebd

Changes so that CREATE and INSERT work from UNION's · 02e0db5a

unknown authored Aug 12, 2001


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

02e0db5a

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

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

2aed7cf9

11 Aug, 2001 10 commits

merged · c9dbb4b7

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

c9dbb4b7

Merge work:/home/bk/mysql-4.0 · d7c5327d

unknown authored Aug 11, 2001

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


BitKeeper/etc/logging_ok:
  auto-union
libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

d7c5327d

temp commit working on a merge · 7a4b7c4f

unknown authored Aug 11, 2001


client/mysqlbinlog.cc:
  remove unused variables
sql/log_event.h:
  fix bad merge

7a4b7c4f

Merge work:/home/bk/mysql · 23d5f3f9

unknown authored Aug 11, 2001

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqlbinlog.cc:
  Auto merged

23d5f3f9

Portability fix for windows · f6751dd8
unknown authored Aug 11, 2001
```
Docs/manual.texi:
  Changelog
```
f6751dd8
Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql · 48d48eac
unknown authored Aug 11, 2001
```
BitKeeper/etc/ignore:
  auto-union
```
48d48eac

delete generated files · cc32440c

unknown authored Aug 11, 2001


BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Delete: bdb/include/rpc_server_ext.h
BitKeeper/deleted/.del-rpc_client_ext.h~85436ca9b5691338:
  Delete: bdb/include/rpc_client_ext.h
BitKeeper/etc/ignore:
  added bdb/include/rpc_client_ext.h

cc32440c

ignore generated include file · 1e5b7a20
unknown authored Aug 11, 2001
```
BitKeeper/etc/ignore:
  added include/widec.h
```
1e5b7a20
Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql · 152de4fe
unknown authored Aug 11, 2001

152de4fe

Made SIGTERM safer for Solaris · cb1c0b08

unknown authored Aug 11, 2001


BitKeeper/etc/ignore:
  added */*_pure_*warnings
BUILD/compile-solaris-sparc:
  Optimized build for ultrasparc
sql/mysqld.cc:
  Made SIGTERM safer for Solaris as it sometimes delivered a not catched
  signal during shutdown

cb1c0b08

10 Aug, 2001 23 commits

Changed to use standard 'install' syntax · 11b0c832
unknown authored Aug 11, 2001

11b0c832

Fixed handling of strings in mysqldumpslow · 49a3cea4

unknown authored Aug 11, 2001


scripts/mysqldumpslow.sh:
  Handling of strings with \ and double ''
sql/mysqlbinlog.cc:
  Fixed type

49a3cea4

Automerge · 46aeed09
unknown authored Aug 10, 2001

46aeed09

Embedded mysql fixes. · b538ff90

unknown authored Aug 10, 2001

There is now a mysql_server_init() function which needs to be
called at the beginning of the program (and _end() for the end
of the program).  This routine handles argument parsing for the
embedded server.

Use the embedded version of mysql_load_file() (ignore the LOCAL
argument, since the client and server are the same program).

There are now mysql_thread_init/end() functions for the client
to use in a multi-threaded app.  They are just wrappers for
my_thread_init/end().



BitKeeper/deleted/.del-README~434e9cae5fa9a4c4:
  Delete: libmysqld/README
libmysqld/lib_load.cc:
  minor cleanup
include/mysql.h:
  add mysql_server/thread_init/end()
libmysql/libmysql.c:
  add mysql_server/thread_init/end()
libmysqld/lib_sql.cc:
  add mysql_server/thread_init/end()
libmysqld/libmysqld.c:
  add mysql_server/thread_init/end()
sql/mysqld.cc:
  allow get_options() to be called more than once
libmysqld/Makefile.am:
  use lib_load.cc instead of sql_load.cc
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

b538ff90

Allow myisam-recover="" and --sql-mode="" · 1ddd584a

unknown authored Aug 10, 2001


Docs/manual.texi:
  Changelog
mysql-test/r/distinct.result:
  new test case
mysql-test/r/innodb.result:
  Fixed result

1ddd584a

merge · 73e86d62

unknown authored Aug 10, 2001


BitKeeper/etc/logging_ok:
  auto-union
innobase/buf/buf0flu.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  Will merge later..

73e86d62

Portability fixes · aa3c4306

unknown authored Aug 10, 2001

Added record_rnd_buffer
Added --safe-user-create
Fix for ALTER TABLE RENAME on windows


Docs/manual.texi:
  Changelog and documentation of new features.
  More information about using threaded client libraries
include/mysql_com.h:
  Added prototype for my_thread_init()
include/mysqld_error.h:
  New error for --safe-create-user
innobase/buf/buf0flu.c:
  Portability fix
innobase/include/univ.i:
  Portability fix
mysql-test/t/distinct.test:
  Test for distinct bug
sql/mysql_priv.h:
  Added record_rnd_buffer
sql/mysqld.cc:
  Added record_rnd_buffer
sql/records.cc:
  Added record_rnd_buffer
sql/share/czech/errmsg.txt:
  New error message for --safe-user-create
sql/share/danish/errmsg.txt:
  New error message for --safe-user-create
sql/share/dutch/errmsg.txt:
  New error message for --safe-user-create
sql/share/english/errmsg.txt:
  New error message for --safe-user-create
sql/share/estonian/errmsg.txt:
  New error message for --safe-user-create
sql/share/french/errmsg.txt:
  New error message for --safe-user-create
sql/share/german/errmsg.txt:
  New error message for --safe-user-create
sql/share/greek/errmsg.txt:
  New error message for --safe-user-create
sql/share/hungarian/errmsg.txt:
  New error message for --safe-user-create
sql/share/italian/errmsg.txt:
  New error message for --safe-user-create
sql/share/japanese/errmsg.txt:
  New error message for --safe-user-create
sql/share/korean/errmsg.txt:
  New error message for --safe-user-create
sql/share/norwegian-ny/errmsg.txt:
  New error message for --safe-user-create
sql/share/norwegian/errmsg.txt:
  New error message for --safe-user-create
sql/share/polish/errmsg.txt:
  New error message for --safe-user-create
sql/share/portuguese/errmsg.txt:
  New error message for --safe-user-create
sql/share/romanian/errmsg.txt:
  New error message for --safe-user-create
sql/share/russian/errmsg.txt:
  New error message for --safe-user-create
sql/share/slovak/errmsg.txt:
  New error message for --safe-user-create
sql/share/spanish/errmsg.txt:
  New error message for --safe-user-create
sql/share/swedish/errmsg.txt:
  New error message for --safe-user-create
sql/sql_acl.cc:
  Checking of privileges for --safe-user-create
sql/sql_acl.h:
  --safe-user-create
sql/sql_base.cc:
  --safe-user-create
sql/sql_parse.cc:
  --safe-user-create
sql/sql_show.cc:
  --safe-user-create
sql/sql_table.cc:
  Fix for ALTER TABLE RENAME on windows

aa3c4306

Fixed bug in ALTER TABLE for MERGE tables · bffebc8e

unknown authored Aug 10, 2001

Portability fixes
Fixed problem when giving wrong arguments to myisam_recover
Fix to remove warnings when using purify


BUILD/compile-solaris-sparc-purify:
  Added innodb and berkeleydb to test
mysql-test/install_test_db.sh:
  Portability fix.
sql/ha_myisam.cc:
  Fixed problem when giving wrong arguments to myisam_recover
sql/ha_myisammrg.cc:
  Fixed bug in ALTER TABLE for MERGE tables
sql/sql_list.h:
  Fix to remove warnings when using purify
sql/sql_select.cc:
  Fix to remove warnings from purify
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

bffebc8e

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql · c0dbd4d9
unknown authored Aug 10, 2001

c0dbd4d9
manual.texi PASSWORD() issue clarified · 0f670051
unknown authored Aug 10, 2001
```
Docs/manual.texi:
  PASSWORD() issue clarified
```
0f670051

Fixed bug in show variables, it didn't show whether slow-query was · 16108af1

unknown authored Aug 10, 2001

enabled or not.


sql/mysqld.cc:
  Added notification to "show variables" whether slow-query-log is
  enabled or not.

16108af1

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql · 7f6b82ac
unknown authored Aug 10, 2001
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
7f6b82ac
New dutch error message file. · d84ef9d9
unknown authored Aug 10, 2001
```
sql/share/dutch/errmsg.txt:
  New dutch error messages.
```
d84ef9d9
Merge jamppa@work:/home/bk/mysql into hynda.mysql.fi:/data/my/bk/mysql · 9e3a42fa
unknown authored Aug 10, 2001

9e3a42fa

changed variable display from string to int (bits) for myisam-recover · e24443b0

unknown authored Aug 10, 2001

and sql-mode options.


sql/mysqld.cc:
  Changed the sql-mode to be shown as a number (bits) instead
  of a string.

e24443b0

Fixed stupid node name in manual.texi. · f73b05ff
unknown authored Aug 10, 2001
```
Docs/manual.texi:
  Fixed stupid node name.
```
f73b05ff
DocTOC Chapter 8 Complete! · cd62fdf6
unknown authored Aug 09, 2001

cd62fdf6
Merge jcole@work.mysql.com:/home/bk/mysql · 7272b454
unknown authored Aug 09, 2001
```
into tetra.spaceapes.com:/home/jcole/bk/mysql
```
7272b454
DocTOC Chapter 9 Complete! · 51bc6118
unknown authored Aug 09, 2001
```
(Chapter 8 Skipped, will be next.)
```
51bc6118

Merge work:/home/bk/mysql-4.0 · 8af8098d

unknown authored Aug 09, 2001

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


configure.in:
  Auto merged

8af8098d

merged · 9a6a7bf5

unknown authored Aug 09, 2001


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
ltmain.sh:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

9a6a7bf5

Merge work:/home/bk/mysql · ebb3bd0f

unknown authored Aug 09, 2001

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


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

ebb3bd0f

mysqlbinlog->client · 8ddf0c44

unknown authored Aug 09, 2001


BitKeeper/etc/ignore:
  Added client/log_event.cc client/log_event.h client/mf_iocache.c client/mf_iocache.cc client/mysqlbinlog client/mysys_priv.h mysql.kdevprj to the ignore list
Makefile.am:
  do symlink hack in the client directory 
  ( originally needed to get log_event.cc for mysqlbinlog)
client/mysqlbinlog.cc:
  fixes to make it compile in the client directory
libmysql/Makefile.shared:
  link mysqlbinlog dependencies into libmysqlclient
libmysql/libmysql.c:
  make simple_command and net_safe_read extern ( for mysqlbinlog)
sql/log_event.cc:
  removed pthread dependency in mysqlbinlog
sql/log_event.h:
  removed pthread dependency in mysqlbinlog

8ddf0c44