Commits · a3ffb06a8c6e76dc1fc3d88493a6e6c98af14e92 · Kirill Smelkov / mariadb

10 Jan, 2003 8 commits
- Merge venu@work.mysql.com:/home/bk/mysql-4.1 · a3ffb06a
  unknown authored Jan 10, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
  a3ffb06a
- Prepared statements - Doc to be incorporated in manual · 0a16d590
  unknown authored Jan 10, 2003
  
  0a16d590
- .del-xml.c~d20ceb97a91fcc2d: · a1f84c11
  unknown authored Jan 10, 2003
```
  Delete: mysys/xml.c
xml.c:
  Rename: BitKeeper/deleted/.del-xml.c~d20ceb97a91fcc2d -> mysys/xml.c

It is actually moved to /strings 


BitKeeper/deleted/.del-xml.c~d20ceb97a91fcc2d:
  Delete: mysys/xml.c
```
  a1f84c11
- xml.c has been moved to /strings from /mysys · c6ad5a4a
  unknown authored Jan 10, 2003
```
This is to reuse code to generate charset related C files
from ther descriptions written in XML files
```
  c6ad5a4a
- xml.c: · f00289c4
  unknown authored Jan 10, 2003
```
  new file
```
  f00289c4
- Added prepared statements sample from manual as a test · 408c41e9
  unknown authored Jan 09, 2003
  
  408c41e9
- Remove/change unwanted variables in client protocol · 6a2fbae6
  unknown authored Jan 09, 2003
```
Add missed mysql_stmt_affected_rows()
sql_yacc.yy : Fix the compilation error .. bison 1.75


sql/sql_yacc.yy:
  Fix the compilarion error .. bison 1.75
```
  6a2fbae6
- Merge venu@work.mysql.com:/home/bk/mysql-4.1 · a91caf8f
  unknown authored Jan 09, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
  a91caf8f
09 Jan, 2003 13 commits

Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 · 91f18f0a

unknown authored Jan 09, 2003


innobase/mem/mem0pool.c:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

91f18f0a

Post merge fix · f7ff1cca

unknown authored Jan 09, 2003

Allow empty key list in USE|IGNORE|FORCE INDEX()


mysql-test/r/myisam.result:
  New explain format
mysql-test/t/myisam.test:
  test of index()
mysys/my_handler.c:
  Updated ha_key_cmp() to be as latest _mi_key_cmp() in 4.0
sql/sql_lex.cc:
  Post merge fix
sql/sql_lex.h:
  Post merge fix
sql/sql_parse.cc:
  Post merge fix
sql/sql_yacc.yy:
  Post merge fix for FORCE INDEX ()
  Allow empty key list in USE|IGNORE|FORCE INDEX()

f7ff1cca

Merge work.mysql.com:/home/bk/mysql-4.1 · 0d520670
unknown authored Jan 09, 2003
```
into myvenu.com:/home/venu/bk/src-4.1


mysql-test/r/create.result:
  Auto merged
```
0d520670

.del-koi8_u.xml~ec104975f7e009bf: · ac2aea8c

unknown authored Jan 09, 2003

  Delete: sql/share/charsets/koi8_u.xml
.del-koi8_r.xml~f95ebf1fb19f94cf:
  Delete: sql/share/charsets/koi8_r.xml


BitKeeper/deleted/.del-koi8_r.xml~f95ebf1fb19f94cf:
  Delete: sql/share/charsets/koi8_r.xml
BitKeeper/deleted/.del-koi8_u.xml~ec104975f7e009bf:
  Delete: sql/share/charsets/koi8_u.xml

ac2aea8c

euc_kr, koi8_r and koi8_u have been renamed so that now · 49fc3a76
unknown authored Jan 09, 2003
```
all charset names don't have "_" sign.
```
49fc3a76
koi8u.xml, koi8r.xml: · 90bf0f97
unknown authored Jan 09, 2003
```
  new file
```
90bf0f97
do not call get_charset_by_name() with string "DEFAULT" · 5a5c618e
unknown authored Jan 09, 2003

5a5c618e

Separating CHARSET and COLLATION terms · 6383a27b

unknown authored Jan 09, 2003


mysql-test/r/alter_table.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/create.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/innodb.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/isam.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/select.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/show_check.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_blob.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_float.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_ranges.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
sql/field.cc:
  In field type charset rather than collation name is displayed
sql/sql_db.cc:
  COLLATE clause has been added into SHOW CREATE DATABASE
sql/sql_lex.cc:
  Detect charset names rather than collation names
sql/sql_show.cc:
  COLLATION field has been added into SHOW FIELDS
sql/sql_yacc.yy:
  COLLATE syntax has been added in CREATE TABLE/DATABASE

6383a27b

fixed order_by test to make it repeatable · 6fb06a7a
unknown authored Jan 09, 2003

6fb06a7a

merge with 4.0.9 · 9d812016

unknown authored Jan 09, 2003

To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys


client/mysqladmin.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/Makefile.am:
  Auto merged
include/my_base.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
sql/lex.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
configure.in:
  merge with 4.0.9
innobase/btr/btr0pcur.c:
  merge with 4.0.9
myisam/mi_check.c:
  merge with 4.0.9
myisam/mi_search.c:
  merge with 4.0.9
mysql-test/t/myisam.test:
  merge with 4.0.9
sql/log_event.cc:
  merge with 4.0.9
sql/mysql_priv.h:
  merge with 4.0.9
