Commits · c335939203ee910c378438198a0a363789772310 · Kirill Smelkov / mariadb

08 Dec, 2003 2 commits

unknown authored Dec 08, 2003


sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

c3359392

Task ID 499:Add a new settable string variable(init_connect, init_slave) · a0e4a6de

unknown authored Dec 08, 2003

to mysqld that is executed for all new connections.
(Similar to the client command: mysql_options(... MYSQL_INIT_COMMAND ...).


sql/mysql_priv.h:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/mysqld.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/protocol.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/set_var.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/slave.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/sql_class.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/sql_class.h:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/sql_parse.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
sql/sql_show.cc:
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.

a0e4a6de

07 Dec, 2003 1 commit
- let chk_index() understand 2-level fulltext index format · 0ff62350
  unknown authored Dec 07, 2003
```
sql/sql_table.cc:
  typo fixed
```
  0ff62350
06 Dec, 2003 3 commits

QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from... · f3bf35ec

unknown authored Dec 06, 2003

QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status


mysql-test/r/union.result:
  union and slow log tests
mysql-test/t/union.test:
  union and slow log tests

f3bf35ec

Merge bk-internal:/home/bk/mysql-4.1/ · afbeb64e
unknown authored Dec 06, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
afbeb64e

fix for my_mbcharlen(charset, c) to return 1 for single-byte characters · 2e82008b

unknown authored Dec 06, 2003

(isn't it obvious ?)


mysys/charset.c:
  all charsets support my_mbcharlen - no need to protect it with use_mb()
sql/sql_load.cc:
  all charsets support my_mbcharlen - no need to protect it with use_mb()

2e82008b

04 Dec, 2003 11 commits
- Merge mysql.com:/home/kostja/mysql/mysql-4.1-root · 07de836b
  unknown authored Dec 05, 2003
```
into mysql.com:/home/kostja/mysql/mysql-4.1-max_prep_stmt_count


sql/mysqld.cc:
  Auto merged
```
  07de836b
- unused variable max_prep_stmt_count removed · 997c4550
  unknown authored Dec 05, 2003
  
  997c4550
- test result fixed · c135ce02
  unknown authored Dec 04, 2003
  
  c135ce02
- Merge bk-internal:/home/bk/mysql-4.1/ · cf45aa2b
  unknown authored Dec 04, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  cf45aa2b
- make a clear distinction between max_word_length in *characters* and in *bytes* · b66c016f
  unknown authored Dec 04, 2003
  
  b66c016f
- Fixup error number - Broke during merge · 580d754d
  unknown authored Dec 04, 2003
```
mysql-test/t/create.test:
  Fixup error number
mysql-test/t/variables.test:
  Fixup error number
```
  580d754d
- Merge gweir@build.mysql.com:/home/bk/mysql-4.1 · cebe1c0e
  unknown authored Dec 04, 2003
```
into mysql.com:/bk/mysql-4.1
```
  cebe1c0e
- Add charset #defines for Windows platform (as of 4.1.1) · d535144e
  unknown authored Dec 04, 2003
```
include/config-win.h:
  Add HAVE_CHARSET_* defines for Windows
```
  d535144e
- comment to user-level lock added · 270b72ff
  unknown authored Dec 04, 2003
  
  270b72ff
- - Bumped up version number in configure.in 4.1.1-alpha -> 4.1.2-alpha · 2e939d77
  unknown authored Dec 04, 2003
```
 - tagged ChangeSet 1.1641 as "mysql-4.1.1"


BitKeeper/etc/ignore:
  Added INSTALL-WIN-SOURCE to the ignore list
configure.in:
   - Bumped up version number: 4.1.1-alpha -> 4.1.2-alpha
```
  2e939d77
- README: · a7990d02
  unknown authored Dec 03, 2003
```
  minor edits


sql-bench/README:
  minor edits
```
  a7990d02
03 Dec, 2003 4 commits
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 60cf79a2
  unknown authored Dec 03, 2003
```
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
```
  60cf79a2
- Delete obsolete references. · c432c0a0
  unknown authored Dec 03, 2003
```
sql-bench/README:
  The Overview-paper file has not been present since 3.20.x, either.
```
  c432c0a0
- Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · ff2aeb99
  unknown authored Dec 03, 2003
```
into mysql.com:/space/my/mysql-4.1
```
  ff2aeb99
- benchmarks README edits · c829bcef
  unknown authored Dec 02, 2003
  
  c829bcef
02 Dec, 2003 8 commits

Merge for update · 09eadf65

unknown authored Dec 02, 2003


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  Merge for updates
mysql-test/r/rpl_change_master.result:
  Merge for updates
sql/share/czech/errmsg.txt:
  Merge for updates
sql/share/danish/errmsg.txt:
  Merge for updates
sql/share/dutch/errmsg.txt:
  Merge for updates
sql/share/english/errmsg.txt:
  Merge for updates
sql/share/estonian/errmsg.txt:
  Merge for updates
sql/share/french/errmsg.txt:
  Merge for updates
sql/share/german/errmsg.txt:
  Merge for updates
sql/share/greek/errmsg.txt:
  Merge for updates
sql/share/hungarian/errmsg.txt:
  Merge for updates
sql/share/italian/errmsg.txt:
  Merge for updates
sql/share/japanese/errmsg.txt:
  Merge for updates
sql/share/korean/errmsg.txt:
  Merge for updates
sql/share/norwegian-ny/errmsg.txt:
  Merge for updates
sql/share/norwegian/errmsg.txt:
  Merge for updates
sql/share/polish/errmsg.txt:
  Merge for updates
sql/share/portuguese/errmsg.txt:
  Merge for updates
sql/share/romanian/errmsg.txt:
  Merge for updates
sql/share/russian/errmsg.txt:
  Merge for updates
sql/share/serbian/errmsg.txt:
  Merge for updates
sql/share/slovak/errmsg.txt:
  Merge for updates
sql/share/spanish/errmsg.txt:
  Merge for updates
sql/share/swedish/errmsg.txt:
  Merge for updates
sql/share/ukrainian/errmsg.txt:
  Merge for updates

09eadf65

WorkLog#1280 - Remove fixed table handler from lex/yacc · c74c90ee

unknown authored Dec 02, 2003


include/mysqld_error.h:
  New error message: unknown table engine
mysql-test/r/create.result:
  New error message: unknown table engine
mysql-test/t/create.test:
  New error message: unknown table engine
sql/lex.h:
  Remove some keywords: HEAP, ISAM, MERGE, MEMORY, MRG_MYISAM, MYISAM
sql/mysql_priv.h:
  Remove unused symbol
sql/set_var.h:
  New system variable type: sys_var_thd_table_type
sql/sql_yacc.yy:
  Remove tokens and make table_types resolve at run time
sql/sql_show.cc:
  Tidy up
sql/sql_table.cc:
  Tidy up
include/sql_state.h:
  Fix indent
sql/mysqld.cc:
  optimize
mysql-test/r/rpl_change_master.result:
  It wouldn't pass the tests
mysql-test/r/variables.result:
  Fix for changes
mysql-test/r/warnings.result:
  Fix for changes
mysql-test/t/variables.test:
  Fix for changes
sql/handler.h:
  parameter is a const
sql/set_var.cc:
  Code clean up for sys_var_thd_table_type::check()
sql/handler.cc:
  More tidyup
sql/share/czech/errmsg.txt:
  Fixups during review
sql/share/danish/errmsg.txt:
  Fixups during review
sql/share/dutch/errmsg.txt:
  Fixups during review
sql/share/english/errmsg.txt:
  Fixups during review
sql/share/estonian/errmsg.txt:
  Fixups during review
sql/share/french/errmsg.txt:
  Fixups during review
sql/share/german/errmsg.txt:
  Fixups during review
sql/share/greek/errmsg.txt:
  Fixups during review
sql/share/hungarian/errmsg.txt:
  Fixups during review
sql/share/italian/errmsg.txt:
  Fixups during review
sql/share/japanese/errmsg.txt:
  Fixups during review
sql/share/korean/errmsg.txt:
  Fixups during review
sql/share/norwegian-ny/errmsg.txt:
  Fixups during review
sql/share/norwegian/errmsg.txt:
  Fixups during review
sql/share/polish/errmsg.txt:
  Fixups during review
sql/share/portuguese/errmsg.txt:
  Fixups during review
sql/share/romanian/errmsg.txt:
  Fixups during review
sql/share/russian/errmsg.txt:
  Fixups during review
sql/share/serbian/errmsg.txt:
  Fixups during review
sql/share/slovak/errmsg.txt:
  Fixups during review
sql/share/spanish/errmsg.txt:
  Fixups during review
sql/share/swedish/errmsg.txt:
  Fixups during review
sql/share/ukrainian/errmsg.txt:
  Fixups during review
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

c74c90ee

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0e286c90
unknown authored Dec 02, 2003
```
into mysql.com:/home/kostja/mysql/mysql-4.1-root
```
0e286c90

Fix for #1189 (Mess with names about CONSTRAINT) · 6990f6cf

unknown authored Dec 02, 2003

Second edition: error message was deleted as Segey suggested
Now name of the constraint will be used as the name of the key
if the last not specified


mysql-test/r/constraints.result:
  appropriate test result
mysql-test/t/constraints.test:
  test case for 1189
sql/sql_yacc.yy:
  language definitions changed so that we can obtaint constraint's name
  and send it as the name of the key if it's not specified

6990f6cf

- removed INSTALL-WIN-SOURCE from the BK tree as its content has been · d1a673c8

unknown authored Dec 02, 2003

   added to manual.texi - extract it from there instead.


BitKeeper/deleted/.del-INSTALL-WIN-SOURCE~8b030042cb95ca9:
  Delete: INSTALL-WIN-SOURCE
Docs/Makefile.am:
   - Create INSTALL-WIN-SOURCE from mysql.info

d1a673c8

Item_param::save_in_field(): · 5ea174a9

unknown authored Dec 02, 2003

thd->command can be anything except COM_EXECUTE in no cases
except programming error.

5ea174a9

Ensure that innodb is created for the first replication test as the... · 40d2de8e

unknown authored Dec 02, 2003

Ensure that innodb is created for the first replication test as the slave-timeout is lower for future tests and this failed on some slower machines

40d2de8e

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7bdb1b1e
unknown authored Dec 02, 2003
```
into mysql.com:/home/kostja/mysql/mysql-4.1-root
```
7bdb1b1e

01 Dec, 2003 5 commits

join_outer.result, null.result, null.test, item_cmpfunc.h: · 17119e6d

unknown authored Dec 01, 2003

  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects (bug #1990).


sql/item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects (bug #1990).
mysql-test/t/null.test:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects (bug #1990).
mysql-test/r/null.result:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects (bug #1990).
mysql-test/r/join_outer.result:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects (bug #1990).

17119e6d

cleanup: unused variable removed · 524ab904
unknown authored Dec 01, 2003
```
followup of Bordeaux Optimizer session
```
524ab904
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 49a8ca4d
unknown authored Dec 01, 2003
```
into mysql.com:/home/kostja/mysql/mysql-4.1-root
```
49a8ca4d
don't delete select_lex->having and select_lex->where as we delete · 6736de28
unknown authored Dec 01, 2003
```
all items in free_prep_stmt(free_items);

indentation fix
```
6736de28

Portability fixes (for binary build) · 91de6fdb

unknown authored Dec 01, 2003

Added --protocol to mysqlbinlog


client/mysql.cc:
  Indentation cleanup
client/mysqlbinlog.cc:
  Added protocol option
mysql-test/r/rpl_until.result:
  Update results
mysql-test/t/rpl_until.test:
  If --sleep option was given then the salve could do many retries, which affected the size of the binary log. This is fixed by not comparing the binary log size/position
sql/mysqld.cc:
  More debugging with set_maximum_open_files()
vio/viosocket.c:
  Portability fix.

91de6fdb

28 Nov, 2003 6 commits
- Mark position as # to make test portable · 046b80bb
  unknown authored Nov 28, 2003
  
  046b80bb
- Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1 · fd3847ce
  unknown authored Nov 28, 2003
```
libmysql/libmysql.c:
  Auto merged
```
  fd3847ce
- rpl_parse and rpl_probe don't have to be reset as they are already 0 · 13f525c0
  unknown authored Nov 28, 2003
  
  13f525c0
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c61299dc
  unknown authored Nov 28, 2003
```
into mysql.com:/my/mysql-4.1
```
  c61299dc
- Merge bk-internal:/home/bk/mysql-4.0/ · 90fc2b97
  unknown authored Nov 28, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
  90fc2b97
- "optimization cleanup" reverted - problems on rpl_redirect test. · 88d274c6
  unknown authored Nov 28, 2003
```
It happens that mysql->client_next->client_next=mysql
and mysql_close() goes into infinite loop.
Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
:)
```
  88d274c6