Commits · e3dee590c1d97710c629556b43826478d01b7850 · nexedi / MariaDB

15 Sep, 2001 6 commits

flush bulk-insert tree on dup key · e3dee590
unknown authored Sep 15, 2001

e3dee590

Merge work:/home/bk/mysql-4.0 · e0e42a79

unknown authored Sep 15, 2001

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


Docs/manual.texi:
  Auto merged

e0e42a79

manual.texi outdated line removed · b0528fc4
unknown authored Sep 15, 2001
```
Docs/manual.texi:
  outdated line removed
```
b0528fc4

manual.texi: · c1caa081

unknown authored Sep 15, 2001

  Add a mirror in Philippines
philippines.txt, philippines.gif, philippines.eps:
  new file


Docs/manual.texi:
  Add a mirror in Philippines

c1caa081

Added my_global.h · ef2e7508
unknown authored Sep 15, 2001
```
BitKeeper/etc/ignore:
  R
```
ef2e7508

Cleanups · 9f6d3894

unknown authored Sep 15, 2001


BitKeeper/etc/ignore:
  added vio/test-ssl
Docs/manual.texi:
  Cleanup
isam/isamchk.c:
  Cleanup
myisam/mi_check.c:
  Cleanup
myisam/myisamchk.c:
  Cleanup
myisam/myisamdef.h:
  Cleanup
sql/log_event.cc:
  Cleanup
sql/mysqld.cc:
  Cleanup

9f6d3894

14 Sep, 2001 9 commits

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · 6612decf
unknown authored Sep 14, 2001
```
Docs/manual.texi:
  Auto merged
```
6612decf

Fixed bug in UNION · af19fa46

unknown authored Sep 14, 2001

Fixed replication bug in load_master_data


BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Delete: include/global.h
Docs/manual.texi:
  Cleaned up "Things to do in 4.0"
mysql-test/r/union.result:
  New test
mysql-test/t/union.test:
  New test
mysys/my_lib.c:
  Cleanup
sql/mysql_priv.h:
  Fixed replication bug load_master_data
sql/sql_base.cc:
  Fixed bug in UNION
sql/sql_db.cc:
  Fixed replication bug load_master_data
sql/sql_parse.cc:
  Fixed replication bug load_master_data
sql/sql_repl.cc:
  Fixed replication bug load_master_data
sql/sql_union.cc:
  Fixed bug in UNION
tools/mysqlmanager.c:
  Portability fix

af19fa46

Merge work.mysql.com:/home/bk/mysql · 687a1b06
unknown authored Sep 14, 2001
```
into work.mysql.com:/home/bk/mysql-4.0


configure.in:
  Auto merged
```
687a1b06

Merge work.mysql.com:/home/bk/mysql · 09f1278c

unknown authored Sep 14, 2001

into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged

09f1278c

Added ukrainian error messages · c97fb8f3
unknown authored Sep 14, 2001

c97fb8f3

Fixed problem with "record not found" in BDB tables. · bd98eb61

unknown authored Sep 14, 2001


Docs/manual.texi:
  Fixed wrong reference to --with-thread-safe-client
mysql-test/r/bdb.result:
  New tests
mysql-test/t/bdb.test:
  New tests

bd98eb61

belgium.txt: · 37604010

unknown authored Sep 14, 2001

  new file
belgium.eps:
  Fix EPS flag image


Docs/Flags/belgium.eps:
  Fix EPS flag image

37604010

Merge tfr@work.mysql.com:/home/bk/mysql-4.0 · 4b73603a
unknown authored Sep 14, 2001
```
into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0
```
4b73603a
belgium.eps, belgium.gif: · daa673af
unknown authored Sep 14, 2001
```
  new file
```
daa673af

13 Sep, 2001 11 commits

merge · cca50665
unknown authored Sep 14, 2001
```
Docs/manual.texi:
  Auto merged
```
cca50665

Changed to use my_global.h · 16115af9

unknown authored Sep 14, 2001

Fixed problem with LIKE with latin1_de
Added parsing support of UNSIGNED LONG LONG


Docs/manual.texi:
  Changelog
client/client_priv.h:
  Changed to use my_global.h
client/completion_hash.cc:
  Changed to use my_global.h
client/errmsg.c:
  Changed to use my_global.h
client/get_password.c:
  Changed to use my_global.h
client/mysqldump.c:
  Changed to use my_global.h
client/mysqlshow.c:
  Changed to use my_global.h
client/mysqltest.c:
  Changed to use my_global.h
client/password.c:
  Changed to use my_global.h
client/readline.cc:
  Changed to use my_global.h
