Commits · c58d9d9a9dda3037db574bbf97b22e7c1c274e02 · nexedi / MariaDB

21 Nov, 2002 5 commits

unknown authored Nov 21, 2002


mysql-test/r/heap_btree.result:
  Updated results
mysql-test/r/heap_hash.result:
  Updated results
mysql-test/r/merge.result:
  Updated results
mysql-test/r/rpl_log.result:
  Updated results
mysql-test/r/select.result:
  Updated results
mysql-test/r/subselect.result:
  Updated results
sql/item_cmpfunc.h:
  Fix after merge
sql/log_event.cc:
  Fix after merge
sql/mysql_priv.h:
  Fix after merge
sql/sql_acl.cc:
  Fix after merge
sql/sql_class.cc:
  Fix after merge
sql/sql_db.cc:
  Fix after merge
sql/sql_delete.cc:
  Fix after merge
sql/sql_lex.cc:
  Fix after merge
sql/sql_lex.h:
  Fix after merge
sql/sql_parse.cc:
  Fix after merge
sql/sql_update.cc:
  Fix after merge
sql/sql_yacc.yy:
  Fix after merge

c58d9d9a

Merge with 4.0 · 33fc0d53

unknown authored Nov 21, 2002


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Auto merged
BitKeeper/etc/config:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
include/myisam.h:
  Auto merged
include/violite.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/tree.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hash_filo.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/ha_myisam.cc:
  Merge with 4.0
  Removed some commented code
sql/sql_db.cc:
  Merge with 4.0
  Optimized the logging of the drop db call a bit
sql/sql_update.cc:
  Added comment

33fc0d53

merge with 3.23 · 70a17cd5
unknown authored Nov 21, 2002
```
innobase/row/row0mysql.c:
  Auto merged
```
70a17cd5
Added 'table lock' state while MySQL is waiting to get locks for tables. · a407ebd3
unknown authored Nov 21, 2002

a407ebd3

Automatic conversion from CHAR(length) to BLOB when length > 255 · 2723dbdb

unknown authored Nov 21, 2002

New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0


include/mysqld_error.h:
  New warning message
mysql-test/r/func_system.result:
  Added testing of new functions
mysql-test/r/func_test.result:
  Added testing of new functions
mysql-test/r/type_blob.result:
  Added testing of new functions
mysql-test/t/func_system.test:
  Added testing of new functions
mysql-test/t/func_test.test:
  Added testing of new functions
mysql-test/t/type_blob.test:
  Added testing of new functions
sql/item_func.cc:
  Added function DIV
sql/item_func.h:
  Added function DIV
sql/lex.h:
  New keywords
sql/share/czech/errmsg.txt:
  New warning message
sql/share/danish/errmsg.txt:
  New warning message
sql/share/dutch/errmsg.txt:
  New warning message
sql/share/english/errmsg.txt:
  New warning message
sql/share/estonian/errmsg.txt:
  New warning message
sql/share/french/errmsg.txt:
  New warning message
sql/share/german/errmsg.txt:
  New warning message
sql/share/greek/errmsg.txt:
  New warning message
sql/share/hungarian/errmsg.txt:
  New warning message
sql/share/italian/errmsg.txt:
  New warning message
sql/share/japanese/errmsg.txt:
  New warning message
sql/share/korean/errmsg.txt:
  New warning message
sql/share/norwegian-ny/errmsg.txt:
  New warning message
sql/share/norwegian/errmsg.txt:
  New warning message
sql/share/polish/errmsg.txt:
  New warning message
sql/share/portuguese/errmsg.txt:
  New warning message
sql/share/romanian/errmsg.txt:
  New warning message
sql/share/russian/errmsg.txt:
  New warning message
sql/share/serbian/errmsg.txt:
  New warning message
sql/share/slovak/errmsg.txt:
  New warning message
sql/share/spanish/errmsg.txt:
  New warning message
sql/share/swedish/errmsg.txt:
  New warning message
  Translated a lot of error messages
