kent@mysql.com/kent-amd64.(none)
21c7eca2bf
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 05:35:10 +01:00
kent@mysql.com/kent-amd64.(none)
67868597bb
Many files:
...
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
Changed copyright header formatting some
plugin_example.c, daemon_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729
my_strtoll10-x86.s:
...
Corrected spelling in copyright text
Makefile.am:
Don't update the files from BitKeeper
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Many files:
Added GPL copyright text
Removed files:
Docs/Support/colspec-fix.pl
Docs/Support/docbook-fixup.pl
Docs/Support/docbook-prefix.pl
Docs/Support/docbook-split
Docs/Support/make-docbook
Docs/Support/make-makefile
Docs/Support/test-make-manual
Docs/Support/test-make-manual-de
Docs/Support/xwf
2006-12-31 01:02:27 +01:00
joerg@trift2.
cb5e2b3004
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-12-28 18:22:43 +01:00
tsmith/tim@siva.hindu.god
682596d7ce
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-26 22:28:28 -07:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa
Many files:
...
Changed header to GPL version 2 only
2006-12-27 02:23:51 +01:00
tsmith/tim@siva.hindu.god
0cb9cee7f4
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
2006-12-26 16:49:10 -07:00
kent@kent-amd64.(none)
be15e3bc15
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
patg@radha.patg.net
2e538b4192
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
2006-12-22 08:57:32 -05:00
tsmith/tim@siva.hindu.god
8075fc447e
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-12-21 18:23:14 -07:00
joerg@trift2.
1341cf1827
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M51/tmp-5.1
2006-12-21 12:18:28 +01:00
df@kahlann.erinye.com
dc33e0f49d
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-24896
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-20 10:40:05 +01:00
monty@mysql.com/narttu.mysql.fi
a6481aa4c7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-12-15 01:01:52 +02:00
monty@mysql.com/narttu.mysql.fi
88dd873de0
Fixed compiler warnings detected by option -Wshadow and -Wunused:
...
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments
Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c
I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
2006-12-15 00:51:37 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
ba6529d7dd
Bug#17642 mysqlbinlog: Restore from row-based binlog fails
...
Problem: mysqlbinlog_base64 failed sporadically.
Reason: Missing "flush logs" before running $MYSQL_BINLOG,
which could start dumping the log file before server
has finished writting into it.
Fix:
- implementing --force-if-open option to "mysqlbinlog"
- adding --disable-force-if-open to make $MYSQL_BINLOG
fail on non-closed log files, to garantee that nobody
will forget "flush logs" in the future.
- adding "flush logs" into all affected tests.
2006-12-14 14:05:25 +04:00
df@kahlann.erinye.com
b9cce096a2
BUG#24896 magnus' suggestion
2006-12-12 15:47:02 +01:00
msvensson@neptunus.(none)
a31827f923
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-11 17:05:04 +01:00
msvensson@neptunus.(none)
b880d8aa05
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-11 17:04:14 +01:00
msvensson@neptunus.(none)
8a7ea3c744
Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite
...
- Add printout in safe_connect indicating that mysqltest is in a loop waiting for
connection to mysqld. Will be printed when --verbose is passed as argument to
mysqltest
2006-12-11 15:39:15 +01:00
msvensson@neptunus.(none)
4e34f77c85
Bug#23735 mysqlbinlog client fails when reading binlog from stdin
...
- Windows opens stdin in text mode by default. Certain characters
such as CTRL-Z are interpeted as events and the read() method
will stop. CTRL-Z is the EOF marker in Windows. to get past this
you have to open stdin in binary mode. Setmode() is used to set
stdin in binary mode. Errors on setting this mode result in
halting the function and printing an error message to stderr.
2006-12-11 11:25:45 +01:00
pgalbraith@bk-internal.mysql.com
23f0c6d765
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-09 02:34:42 +01:00
lars@black.(none)
d85ca0dc1d
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-12-08 23:41:29 +01:00
lars@mysql.com/black.(none)
e2e3f0e5c3
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-12-08 23:33:39 +01:00
lars@mysql.com/black.(none)
587330f125
Merge mysql.com:/home/bkroot/mysql-4.1-rpl
...
into mysql.com:/home/bk/MERGE/mysql-4.1-merge
2006-12-08 23:33:15 +01:00
msvensson@neptunus.(none)
aba988485a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-08 16:53:59 +01:00
msvensson@neptunus.(none)
3a4491c70a
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-08 16:50:54 +01:00
msvensson@neptunus.(none)
3e43b86329
Add missing space
2006-12-08 16:48:49 +01:00
msvensson@neptunus.(none)
9064723d1b
Bug#19410 Test 'kill' fails on Windows + SCO
...
- Use "mysql_field_count" to determine if there is a need to
call "mysql_store_result"
2006-12-08 16:43:50 +01:00
msvensson@neptunus.(none)
40927c0cb2
Bug#24498 Stack overflow in mysqltest
...
- Thanks to Vasil Dimov for the patch!
2006-12-08 16:08:54 +01:00
rafal@quant.(none)
fe2d5c59c2
Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
...
into quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
2006-12-08 11:47:48 +01:00
df@kahlann.erinye.com
8375e6684d
BUG#24896 mysql_upgrade -p fix
2006-12-08 10:23:03 +01:00
bar@bar.intranet.mysql.r18.ru
864ad7daa0
After merge fix
2006-12-08 10:33:05 +04:00
msvensson@neptunus.(none)
961275a356
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-06 23:45:09 +01:00
msvensson@neptunus.(none)
94eb027f6b
Only call mysql_server_end if mysql_server_init has been called.
...
Remove DBUG_ENTER in my_end
2006-12-06 23:43:36 +01:00
msvensson@neptunus.(none)
90226bbc33
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-05 19:19:58 +01:00
msvensson@neptunus.(none)
6d71f74743
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883
2006-12-05 18:46:08 +01:00
msvensson@neptunus.(none)
0879aeae0c
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 20:02:48 +01:00
msvensson@neptunus.(none)
2f79d20bc3
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:36:53 +01:00
msvensson@neptunus.(none)
128b73fc36
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
544d0c909b
mysqltest
...
Close any statements that might be open before program exit
Close any statments that might be open when calling "disable_ps_protocol"
2006-12-04 19:16:55 +01:00
msvensson@neptunus.(none)
971c783f7d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
msvensson@neptunus.(none)
33c248eee5
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:06:42 +01:00
msvensson@neptunus.(none)
c2488ba10f
Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connection to MySQL
...
- Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
attempt in mysqltest
2006-12-04 15:48:34 +01:00
baker@bk-internal.mysql.com
dbe5f0acc5
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-03 21:19:35 +01:00
brian@zim.(none)
31d67280f7
This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h
2006-12-01 17:26:52 -08:00
mskold/marty@linux.site
6f0e7a2631
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 21:12:13 +01:00
df@kahlann.erinye.com
da7820c37d
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-01 13:02:54 +01:00
df@kahlann.erinye.com
6dc7e55e9c
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-01 10:39:48 +01:00