mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
54128 commits 2784 branches 343 tags 1.6 GiB
Commit graph

2974 commits

Author SHA1 Message Date
davi@mysql.com/endora.local
e293389f4b Silence warning due to copying the address of a string constant 
into a non-const string pointer.
 2008-05-06 10:37:36 -03:00
davi@endora.local
f28e6ac476 Merge mysql.com:/Users/davi/mysql/bugs/36031-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
 2008-05-05 17:26:43 -03:00
davi@mysql.com/endora.local
cca174b6b8 Bug#36031 Test funcs_1.<engine>_views failing on Windows 
The problem is a hack in mysqltest.c::append_field that modifies
the exponential notation of floating point numbers by removing a
zero after the the symbol 'e' (eg: 00001.2e+018 is converted to
00001.2e+18) but does not take into account the zerofill affect
in the start of the string.

The solution is to check if the field was zero filled and insert
a zero at the start of the string if a zero after the exponential
notation symbol is removed.
 2008-05-02 15:10:32 -03:00
msvensson@pilot.mysql.com
ee6373ab7c Remove unused variable 2008-05-02 19:44:18 +02:00
msvensson@pilot.mysql.com
8d35b57b37 Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-bugteam
 2008-05-02 19:42:34 +02:00
msvensson@pilot.mysql.com
e549ba8067 Bug#36469 mysql_upgrade does not use --tmpdir 2008-05-02 14:41:19 +02:00
msvensson@pilot.mysql.com
c1918b0464 Bug#36465 mysqltest should always use the --tmpdir 2008-05-02 11:22:10 +02:00
pcrews@pcrews-mac-local.local
b3510ccf90 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs
 2008-05-01 11:58:39 -04:00
pcrews@pcrews-mac-local.local
91e893bca1 Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs 
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs
 2008-05-01 11:37:34 -04:00
pcrews@pcrews-mac-local.local
853b9f4d0c Bug#36026 - Test funcs_1.<engine>_trig_03 failing on Windows 
Bug#36028 - Test funcs_1.<engine>_trig_03e failing on Windows
Bug#36029 - Test funcs_1.<engine>_trig_0407 failing on Windows
Bug#36030 - Test funcs_1.<engine>_trig_08 failing on Windows

Adding $MASTER_MYSOCK to init_win_path()
When path names are short, master.sock ends up in MYSQL_TMP_DIR, but with longer path names,
master.sock ends up in /tmp/<random_string>/ and these tests will fail due to path delimiter difference.

New changeset to start with 5.0 -- Not all of these tests are present in 5.0, but want to keep mysqltest the same
 2008-05-01 11:36:03 -04:00
gkodinov/kgeorge@magare.gmz
c9428af688 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  magare.gmz:/home/kgeorge/mysql/autopush/B36041-5.1-bugteam
 2008-05-01 16:34:14 +03:00
gkodinov/kgeorge@magare.gmz
0cbca19357 Bug #36041: mysql-test-run doesn't seem to string match 
100% effectively on Windows

The mysqltest docs state that the 'replace_result' command
doesn't perform any escape processing.
However the current implementation was processing backslash 
escapes in the from/to strings.
This prevents replacing e.g. patch on windows (where backslash
is used as a path separator).
Fixed by removing the backslash escape processing from 
'replace_result'.
 2008-04-29 19:08:52 +03:00
cmiller@zippy.cornsilk.net
9fe5c36668 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug35157/my51-bug35157 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-24 10:50:38 -04:00
cmiller@zippy.cornsilk.net
13fa535b80 Bug#35157: mysqldump should use FLUSH TABLES NO_WRITE_TO_BINLOG \ 
when --master-data is used

When using the --master-data option with mysqldump, mysqldump uses 
a FLUSH TABLES command.  However, this statement got replicated to 
the slave(s), which caused the slave(s) to block unnecessarily while
the FLUSH tables command completed.

Now, if the master-data option is set to one of the two "on" modes,
then use the "LOCAL" qualifier to ensure that it's not replicated.
 2008-04-14 17:43:08 -04:00
cmiller@zippy.cornsilk.net
7b77e36909 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-03 13:21:02 -04:00
cmiller@zippy.cornsilk.net
7e78633f81 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
 2008-04-03 13:14:57 -04:00
