Commits · f085e458f1fc8f079a9e8d63fc511a87679cbde3 · nexedi / MariaDB

16 Jan, 2003 1 commit
- Remove un-used code · f085e458
  unknown authored Jan 16, 2003
```
sql/sql_prepare.cc:
  Remove uun-used code
```
  f085e458
11 Jan, 2003 1 commit
- Fix to make the tables re-inited for every execute call · 6e89e181
  unknown authored Jan 11, 2003
  
  6e89e181
10 Jan, 2003 8 commits
- Merge venu@work.mysql.com:/home/bk/mysql-4.1 · 90bab000
  unknown authored Jan 10, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
  90bab000
- Prepared statements - Doc to be incorporated in manual · 41676d75
  unknown authored Jan 10, 2003
  
  41676d75
- .del-xml.c~d20ceb97a91fcc2d: · beab9c64
  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
```
  beab9c64
- xml.c has been moved to /strings from /mysys · 6ad7cb9b
  unknown authored Jan 10, 2003
```
This is to reuse code to generate charset related C files
from ther descriptions written in XML files
```
  6ad7cb9b
- xml.c: · 6a2de9bf
  unknown authored Jan 10, 2003
```
  new file
```
  6a2de9bf
- Added prepared statements sample from manual as a test · c1e10724
  unknown authored Jan 09, 2003
  
  c1e10724
- Remove/change unwanted variables in client protocol · 8e8c684c
  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
```
  8e8c684c
- Merge venu@work.mysql.com:/home/bk/mysql-4.1 · ab9e0f66
  unknown authored Jan 09, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
  ab9e0f66
09 Jan, 2003 13 commits

Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 · 54b97ca6

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

54b97ca6

Post merge fix · ababf367

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

ababf367

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


mysql-test/r/create.result:
  Auto merged
```
12c1052c

.del-koi8_u.xml~ec104975f7e009bf: · dcc9635b

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

dcc9635b

euc_kr, koi8_r and koi8_u have been renamed so that now · 38b29509
unknown authored Jan 09, 2003
```
all charset names don't have "_" sign.
```
38b29509
koi8u.xml, koi8r.xml: · 164a874e
unknown authored Jan 09, 2003
```
  new file
```
164a874e
do not call get_charset_by_name() with string "DEFAULT" · 63a4a327
unknown authored Jan 09, 2003

63a4a327

Separating CHARSET and COLLATION terms · 965392b3

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

965392b3

fixed order_by test to make it repeatable · 0c914236
unknown authored Jan 09, 2003

0c914236

merge with 4.0.9 · 0396f97e

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

0396f97e

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

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

f5310091

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

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

805016c5

08 Jan, 2003 17 commits
- buf0buf.c: · 8410bf7e
  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
```
  8410bf7e
- os0proc.c: · 0053e09a
  unknown authored Jan 09, 2003
```
  Fix typos


innobase/os/os0proc.c:
  Fix typos
```
  0053e09a
- srv0srv.c, mem0pool.c, mem0pool.h, buf0buf.h, buf0buf.c: · b0dbbac2
  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
```
  b0dbbac2
- Merge work:/home/bk/mysql-4.0 · 8c89bd2a
  unknown authored Jan 08, 2003
```
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
  8c89bd2a
- ft_nlq_search.c: · f3c729b8
  unknown authored Jan 08, 2003
```
  no _mi_search_next() bug fixed


myisam/ft_nlq_search.c:
  no _mi_search_next() bug fixed
```
  f3c729b8
- Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 · f710940b
  unknown authored Jan 08, 2003
```
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean


sql/item_strfunc.cc:
  Auto merged
```
  f710940b
- Fix for the bug about point(subselect(...)) · aa8fcaa2
  unknown authored Jan 08, 2003
```
sql/item_strfunc.cc:
  null_value-s was indefined here
```
  aa8fcaa2
- Merge work:/home/bk/mysql-4.0 into hynda.(none):/home/my/bk/mysql-4.0 · f5471694
  unknown authored Jan 08, 2003
  
  f5471694
- Fixed a couple of bugs. · 75c851d3
  unknown authored Jan 08, 2003
  
  75c851d3
- Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · 2d213615
  unknown authored Jan 08, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  2d213615
- Renamed to look in common style · ee277f05
  unknown authored Jan 08, 2003
  
  ee277f05
- Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · 6ebb02b1
  unknown authored Jan 08, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
```
  6ebb02b1
- fix for readline building · ea38d62a
  unknown authored Jan 08, 2003
  
  ea38d62a
- charset.c: · beabcc66
  unknown authored Jan 08, 2003
```
  find only primary collations


mysys/charset.c:
  find only primary collations
```
  beabcc66
- New function to search for charset using charset name rather than collation name · bfaa40ad
  unknown authored Jan 08, 2003
  
  bfaa40ad
- Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · 16693249
  unknown authored Jan 08, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  16693249
- COLLATE is field attribute not field type · 9d242d16
  unknown authored Jan 08, 2003
  
  9d242d16