sql/share/ukrainian/errmsg.txt:
  New warning message
sql/sql_class.cc:
  Added support for warnings during parsing
sql/sql_class.h:
  Added support for warnings during parsing
sql/sql_error.cc:
  Added support for warnings during parsing
sql/sql_lex.cc:
  Fixed comment
sql/sql_parse.cc:
  Added automatic conversion from CHAR(length) to BLOB when length > 255
  Added support for BLOB(length)
sql/sql_yacc.yy:
  New operators MOD and DIV
  SELECT ... FROM DUAL
  TRUE = 1 and FALSE = 0

2723dbdb

20 Nov, 2002 5 commits

Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 · 910849cc
unknown authored Nov 20, 2002

910849cc

Try to optimize the cache buffer size needed for bulk_insert · 9b9546ed

unknown authored Nov 20, 2002

Fix for shutdown on Mac OS X


include/my_tree.h:
  Try to optimize the cache buffer size needed for bulk_insert
myisam/mi_write.c:
  Try to optimize the cache buffer size needed for bulk_insert
mysql-test/r/bdb.result:
  Make test repeatable
mysql-test/t/bdb.test:
  Make test repeatable
mysys/tree.c:
  Try to optimize the cache buffer size needed for bulk_insert
sql/mysql_priv.h:
  Small optimization
sql/mysqld.cc:
  Fix for shutdown on Mac OS X
sql/sql_insert.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/sql_yacc.yy:
  Call thd->strmake() instead of sql_strmake()
sql/table.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/table.h:
  Try to optimize the cache buffer size needed for bulk_insert

9b9546ed

Added some compatibility modes (for the future) · 548e59c6

unknown authored Nov 20, 2002


libmysql/libmysql.c:
  Removed ^M from source
libmysqld/libmysqld.c:
  Added handling of protocol options (to get source to compile)
sql/lex.h:
  Added compabitlity keywords
sql/mysql_priv.h:
  Added compatibility modes
sql/mysqld.cc:
  Added compatibility modes
sql/sql_delete.cc:
  Cleaned up SAFE_UPDATES handling
sql/sql_yacc.yy:
  Added compatibility modes

548e59c6

Merge work:/home/bk/mysql-4.0 · 0c3106f9
unknown authored Nov 20, 2002
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
0c3106f9
bug in _ftb_strstr fixed :) · da6fc282
unknown authored Nov 20, 2002

da6fc282

19 Nov, 2002 16 commits

set_var.cc: · 4813f049

unknown authored Nov 19, 2002

Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them

sql/set_var.cc:
Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them

4813f049

Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 · ecc59f6a
unknown authored Nov 19, 2002
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
ecc59f6a
fixed another small bug with LIMIT ) · e96234aa
unknown authored Nov 19, 2002

e96234aa
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · 888424a1
unknown authored Nov 19, 2002
```
into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb
```
888424a1
added 'USING BTREE' for 'show create table' for HEAP · f6da2b24
unknown authored Nov 19, 2002

f6da2b24
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 · a629adc6
unknown authored Nov 19, 2002
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
a629adc6
Makng sure that LIMIT 0 works in this case to: · 97052572
unknown authored Nov 19, 2002
```
select sql_calc_found_rows * from table limit 0;
It does ...
```
97052572

ha_innobase.cc: · 9b891cee

unknown authored Nov 19, 2002

Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

sql/ha_innobase.cc:
Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

9b891cee

row0mysql.c, row0mysql.h: · 0fb06a68

unknown authored Nov 19, 2002

Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

innobase/include/row0mysql.h:
Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
innobase/row/row0mysql.c:
Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

0fb06a68

Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · cffec6dc
unknown authored Nov 19, 2002
```
into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb
```
cffec6dc
fix for byte ordering bug in HEAP rb-tree · 951669f0
unknown authored Nov 19, 2002

951669f0

row0mysql.c, row0mysql.h, ha_innodb.cc, sql_table.cc, handler.h: · d050750f

