Commits · ec8e9125e0df422798bdb31ef60d9970de6b0731 · nexedi / MariaDB

17 Mar, 2003 5 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ec8e9125

unknown authored Mar 17, 2003

into narttu.mysql.fi:/my/mysql-4.1


sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

ec8e9125

After merge fixes · 6a44ee4d

unknown authored Mar 17, 2003

Don't create temporary objects with no table name


myisam/mi_open.c:
  After merge fix
mysql-test/r/analyse.result:
  After merge fix
mysql-test/r/backup.result:
  After merge fix
mysql-test/r/create.result:
  After merge fix
mysql-test/r/delete.result:
  After merge fix
mysql-test/r/func_like.result:
  After merge fix
mysql-test/r/innodb.result:
  After merge fix
mysql-test/r/rpl_loaddatalocal.result:
  After merge fix
mysql-test/r/type_timestamp.result:
  After merge fix
mysql-test/t/delete.test:
  Change to not use table 't'
sql/sql_class.h:
  Remove usage of thd when creating 'Table_ident'
  Don't create temporary objects with no table name
sql/sql_derived.cc:
  Indentation fix
sql/sql_select.cc:
  After merge fix
  Fixed wrong return -> DBUG_RETURN()
sql/sql_yacc.yy:
  Remove usage of thd when creating 'Table_ident'

6a44ee4d

sql_string.cc: · b5eed2dc

unknown authored Mar 17, 2003

  Copy as is if src or dst are binary


sql/sql_string.cc:
  Copy as is if src or dst are binary

b5eed2dc

Preparing to client<->server autoconvert · 716f2c27
unknown authored Mar 17, 2003

716f2c27

sql_select.cc: · f03a28c8

unknown authored Mar 17, 2003

binary comparing alway must be used, because sort_string() is executed for textual data.

sql/sql_select.cc:
binary comparing alway must be used, because sort_string() is executed for textual data.

f03a28c8

16 Mar, 2003 9 commits

Merge with 4.0 · 4b3b8d37

unknown authored Mar 16, 2003


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-compile-netware-standard:
  Delete: netware/BUILD/compile-netware-standard
BitKeeper/deleted/.del-mwenv:
  Delete: netware/BUILD/mwenv
BitKeeper/deleted/.del-nwbootstrap:
  Delete: netware/BUILD/nwbootstrap
BitKeeper/deleted/.del-compile-AUTOTOOLS:
  Delete: netware/BUILD/compile-AUTOTOOLS
BitKeeper/deleted/.del-compile-linux-tools:
  Delete: netware/BUILD/compile-linux-tools
BitKeeper/deleted/.del-compile-netware-END:
  Delete: netware/BUILD/compile-netware-END
BitKeeper/deleted/.del-compile-netware-START:
  Delete: netware/BUILD/compile-netware-START
BitKeeper/deleted/.del-compile-netware-all:
  Delete: netware/BUILD/compile-netware-all
BitKeeper/deleted/.del-compile-netware-debug:
  Delete: netware/BUILD/compile-netware-debug
BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5:
  Auto merged
BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
  Auto merged
BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f:
  Auto merged
BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980:
  Auto merged
BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee:
  Auto merged
Docs/internals.texi:
  Auto merged
VC++Files/bdb/bdb.dsp:
  Auto merged
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
  Auto merged
VC++Files/bdb/build_win32/db_archive.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_buildall.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_checkpoint.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_deadlock.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_dll.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_dump.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_java.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_load.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_printlog.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_recover.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_stat.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_static.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_static1.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_tcl.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_test.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_upgrade.dsp:
  Auto merged
VC++Files/bdb/build_win32/db_verify.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_access.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_btrec.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_env.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_lock.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_mpool.dsp:
  Auto merged
VC++Files/bdb/build_win32/ex_tpcb.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_access.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_btrec.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_env.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_lock.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_mpool.dsp:
  Auto merged
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
  Auto merged
VC++Files/client/mysql.dsp:
  Auto merged
VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqlcheck.dsp:
  Auto merged
VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/client/mysqlclient.dsw:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/contrib/asm386/zlibvc.dsp:
  Auto merged
VC++Files/contrib/asm386/zlibvc.dsw:
  Auto merged
VC++Files/contrib/minizip/zlibvc.dsp:
  Auto merged
VC++Files/contrib/minizip/zlibvc.dsw:
  Auto merged
VC++Files/dbug/dbug.dsp:
  Auto merged