client/sql_string.cc:
  Changed to use my_global.h
client/thimble.cc:
  Changed to use my_global.h
client/thread_test.c:
  Changed to use my_global.h
dbug/dbug.c:
  Changed to use my_global.h
dbug/dbug_analyze.c:
  Changed to use my_global.h
dbug/example1.c:
  Changed to use my_global.h
dbug/example2.c:
  Changed to use my_global.h
dbug/example3.c:
  Changed to use my_global.h
dbug/factorial.c:
  Changed to use my_global.h
dbug/main.c:
  Changed to use my_global.h
dbug/sanity.c:
  Changed to use my_global.h
extra/comp_err.c:
  Changed to use my_global.h
extra/my_print_defaults.c:
  Changed to use my_global.h
extra/perror.c:
  Changed to use my_global.h
extra/replace.c:
  Changed to use my_global.h
extra/resolve_stack_dump.c:
  Changed to use my_global.h
extra/resolveip.c:
  Changed to use my_global.h
fs/libmysqlfs.h:
  Changed to use my_global.h
fs/mysqlcorbafs.h:
  Changed to use my_global.h
heap/hp_test1.c:
  Changed to use my_global.h
include/Makefile.am:
  Changed to use my_global.h
include/m_ctype.h:
  Changed to use my_global.h
include/my_base.h:
  Changed to use my_global.h
innobase/include/univ.i:
  Changed to use my_global.h
libmysql/dll.c:
  Changed to use my_global.h
libmysql/errmsg.c:
  Changed to use my_global.h
libmysql/get_password.c:
  Changed to use my_global.h
libmysql/libmysql.c:
  Changed to use my_global.h
libmysql/net.c:
  Changed to use my_global.h
libmysql/password.c:
  Changed to use my_global.h
libmysqld/lib_sql.cc:
  Changed to use my_global.h
libmysqld/lib_vio.c:
  Changed to use my_global.h
libmysqld/libmysqld.c:
  Changed to use my_global.h
mysql-test/mysql-test-run.sh:
  Changed to use latin1 as default character set
mysql-test/r/ctype_latin1_de.result:
  Changed to use my_global.h
mysql-test/r/func_like.result:
  New test
mysql-test/t/ctype_latin1_de.test:
  Added test of part keys
mysql-test/t/func_like.test:
  New test
mysys/checksum.c:
  Changed to use my_global.h
mysys/getopt.c:
  Changed to use my_global.h
mysys/getopt1.c:
  Changed to use my_global.h
mysys/make-conf.c:
  Changed to use my_global.h
mysys/my_alloc.c:
  Changed to use my_global.h
mysys/my_clock.c:
  Changed to use my_global.h
mysys/my_compress.c:
  Changed to use my_global.h
mysys/mysys_priv.h:
  Changed to use my_global.h
mysys/test_charset.c:
  Changed to use my_global.h
mysys/testhash.c:
  Changed to use my_global.h
mysys/thr_alarm.c:
  Changed to use my_global.h
mysys/thr_mutex.c:
  Changed to use my_global.h
regex/debug.c:
  Changed to use my_global.h
regex/main.c:
  Changed to use my_global.h
regex/regcomp.c:
  Changed to use my_global.h
regex/regerror.c:
  Changed to use my_global.h
regex/regexec.c:
  Changed to use my_global.h
regex/regexp.c:
  Changed to use my_global.h
regex/regfree.c:
  Changed to use my_global.h
regex/reginit.c:
  Changed to use my_global.h
sql/cache_manager.cc:
  Changed to use my_global.h
sql/gen_lex_hash.cc:
  Changed to use my_global.h
sql/ha_berkeley.cc:
  Fixed problem with UNIQUE keys that could contain NULL
sql/ha_gemini.h:
  Changed to use my_global.h
sql/handler.cc:
  Fixed problem after merge
sql/item.cc:
  Added Item_unit
sql/item.h:
  Added Item_uint
sql/matherr.c:
  Changed to use my_global.h
sql/md5.c:
  Changed to use my_global.h
sql/mini_client.cc:
  Changed to use my_global.h
sql/my_lock.c:
  Changed to use my_global.h
sql/mysql_priv.h:
  Changed to use my_global.h
sql/net_serv.cc:
  Changed to use my_global.h
sql/password.c:
  Changed to use my_global.h
sql/sql_lex.cc:
  Added parsing support of UNSIGNED LONG LONG
sql/sql_show.cc:
  Changed to use my_global.h
sql/sql_string.cc:
  Changed to use my_global.h
sql/sql_yacc.yy:
  Added usage of Int_uint
sql/stacktrace.c:
  Changed to use my_global.h
