Commits · b331fe928c38666a7119aa62f7a8e3acbb4e330a · nexedi / MariaDB

02 Mar, 2003 3 commits

ChangeSet 1.1625 was faulty as regards sql/mf_iocache.cc and LOAD DATA LOCAL replication tests · b331fe92

unknown authored Mar 02, 2003


mysql-test/r/rpl_loaddatalocal.result:
  ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)
mysql-test/t/rpl_loaddatalocal.test:
  ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)
sql/mf_iocache.cc:
  ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)

b331fe92

Merge work:/home/bk/mysql-4.0 · a2cc8218
unknown authored Mar 02, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
a2cc8218
fix auto-increment in sub-key and insert ... select · 6a933b2e
unknown authored Mar 02, 2003

6a933b2e

01 Mar, 2003 2 commits

Replication: simplification of init_relay_log_pos: always initialize, · 14ea63cd

unknown authored Mar 02, 2003

remove variable rli->log_pos_current.


sql/slave.cc:
  Simplification of init_relay_log_pos : always initialize,
  remove variable rli->log_pos_current.
sql/slave.h:
  Simplification of init_relay_log_pos : always initialize,
  remove variable rli->log_pos_current.

14ea63cd

When the SQL thread cannot read an event from the relay log · f29fb98d

unknown authored Mar 02, 2003