VC++Files/dbug/dbug.dsw:
  Auto merged
VC++Files/heap/heap.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/isam/isam.dsp:
  Auto merged
VC++Files/isam/isam.dsw:
  Auto merged
VC++Files/isamchk/isamchk.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsw:
  Auto merged
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/libmysqltest/myTest.dsp:
  Auto merged
VC++Files/libmysqltest/mytest.dsw:
  Auto merged
VC++Files/merge/merge.dsp:
  Auto merged
VC++Files/merge/merge.dsw:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisam/myisam.dsp:
  Auto merged
VC++Files/myisamchk/myisamchk.dsp:
  Auto merged
VC++Files/myisamlog/myisamlog.dsp:
  Auto merged
VC++Files/myisammrg/myisammrg.dsp:
  Auto merged
VC++Files/mysql.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/myisampack/myisampack.dsp:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
  Auto merged
VC++Files/mysqlmanager/MySqlManager.dsp:
  Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsw:
  Auto merged
VC++Files/mysqlserver/mysqlserver.dsp:
  Auto merged
VC++Files/mysqlshutdown/myshutdown.dsp:
  Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Auto merged
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/mysys/mysys.dsw:
  Auto merged
VC++Files/pack_isam/pack_isam.dsp:
  Auto merged
VC++Files/perror/perror.dsp:
  Auto merged
VC++Files/regex/regex.dsp:
  Auto merged
VC++Files/regex/regex.dsw:
  Auto merged
VC++Files/replace/replace.dsp:
  Auto merged
VC++Files/sql/mysqld.dsw:
  Auto merged
VC++Files/sql/mysqldmax.dsp:
  Auto merged
VC++Files/sql/old/mysqld.dsw:
  Auto merged
VC++Files/strings/MASM6x/strings.dsp:
  Auto merged
VC++Files/strings/MASM6x/strings.dsw:
  Auto merged
VC++Files/strings/backup/strings.dsp:
  Auto merged
VC++Files/strings/backup/strings.dsw:
  Auto merged
VC++Files/strings/noMASM/strings.dsp:
  Auto merged
VC++Files/strings/noMASM/strings.dsw:
  Auto merged
VC++Files/strings/strings.dsw:
  Auto merged
VC++Files/test1/test1.dsp:
  Auto merged
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Auto merged
VC++Files/thr_test/thr_test.dsp:
  Auto merged
VC++Files/vio/vio.dsp:
  Auto merged
VC++Files/zlib/zlib.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlshow.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/myisam.h:
  Auto merged
include/thr_lock.h:
  Auto merged
include/violite.h:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
libmysqld/lib_vio.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/rpl000001.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/func_like.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mf_iocache.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/repl_failsafe.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.h:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/t_ctype.h:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/grant.res:
  Auto merged
vio/viosocket.c:
  Auto merged

4b3b8d37

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 1eefda14
unknown authored Mar 16, 2003
```
into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
```
1eefda14
Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 26e849be
unknown authored Mar 16, 2003
```
into mashka.mysql.fi:/home/my/mysql-4.0
```
26e849be

Write binlog before commit when doing INSERT ... SELECT · 2640e74e

unknown authored Mar 16, 2003


mysql-test/r/create.result:
  After merge fix
sql/sql_insert.cc:
  Write binlog before commit
sql/sql_update.cc:
  Added comment

2640e74e

New function my_charset_same() · fef3bb48
unknown authored Mar 16, 2003
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
fef3bb48
system_charset_info has been moved to /sql directory · bb4d8438
unknown authored Mar 16, 2003
```
and isn't used in libraries any longer
```
bb4d8438

mysqltest.c, mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc: · 2e8c5ea0

unknown authored Mar 16, 2003

  system_charset_info was removed


client/mysql.cc:
  system_charset_info was removed
client/mysqlcheck.c:
  system_charset_info was removed
client/mysqldump.c:
  system_charset_info was removed
client/mysqlimport.c:
  system_charset_info was removed
client/mysqltest.c:
  system_charset_info was removed

2e8c5ea0

trx0roll.c: · 855b6584

unknown authored Mar 16, 2003

  Fix compiler warning in Windows about ib_longlong to ulint conversion


innobase/trx/trx0roll.c:
  Fix compiler warning in Windows about ib_longlong to ulint conversion

855b6584

set_default_charset() is not used anymore · 1b334d9d

unknown authored Mar 16, 2003

Some system_charset_info were removed


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1b334d9d

15 Mar, 2003 12 commits

row0sel.c: · c1733bc3