sql/udf_example.cc:
  Changed to use my_global.h
strings/atof.c:
  Changed to use my_global.h
strings/bchange.c:
  Changed to use my_global.h
strings/bcmp.c:
  Changed to use my_global.h
strings/bfill.c:
  Changed to use my_global.h
strings/bmove.c:
  Changed to use my_global.h
strings/bmove512.c:
  Changed to use my_global.h
strings/bmove_upp.c:
  Changed to use my_global.h
strings/ctype-big5.c:
  Changed to use my_global.h
strings/ctype-czech.c:
  Changed to use my_global.h
strings/ctype-euc_kr.c:
  Changed to use my_global.h
strings/ctype-gb2312.c:
  Changed to use my_global.h
strings/ctype-gbk.c:
  Changed to use my_global.h
strings/ctype-latin1_de.c:
  Fixed problem with LIKE
strings/ctype-sjis.c:
  Changed to use my_global.h
strings/ctype-tis620.c:
  Changed to use my_global.h
strings/ctype-ujis.c:
  Changed to use my_global.h
strings/ctype.c:
  Changed to use my_global.h
strings/do_ctype.c:
  Changed to use my_global.h
strings/int2str.c:
  Changed to use my_global.h
strings/is_prefix.c:
  Changed to use my_global.h
strings/llstr.c:
  Changed to use my_global.h
strings/longlong2str.c:
  Changed to use my_global.h
strings/r_strinstr.c:
  Changed to use my_global.h
strings/str2int.c:
  Changed to use my_global.h
strings/str_test.c:
  Changed to use my_global.h
strings/strappend.c:
  Changed to use my_global.h
strings/strcend.c:
  Changed to use my_global.h
strings/strcont.c:
  Changed to use my_global.h
strings/strend.c:
  Changed to use my_global.h
strings/strfill.c:
  Changed to use my_global.h
strings/strings-not-used.h:
  Changed to use my_global.h
strings/strinstr.c:
  Changed to use my_global.h
strings/strmake.c:
  Changed to use my_global.h
strings/strmov.c:
  Changed to use my_global.h
strings/strnlen.c:
  Changed to use my_global.h
strings/strnmov.c:
  Changed to use my_global.h
strings/strstr.c:
  Changed to use my_global.h
strings/strto.c:
  Changed to use my_global.h
strings/strtol.c:
  Changed to use my_global.h
strings/strtoll.c:
  Changed to use my_global.h
strings/strtoul.c:
  Changed to use my_global.h
strings/strtoull.c:
  Changed to use my_global.h
strings/strxmov.c:
  Changed to use my_global.h
strings/strxnmov.c:
  Changed to use my_global.h
strings/udiv.c:
  Changed to use my_global.h
tools/mysqlmanager.c:
  Changed to use my_global.h
vio/test-ssl.c:
  Changed to use my_global.h
vio/test-sslclient.c:
  Changed to use my_global.h
vio/test-sslserver.c:
  Changed to use my_global.h
vio/test-ssl:
  Changed to use my_global.h
vio/vio.c:
  Changed to use my_global.h
vio/viosocket.c:
  Changed to use my_global.h
vio/viossl.c:
  Changed to use my_global.h
vio/viosslfactories.c:
  Changed to use my_global.h
vio/viotest-ssl.c:
  Changed to use my_global.h

16115af9

Merge paul@work.mysql.com:/home/bk/mysql-4.0 · 87000f6e
unknown authored Sep 13, 2001
```
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
```
87000f6e
manual.texi fix incorrect example (no function named INDEX) · d58666b2
unknown authored Sep 13, 2001
```
Docs/manual.texi:
  fix incorrect example (no function named INDEX)
```
d58666b2

Merge work:/home/bk/mysql-4.0 · 623a6e55

unknown authored Sep 13, 2001

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

623a6e55

re-wrote section about foreign keys · 88c767fc

unknown authored Sep 13, 2001


Docs/manual.texi:
  re-wrote secion about foreign keys
vio/test-ssl:
  no change

88c767fc

Merge · 57abbee2
unknown authored Sep 13, 2001
```
Docs/manual.texi:
  Merge gone bad
```
57abbee2

manual.texi: · c4665741

unknown authored Sep 13, 2001

  Add a mirror in Belgium


Docs/manual.texi:
  Add a mirror in Belgium

c4665741

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · f9963095
unknown authored Sep 13, 2001
```
Docs/manual.texi:
  Auto merged
```
f9963095

Fixed sorting of é in latin_de · 4a04ce56

unknown authored Sep 13, 2001


Docs/manual.texi:
  Updated German sorting info
