mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7554 commits 2790 branches 343 tags 1.7 GiB
Commit graph

7554 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
bf53c87049 Fix for BUG#3017 
"wrong Relay_Log_Pos if Rotate is in the middle of a transaction in relay log"
increment 'pending' instead of 'relay_log_pos'.


mysql-test/r/rpl_trunc_binlog.result:
  result update
sql/log_event.cc:
  - corrected error message
  - in Rotate_log_event::exec_event(), if we're in a transaction (which
  can happen if the I/O slave thread reconnected while reading a
  transaction), don't increment relay_log_pos but pending instead.
  Otherwise, relay_log_pos becomes garbage (and so if slave stops at that
  moment, it will never restart).
 2004-03-01 00:46:31 +01:00
unknown
343680f46e Fix problem with NT named pipes code (per e-mail thread). 
sql/mysqld.cc:
  Should be mysql_unix_port (cut and paste error).
 2004-02-28 15:11:16 +01:00
unknown
588b8b9310 Changes to fix errors encountered in test builds on Windows. 
VC++Files/innobase/innobase.dsp:
  odbc0odbc.c was removed from the tree.
VC++Files/libmysql/libmysql.dsp:
  strxnmov.c is needed in this module.
sql/log_event.cc:
  Cast required to resolve compile error on Windows - byte * is 
  not equivalent to char *.
sql/opt_range.cc:
  Cast to const char * required to resolve compile error on Windows.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-02-27 16:51:01 +01:00
unknown
d32e12b253 row0upd.c: 
Fix bug: in a FOREIGN KEY, ON UPDATE CASCADE was not triggered if the update changed a string to another value identical in alphabetical ordering, e.g., abc -> aBc


innobase/row/row0upd.c:
  Fix bug: in a FOREIGN KEY, ON UPDATE CASCADE was not triggered if the update changed a string to another value identical in alphabetical ordering, e.g., abc -> aBc
 2004-02-27 16:54:16 +02:00
unknown
e0618ae4ae do not look for string characters "'` inside comments - bug#539 2004-02-26 01:05:04 +01:00
unknown
f3b4f760f6 Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/m/mysql-4.0
 2004-02-25 12:55:16 +02:00
unknown
22e1491188 trx0undo.c: 
Removed bogus assertion


innobase/trx/trx0undo.c:
  Removed bogus assertion
 2004-02-25 12:44:53 +02:00