("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.


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

f29fb98d

28 Feb, 2003 9 commits

Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 · 4c0f2f45
unknown authored Feb 28, 2003

4c0f2f45

LOAD DATA INFILE is not replicated if replicate_*_table is set · b276b60e

unknown authored Feb 28, 2003

LOAD DATA LOCAL INFILE was not replicated correctly


VC++Files/bdb/bdb.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_archive.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_buildall.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_checkpoint.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_deadlock.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_dll.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_dump.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_java.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_load.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_printlog.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_recover.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_stat.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_static.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_static1.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_tcl.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_test.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_upgrade.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/db_verify.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_access.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_btrec.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_env.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_lock.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_mpool.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/ex_tpcb.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_access.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_btrec.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_env.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_lock.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_mpool.dsp:
  Updated VC++ files +end space removed
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysql.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqladmin.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqlcheck.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqlclient.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqlclient.dsw:
  Updated VC++ files +end space removed
VC++Files/client/mysqldump.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqlimport.dsp:
  Updated VC++ files +end space removed
VC++Files/client/mysqlshow.dsp:
  Updated VC++ files +end space removed
VC++Files/comp_err/comp_err.dsp:
  Updated VC++ files +end space removed
VC++Files/contrib/asm386/zlibvc.dsp:
  Updated VC++ files +end space removed
VC++Files/contrib/asm386/zlibvc.dsw:
  Updated VC++ files +end space removed
VC++Files/contrib/minizip/zlibvc.dsp:
  Updated VC++ files +end space removed
VC++Files/contrib/minizip/zlibvc.dsw:
  Updated VC++ files +end space removed
VC++Files/dbug/dbug.dsp:
  Updated VC++ files +end space removed
VC++Files/dbug/dbug.dsw:
  Updated VC++ files +end space removed
VC++Files/heap/heap.dsp:
  Updated VC++ files +end space removed
VC++Files/innobase/innobase.dsp:
  Updated VC++ files +end space removed
VC++Files/isam/isam.dsp:
  Updated VC++ files +end space removed
VC++Files/isam/isam.dsw:
  Updated VC++ files +end space removed
VC++Files/isamchk/isamchk.dsp:
  Updated VC++ files +end space removed
VC++Files/libmysql/libmysql.dsp:
  Updated VC++ files +end space removed
VC++Files/libmysql/libmysql.dsw:
  Updated VC++ files +end space removed
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Updated VC++ files +end space removed
VC++Files/libmysqld/libmysqld.dsp:
  Updated VC++ files +end space removed
VC++Files/libmysqltest/myTest.dsp:
  Updated VC++ files +end space removed
VC++Files/libmysqltest/mytest.dsw:
  Updated VC++ files +end space removed
VC++Files/merge/merge.dsp:
  Updated VC++ files +end space removed
VC++Files/merge/merge.dsw:
  Updated VC++ files +end space removed
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Updated VC++ files +end space removed
VC++Files/myisam/myisam.dsp:
  Updated VC++ files +end space removed
VC++Files/myisamchk/myisamchk.dsp:
  Updated VC++ files +end space removed
VC++Files/myisamlog/myisamlog.dsp:
  Updated VC++ files +end space removed
VC++Files/myisammrg/myisammrg.dsp:
  Updated VC++ files +end space removed
VC++Files/myisampack/myisampack.dsp:
  Updated VC++ files +end space removed
VC++Files/mysql.dsp:
  Updated VC++ files +end space removed
VC++Files/mysql.dsw:
  Updated VC++ files +end space removed
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqldemb/mysqldemb.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlmanager/MySqlManager.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlmanager/mysqlmanager.dsw:
  Updated VC++ files +end space removed
VC++Files/mysqlserver/mysqlserver.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlshutdown/myshutdown.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Updated VC++ files +end space removed
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Updated VC++ files +end space removed
VC++Files/mysys/mysys.dsp:
  Updated VC++ files +end space removed
VC++Files/mysys/mysys.dsw:
  Updated VC++ files +end space removed
VC++Files/pack_isam/pack_isam.dsp:
  Updated VC++ files +end space removed
VC++Files/perror/perror.dsp:
  Updated VC++ files +end space removed
VC++Files/regex/regex.dsp:
  Updated VC++ files +end space removed
VC++Files/regex/regex.dsw:
  Updated VC++ files +end space removed
VC++Files/replace/replace.dsp:
  Updated VC++ files +end space removed
VC++Files/sql/mysqld.dsp:
  Updated VC++ files +end space removed
VC++Files/sql/mysqld.dsw:
  Updated VC++ files +end space removed
VC++Files/sql/mysqldmax.dsp:
  Updated VC++ files +end space removed
VC++Files/sql/old/mysqld.dsw:
  Updated VC++ files +end space removed
VC++Files/strings/MASM6x/strings.dsp:
  Updated VC++ files +end space removed
VC++Files/strings/MASM6x/strings.dsw:
  Updated VC++ files +end space removed
VC++Files/strings/backup/strings.dsp:
  Updated VC++ files +end space removed
VC++Files/strings/backup/strings.dsw:
  Updated VC++ files +end space removed
VC++Files/strings/noMASM/strings.dsp:
  Updated VC++ files +end space removed
VC++Files/strings/noMASM/strings.dsw:
  Updated VC++ files +end space removed
VC++Files/strings/strings.dsp:
  Updated VC++ files +end space removed
VC++Files/strings/strings.dsw:
  Updated VC++ files +end space removed
VC++Files/test1/test1.dsp:
  Updated VC++ files +end space removed
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Updated VC++ files +end space removed
VC++Files/thr_test/thr_test.dsp:
  Updated VC++ files +end space removed
VC++Files/vio/vio.dsp:
  Updated VC++ files +end space removed
VC++Files/zlib/zlib.dsp:
  Updated VC++ files +end space removed
include/my_global.h:
  Always include errno.h
sql/log_event.cc:
  LOAD DATA INFILE is not replicated if replicate_*_table is set
sql/mf_iocache.cc:
  LOAD DATA LOCAL INFILE was not replicated correctly

b276b60e

used correct function (SCRUM) · c56f268f
unknown authored Feb 28, 2003
```
sql/sql_show.cc:
  used correct function
```
c56f268f
merge (use local version) · 94d8decf
unknown authored Feb 28, 2003
```
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
```
94d8decf

Always include errno.h · 391bc11a

unknown authored Feb 28, 2003


include/global.h:
  Portability fix
  (Using errno before including errno.h can give big problems on Linux)

391bc11a

LOAD DATA INFILE is not replicated by slave if replicate_*_table is set · 40fbd0fc
unknown authored Feb 28, 2003

40fbd0fc
- Changed version number from "4.0.12-gamma" to "4.0.12" (confirmed by · b94e413f
unknown authored Feb 28, 2003
```
   Monty)
```
b94e413f
Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 · 654878ac
unknown authored Feb 28, 2003
```
mysql-test/Makefile.am:
  Auto merged
```
654878ac
Added copying of *.slave-mi mysql-test files · 41e10e72
unknown authored Feb 28, 2003

41e10e72

27 Feb, 2003 6 commits

postmerging fix (SCRUM) · 828d7c6e

unknown authored Feb 27, 2003


include/violite.h:
  postmerging fix
libmysqld/lib_vio.c:
  postmerging fix

828d7c6e

posreview changing (SCRUM) · b01f20db

unknown authored Feb 27, 2003

increased compatibility
postmerge changing


sql/sql_class.h:
  increased compatibility
sql/sql_show.cc:
  postmerge changing
vio/viosocket.c:
  increased compatibility

b01f20db

merging · e807bcf0
unknown authored Feb 27, 2003
```
sql/sql_parse.cc:
  Auto merged
```
e807bcf0

Added detection if pthread_attr_getstacksize() exists · e6dad704

unknown authored Feb 27, 2003

Fixed bug in RAND() usage in mysqlbinlog


configure.in:
  Added detection if pthread_attr_getstacksize() exists
include/thr_lock.h:
  Fixed wrong comment
sql/log_event.cc:
  Fixed bug in RAND() usage in mysqlbinlog
sql/mysqld.cc:
  Portablity fix
sql/repl_failsafe.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/slave.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_class.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_insert.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_show.cc:
  Set host_or_ip for system threads (to make other code simpler)

e6dad704

Add missing SIGNAL_WITH_VIO_CLOSE to fix problem with SLAVE STOP on windows · be9a61f1
unknown authored Feb 27, 2003

be9a61f1

Integer values between 9223372036854775807 and 9999999999999999999 are now · 3f9ea802

unknown authored Feb 27, 2003

regarded as unsigned longlongss, not as floats. This make these values work
similar to values between 10000000000000000000 and 18446744073709551615.


mysql-test/r/bigint.result:
  Fixed results for bigints
mysql-test/t/bigint.test:
  Fixed results for bigints
sql/item.h:
  Mark unsigned big ints as unsigned
sql/sql_lex.cc:
  Returns numbers between 9223372036854775807 and 9999999999999999999 as unsigned 64 bit numbers

3f9ea802

26 Feb, 2003 9 commits
- Code cleanup · 66afa065
  unknown authored Feb 27, 2003
  
  66afa065
- Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 · f407dbd2
  unknown authored Feb 26, 2003
  
  f407dbd2
- Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 · 8c3efbc3
  unknown authored Feb 26, 2003
```
sql/sql_show.cc:
  Auto merged
```
  8c3efbc3
- ha_innodb.cc: · bdc655d9
  unknown authored Feb 26, 2003
```
  Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table


sql/ha_innodb.cc:
  Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table
```
  bdc655d9
- ha_innodb.cc: · 7edb0687
  unknown authored Feb 26, 2003
```
  Add docs to store_lock()


sql/ha_innodb.cc:
  Add docs to store_lock()
```
  7edb0687
- Merge sinisa@work.mysql.com://home/bk/mysql-4.0 · c976968d
  unknown authored Feb 26, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
```
  c976968d
- A fix for a crashing bug with unspecified database in this type of · 8300158d
  unknown authored Feb 26, 2003
```
command:

load  data infile 'filename' into table db.table;
```
  8300158d
- Fix for SHOW TABLE STATUS with empty .frm file · 23a850e5
  unknown authored Feb 26, 2003
  
  23a850e5
- Comment column in SHOW TABLE STATUS now reports that it can · 85d6d3d8
  unknown authored Feb 26, 2003
```
contain NULL values (which is the case for a crashed .frm file).
```
  85d6d3d8
25 Feb, 2003 11 commits

Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 · bebafeba
unknown authored Feb 26, 2003

bebafeba

merge with 3.23 to get corrected error message files and rename of files in mysql-test · b9c69c16

unknown authored Feb 26, 2003


innobase/ibuf/ibuf0ibuf.c:
  Auto merged
sql/share/english/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-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_analyse.h:
  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/ukrainian/errmsg.txt:
  Auto merged
mysql-test/t/rpl000015.slave-mi:
  Auto merged
mysql-test/t/rpl_rotate_logs.slave-mi:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge with 3.23
scripts/make_binary_distribution.sh:
  merge with 3.23
sql/share/czech/errmsg.txt:
  merge with 3.23
sql/share/danish/errmsg.txt:
  merge with 3.23
sql/share/dutch/errmsg.txt:
  merge with 3.23
sql/share/estonian/errmsg.txt:
  merge with 3.23
sql/share/swedish/errmsg.txt:
  merge with 3.23
sql/sql_class.cc:
  merge with 3.23 (Keep local copy)

b9c69c16

Safety fix (caused a core dump on slave during shutdown when shutting down replication on some OS) · 6e2ee187

unknown authored Feb 26, 2003


mysql-test/t/rpl_rotate_logs-slave-master-info.opt:
  Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/t/rpl_rotate_logs-slave-master-info.opt
mysql-test/t/rpl000015-slave-master-info.opt:
  Rename: mysql-test/t/rpl000015.slave-mi -> mysql-test/t/rpl000015-slave-master-info.opt
mysql-test/r/bigint.result:
  New bigint test
mysql-test/t/bigint.test:
  New bigint test
netware/mysql_test_run.c:
  slave-master-info.opt -> .slave-mi

6e2ee187

change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS · 21f2382b

unknown authored Feb 26, 2003

mysql-test/t/rpl_rotate_logs.slave-mi:
Rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi
mysql-test/t/rpl000015.slave-mi:
Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi

21f2382b

Merge work:/home/bk/mysql-4.0 · e0ba590f
unknown authored Feb 25, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
e0ba590f
fixed again · 49ecdaec
unknown authored Feb 25, 2003

49ecdaec
Portability fix · 0a1af051
unknown authored Feb 25, 2003

0a1af051
Merge work:/home/bk/mysql-4.0 · 01664260
unknown authored Feb 25, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
01664260

Ignore some automaticly generated files · 01e32fd0

unknown authored Feb 25, 2003


BitKeeper/etc/ignore:
  added support-files/MacOSX/StartupParameters.plist support-files/MacOSX/postinstall support-files/MacOSX/preinstall

01e32fd0

Portability fix for HPUX10.20 · a54c17ce

unknown authored Feb 25, 2003


BUILD/compile-pentium-debug-max:
  Added -DBIG_TABLES
sql/mysqld.cc:
  Simple code cleanup

a54c17ce

Merge work:/home/bk/mysql-4.0 · 1f4fed8a
unknown authored Feb 25, 2003
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
1f4fed8a