Sergei Golubchik
d2755a2c9c
5.3->5.5 merge
2011-11-22 18:04:38 +01:00
Sergei Golubchik
0e007344ea
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
Sergei Golubchik
aeaa112edb
fixes for windows
2011-10-21 23:07:13 +02:00
Sergei Golubchik
76f0b94bb0
merge with 5.3
...
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
2011-10-19 21:45:18 +02:00
unknown
255c04aed8
Compiler warning about assigned but not used variables fixed.
2011-10-18 13:44:12 +03:00
Sergei Golubchik
7e6c8ea891
remove unused autotools files
2011-07-03 20:07:41 +02:00
Sergei Golubchik
0accbd0364
lots of post-merge changes
2011-04-25 17:22:25 +02:00
unknown
970e67b5e3
MBug#691437: storage/sphinx/plug.in missing from source tarball.
...
It was missing from EXTRA_DIST in Makefile.am.
2010-12-17 08:33:36 +01:00
Michael Widenius
863a493b4f
Fixed compiler warnings
...
sql/debug_sync.cc:
Initalize variable
storage/sphinx/Makefile.am:
Ensure we compile with the -Wno-unused-parameter flag
2010-12-01 22:23:59 +02:00
Michael Widenius
1e5061fe3b
merge with 5.1
2010-11-30 23:11:03 +02:00
Sergei Golubchik
65ca700def
merge.
...
checkpoint.
does not compile.
2010-11-25 18:17:28 +01:00
unknown
95b37a254b
Merge MariaDB 5.1->5.2
2010-11-19 22:33:47 +01:00
Sergei Golubchik
6467bcca60
oqgraph and sphinx on windows
2010-09-15 17:29:57 +02:00
Michael Widenius
ec06ba2455
Fixed compiler warnings
...
sql/item.h:
Fixed wrong declaration
storage/sphinx/ha_sphinx.h:
Fixed arguments to read_time()
storage/sphinx/snippets_udf.cc:
Include mysql headerfile first to avoid compiler warnings
2010-08-26 16:20:27 +03:00
Michael Widenius
13141c9842
Fixed compiler warnings and test failures
2010-08-06 11:05:44 +03:00
Michael Widenius
a35b486323
Fixed compiler and valgrind warnings
...
mysql-test/valgrind.supp:
Added suppression for memory leak in dlsym() on work-amd64
plugin/auth/auth_socket.c:
Fixed compiler warning (wrong macro usage)
storage/example/ha_example.cc:
Fixed compiler warnings
storage/sphinx/ha_sphinx.cc:
Fixed compiler warnings
2010-07-19 21:53:28 +03:00
unknown
6197332366
Initial import of SpinxSE, with fixes for MariaDB.
2010-07-09 14:03:09 +02:00