unknown
1fbad3c0d2 Inserted comment about lost root pwd procedure in Docs relying on command order in mysqladmin. 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-02-25 09:46:43 +10:00
unknown
4e8d56654c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-02-24 23:10:13 +01:00
unknown
53660c6f5b --set-character-set and --character-sets-dir in myisamchk now work 2004-02-24 23:07:45 +01:00
unknown
7b185bb436 ha_innodb.cc: 
Add diagnostic code to analyze an assertion failure in ha_innodb.cc on line 2020 reported by a user (Bug #2903)


sql/ha_innodb.cc:
  Add diagnostic code to analyze an assertion failure in ha_innodb.cc on line 2020 reported by a user (Bug #2903)
 2004-02-24 17:38:47 +02:00
unknown
c72a9e7ede ut0dbg.h: 
If there is an assertion failur refer the user to section 6.1 of the InnoDB online manual about forcing recovery


innobase/include/ut0dbg.h:
  If there is an assertion failur refer the user to section 6.1 of the InnoDB online manual about forcing recovery
 2004-02-24 17:17:02 +02:00
unknown
dd8adcc89b A fix for double free of memory in mysqlbinlog. 2004-02-23 14:02:32 +02:00
unknown
1ef4295600 Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/m/mysql-4.0
 2004-02-23 12:34:33 +02:00
unknown
dcb196741f configure.in: 
Removed the unused odbc directory


innobase/configure.in:
  Removed the unused odbc directory
 2004-02-23 12:33:43 +02:00
unknown
9aecd2044e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-02-22 11:30:58 +01:00
unknown
a61331d805 Complement to 
ChangeSet 1.1616.23.1
Fix for BUG#1858 "SQL-Thread stops working when using optimize table".
A test for this.


sql/sql_base.cc:
  In remove_table_from_cache(), kill only delayed threads.
 2004-02-22 11:22:51 +01:00
unknown
16874ede63 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2004-02-22 10:52:43 +02:00
unknown
2100d85c4f Move tests that uses innodb to innodb.test 
mysql-test/t/lock_tables_lost_commit.test:
  Ensure that innodb is compiled in
 2004-02-22 09:58:51 +02:00
unknown
522e83b64a Cleanups 
acinclude.m4:
  Remove innobase/libodbc
innobase/Makefile.am:
  Remove innobase/libodbc
sql/sql_delete.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fixed wrong merge
 2004-02-22 08:54:06 +02:00
unknown
d8f1d154a4 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-02-22 00:20:09 +01:00
unknown
7759360dca ftb +(+(many -parens)) bug fixed 2004-02-22 00:19:36 +01:00
unknown
f312a516cc Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0


sql/sql_yacc.yy:
  Auto merged
 2004-02-22 00:40:50 +02:00
unknown
e06fbc5765 change that master_server_id is not a restricted word 2004-02-22 00:38:05 +02:00
unknown
62b22fb71a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-02-21 20:11:47 +02:00
unknown
3dcd3d4be9 making one symbol a keyword 2004-02-21 20:10:59 +02:00
unknown
ecf6eeca60 c++ comment fixed 2004-02-21 14:25:43 +01:00
unknown
ff76e674b5 ignore: 
added scripts/make_win_binary_distribution


BitKeeper/etc/ignore:
  added scripts/make_win_binary_distribution
 2004-02-21 14:00:54 +01:00
unknown
b0bdf5fda2 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-02-21 11:19:11 +01:00
unknown
6855954a97 portability fixes 
cleanup
 2004-02-21 11:18:29 +01:00
unknown
5db8fc5c27 Added missing argument to strxnmov() (Applies for windows debug mode) 
libmysql/libmysql.c:
  Added missing argument to strxnmov()
 2004-02-20 17:58:34 +02:00
unknown
40b8593d4e Fix name conflict with alternate capitalization 
VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old:
  Rename: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old
VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old:
  Rename: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old
VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old:
  Rename: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old
 2004-02-20 14:42:43 -01:00
unknown
458c4d3119 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/bk/mysql-4.0
 2004-02-20 14:42:42 -01:00
unknown
c198934d62 Remove unused files 
.del-odbc0odbc.c~6a372e94945263b5:
  Delete: innobase/odbc/odbc0odbc.c
.del-odbc0dummy.c~761be78656f44ad2:
  Delete: innobase/odbc/odbc0dummy.c
.del-makefilewin~15bf11ba8e0e4efe:
  Delete: innobase/odbc/makefilewin
.del-Makefile.am~f40398b15a266f24:
  Delete: innobase/odbc/Makefile.am


BitKeeper/deleted/.del-Makefile.am~f40398b15a266f24:
  Delete: innobase/odbc/Makefile.am
BitKeeper/deleted/.del-makefilewin~15bf11ba8e0e4efe:
  Delete: innobase/odbc/makefilewin
BitKeeper/deleted/.del-odbc0dummy.c~761be78656f44ad2:
  Delete: innobase/odbc/odbc0dummy.c
BitKeeper/deleted/.del-odbc0odbc.c~6a372e94945263b5:
  Delete: innobase/odbc/odbc0odbc.c
 2004-02-20 17:42:41 +02:00
unknown
661c40fb1c Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/m/mysql-4.0


innobase/que/que0que.c:
  Auto merged
 2004-02-20 16:40:25 +02:00
unknown
0eacf58fd5 Many files: 
Removed unused code
.del-os0trash.c~8cae5c1695501117:
  Delete: innobase/os/os0trash.c
dict0crea.c:
  Protect all sprintf(%s) with assertions


BitKeeper/deleted/.del-os0trash.c~8cae5c1695501117:
  Delete: innobase/os/os0trash.c
innobase/btr/btr0sea.c:
  Removed unused code
innobase/buf/buf0buf.c:
  Removed unused code
innobase/com/com0shm.c:
  Removed unused code
innobase/data/data0data.c:
  Removed unused code
innobase/dict/dict0crea.c:
  Removed unused code
innobase/fsp/fsp0fsp.c:
  Removed unused code
innobase/ha/ha0ha.c:
  Removed unused code
innobase/include/btr0cur.h:
  Removed unused code
innobase/include/btr0sea.h:
  Removed unused code
innobase/include/buf0buf.ic:
  Removed unused code
innobase/include/data0data.h:
  Removed unused code
innobase/include/dict0crea.h:
  Removed unused code
innobase/include/dict0dict.h:
  Removed unused code
innobase/include/ibuf0ibuf.h:
  Removed unused code
innobase/include/lock0lock.h:
  Removed unused code
innobase/include/mem0dbg.h:
  Removed unused code
innobase/include/mem0mem.ic:
  Removed unused code
innobase/include/mtr0log.h:
  Removed unused code
innobase/include/mtr0mtr.h:
  Removed unused code
innobase/include/os0proc.h:
  Removed unused code
innobase/include/os0thread.h:
  Removed unused code
innobase/include/rem0cmp.ic:
  Removed unused code
innobase/include/row0row.h:
  Removed unused code
innobase/include/srv0srv.h:
  Removed unused code
innobase/include/sync0sync.h:
  Removed unused code
innobase/lock/lock0lock.c:
  Removed unused code
innobase/log/log0recv.c:
  Removed unused code
innobase/mem/mem0dbg.c:
  Removed unused code
innobase/mtr/mtr0mtr.c:
  Removed unused code
innobase/os/os0proc.c:
  Removed unused code
innobase/page/page0page.c:
  Removed unused code
innobase/que/que0que.c:
  Removed unused code
innobase/rem/rem0cmp.c:
  Removed unused code
innobase/row/row0ins.c:
  Removed unused code
innobase/row/row0mysql.c:
  Removed unused code
innobase/row/row0row.c:
  Removed unused code
innobase/srv/srv0srv.c:
  Removed unused code
innobase/srv/srv0start.c:
  Removed unused code
innobase/sync/sync0sync.c:
  Removed unused code
innobase/trx/trx0rec.c:
  Removed unused code
innobase/trx/trx0trx.c:
  Removed unused code
innobase/ut/ut0dbg.c:
  Removed unused code
innobase/ut/ut0mem.c:
  Removed unused code
innobase/ut/ut0ut.c:
  Removed unused code
 2004-02-20 16:34:09 +02:00
unknown
89945d1d32 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-02-20 12:02:59 +01:00
unknown
2bd261a153 \| is sed is on-portable 2004-02-20 12:02:34 +01:00
unknown
ea9aa4d352 Major work on Windows build automation-- add binary packaging, suffixes 
Build-tools/Do-win-build:
  Add suffix option, classic build, binary packaging
VC++Files/comp_err/comp_err.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/myisampack/myisampack.dsp:
  Update project file -- binary goes to ../client_release now
scripts/Makefile.am:
  Add make_win_binary_distribution to Makefile (for @VERSION@)
 2004-02-19 19:04:47 -01:00
unknown
9bc5cdba41 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0


libmysql/libmysql.c:
  Auto merged
 2004-02-19 22:04:46 +02:00
unknown
68242939d8 Fixed usage of strxnmov() in recent changesets 
libmysql/libmysql.c:
  szPipeName -> pipe_name
  fixed usage of strxnmov()
mysys/mf_tempfile.c:
  Fixed usage of strnxmov()
  Simple optimization
mysys/my_tempnam.c:
  Fixed usage of strnxmov()
  Simple optimization
sql/log.cc:
  simple optimization
sql/mini_client.cc:
  szPipeName -> pipe_name
  fixed usage of strxnmov()
sql/mysqld.cc:
  szPipeName -> pipe_name
  fixed usage of strxnmov()
  Fixed indentation
 2004-02-19 22:04:31 +02:00
unknown
035ac2917c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-02-19 20:50:43 +02:00
unknown
e022b27860 Fix for a bug #2799. 
Multi-table delete's with tables having foreign key constraints
did not return the error.

Also added tests for multi-table updates.
 2004-02-19 19:43:46 +02:00
unknown
a01a3dd5ef Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-02-19 19:37:31 +02:00
unknown
4e01d4de15 crease number of open files to 2048 on windows 
Don't do fsync on temporary .frm files


include/config-win.h:
  Increase number of open files to 2048 on windows
sql/unireg.cc:
  Don't do fsync on temporary files
 2004-02-19 19:36:53 +02:00
unknown
41a76c7c61 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/bk/mysql-4.0


libmysql/libmysql.c:
  Auto merged
 2004-02-19 14:56:31 -01:00
unknown
6c1795ee09 Merge heikki@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.0
 2004-02-19 17:56:30 +02:00
unknown
1f696bf3a2 que0que.c: 
Testing if bk push works


innobase/que/que0que.c:
  Testing if bk push works
 2004-02-19 17:16:16 +02:00
unknown
7f44d1788b First round of changes to set up for Windows build automation. 
VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl:
  Add myisam_ftdump to client files
VC++Files/InstallShield/4.0.XX-classic/File Groups/Development.fgl:
  Add mysql_fix_privilege_tables.sql
VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl:
  Add README.txt
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl:
  Add myisam_ftdump to client files
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl:
  Add mysql_fix_privilege_tables.sql
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl:
  Add README.txt
VC++Files/InstallShield/4.0.XX-pro/File Groups/Clients and Tools.fgl:
  Add myisam_ftdump to client files
VC++Files/InstallShield/4.0.XX-pro/File Groups/Development.fgl:
  Add mysql_fix_privilege_tables.sql
VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl:
  Add README.txt
VC++Files/mysql.dsw:
  Add myisam_ftdump
VC++Files/mysys/mysys.dsp:
  Fix defines
VC++Files/sql/mysqld.dsp:
  Fix defines, etc
 2004-02-19 13:34:40 -01:00
unknown
f443541a36 srv_add_path_separator_if_needed: be static; use memcpy, not sprintf 
innobase/include/srv0start.h:
  Remove unused functions
innobase/srv/srv0start.c:
  srv_add_path_separator_if_needed: Replace sprintf with memcpy
 2004-02-19 14:56:19 +02:00