unknown authored Mar 15, 2003

  Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal


innobase/row/row0sel.c:
  Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal

c1733bc3

- fixed C++-style comments to make IBM C compiler happy · 6ddbaa1d
unknown authored Mar 15, 2003
```
client/mysqlshow.c:
   - fixed C++-style comment to make IBM C compiler happy
```
6ddbaa1d
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · cad14ab6
unknown authored Mar 15, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
cad14ab6

sql_parse.cc, sql_db.cc: · a410f67b

unknown authored Mar 15, 2003

  less system_charset_info


sql/sql_db.cc:
  less system_charset_info
sql/sql_parse.cc:
  less system_charset_info

a410f67b

Merge · ed4400e6

unknown authored Mar 15, 2003


sql/item_subselect.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

ed4400e6

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 21d627fc
unknown authored Mar 15, 2003
```
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
```
21d627fc

sql_lex.cc: · a9861a9b

unknown authored Mar 15, 2003

  Use LEX charset instead of system one


sql/sql_lex.cc:
  Use LEX charset instead of system one

a9861a9b

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 7c0261e7
unknown authored Mar 15, 2003
```
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
```
7c0261e7
fixed typo (double ++ in assert) · f470e3a4
unknown authored Mar 15, 2003
```
removed all side effects from asserts for not to confuse casual reader
```
f470e3a4

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 538a4901

unknown authored Mar 15, 2003

into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged

538a4901

merge with 3.23 to get: · 1ce34eaf

unknown authored Mar 15, 2003

- Fix for empty table/column names


mysql-test/t/create.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.pl:
  Auto merged
sql/filesort.cc:
  merge with 3.23
sql/sql_table.cc:
  merge with 3.23
tests/grant.res:
  merge with 3.23

1ce34eaf

Code cleanup · 1138f84a
unknown authored Mar 15, 2003
```
sql/sql_parse.cc:
  Removed not needed test
```
1138f84a

14 Mar, 2003 14 commits

Code cleanup · 4885e9a1
unknown authored Mar 14, 2003

4885e9a1

Merge bk-internal:/home/bk/mysql-4.1/ · 6baa3511

unknown authored Mar 14, 2003

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged

6baa3511

cleanup · 0399daf0
unknown authored Mar 14, 2003

0399daf0
Merge build:/home/bk/mysql-4.0 · c00ea45c
unknown authored Mar 14, 2003
```
into mysql.com:/Users/mysqldev/my/mysql-4.0
```
c00ea45c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c9a5a174
unknown authored Mar 14, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
c9a5a174

Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format · bc5696e3

unknown authored Mar 14, 2003

(normal protocol only, prepared protocol already handles it)


sql/protocol.cc:
  Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format

bc5696e3

Merge bk-internal.mysql.com:/home/bk/mysql-3.23 · 184c5053
unknown authored Mar 14, 2003
```
into mashka.mysql.fi:/home/my/mysql-3.23
```
184c5053

Check for empty table/column names · d5eae063

unknown authored Mar 14, 2003


mysql-test/t/create.test:
  Test for empty table/column name
tests/grant.pl:
  More tests
tests/grant.res:
  More tests

d5eae063

Small fixes in mysql_tableinfo. It's only code tiny changes, does not modify · 81339e7f

unknown authored Mar 14, 2003

the output of the script.


scripts/mysql_tableinfo.sh:
  Small fixes in this program which I contributed some time ago. These fixes
  are waiting in Monty's mailbox since August, and there are tiny :
  * use array{'x'} instead of array{x}
  * use fetchrow_arrayref instead of fetchrow_array
  * try to hide the command-line options from 'ps' like mysqlhotcopy does
  * use 'map' instead of homegrown function
  * use $_ instead of $i when possible

81339e7f

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 46fff218
unknown authored Mar 14, 2003
```
into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
```
46fff218
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 26ea2625
unknown authored Mar 14, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/sql_lex.h:
  Auto merged
```
26ea2625
Every charset now have its own parser state arrays · e900b23f
unknown authored Mar 14, 2003

e900b23f
- we need to require an installation on the root volume (/usr/local/mysql) · 51bcfcb2
unknown authored Mar 14, 2003

51bcfcb2

fixed uncachable union (bug #150) · 38c3ca15

unknown authored Mar 14, 2003


mysql-test/r/union.result:
  sect of uncachable union
mysql-test/t/union.test:
  sect of uncachable union
sql/sql_lex.h:
  fixed uncachable union

38c3ca15