strings/ctype-latin1_de.c:
  Fixed sorting of é

4a04ce56

Merge with 3.23.42 · c96bf55b

unknown authored Sep 13, 2001


configure.in:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
heap/hp_test2.c:
  Auto merged
include/global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/net.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
Docs/manual.texi:
  merge
myisam/myisampack.c:
  merge

c96bf55b

12 Sep, 2001 4 commits

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · c88dd9b2
unknown authored Sep 12, 2001

c88dd9b2

OS2 patch · 76989cf5

unknown authored Sep 12, 2001


Docs/manual.texi:
  Updated section of how to change the socket file.
  Changelog for 3.23.43
include/merge.h:
  Fixed typo
include/my_pthread.h:
  Fixed bug for WIN32
include/myisam.h:
  Fixed typo
include/nisam.h:
  Fixed typo
sql/handler.h:
  Fixed typo
sql/sql_table.cc:
  Fixed typo
sql/unireg.cc:
  F

76989cf5

Merge work:/home/bk/mysql-4.0 · 9e4206b9
unknown authored Sep 11, 2001
```
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
```
9e4206b9
more work on mysqlmanager · 301cd963
unknown authored Sep 11, 2001

301cd963

11 Sep, 2001 1 commit
- First drop merge table, then other tables · a53e8ea0
  unknown authored Sep 12, 2001
```
Docs/manual.texi:
  Updated information about mysql_insert_id()
```
  a53e8ea0
10 Sep, 2001 4 commits

Merge work:/home/bk/mysql · 93a15f45
unknown authored Sep 10, 2001
```
into mysql.sashanet.com:/home/sasha/src/bk/mysql
```
93a15f45
fixed IDENTITY crisis · 8cfd4949
unknown authored Sep 10, 2001

8cfd4949

Fixes for German sorting order. · 34925f8d

unknown authored Sep 11, 2001


Docs/manual.texi:
  Update for German sorting
configure.in:
  Don't make the German sort order default
myisam/mi_delete_all.c:
  Truncate files on DELETE FROM table_name to not get warnings when checking files
myisam/mi_search.c:
  Fix for multi-byte character sets.
sql/item_cmpfunc.cc:
  Use current character set when using STRCMP()
strings/ctype-latin1_de.c:
  F

34925f8d

handler.cc If CREATE TABLE fails for an InnoDB table, do not put the OS error... · 341504b3

unknown authored Sep 10, 2001

handler.cc If CREATE TABLE fails for an InnoDB table, do not put the OS error number to the error message, because it is not the cause

sql/handler.cc:
If CREATE TABLE fails for an InnoDB table, do not put the OS error number to the error message, because it is not the cause

341504b3

09 Sep, 2001 2 commits

ha_innobase.cc mean_rec_length was set to a too small value for > 4 GB tables... · 1c404ff9

unknown authored Sep 09, 2001

ha_innobase.cc mean_rec_length was set to a too small value for > 4 GB tables because of a wrong typecast

sql/ha_innobase.cc:
mean_rec_length was set to a too small value for > 4 GB tables because of a wrong typecast

1c404ff9

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · 354882c8
unknown authored Sep 09, 2001
```
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
```
354882c8

08 Sep, 2001 3 commits

Some cleanups to replication section · a2784112
unknown authored Sep 08, 2001

a2784112

Fix bugs when using LOCK TABLES with BDB tables · 851bea0e

unknown authored Sep 08, 2001

Optimized remove of key when using internal cursor in BDB tables.


mysql-test/r/bdb.result:
  Test for LOCK bug
mysql-test/t/bdb.test:
  Test for LOCK bug
sql/ha_berkeley.cc:
  Fix bugs when using LOCK TABLES
  Optimized remove of key when using internal cursor
sql/ha_berkeley.h:
  Initilize of changed_rows
sql/lock.cc:
  Fix for BDB tables

851bea0e

More debug info · 8e9c21de

unknown authored Sep 08, 2001

Fix DBUG_ASSERT()
Optimization for BDB tables
Fix for BDB under Win98


Docs/manual.texi:
  Removed wrong info
bdb/os_win32/os_rename.c:
  Fix for windows 98
configure.in:
  Better options for MAC OS X
include/dbug.h:
  Fix DBUG_ASSERT()
mysys/thr_lock.c:
  More DBUG messages
sql/ha_berkeley.cc:
  Use cursor in remove_key
sql/lock.cc:
  Fix possible problem when pre-unlocking tables in SELECT
sql/sql_select.cc:
  More DBUG messages
sql/violite.c:
  Fix DBUG messages

8e9c21de