Commits · 60093be84864b63b80a572b3c04b007c0cafc8c1 · nexedi / MariaDB

08 Dec, 2003 3 commits

Fixed test for 'init_slave' variable · 60093be8
unknown authored Dec 08, 2003

60093be8

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

306b58b1

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

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.

209e976d

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

QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from... · 65a947e2

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

65a947e2

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

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

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()

8d143c1c

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


sql/mysqld.cc:
  Auto merged
```
  5ff40e02
- unused variable max_prep_stmt_count removed · f09346d0
  unknown authored Dec 05, 2003
  
  f09346d0
- test result fixed · be972a50
  unknown authored Dec 04, 2003
  
  be972a50
- Merge bk-internal:/home/bk/mysql-4.1/ · 1ba87aa7
  unknown authored Dec 04, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  1ba87aa7
- make a clear distinction between max_word_length in *characters* and in *bytes* · 6a38e829
  unknown authored Dec 04, 2003
  
  6a38e829
- Fixup error number - Broke during merge · d675b570
  unknown authored Dec 04, 2003
```
mysql-test/t/create.test:
  Fixup error number
mysql-test/t/variables.test:
  Fixup error number
```
  d675b570
- Merge gweir@build.mysql.com:/home/bk/mysql-4.1 · 649b9f42
  unknown authored Dec 04, 2003
```
into mysql.com:/bk/mysql-4.1
```
  649b9f42
- Add charset #defines for Windows platform (as of 4.1.1) · a1792c21
  unknown authored Dec 04, 2003
```
include/config-win.h:
  Add HAVE_CHARSET_* defines for Windows
```
  a1792c21
- comment to user-level lock added · 2ff00faf
  unknown authored Dec 04, 2003
  
  2ff00faf
- - Bumped up version number in configure.in 4.1.1-alpha -> 4.1.2-alpha · 7dc82927
  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
```
  7dc82927
- README: · 48f26881
  unknown authored Dec 03, 2003
```
  minor edits


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

Merge for update · 4d445feb

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

4d445feb

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

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

f4a0e903

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

Fix for #1189 (Mess with names about CONSTRAINT) · 1906e569

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

1906e569

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

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

44e8b7e8

Item_param::save_in_field(): · e34536fc

unknown authored Dec 02, 2003

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

e34536fc

Ensure that innodb is created for the first replication test as the... · 9745fda6

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

9745fda6

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

01 Dec, 2003 5 commits

join_outer.result, null.result, null.test, item_cmpfunc.h: · f656fde2

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

f656fde2

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

indentation fix
```
164a5fdb

Portability fixes (for binary build) · 78436e89

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.

78436e89

28 Nov, 2003 5 commits
- Mark position as # to make test portable · 3d22785d
  unknown authored Nov 28, 2003
  
  3d22785d
- Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1 · f29f1024
  unknown authored Nov 28, 2003
```
libmysql/libmysql.c:
  Auto merged
```
  f29f1024
- rpl_parse and rpl_probe don't have to be reset as they are already 0 · cf4099d8
  unknown authored Nov 28, 2003
  
  cf4099d8
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 69a9941c
  unknown authored Nov 28, 2003
```
into mysql.com:/my/mysql-4.1
```
  69a9941c
- Merge bk-internal:/home/bk/mysql-4.0/ · 95034b91
  unknown authored Nov 28, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
  95034b91