sql/sql_lex.h:
  merge with 4.0.9
sql/sql_parse.cc:
  merge with 4.0.9
sql/sql_yacc.yy:
  merge with 4.0.9

9d812016

Add TYPE as an alias for specifying key type · cd2f741d
unknown authored Jan 09, 2003

cd2f741d
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 · cf2ef3c6
unknown authored Jan 09, 2003

cf2ef3c6

Don't count NULL values in cardinalty for MyISAM tables. · b5e37b24

unknown authored Jan 09, 2003

Free row buffer cache after each query for MyISAM tables.
Added table join option FORCE INDEX
Fixed core dump bug when connecting with hostname that could not be resolved.


include/my_base.h:
  Don't count NULL values in cardinalty
myisam/mi_check.c:
  Don't count NULL values in cardinalty
myisam/mi_extra.c:
  Free row buffer cache after each query
myisam/mi_open.c:
  Avoid realloc if cache size doesn't change
myisam/mi_search.c:
  Don't count NULL values in cardinalty
myisam/myisamdef.h:
  Change buffer length from uint to uint32 to make it more portable/predictable
mysql-test/r/myisam.result:
  Test case for cardinality with NULL keys and FORCE INDEX
mysql-test/t/myisam.test:
  Test case for cardinality with NULL keys and FORCE INDEX
sql/lex.h:
  Added table join option FORCE INDEX
sql/mysql_priv.h:
  Added table join option FORCE INDEX
sql/opt_range.cc:
  Added table join option FORCE INDEX
sql/sql_base.cc:
  Added table join option FORCE INDEX
sql/sql_lex.h:
  Added table join option FORCE INDEX
sql/sql_parse.cc:
  Added table join option FORCE INDEX
  Don't use strlen() on hostname without first checking if it's not NULL
sql/sql_select.cc:
  Added table join option FORCE INDEX
sql/sql_yacc.yy:
  Added table join option FORCE INDEX
sql/table.h:
  Added table join option FORCE INDEX

b5e37b24

08 Jan, 2003 19 commits

buf0buf.c: · aef11cc9

unknown authored Jan 09, 2003

  Add a sanity check awe mem >= buf pool size


innobase/buf/buf0buf.c:
  Add a sanity check awe mem >= buf pool size

aef11cc9

os0proc.c: · c2c98f91
unknown authored Jan 09, 2003
```
  Fix typos


innobase/os/os0proc.c:
  Fix typos
```
c2c98f91

srv0srv.c, mem0pool.c, mem0pool.h, buf0buf.h, buf0buf.c: · 106d4fe2

unknown authored Jan 09, 2003

  Make smaller buffer headers and the lock table; fix AWE high_end bug


innobase/buf/buf0buf.c:
  Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/include/buf0buf.h:
  Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/include/mem0pool.h:
  Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/mem/mem0pool.c:
  Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/srv/srv0srv.c:
  Make smaller buffer headers and the lock table; fix AWE high_end bug

106d4fe2

Merge work:/home/bk/mysql-4.0 · 51891d4e
unknown authored Jan 08, 2003
```
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
51891d4e

ft_nlq_search.c: · 3a8d0b7d

unknown authored Jan 08, 2003

  no _mi_search_next() bug fixed


myisam/ft_nlq_search.c:
  no _mi_search_next() bug fixed

3a8d0b7d

Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 · 3f323f46
unknown authored Jan 08, 2003
```
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean


sql/item_strfunc.cc:
  Auto merged
```
3f323f46
Fix for the bug about point(subselect(...)) · dc5ce03f
unknown authored Jan 08, 2003
```
sql/item_strfunc.cc:
  null_value-s was indefined here
```
dc5ce03f
Merge work:/home/bk/mysql-4.0 into hynda.(none):/home/my/bk/mysql-4.0 · 37d5edda
unknown authored Jan 08, 2003

37d5edda
Fixed a couple of bugs. · 86a7b72f
unknown authored Jan 08, 2003

86a7b72f
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · ec827d55
unknown authored Jan 08, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
ec827d55
Renamed to look in common style · 3bc97a7f
unknown authored Jan 08, 2003

3bc97a7f
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · adda82c3
unknown authored Jan 08, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
```
adda82c3
fix for readline building · a2b66896
unknown authored Jan 08, 2003

a2b66896

charset.c: · 1c334ec0

unknown authored Jan 08, 2003

  find only primary collations


mysys/charset.c:
  find only primary collations

1c334ec0

New function to search for charset using charset name rather than collation name · fe47e535
unknown authored Jan 08, 2003

fe47e535
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · f94cc9b6
unknown authored Jan 08, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
f94cc9b6
COLLATE is field attribute not field type · 8ef72be7
unknown authored Jan 08, 2003

8ef72be7
merge · a3f4a46b
unknown authored Jan 08, 2003

a3f4a46b

Fix for bug in LOAD DATA INFILE and replication · 1543bad3

unknown authored Jan 08, 2003

Fix for SHOW VARIABLES in embedded server


Docs/internals.texi:
  Added documentation for join_buffer_size
configure.in:
  Changed version number
sql/log_event.cc:
  Fix for bug in LOAD DATA INFILE
sql/log_event.h:
  Fix for bug in LOAD DATA INFILE
sql/slave.cc:
  Fix for bug in LOAD DATA INFILE
sql/sql_show.cc:
  Fix for SHOW VARIABLES in embedded server

1543bad3