cmiller@zippy.cornsilk.net
9ff7a0cedc Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3 
When linking with some external programs, "multiple definition 
of `init_time'"

Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).
 2008-04-03 11:32:00 -04:00
gkodinov/kgeorge@magare.gmz
0463ba57a5 Merge bk-internal:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
 2008-03-31 11:57:18 +03:00
gkodinov/kgeorge@magare.gmz
dd62320d0e Merge bk-internal:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
 2008-03-31 10:40:39 +03:00
aelkin/andrei@mysql1000.(none)
c7447a25c6 Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-30 14:12:27 +03:00
aelkin/andrei@mysql1000.(none)
22536fc53e Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-29 14:19:53 +02:00
iggy@amd64.(none)
b9877b84ac Merge amd64.(none):/src/mysql-5.0-bugteam 
into  amd64.(none):/src/bug26243/my50-bug26243
 2008-03-28 16:01:05 -04:00
iggy@amd64.(none)
01aa4736f7 Merge amd64.(none):/src/mysql-5.1-bugteam 
into  amd64.(none):/src/bug26243/my51-bug26243
 2008-03-28 15:00:35 -04:00
iggy@amd64.(none)
09a2292d3f Merge amd64.(none):/src/bug26243/my50-bug26243 
into  amd64.(none):/src/bug26243/my51-bug26243
 2008-03-28 14:20:21 -04:00
iggy@amd64.(none)
79e434bc67 Bug#26243 mysql command line crash after control-c 
- Backported the 5.1 DBUG to 5.0.
- Avoid memory cleanup race on Windows client for CTRL-C
 2008-03-28 14:02:27 -04:00
jani@a88-113-38-195.elisa-laajakaista.fi
090d1396cf Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2008-03-28 12:14:27 +02:00
tnurnberg@white.intern.koehntopp.de
282825af33 Merge mysql.com:/misc/mysql/mysql-5.0 
into  mysql.com:/misc/mysql/mysql-5.0-opt
 2008-03-27 23:35:56 +01:00
tnurnberg@white.intern.koehntopp.de
a3df2a4cf4 Merge mysql.com:/misc/mysql/mysql-5.1 
into  mysql.com:/misc/mysql/mysql-5.1-opt
 2008-03-27 23:34:12 +01:00
gshchepa/uchum@host.loc
810059404e Merge host.loc:/home/uchum/work/mysql-5.1 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 15:54:45 +04:00
tsmith@rhel5-ia64-a.mysql.com
3069db1da7 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
 2008-03-27 08:20:25 +01:00
holyfoot/hf@hfmain.(none)
0440eb7798 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/33334/my51-33334
 2008-03-23 21:55:02 +04:00
holyfoot/hf@hfmain.(none)
28b8fa10a8 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/33334/my50-33334
 2008-03-23 21:53:36 +04:00
holyfoot/hf@hfmain.(none)
766998684d Merge mysql.com:/home/hf/work/33334/my50-33334 
into  mysql.com:/home/hf/work/33334/my51-33334
 2008-03-23 20:35:00 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
635b44f19b Bug #33334 mysqltest_embedded crashes when disconnecting before reap. 
Before breaking the connection we have to check that there's no query
  executing at the moment. Otherwise it can lead to crash in embedded server.
 2008-03-19 15:51:22 +04:00
anozdrin/alik@quad.opbmk
fa6ed3cf36 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2008-03-18 13:51:17 +03:00
anozdrin/alik@quad.
f2b39a5a5b A patch for Bug#35329: connect does not set mysql_errno variable. 
The problem was that 'connect' command didn't set mysql_errno
variable, thus the script was unable to determine whether connection
was opened or not.

The fix is to set this variable.

Test cases will be added in the scope of Bug33507
into connect.test file.
 2008-03-17 13:39:56 +03:00
joerg@trift2.
e784898959 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-14 14:41:08 +01:00
joerg@trift2.
b399594a4a Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2008-03-14 14:32:01 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
74cbd71e94 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2008-03-13 23:35:52 +02:00
cmiller@zippy.cornsilk.net
23ce2f5129 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-03-13 14:01:11 -04:00
cmiller@zippy.cornsilk.net
8c1ba819be Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-03-13 11:22:11 -04:00
cmiller@zippy.cornsilk.net
e0af86743b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192
 2008-03-13 10:10:31 -04:00
cmiller@zippy.cornsilk.net
ad3f51b54e Bug#34192: mysqldump from mysql 5.0.51 silently fails on dumping \ 
databases from 4.0 server

mysqldump treated a failure to set the results charset as a severe
error.  

Now, don't try to set the charset for the SHOW CREATE TABLE statement,
if remote server's version is earlier than 4.1, which means it 
doesn't support changing charsets.
 2008-03-12 17:03:50 -04:00
kaa@kaamos.(none)
0a7052e4d3 Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 11:19:46 +03:00
kaa@kaamos.(none)
d0eb90501d Merge kaamos.(none):/data/src/mysql-5.0 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-12 10:59:15 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
ab013df080 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2008-03-07 11:25:47 +02:00
gkodinov/kgeorge@magare.gmz
dbc3ef6c9f Merge magare.gmz:/home/kgeorge/mysql/work/B34909-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B34909-5.1-opt
 2008-03-07 11:19:51 +02:00
gkodinov/kgeorge@magare.gmz
11cd97ed6b Bug #34909: mysqldump returns a 0 status on error when using 
--master-data

No error code was returned by mysqldump if it detects that binary
logging is not enabled on the server.
Fixed by returning error code.
 2008-03-07 11:15:49 +02:00
msvensson@pilot.mysql.com
78392fbc84 Merge bk-internal:/home/bk/mysql-5.1-rpl 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
 2008-03-06 08:39:23 +01:00
msvensson@pilot.mysql.com
8cf2e2f3c4 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-rpl 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
 2008-02-28 15:06:59 +01:00