unknown authored Nov 19, 2002

Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp

sql/handler.h:
Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
sql/sql_table.cc:
Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
sql/ha_innodb.cc:
Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
innobase/include/row0mysql.h:
Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
innobase/row/row0mysql.c:
Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp

d050750f

Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · 2f639e57
unknown authored Nov 19, 2002
```
into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1
```
2f639e57
fix for BDB · 56b6433e
unknown authored Nov 19, 2002

56b6433e

merge with 3.23 · 33d678fc

unknown authored Nov 19, 2002


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-depcomp:
  Delete: depcomp
config.guess:
  Auto merged
config.sub:
  Auto merged
configure.in:
  Auto merged
dbug/Makefile.am:
  Auto merged
heap/Makefile.am:
  Auto merged
install-sh:
  Auto merged
isam/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
ltconfig:
  Auto merged
ltmain.sh:
  Auto merged
missing:
  Auto merged
myisam/Makefile.am:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
regex/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
strings/Makefile.am:
  Auto merged

33d678fc

Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 · 7bc917e9
unknown authored Nov 19, 2002

7bc917e9

18 Nov, 2002 14 commits
- Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 · 10de2720
  unknown authored Nov 18, 2002
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
  10de2720
- small revert · fb23575c
  unknown authored Nov 18, 2002
```
sql/sql_base.cc:
  one more change reverted
```
  fb23575c
- small change · 1556ea9a
  unknown authored Nov 18, 2002
```
sql/sql_class.cc:
  reverting some changes and fixig C style of Sanja ... ;o)
```
  1556ea9a
- Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 3a21e244
  unknown authored Nov 18, 2002
```
into sanja.is.com.ua:/home/bell/mysql/work-explain-4.1


sql/sql_select.cc:
  Auto merged
```
  3a21e244
- Fixed explain error handling · 2eb4a1ea
  unknown authored Nov 18, 2002
```
mysql-test/r/subselect.result:
  test of subselect explain
mysql-test/t/subselect.test:
  test of subselect explain
```
  2eb4a1ea
- fix for message being sent in EXPLAIN ... · f22010c8
  unknown authored Nov 18, 2002
```
sql/sql_base.cc:
  temporary removal ...
```
  f22010c8
- Merge vvagin@work.mysql.com:/home/bk/mysql-4.0 · 54c03ff7
  unknown authored Nov 18, 2002
```
into genie.(none):/home/vva/work/mysqldump_xml/4.0
```
  54c03ff7
- fix xml-output of mysqldump · db7357a9
  unknown authored Nov 18, 2002
```
client/mysqldump.c:
  fix xml-output
```
  db7357a9
- lot's of fixes with test cases · 8e2346e8
  unknown authored Nov 18, 2002
```
mysql-test/r/create.result:
  A test case for foreign key bug that is resolved
mysql-test/r/select_found.result:
  test case for new select ... limit 0 behaviour
mysql-test/t/create.test:
  test case for foreign key bug that is fixed
mysql-test/t/select_found.test:
  test case for new behaviour of SELECT ... LIMIT 0
sql/sql_select.cc:
  SELECT ... LIMIT 0
sql/sql_union.cc:
  replacing my dirty hack with Sanja's "proper" fix
```
  8e2346e8
- add -DHAVE_BROKEN_REALPATH to CFLAGS on FreeBSD (previous patch touched only CXXFLAGS) · 6600e656
  unknown authored Nov 18, 2002
  
  6600e656
- Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql · 8c71ab84
  unknown authored Nov 18, 2002
```
configure.in:
  Auto merged
```
  8c71ab84
- added -DHAVE_BROKEN_REALPATH for FreeBSD builds · 4cdf5497
  unknown authored Nov 18, 2002
  
  4cdf5497
- Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 · b34d11f8
  unknown authored Nov 18, 2002
  
  b34d11f8
- Small change to make key cache code cleaer · e41123b8
  unknown authored Nov 18, 2002
  
  e41123b8